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 decimal literal equals uncheck type (backport #50626) #50661

Merged
merged 1 commit into from
Sep 6, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 4, 2024

Why I'm doing:

image

sum(gmv * 1.00000000000): 1.00000000000 is DECIMAL64(12, 11) Literal
sum(gmv * 1.000) : 1.000 is DECIMAL32(4, 3) Literal

equals method check 1.00000000000 is same as 1.000, but the results of hashcode method is different.
In analyze, will check duplicate expression by list.contains, only use equals method, then two expression will be reduce to one, but in QueryTransform, use HashMap to find expression, it's will take can't find expression because hashcode is different.

What I'm doing:

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 #50626 done by [Mergify](https://mergify.com). ## Why I'm doing: ![image](https://github.com/user-attachments/assets/f19909f9-8570-4dd1-8759-289ea6a56308)

sum(gmv * 1.00000000000): 1.00000000000 is DECIMAL64(12, 11) Literal
sum(gmv * 1.000) : 1.000 is DECIMAL32(4, 3) Literal

equals method check 1.00000000000 is same as 1.000, but the results of hashcode method is different.
In analyze, will check duplicate expression by list.contains, only use equals method, then two expression will be reduce to one, but in QueryTransform, use HashMap to find expression, it's will take can't find expression because hashcode is different.

What I'm doing:

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

Copy link
Contributor Author

mergify bot commented Sep 4, 2024

Cherry-pick of b95c6ee has failed:

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

You are currently cherry-picking commit b95c6ee577.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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 Sep 4, 2024

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

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-50626 branch September 4, 2024 02:50
@Seaven Seaven restored the mergify/bp/branch-2.5/pr-50626 branch September 6, 2024 06:37
@Seaven Seaven reopened this Sep 6, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) September 6, 2024 06:37
Signed-off-by: Seaven <[email protected]>
(cherry picked from commit b95c6ee)
@Seaven Seaven force-pushed the mergify/bp/branch-2.5/pr-50626 branch from 91b4149 to 2cad0a2 Compare September 6, 2024 06:41
Copy link

sonarcloud bot commented Sep 6, 2024

@wanpengfei-git wanpengfei-git merged commit 7209a49 into branch-2.5 Sep 6, 2024
29 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-50626 branch September 6, 2024 07:19
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.

2 participants