aokolnychyi commented on code in PR #40206:
URL: https://github.com/apache/spark/pull/40206#discussion_r1121090611
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/TableOutputResolver.scala:
##########
@@ -40,16 +40,20 @@ object TableOutputResolver {
throw
QueryCompilationErrors.cannotWriteTooManyColumnsToTableError(tableName,
expected, query)
}
+ val actualExpectedCols = expected.map { attr =>
+
attr.withDataType(CharVarcharUtils.getRawType(attr.metadata).getOrElse(attr.dataType))
+ }
+
val errors = new mutable.ArrayBuffer[String]()
val resolved: Seq[NamedExpression] = if (byName) {
- reorderColumnsByName(query.output, expected, conf, errors += _)
+ reorderColumnsByName(query.output, actualExpectedCols, conf, errors += _)
} else {
if (expected.size > query.output.size) {
throw QueryCompilationErrors.cannotWriteNotEnoughColumnsToTableError(
tableName, expected, query)
}
Review Comment:
Done.
##########
sql/core/src/test/scala/org/apache/spark/sql/CharVarcharTestSuite.scala:
##########
@@ -926,4 +926,56 @@ class DSV2CharVarcharTestSuite extends CharVarcharTestSuite
}
}
}
+
+ test("SPARK-42611: check char/varchar length in reordered nested structs") {
+ Seq("CHAR(5)", "VARCHAR(5)").foreach { typ =>
+ withTable("t") {
+ sql(s"CREATE TABLE t(s STRUCT<n_c:$typ,n_i:INT>) USING $format")
Review Comment:
Done.
--
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]
