Switch to asMultiPartIdentifier function for pattern matching

urosstan-db · Feb 27, 2024 · 5f4e062 · 5f4e062
1 parent d142e15
commit 5f4e062
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 27 deletions.
diff --git a/sql/api/src/main/scala/org/apache/spark/sql/connector/catalog/IdentifierParts.scala b/sql/api/src/main/scala/org/apache/spark/sql/connector/catalog/IdentifierParts.scala
diff --git a/...e/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2Strategy.scala b/...e/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2Strategy.scala
@@ -33,7 +33,7 @@ import org.apache.spark.sql.catalyst.expressions.Literal.TrueLiteral
 import org.apache.spark.sql.catalyst.planning.PhysicalOperation
 import org.apache.spark.sql.catalyst.plans.logical._
 import org.apache.spark.sql.catalyst.util.{toPrettySQL, GeneratedColumn, ResolveDefaultColumns, V2ExpressionBuilder}
-import org.apache.spark.sql.connector.catalog.{Identifier, IdentifierParts, StagingTableCatalog, SupportsDeleteV2, SupportsNamespaces, SupportsPartitionManagement, SupportsWrite, Table, TableCapability, TableCatalog, TruncatableTable}
+import org.apache.spark.sql.connector.catalog.{Identifier, StagingTableCatalog, SupportsDeleteV2, SupportsNamespaces, SupportsPartitionManagement, SupportsWrite, Table, TableCapability, TableCatalog, TruncatableTable}
 import org.apache.spark.sql.connector.catalog.index.SupportsIndex
 import org.apache.spark.sql.connector.expressions.{FieldReference, LiteralValue}
 import org.apache.spark.sql.connector.expressions.filter.{And => V2And, Not => V2Not, Or => V2Or, Predicate}
@@ -117,8 +117,8 @@ class DataSourceV2Strategy(session: SparkSession) extends Strategy with Predicat
       val rdd = v1Relation.buildScan()
       val unsafeRowRDD = DataSourceStrategy.toCatalystRDD(v1Relation, output, rdd)
 
-      val tableIdentifier = v2Relation.identifier match {
-        case Some(IdentifierParts(Seq(schema, tableName))) =>
+      val tableIdentifier = v2Relation.identifier.map(_.asMultipartIdentifier) match {
+        case Some(Seq(schema, tableName)) =>
           Some(new TableIdentifier(tableName, Some(schema), v2Relation.catalog.map(_.name())))
         case _ =>
           None