cloud-fan commented on code in PR #36586:
URL: https://github.com/apache/spark/pull/36586#discussion_r891881553
##########
sql/core/src/test/scala/org/apache/spark/sql/internal/CatalogSuite.scala:
##########
@@ -553,4 +571,103 @@ class CatalogSuite extends SharedSparkSession with
AnalysisTest {
}.getMessage
assert(errMsg.contains("my_temp_table is a temp view.
'recoverPartitions()' expects a table"))
}
+
+ test("three layer namespace compatibility - create managed table") {
+ val catalogName = "testcat"
+ val dbName = "my_db"
+ val tableName = "my_table"
+ val tableSchema = new StructType().add("i", "int")
+ val description = "this is a test table"
+
+ val df = spark.catalog.createTable(
+ tableName = Array(catalogName, dbName, tableName).mkString("."),
+ source = classOf[FakeV2Provider].getName,
+ schema = tableSchema,
+ description = description,
+ options = Map.empty[String, String])
+ assert(df.schema.equals(tableSchema))
+
+ val testCatalog =
+ spark.sessionState.catalogManager.catalog(catalogName).asTableCatalog
+ val table = testCatalog.loadTable(Identifier.of(Array(dbName), tableName))
+ assert(table.schema().equals(tableSchema))
+
assert(table.properties().get("provider").equals(classOf[FakeV2Provider].getName))
+ assert(table.properties().get("comment").equals(description))
+ }
+
+ test("three layer namespace compatibility - create external table") {
+ withTempDir { dir =>
+ val catalogName = "testcat"
+ val dbName = "my_db"
+ val tableName = "my_table"
+ val tableSchema = new StructType().add("i", "int")
+ val description = "this is a test table"
+
+ val df = spark.catalog.createTable(
+ tableName = Array(catalogName, dbName, tableName).mkString("."),
+ source = classOf[FakeV2Provider].getName,
+ schema = tableSchema,
+ description = description,
+ options = Map("path" -> dir.getAbsolutePath))
+ assert(df.schema.equals(tableSchema))
+
+ val testCatalog =
+ spark.sessionState.catalogManager.catalog("testcat").asTableCatalog
+ val table = testCatalog.loadTable(Identifier.of(Array(dbName),
tableName))
+ assert(table.schema().equals(tableSchema))
+
assert(table.properties().get("provider").equals(classOf[FakeV2Provider].getName))
+ assert(table.properties().get("comment").equals(description))
+ assert(table.properties().get("path").equals(dir.getAbsolutePath))
+ assert(table.properties().get("external").equals("true"))
+ assert(table.properties().get("location").equals("file:" +
dir.getAbsolutePath))
+ }
+ }
+
+ test("three layer namespace compatibility - list tables") {
+ withTempDir { dir =>
+ val catalogName = "testcat"
+ val dbName = "my_db"
+ val tableName = "my_table"
+ val tableSchema = new StructType().add("i", "int")
+ val description = "this is a test managed table"
+
+ spark.catalog.createTable(
+ tableName = Array(catalogName, dbName, tableName).mkString("."),
+ source = classOf[FakeV2Provider].getName,
+ schema = tableSchema,
+ description = description,
+ options = Map.empty[String, String])
+
+ val tableName2 = "my_table2"
+ val description2 = "this is a test external table"
+
+ spark.catalog.createTable(
+ tableName = Array(catalogName, dbName, tableName2).mkString("."),
+ source = classOf[FakeV2Provider].getName,
+ schema = tableSchema,
+ description = description2,
+ options = Map("path" -> dir.getAbsolutePath))
+
+ val tables = spark.catalog.listTables("testcat.my_db").collect()
+ assert(tables.size == 2)
+
+ val expectedTable1 =
+ new Table(tableName, catalogName, Array(dbName), description,
+ CatalogTableType.MANAGED.name, false)
+ assert(tables.exists(t =>
+ expectedTable1.name.equals(t.name) &&
expectedTable1.database.equals(t.database) &&
+ expectedTable1.description.equals(t.description) &&
+ expectedTable1.tableType.equals(t.tableType) &&
+ expectedTable1.isTemporary == t.isTemporary))
+
+ val expectedTable2 =
+ new Table(tableName2, catalogName, Array(dbName), description2,
+ CatalogTableType.EXTERNAL.name, false)
+ assert(tables.exists(t =>
+ expectedTable2.name.equals(t.name) &&
expectedTable2.database.equals(t.database) &&
+ expectedTable2.description.equals(t.description) &&
+ expectedTable2.tableType.equals(t.tableType) &&
+ expectedTable2.isTemporary == t.isTemporary))
+ }
Review Comment:
can we test the backward compatibility case? e.g. register a new catalog
"default" in this test case, and `listTable("default")` should still list
tables under "default" schema in HMS.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
