Skip to content

[SPARK-48709][SQL] Fix varchar type resolution mismatch for DataSourceV2 CTAS #47082

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
wangyum wants to merge 1 commit into from
Closed

[SPARK-48709][SQL] Fix varchar type resolution mismatch for DataSourceV2 CTAS #47082

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/v2Commands.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,11 @@ trait V2WriteCommand extends UnaryCommand with KeepAnalyzedQuery with CTEInChild
table.skipSchemaResolution || (query.output.size == table.output.size &&
query.output.zip(table.output).forall {
case (inAttr, outAttr) =>
val inType = CharVarcharUtils.getRawType(inAttr.metadata).getOrElse(inAttr.dataType)
val outType = CharVarcharUtils.getRawType(outAttr.metadata).getOrElse(outAttr.dataType)
// names and types must match, nullability must be compatible
inAttr.name == outAttr.name &&
DataType.equalsIgnoreCompatibleNullability(inAttr.dataType, outType) &&
DataType.equalsIgnoreCompatibleNullability(inType, outType) &&
(outAttr.nullable || !inAttr.nullable)
})
}
Expand Down
10 changes: 10 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2SQLSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1739,6 +1739,16 @@ class DataSourceV2SQLSuiteV1Filter
}
}

test("SPARK-48709: varchar resolution mismatch for DataSourceV2 CTAS") {
withSQLConf(
SQLConf.STORE_ASSIGNMENT_POLICY.key -> SQLConf.StoreAssignmentPolicy.LEGACY.toString) {
Copy link
Contributor

@cloud-fan cloud-fan Jun 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just for my education, why it's only a problem with the legacy store assignment?

Copy link
Member

@yaooqinn yaooqinn Jun 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can test all options here

Copy link
Member Author

@wangyum wangyum Jun 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will validate store assignment policy if !v2Write.outputResolved is true.

spark/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala

Lines 3530 to 3532 in 0864bbe

case v2Write: V2WriteCommand
if v2Write.table.resolved && v2Write.query.resolved && !v2Write.outputResolved =>
validateStoreAssignmentPolicy()

Similar to outType, we should get RawType to make output resolved.

Copy link
Contributor

@cloud-fan cloud-fan Jun 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does this end up with the error org.apache.spark.sql.AnalysisException: LEGACY store assignment policy is disallowed in Spark data source V2.?

Copy link
Contributor

@cloud-fan cloud-fan Jun 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean, it looks like the right error.

Copy link
Contributor

@cloud-fan cloud-fan Jun 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh nvm, when we don't need to do store assignment, then the mode doesn't matter.

withTable("testcat.ns.t1", "testcat.ns.t2") {
sql("CREATE TABLE testcat.ns.t1 (d1 string, d2 varchar(200)) USING parquet")
sql("CREATE TABLE testcat.ns.t2 USING foo as select * from testcat.ns.t1")
}
}
}

test("ShowCurrentNamespace: basic tests") {
def testShowCurrentNamespace(expectedCatalogName: String, expectedNamespace: String): Unit = {
val schema = new StructType()
Expand Down