Skip to content

[SPARK-49352][SQL][3.5] Avoid redundant array transform for identical expression #47863

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

[SPARK-49352][SQL][3.5] Avoid redundant array transform for identical expression #47863

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
12 changes: 10 additions & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/TableOutputResolver.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,8 +371,16 @@ object TableOutputResolver {
resolveColumnsByPosition(tableName, Seq(param), Seq(fakeAttr), conf, addError, colPath)
}
if (res.length == 1) {
val func = LambdaFunction(res.head, Seq(param))
Some(Alias(ArrayTransform(nullCheckedInput, func), expected.name)())
if (res.head == param) {
// If the element type is the same, we can reuse the input array directly.
Some(
Alias(nullCheckedInput, expected.name)(
nonInheritableMetadataKeys =
Seq(CharVarcharUtils.CHAR_VARCHAR_TYPE_STRING_METADATA_KEY)))
} else {
val func = LambdaFunction(res.head, Seq(param))
Some(Alias(ArrayTransform(nullCheckedInput, func), expected.name)())
}
} else {
None
}
Expand Down
32 changes: 31 additions & 1 deletion ...catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/V2WriteAnalysisSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import java.util.Locale
import org.apache.spark.QueryContext
import org.apache.spark.sql.catalyst.dsl.expressions._
import org.apache.spark.sql.catalyst.dsl.plans._
import org.apache.spark.sql.catalyst.expressions.{Alias, AttributeReference, Cast, CreateNamedStruct, GetStructField, If, IsNull, LessThanOrEqual, Literal}
import org.apache.spark.sql.catalyst.expressions.{Alias, ArrayTransform, AttributeReference, Cast, CreateNamedStruct, GetStructField, If, IsNull, LessThanOrEqual, Literal}
import org.apache.spark.sql.catalyst.expressions.objects.AssertNotNull
import org.apache.spark.sql.catalyst.plans.logical._
import org.apache.spark.sql.catalyst.rules.Rule
Expand Down Expand Up @@ -304,6 +304,36 @@ abstract class V2WriteAnalysisSuiteBase extends AnalysisTest {

def byPosition(table: NamedRelation, query: LogicalPlan): LogicalPlan

test("SPARK-49352: Avoid redundant array transform for identical expression") {
def assertArrayField(fromType: ArrayType, toType: ArrayType, hasTransform: Boolean): Unit = {
val table = TestRelation(Seq($"a".int, $"arr".array(toType)))
val query = TestRelation(Seq($"arr".array(fromType), $"a".int))

val writePlan = byName(table, query).analyze

assertResolved(writePlan)
checkAnalysis(writePlan, writePlan)

val transform = writePlan.children.head.expressions.exists { e =>
e.find {
case _: ArrayTransform => true
case _ => false
}.isDefined
}
if (hasTransform) {
assert(transform)
} else {
assert(!transform)
}
}

assertArrayField(ArrayType(LongType), ArrayType(LongType), hasTransform = false)
assertArrayField(
ArrayType(new StructType().add("x", "int").add("y", "int")),
ArrayType(new StructType().add("y", "int").add("x", "byte")),
hasTransform = true)
}

test("SPARK-33136: output resolved on complex types for V2 write commands") {
def assertTypeCompatibility(name: String, fromType: DataType, toType: DataType): Unit = {
val table = TestRelation(StructType(Seq(StructField("a", toType))))
Expand Down