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] Disable date_trunc equivalent replace if binary type is LE (backport #53229) #53275

Merged
merged 4 commits into from
Nov 28, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 27, 2024

Why I'm doing:

Query should be rewritten below:

 MV       : select date_trunc('day', dt) as dt from t
Query  : select date_trunc('month, dt) from t where dt between '2023-11-01' and '2023-12-01'

What I'm doing:

    /**
     * TODO: we can support this later.
     * Change date_trunc('month', dt) to col = '2023-12-01' will get a wrong result.
     * MV       : select date_trunc('day', dt) as dt from t
     * Query1   : select date_trunc('month, dt) from t dt = '2023-11-01'
     * -- cannot be rewritten, rewrite  result will be wrong
     * Rewritten: select date_trunc('month, dt) from t where date_trunc('month', dt) = '2023-11-01'
     *
     * Query2   : select date_trunc('month, dt) from t where dt between '2023-11-01' and '2023-12-01'
     * -- cannot be rewritten, dt='2023-12-01' doesn't match with date_trunc('month', dt)= '2023-11-01'
     * Rewritten : select date_trunc('month, dt) from t where date_trunc('month', dt) between '2023-11-01' and '2023-12-01'
     */

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:

Why I'm doing:

Query should be rewritten below:

 MV       : select date_trunc('day', dt) as dt from t
Query  : select date_trunc('month, dt) from t where dt between '2023-11-01' and '2023-12-01'

What I'm doing:

    /**
     * TODO: we can support this later.
     * Change date_trunc('month', dt) to col = '2023-12-01' will get a wrong result.
     * MV       : select date_trunc('day', dt) as dt from t
     * Query1   : select date_trunc('month, dt) from t dt = '2023-11-01'
     * -- cannot be rewritten, rewrite  result will be wrong
     * Rewritten: select date_trunc('month, dt) from t where date_trunc('month', dt) = '2023-11-01'
     *
     * Query2   : select date_trunc('month, dt) from t where dt between '2023-11-01' and '2023-12-01'
     * -- cannot be rewritten, dt='2023-12-01' doesn't match with date_trunc('month', dt)= '2023-11-01'
     * Rewritten : select date_trunc('month, dt) from t where date_trunc('month', dt) between '2023-11-01' and '2023-12-01'
     */

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

…53229)

Signed-off-by: shuming.li <[email protected]>
(cherry picked from commit 3e89c4e)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rule/transformation/materialization/equivalent/DateTruncEquivalent.java
#	fe/fe-core/src/test/java/com/starrocks/planner/MaterializedViewManualTest.java
@mergify mergify bot added the conflicts label Nov 27, 2024
Copy link
Contributor Author

mergify bot commented Nov 27, 2024

Cherry-pick of 3e89c4e has failed:

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

You are currently cherry-picking commit 3e89c4e7cb.
  (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/test/java/com/starrocks/sql/optimizer/rule/transformation/materialization/MvRewritePartialPartitionTest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rule/transformation/materialization/equivalent/DateTruncEquivalent.java
	both modified:   fe/fe-core/src/test/java/com/starrocks/planner/MaterializedViewManualTest.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 Nov 27, 2024

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

@mergify mergify bot closed this Nov 27, 2024
Signed-off-by: shuming.li <[email protected]>
@LiShuMing LiShuMing reopened this Nov 28, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) November 28, 2024 05:26
Signed-off-by: shuming.li <[email protected]>
Signed-off-by: shuming.li <[email protected]>
@LiShuMing LiShuMing force-pushed the mergify/bp/branch-3.2/pr-53229 branch from 02934df to e08c9ba Compare November 28, 2024 08:36
Copy link

sonarcloud bot commented Nov 28, 2024

@wanpengfei-git wanpengfei-git merged commit 8c25b02 into branch-3.2 Nov 28, 2024
28 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.2/pr-53229 branch November 28, 2024 09:37
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