fix: Final aggregation should not bind to the input of partial aggregation #155
Conversation
This file contains 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
|
cc @huaxingao |
viirya
force-pushed
the
fix_final_agg_binding
branch
from
375f11c to
f5c4758
Compare
|
cc @sunchao |
huaxingao
approved these changes
Mar 4, 2024
sunchao
reviewed
Mar 4, 2024
| @@ -38,6 +38,25 @@ import org.apache.comet.CometSparkSessionExtensions.isSpark34Plus | |||
| * Test suite dedicated to Comet native aggregate operator | |||
| */ | |||
| class CometAggregateSuite extends CometTestBase with AdaptiveSparkPlanHelper { | |||
| import testImplicits._ | |||
|
|
|||
| test("Final aggregation should not bind to the input of partial aggregation") { | |||
There was a problem hiding this comment.
hmm does this test the issue in this PR? seems it passes in the main branch without the fix.
There was a problem hiding this comment.
After adding the bound index check, it fails. It passes now because we don't have the check now. As I mentioned in the description, the bound is incorrect but because we don't check it, it is not exposed.
There was a problem hiding this comment.
Btw, we need to add the bound check as required for SortMergeJoin work. In that work, it checks joining keys bindings internally in DataFusion. Which checks both binding index and binding column name. So we need to bind column reference to input schema.
spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala
Outdated
Show resolved
Hide resolved
sunchao
reviewed
Mar 4, 2024
|
Merged. Thanks. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Which issue does this PR close?
Closes #156.
Rationale for this change
We now bind aggregate expressions to the input of partial aggregate for
HashAggregateno matter what the mode is. However, the output of partial aggregate is not same as its input. This incorrect binding will cause unmatched column index. Currently it doesn't expose issues because we don't check the index of bound reference in native side, and the bound columns in aggregate expressions are not used.However, this is a potential bug and causes some issues when starting to check the index of bound reference.
What changes are included in this PR?
This patch adds the check of the index of bound reference. The aggregate expressions of final aggregation are not bound to the input of partial aggregation anymore but sent to native side as unbound expressions.
How are these changes tested?