cloud-fan commented on a change in pull request #25771: [SPARK-28970][SQL]
Implement USE CATALOG/NAMESPACE for Data Source V2
URL: https://github.com/apache/spark/pull/25771#discussion_r328971225
##########
File path:
sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2SQLSuite.scala
##########
@@ -830,6 +830,70 @@ class DataSourceV2SQLSuite
assert(df.collect().map(_.getAs[String](0)).sorted === expected.sorted)
}
+ test("UseCatalog: use catalog with v2 catalog") {
+ val catalogManager = spark.sessionState.catalogManager
+ assert(catalogManager.currentCatalog.name() == "session")
+
+ sql("USE CATALOG testcat")
+ assert(catalogManager.currentCatalog.name() == "testcat")
+ }
+
+ test("UseCatalog: v2 catalog does not exist") {
+ val exception = intercept[AnalysisException] {
+ sql("USE CATALOG unknown")
+ }
+ assert(exception.getMessage.contains("v2 catalog 'unknown' cannot be
loaded"))
+ }
+
+ test("Use: basic tests with USE statements") {
+ val catalogManager = spark.sessionState.catalogManager
+
+ // Validate the initial current catalog and namespace.
+ assert(catalogManager.currentCatalog.name() == "session")
+ assert(catalogManager.currentNamespace === Array("default"))
+
+ // The following implicitly creates namespaces.
+ sql("CREATE TABLE testcat.ns1.ns1_1.table (id bigint) USING foo")
+ sql("CREATE TABLE testcat2.ns2.ns2_2.table (id bigint) USING foo")
+ sql("CREATE TABLE testcat2.ns3.ns3_3.table (id bigint) USING foo")
+
+ // Catalog is explicitly specified as 'testcat'.
+ sql("USE ns1.ns1_1 IN testcat")
+ assert(catalogManager.currentCatalog.name() == "testcat")
+ assert(catalogManager.currentNamespace === Array("ns1", "ns1_1"))
+
+ // Catalog is resolved to 'testcat2'.
+ sql("USE testcat2.ns2.ns2_2")
Review comment:
If we go with this proposal, we can simplify the parser a little bit
```
USE (CATALOG | NAMESPACE)? multipartIdentifier
```
```
def visitUse(ctx: UseContext): LogicalPlan = withOrigin(ctx) {
val nameParts = visitMultipartIdentifier(ctx.multipartIdentifier)
// USE CATALOG can only specify a single catalog name
if (ctx.CATALOG != null && nameParts.length > 1) parser error
UseStatement(ctx.CATALOG != null, ctx.NAMESPACE != null, nameParts)
}
...
case class UseStatement(isCatalog: Boolean, isNamespace: Boolean, nameParts:
Seq[String]) {
if (isCatalog) {
assert(!isNamespace) // isCatalog and isNamespace can't be both true
assert(nameParts.length ==1) // USE CATALOG can only specify a single
catalog name
}
}
...
```
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
