Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix column name with special character when create materialized view #98

Merged
merged 4 commits into from
Oct 25, 2023
Merged

Fix column name with special character when create materialized view #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
711e1a5
Add IT to verify identifier is unquoted properly
dai-chen Oct 23, 2023
00c203a
Fix dotted column name issue with IT
dai-chen Oct 24, 2023
d5b4861
Merge branch 'main' into fix-quoted-identifier-issue
dai-chen Oct 25, 2023
560ed66
Merge branch 'main' into fix-quoted-identifier-issue
dai-chen Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion flint-spark-integration/src/main/scala/org/opensearch/flint/spark/FlintSparkIndex.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,10 @@ object FlintSparkIndex {
}

def generateSchemaJSON(allFieldTypes: Map[String, String]): String = {
// Backtick column names to escape special characters, otherwise fromDDL() will fail
val catalogDDL =
allFieldTypes
.map { case (colName, colType) => s"$colName $colType not null" }
.map { case (colName, colType) => s"`$colName` $colType not null" }
.mkString(",")

val structType = StructType.fromDDL(catalogDDL)
Expand Down
17 changes: 16 additions & 1 deletion integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkCoveringIndexSqlITSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package org.opensearch.flint.spark

import scala.Option.empty
import scala.collection.JavaConverters.mapAsJavaMapConverter
import scala.collection.JavaConverters.{mapAsJavaMapConverter, mapAsScalaMapConverter}

import org.json4s.{Formats, NoTypeHints}
import org.json4s.native.JsonMethods.parse
Expand Down Expand Up @@ -179,6 +179,21 @@ class FlintSparkCoveringIndexSqlITSuite extends FlintSparkSuite {
|""".stripMargin)
}

test("create skipping index with quoted index, table and column name") {
sql(s"""
| CREATE INDEX `$testIndex` ON `spark_catalog`.`default`.`covering_sql_test`
| (`name`, `age`)
| """.stripMargin)

val index = flint.describeIndex(testFlintIndex)
index shouldBe defined

val metadata = index.get.metadata()
metadata.name shouldBe testIndex
metadata.source shouldBe testTable
metadata.indexedColumns.map(_.asScala("columnName")) shouldBe Seq("name", "age")
}

test("show all covering index on the source table") {
flint
.coveringIndex()
Expand Down
24 changes: 23 additions & 1 deletion ...test/src/test/scala/org/opensearch/flint/spark/FlintSparkMaterializedViewSqlITSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package org.opensearch.flint.spark
import java.sql.Timestamp

import scala.Option.empty
import scala.collection.JavaConverters.mapAsJavaMapConverter
import scala.collection.JavaConverters.{mapAsJavaMapConverter, mapAsScalaMapConverter}

import org.json4s.{Formats, NoTypeHints}
import org.json4s.native.JsonMethods.parse
Expand Down Expand Up @@ -157,6 +157,28 @@ class FlintSparkMaterializedViewSqlITSuite extends FlintSparkSuite {
sql(s"CREATE MATERIALIZED VIEW IF NOT EXISTS $testMvName AS $testQuery")
}

test("create materialized view with quoted name and column name") {
val testQuotedQuery =
""" SELECT
| window.start AS `start.time`,
| COUNT(*) AS `count`
| FROM `spark_catalog`.`default`.`mv_test`
| GROUP BY TUMBLE(`time`, '10 Minutes')""".stripMargin.trim

sql(s"""
| CREATE MATERIALIZED VIEW `spark_catalog`.`default`.`mv_test_metrics`
| AS $testQuotedQuery
|""".stripMargin)

val index = flint.describeIndex(testFlintIndex)
index shouldBe defined

val metadata = index.get.metadata()
metadata.name shouldBe testMvName
metadata.source shouldBe testQuotedQuery
metadata.indexedColumns.map(_.asScala("columnName")) shouldBe Seq("start.time", "count")
}

test("show all materialized views in catalog and database") {
// Show in catalog
flint.materializedView().name("spark_catalog.default.mv1").query(testQuery).create()
Expand Down
20 changes: 19 additions & 1 deletion integ-test/src/test/scala/org/opensearch/flint/spark/FlintSparkSkippingIndexSqlITSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package org.opensearch.flint.spark

import scala.Option.empty
import scala.collection.JavaConverters.mapAsJavaMapConverter
import scala.collection.JavaConverters.{mapAsJavaMapConverter, mapAsScalaMapConverter}

import org.json4s.{Formats, NoTypeHints}
import org.json4s.native.JsonMethods.parse
Expand Down Expand Up @@ -150,6 +150,24 @@ class FlintSparkSkippingIndexSqlITSuite extends FlintSparkSuite {
| """.stripMargin)
}

test("create skipping index with quoted table and column name") {
sql(s"""
| CREATE SKIPPING INDEX ON `spark_catalog`.`default`.`skipping_sql_test`
| (
| `year` PARTITION,
| `name` VALUE_SET,
| `age` MIN_MAX
| )
| """.stripMargin)

val index = flint.describeIndex(testIndex)
index shouldBe defined

val metadata = index.get.metadata()
metadata.source shouldBe testTable
metadata.indexedColumns.map(_.asScala("columnName")) shouldBe Seq("year", "name", "age")
}

test("describe skipping index") {
flint
.skippingIndex()
Expand Down
Loading