Skip to content

[SPARK-47265][SQL][FOLLOWUP] V2SessionCatalog#createTable should not fail #47755

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

Closed
cloud-fan wants to merge 1 commit into from
Closed

[SPARK-47265][SQL][FOLLOWUP] V2SessionCatalog#createTable should not fail #47755

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 15 additions & 4 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/V2SessionCatalog.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import org.apache.spark.sql.internal.connector.V1Function
import org.apache.spark.sql.types.{DataType, StructType}
import org.apache.spark.sql.util.CaseInsensitiveStringMap
import org.apache.spark.util.ArrayImplicits._
import org.apache.spark.util.Utils

/**
* A [[TableCatalog]] that translates calls to the v1 SessionCatalog.
Expand Down Expand Up @@ -158,9 +159,9 @@ class V2SessionCatalog(catalog: SessionCatalog)
catalog.refreshTable(ident.asTableIdentifier)
}

override def createTable(
private def createTable0(
ident: Identifier,
columns: Array[Column],
schema: StructType,
partitions: Array[Transform],
properties: util.Map[String, String]): Table = {
import org.apache.spark.sql.connector.catalog.CatalogV2Implicits._
Expand All @@ -178,7 +179,6 @@ class V2SessionCatalog(catalog: SessionCatalog)
CatalogTableType.MANAGED
}

val schema = CatalogV2Util.v2ColumnsToStructType(columns)
val (newSchema, newPartitions) = DataSourceV2Utils.getTableProvider(provider, conf) match {
// If the provider does not support external metadata, users should not be allowed to
// specify custom schema when creating the data source table, since the schema will not
Expand Down Expand Up @@ -255,7 +255,18 @@ class V2SessionCatalog(catalog: SessionCatalog)
schema: StructType,
partitions: Array[Transform],
properties: util.Map[String, String]): Table = {
throw QueryCompilationErrors.createTableDeprecatedError()
if (Utils.isTesting) {
throw QueryCompilationErrors.createTableDeprecatedError()
}
createTable0(ident, schema, partitions, properties)
}

override def createTable(
ident: Identifier,
columns: Array[Column],
partitions: Array[Transform],
properties: util.Map[String, String]): Table = {
createTable0(ident, CatalogV2Util.v2ColumnsToStructType(columns), partitions, properties)
}

private def toOptions(properties: Map[String, String]): Map[String, String] = {
Expand Down