Skip to content
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

[BugFix] fix One tablet property cause multi stage agg result wrong (backport #43842) #43885

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 11, 2024

Why I'm doing:

close #43223

after this pr:

mysql> explain select c2,count(distinct c1,c2) from t group by c2;
+----------------------------------------------------+
| Explain String                                     |
+----------------------------------------------------+
| PLAN FRAGMENT 0                                    |
|  OUTPUT EXPRS:3: c2 | 4: count                     |
|   PARTITION: HASH_PARTITIONED: 3: c2               |
|                                                    |
|   RESULT SINK                                      |
|                                                    |
|   6:AGGREGATE (merge finalize)                     |
|   |  output: count(4: count)                       |
|   |  group by: 3: c2                               |
|   |                                                |
|   5:EXCHANGE                                       |
|                                                    |
| PLAN FRAGMENT 1                                    |
|  OUTPUT EXPRS:                                     |
|   PARTITION: HASH_PARTITIONED: 2: c1, 3: c2        |
|                                                    |
|   STREAM DATA SINK                                 |
|     EXCHANGE ID: 05                                |
|     HASH_PARTITIONED: 3: c2                        |
|                                                    |
|   4:AGGREGATE (update serialize)                   |
|   |  STREAMING                                     |
|   |  output: count(if(2: c1 IS NULL, NULL, 3: c2)) |
|   |  group by: 3: c2                               |
|   |                                                |
|   3:AGGREGATE (merge serialize)                    |
|   |  group by: 2: c1, 3: c2                        |
|   |                                                |
|   2:EXCHANGE                                       |
|                                                    |
| PLAN FRAGMENT 2                                    |
|  OUTPUT EXPRS:                                     |
|   PARTITION: RANDOM                                |
|                                                    |
|   STREAM DATA SINK                                 |
|     EXCHANGE ID: 02                                |
|     HASH_PARTITIONED: 2: c1, 3: c2                 |
|                                                    |
|   1:AGGREGATE (update serialize)                   |
|   |  STREAMING                                     |
|   |  group by: 2: c1, 3: c2                        |
|   |                                                |
|   0:OlapScanNode                                   |
|      TABLE: t                                      |
|      PREAGGREGATION: ON                            |
|      partitions=1/1                                |
|      rollup: t                                     |
|      tabletRatio=1/1                               |
|      tabletList=20014                              |
|      cardinality=4                                 |
|      avgRowSize=8.0                                |
+----------------------------------------------------+
51 rows in set (0.01 sec)

What I'm doing:

for multi stage agg, we don't support one tablet optimization
Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
  • I have added documentation for my new feature or new function
  • This is a backport pr

Bugfix cherry-pick branch check:

  • I have checked the version labels which the pr will be auto-backported to the target branch
    • 3.3
    • 3.2
    • 3.1
    • 3.0
    • 2.5

This is an automatic backport of pull request #43842 done by [Mergify](https://mergify.com). ## Why I'm doing: close https://github.com//issues/43223

after this pr:

mysql> explain select c2,count(distinct c1,c2) from t group by c2;
+----------------------------------------------------+
| Explain String                                     |
+----------------------------------------------------+
| PLAN FRAGMENT 0                                    |
|  OUTPUT EXPRS:3: c2 | 4: count                     |
|   PARTITION: HASH_PARTITIONED: 3: c2               |
|                                                    |
|   RESULT SINK                                      |
|                                                    |
|   6:AGGREGATE (merge finalize)                     |
|   |  output: count(4: count)                       |
|   |  group by: 3: c2                               |
|   |                                                |
|   5:EXCHANGE                                       |
|                                                    |
| PLAN FRAGMENT 1                                    |
|  OUTPUT EXPRS:                                     |
|   PARTITION: HASH_PARTITIONED: 2: c1, 3: c2        |
|                                                    |
|   STREAM DATA SINK                                 |
|     EXCHANGE ID: 05                                |
|     HASH_PARTITIONED: 3: c2                        |
|                                                    |
|   4:AGGREGATE (update serialize)                   |
|   |  STREAMING                                     |
|   |  output: count(if(2: c1 IS NULL, NULL, 3: c2)) |
|   |  group by: 3: c2                               |
|   |                                                |
|   3:AGGREGATE (merge serialize)                    |
|   |  group by: 2: c1, 3: c2                        |
|   |                                                |
|   2:EXCHANGE                                       |
|                                                    |
| PLAN FRAGMENT 2                                    |
|  OUTPUT EXPRS:                                     |
|   PARTITION: RANDOM                                |
|                                                    |
|   STREAM DATA SINK                                 |
|     EXCHANGE ID: 02                                |
|     HASH_PARTITIONED: 2: c1, 3: c2                 |
|                                                    |
|   1:AGGREGATE (update serialize)                   |
|   |  STREAMING                                     |
|   |  group by: 2: c1, 3: c2                        |
|   |                                                |
|   0:OlapScanNode                                   |
|      TABLE: t                                      |
|      PREAGGREGATION: ON                            |
|      partitions=1/1                                |
|      rollup: t                                     |
|      tabletRatio=1/1                               |
|      tabletList=20014                              |
|      cardinality=4                                 |
|      avgRowSize=8.0                                |
+----------------------------------------------------+
51 rows in set (0.01 sec)

What I'm doing:

for multi stage agg, we don't support one tablet optimization
Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
  • I have added documentation for my new feature or new function
  • This is a backport pr

…43842)

Signed-off-by: before-Sunrise <[email protected]>
(cherry picked from commit 654fe83)

# Conflicts:
#	fe/fe-core/src/test/java/com/starrocks/analysis/SelectStmtTest.java
#	fe/fe-core/src/test/java/com/starrocks/sql/plan/DistributedEnvPlanWithCostTest.java
@mergify mergify bot added the conflicts label Apr 11, 2024
Copy link
Contributor Author

mergify bot commented Apr 11, 2024

Cherry-pick of 654fe83 has failed:

On branch mergify/bp/branch-2.5/pr-43842
Your branch is up to date with 'origin/branch-2.5'.

You are currently cherry-picking commit 654fe83fba.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/optimizer/base/LogicalProperty.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/test/java/com/starrocks/analysis/SelectStmtTest.java
	both modified:   fe/fe-core/src/test/java/com/starrocks/sql/plan/DistributedEnvPlanWithCostTest.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Contributor Author

mergify bot commented Apr 11, 2024

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

@mergify mergify bot closed this Apr 11, 2024
@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-43842 branch April 11, 2024 06:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant