-
Notifications
You must be signed in to change notification settings - Fork 354
perf: memoize Comet-subtree check in EliminateRedundantTransitions #5213
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
Open
andygrove
wants to merge
1
commit into
apache:main
Choose a base branch
from
andygrove:perf/memoize-has-comet-native-child
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+114
−5
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
spark/src/test/scala/org/apache/comet/rules/EliminateRedundantTransitionsSuite.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.comet.rules | ||
|
|
||
| import org.apache.spark.sql.CometTestBase | ||
| import org.apache.spark.sql.comet.{CometColumnarToRowExec, CometNativeColumnarToRowExec, CometPlan} | ||
| import org.apache.spark.sql.execution.{ColumnarToRowExec, SparkPlan, UnionExec} | ||
|
|
||
| import org.apache.comet.CometConf | ||
|
|
||
| class EliminateRedundantTransitionsSuite extends CometTestBase { | ||
|
|
||
| private def sparkPlanFor(sql: String): SparkPlan = { | ||
| var plan: SparkPlan = null | ||
| withSQLConf(CometConf.COMET_ENABLED.key -> "false") { | ||
| plan = spark.sql(sql).queryExecution.executedPlan | ||
| } | ||
| stripAQEPlan(plan) | ||
| } | ||
|
|
||
| private def isCometColumnarToRow(plan: SparkPlan): Boolean = plan match { | ||
| case _: CometColumnarToRowExec => true | ||
| case _: CometNativeColumnarToRowExec => true | ||
| case _ => false | ||
| } | ||
|
|
||
| // The rule decides, per `ColumnarToRowExec`, whether the subtree below it is Comet columnar. | ||
| // That check is memoized across the whole plan, so a Comet branch must not make a sibling | ||
| // Spark-only branch look Comet, or the other way around. | ||
| test("sibling branches are classified independently") { | ||
| withParquetTable((0 until 10).map(i => (i, i.toString)), "tbl") { | ||
| val sparkPlan = sparkPlanFor("SELECT _1 FROM tbl") | ||
| val sparkScan = sparkPlan.collectFirst { case p if p.supportsColumnar => p } | ||
| assume(sparkScan.isDefined, "test requires a columnar Spark scan") | ||
| assert(!sparkScan.get.exists(_.isInstanceOf[CometPlan])) | ||
|
|
||
| val cometPlan = CometExecRule(spark).apply(CometScanRule(spark).apply(sparkPlan)) | ||
| val cometScan = cometPlan.collectFirst { case p: CometPlan if p.supportsColumnar => p } | ||
| assume(cometScan.isDefined, "test requires a columnar Comet scan") | ||
|
|
||
| // Two columnar branches producing the same output, only one of which is Comet. | ||
| val sparkTransition = ColumnarToRowExec(sparkScan.get) | ||
| val union = UnionExec(Seq(ColumnarToRowExec(cometScan.get), sparkTransition)) | ||
|
|
||
| val result = EliminateRedundantTransitions(spark).apply(union) | ||
|
|
||
| val Seq(cometBranch, sparkBranch) = result.children | ||
| assert( | ||
| isCometColumnarToRow(cometBranch), | ||
| s"Comet branch should use a Comet columnar-to-row transition:\n${result.treeString}") | ||
| assert( | ||
| sparkBranch == sparkTransition, | ||
| s"Spark-only branch should be left untouched:\n${result.treeString}") | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
[P2] Register the new suite in both CI workflow matrices
Could you add
org.apache.comet.rules.EliminateRedundantTransitionsSuiteto the suite lists inpr_build_linux.ymlandpr_build_macos.yml?dev/ci/check-suites.pyrequires every non-exempt suite in both workflows. Running it against this exact head exits 255 withSuite not found in workflow .github/workflows/pr_build_linux.yml: org.apache.comet.rules.EliminateRedundantTransitionsSuite. The live Preflight job fails for the same reason, which leaves the main Linux/macOS builds and Spark SQL jobs skipped, so neither the new regression test nor the main build matrix runs.