-
Notifications
You must be signed in to change notification settings - Fork 28.9k
[SPARK-37392][SQL] Fix the performance bug when inferring constraints for Generate #34823
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -47,6 +47,7 @@ object ConstantFolding extends Rule[LogicalPlan] { | |
| private def hasNoSideEffect(e: Expression): Boolean = e match { | ||
| case _: Attribute => true | ||
| case _: Literal => true | ||
| case c: Cast if !conf.ansiEnabled => hasNoSideEffect(c.child) | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Either this change or the change in |
||
| case _: NoThrow if e.deterministic => e.children.forall(hasNoSideEffect) | ||
| case _ => false | ||
| } | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,10 +18,8 @@ | |
| package org.apache.spark.sql.catalyst.optimizer | ||
|
|
||
| import org.apache.spark.sql.Row | ||
| import org.apache.spark.sql.catalyst.analysis.EliminateSubqueryAliases | ||
| import org.apache.spark.sql.catalyst.dsl.expressions._ | ||
| import org.apache.spark.sql.catalyst.dsl.plans._ | ||
| import org.apache.spark.sql.catalyst.encoders.ExpressionEncoder | ||
| import org.apache.spark.sql.catalyst.expressions._ | ||
| import org.apache.spark.sql.catalyst.plans._ | ||
| import org.apache.spark.sql.catalyst.plans.logical._ | ||
|
|
@@ -36,7 +34,7 @@ class InferFiltersFromGenerateSuite extends PlanTest { | |
| val testRelation = LocalRelation('a.array(StructType(Seq( | ||
| StructField("x", IntegerType), | ||
| StructField("y", IntegerType) | ||
| ))), 'c1.string, 'c2.string) | ||
| ))), 'c1.string, 'c2.string, 'c3.int) | ||
|
|
||
| Seq(Explode(_), PosExplode(_), Inline(_)).foreach { f => | ||
| val generator = f('a) | ||
|
|
@@ -74,63 +72,53 @@ class InferFiltersFromGenerateSuite extends PlanTest { | |
| val optimized = Optimize.execute(originalQuery) | ||
| comparePlans(optimized, originalQuery) | ||
| } | ||
| } | ||
|
|
||
| // setup rules to test inferFilters with ConstantFolding to make sure | ||
| // the Filter rule added in inferFilters is removed again when doing | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We don't need this now, because we don't infer the filters at the first place, instead of removing the inferred filters later. |
||
| // explode with CreateArray/CreateMap | ||
| object OptimizeInferAndConstantFold extends RuleExecutor[LogicalPlan] { | ||
| val batches = | ||
| Batch("AnalysisNodes", Once, | ||
| EliminateSubqueryAliases) :: | ||
| Batch("Infer Filters", Once, InferFiltersFromGenerate) :: | ||
| Batch("ConstantFolding after", FixedPoint(4), | ||
| ConstantFolding, | ||
| NullPropagation, | ||
| PruneFilters) :: Nil | ||
| val generatorWithFromJson = f(JsonToStructs( | ||
| ArrayType(new StructType().add("s", "string")), | ||
| Map.empty, | ||
| 'c1)) | ||
| test("SPARK-37392: Don't infer filters from " + generatorWithFromJson) { | ||
| val originalQuery = testRelation.generate(generatorWithFromJson).analyze | ||
| val optimized = Optimize.execute(originalQuery) | ||
| comparePlans(optimized, originalQuery) | ||
| } | ||
|
|
||
| val returnSchema = ArrayType(StructType(Seq( | ||
| StructField("x", IntegerType), | ||
| StructField("y", StringType) | ||
| ))) | ||
| val fakeUDF = ScalaUDF( | ||
| (i: Int) => Array(Row.fromSeq(Seq(1, "a")), Row.fromSeq(Seq(2, "b"))), | ||
| returnSchema, 'c3 :: Nil, Nil) | ||
| val generatorWithUDF = f(fakeUDF) | ||
| test("SPARK-36715: Don't infer filters from " + generatorWithUDF) { | ||
| val originalQuery = testRelation.generate(generatorWithUDF).analyze | ||
| val optimized = Optimize.execute(originalQuery) | ||
| comparePlans(optimized, originalQuery) | ||
| } | ||
| } | ||
|
|
||
| Seq(Explode(_), PosExplode(_)).foreach { f => | ||
| val createArrayExplode = f(CreateArray(Seq('c1))) | ||
| test("SPARK-33544: Don't infer filters from CreateArray " + createArrayExplode) { | ||
| val originalQuery = testRelation.generate(createArrayExplode).analyze | ||
| val optimized = OptimizeInferAndConstantFold.execute(originalQuery) | ||
| comparePlans(optimized, originalQuery) | ||
| } | ||
| val createMapExplode = f(CreateMap(Seq('c1, 'c2))) | ||
| test("SPARK-33544: Don't infer filters from CreateMap " + createMapExplode) { | ||
| val originalQuery = testRelation.generate(createMapExplode).analyze | ||
| val optimized = OptimizeInferAndConstantFold.execute(originalQuery) | ||
| comparePlans(optimized, originalQuery) | ||
| } | ||
| } | ||
|
|
||
| Seq(Inline(_)).foreach { f => | ||
| val createArrayStructExplode = f(CreateArray(Seq(CreateStruct(Seq('c1))))) | ||
| test("SPARK-33544: Don't infer filters from CreateArray " + createArrayStructExplode) { | ||
| val originalQuery = testRelation.generate(createArrayStructExplode).analyze | ||
| val optimized = OptimizeInferAndConstantFold.execute(originalQuery) | ||
| comparePlans(optimized, originalQuery) | ||
| } | ||
| } | ||
| val createArrayExplode = f(CreateArray(Seq('c1))) | ||
| test("SPARK-33544: Don't infer filters from " + createArrayExplode) { | ||
| val originalQuery = testRelation.generate(createArrayExplode).analyze | ||
| val optimized = Optimize.execute(originalQuery) | ||
| comparePlans(optimized, originalQuery) | ||
| } | ||
| val createMapExplode = f(CreateMap(Seq('c1, 'c2))) | ||
| test("SPARK-33544: Don't infer filters from " + createMapExplode) { | ||
| val originalQuery = testRelation.generate(createMapExplode).analyze | ||
| val optimized = Optimize.execute(originalQuery) | ||
| comparePlans(optimized, originalQuery) | ||
| } | ||
| } | ||
|
|
||
| test("SPARK-36715: Don't infer filters from udf") { | ||
| Seq(Explode(_), PosExplode(_), Inline(_)).foreach { f => | ||
| val returnSchema = ArrayType(StructType(Seq( | ||
| StructField("x", IntegerType), | ||
| StructField("y", StringType) | ||
| ))) | ||
| val fakeUDF = ScalaUDF( | ||
| (i: Int) => Array(Row.fromSeq(Seq(1, "a")), Row.fromSeq(Seq(2, "b"))), | ||
| returnSchema, Literal(8) :: Nil, | ||
| Option(ExpressionEncoder[Int]().resolveAndBind()) :: Nil) | ||
| val generator = f(fakeUDF) | ||
| val originalQuery = OneRowRelation().generate(generator).analyze | ||
| val optimized = OptimizeInferAndConstantFold.execute(originalQuery) | ||
| val correctAnswer = OneRowRelation() | ||
| .generate(generator) | ||
| .analyze | ||
| comparePlans(optimized, correctAnswer) | ||
| Seq(Inline(_)).foreach { f => | ||
| val createArrayStructExplode = f(CreateArray(Seq(CreateStruct(Seq('c1))))) | ||
| test("SPARK-33544: Don't infer filters from " + createArrayStructExplode) { | ||
| val originalQuery = testRelation.generate(createArrayStructExplode).analyze | ||
| val optimized = Optimize.execute(originalQuery) | ||
| comparePlans(optimized, originalQuery) | ||
| } | ||
| } | ||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's almost useless to generate predicate with
CreateArray/CreateMap.Size(CreateArray(...)) > 0is always true unless you create an empty array.