Skip to content

[bug](prepared statement) fix bug and add some cases for in list prepared statement #36683

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.

Sign up for GitHub

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

Merged
xy720 merged 4 commits into from
Jun 24, 2024
Merged

[bug](prepared statement) fix bug and add some cases for in list prepared statement #36683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a9da18
save
xy720 Jun 21, 2024
9bfb980
save
xy720 Jun 21, 2024
912f062
Merge branch 'master' into fix-in-list
xy720 Jun 22, 2024
9033b5c
Merge branch 'master' into fix-in-list
xy720 Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions fe/fe-core/src/main/java/org/apache/doris/rewrite/RewriteInPredicateRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ public Expr apply(Expr expr, Analyzer analyzer, ClauseType clauseType) throws An
// cannot be directly converted to LargeIntLiteral, so it is converted to decimal first.
if (childExpr.getType().getPrimitiveType().isCharFamily() || childExpr.getType().isFloatingPointType()) {
try {
if (childExpr instanceof PlaceHolderExpr) {
childExpr = ((PlaceHolderExpr) childExpr).getLiteral();
}
childExpr = (LiteralExpr) childExpr.castTo(Type.DECIMALV2);
} catch (AnalysisException e) {
if (ConnectContext.get() != null) {
Expand All @@ -115,11 +118,10 @@ public Expr apply(Expr expr, Analyzer analyzer, ClauseType clauseType) throws An
// For example, 2.1 is converted to 2;
// 3. childExpr is precisely converted to column type. For example, 2.0 is converted to 2.
// In cases 1 and 2 above, childExpr should be discarded.
Expr tmpExpr = childExpr.castTo(columnType);
if (tmpExpr instanceof CastExpr && tmpExpr.getChild(0) instanceof PlaceHolderExpr) {
tmpExpr = ((PlaceHolderExpr) tmpExpr.getChild(0)).getLiteral().castTo(columnType);
if (childExpr instanceof PlaceHolderExpr) {
childExpr = ((PlaceHolderExpr) childExpr).getLiteral();
}
LiteralExpr newExpr = (LiteralExpr) tmpExpr;
LiteralExpr newExpr = (LiteralExpr) childExpr.castTo(columnType);
if (childExpr.compareLiteral(newExpr) == 0) {
isCast = true;
newInList.add(newExpr);
Expand Down
129 changes: 129 additions & 0 deletions regression-test/data/prepared_stmt_p0/prepared_stmt_in_list.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !sql --
1 1300 55356821 15982329875 119291.110000000 abcd \N 2020-01-01T12:36:38 \N 1022-01-01T11:30:38 1022-01-01
2 1301 56052706 14285329801 12222.991211350 doris 2023-01-02 2021-01-01T12:36:38 522.762 2022-01-01T11:30:38 2022-01-01
3 1302 55702967 17754445280 1.392932911 superman 2024-01-02 2022-01-01T12:36:38 52.862 3022-01-01T11:30:38 3022-01-01
4 1303 56054326 15669391193 12919291.129191137 xxabcd 2025-01-02 2023-01-01T12:36:38 552.872 4022-01-01T11:30:38 4022-01-01
5 1304 36548425 15229335116 991129292901.111380000 dd 2120-01-02 2024-01-01T12:36:38 652.692 5022-01-01T11:30:38 5022-01-01
6 1305 56054803 18031831909 100320.111390000 haha abcd 2220-01-02 2025-01-01T12:36:38 2.7692 6022-01-01T11:30:38 6022-01-01
7 1306 56055112 13777918563 120939.111300000 a abcd 2030-01-02 2026-01-01T12:36:38 22.822 7022-01-01T11:30:38 7022-01-01

-- !stmt_read1_1 --
1 1300 55356821 15982329875 119291.110000000 abcd \N 2020-01-01T12:36:38 \N 1022-01-01T11:30:38 1022-01-01
2 1301 56052706 14285329801 12222.991211350 doris 2023-01-02 2021-01-01T12:36:38 522.762 2022-01-01T11:30:38 2022-01-01
3 1302 55702967 17754445280 1.392932911 superman 2024-01-02 2022-01-01T12:36:38 52.862 3022-01-01T11:30:38 3022-01-01
4 1303 56054326 15669391193 12919291.129191137 xxabcd 2025-01-02 2023-01-01T12:36:38 552.872 4022-01-01T11:30:38 4022-01-01
5 1304 36548425 15229335116 991129292901.111380000 dd 2120-01-02 2024-01-01T12:36:38 652.692 5022-01-01T11:30:38 5022-01-01

-- !stmt_read1_2 --
1 1300 55356821 15982329875 119291.110000000 abcd \N 2020-01-01T12:36:38 \N 1022-01-01T11:30:38 1022-01-01
2 1301 56052706 14285329801 12222.991211350 doris 2023-01-02 2021-01-01T12:36:38 522.762 2022-01-01T11:30:38 2022-01-01
3 1302 55702967 17754445280 1.392932911 superman 2024-01-02 2022-01-01T12:36:38 52.862 3022-01-01T11:30:38 3022-01-01
4 1303 56054326 15669391193 12919291.129191137 xxabcd 2025-01-02 2023-01-01T12:36:38 552.872 4022-01-01T11:30:38 4022-01-01
5 1304 36548425 15229335116 991129292901.111380000 dd 2120-01-02 2024-01-01T12:36:38 652.692 5022-01-01T11:30:38 5022-01-01

-- !stmt_read2_1 --
1 1300 55356821 15982329875 119291.110000000 abcd \N 2020-01-01T12:36:38 \N 1022-01-01T11:30:38 1022-01-01
2 1301 56052706 14285329801 12222.991211350 doris 2023-01-02 2021-01-01T12:36:38 522.762 2022-01-01T11:30:38 2022-01-01
3 1302 55702967 17754445280 1.392932911 superman 2024-01-02 2022-01-01T12:36:38 52.862 3022-01-01T11:30:38 3022-01-01
4 1303 56054326 15669391193 12919291.129191137 xxabcd 2025-01-02 2023-01-01T12:36:38 552.872 4022-01-01T11:30:38 4022-01-01
5 1304 36548425 15229335116 991129292901.111380000 dd 2120-01-02 2024-01-01T12:36:38 652.692 5022-01-01T11:30:38 5022-01-01

-- !stmt_read2_2 --
1 1300 55356821 15982329875 119291.110000000 abcd \N 2020-01-01T12:36:38 \N 1022-01-01T11:30:38 1022-01-01
2 1301 56052706 14285329801 12222.991211350 doris 2023-01-02 2021-01-01T12:36:38 522.762 2022-01-01T11:30:38 2022-01-01
3 1302 55702967 17754445280 1.392932911 superman 2024-01-02 2022-01-01T12:36:38 52.862 3022-01-01T11:30:38 3022-01-01
4 1303 56054326 15669391193 12919291.129191137 xxabcd 2025-01-02 2023-01-01T12:36:38 552.872 4022-01-01T11:30:38 4022-01-01
5 1304 36548425 15229335116 991129292901.111380000 dd 2120-01-02 2024-01-01T12:36:38 652.692 5022-01-01T11:30:38 5022-01-01

-- !stmt_read3_1 --
1 1300 55356821 15982329875 119291.110000000 abcd \N 2020-01-01T12:36:38 \N 1022-01-01T11:30:38 1022-01-01
4 1303 56054326 15669391193 12919291.129191137 xxabcd 2025-01-02 2023-01-01T12:36:38 552.872 4022-01-01T11:30:38 4022-01-01
5 1304 36548425 15229335116 991129292901.111380000 dd 2120-01-02 2024-01-01T12:36:38 652.692 5022-01-01T11:30:38 5022-01-01
6 1305 56054803 18031831909 100320.111390000 haha abcd 2220-01-02 2025-01-01T12:36:38 2.7692 6022-01-01T11:30:38 6022-01-01
7 1306 56055112 13777918563 120939.111300000 a abcd 2030-01-02 2026-01-01T12:36:38 22.822 7022-01-01T11:30:38 7022-01-01

-- !stmt_read3_2 --
1 1300 55356821 15982329875 119291.110000000 abcd \N 2020-01-01T12:36:38 \N 1022-01-01T11:30:38 1022-01-01
4 1303 56054326 15669391193 12919291.129191137 xxabcd 2025-01-02 2023-01-01T12:36:38 552.872 4022-01-01T11:30:38 4022-01-01
5 1304 36548425 15229335116 991129292901.111380000 dd 2120-01-02 2024-01-01T12:36:38 652.692 5022-01-01T11:30:38 5022-01-01
6 1305 56054803 18031831909 100320.111390000 haha abcd 2220-01-02 2025-01-01T12:36:38 2.7692 6022-01-01T11:30:38 6022-01-01
7 1306 56055112 13777918563 120939.111300000 a abcd 2030-01-02 2026-01-01T12:36:38 22.822 7022-01-01T11:30:38 7022-01-01

-- !stmt_read4_1 --
1 1300 55356821 15982329875 119291.110000000 abcd \N 2020-01-01T12:36:38 \N 1022-01-01T11:30:38 1022-01-01
2 1301 56052706 14285329801 12222.991211350 doris 2023-01-02 2021-01-01T12:36:38 522.762 2022-01-01T11:30:38 2022-01-01
3 1302 55702967 17754445280 1.392932911 superman 2024-01-02 2022-01-01T12:36:38 52.862 3022-01-01T11:30:38 3022-01-01
4 1303 56054326 15669391193 12919291.129191137 xxabcd 2025-01-02 2023-01-01T12:36:38 552.872 4022-01-01T11:30:38 4022-01-01
5 1304 36548425 15229335116 991129292901.111380000 dd 2120-01-02 2024-01-01T12:36:38 652.692 5022-01-01T11:30:38 5022-01-01

-- !stmt_read4_2 --
1 1300 55356821 15982329875 119291.110000000 abcd \N 2020-01-01T12:36:38 \N 1022-01-01T11:30:38 1022-01-01
2 1301 56052706 14285329801 12222.991211350 doris 2023-01-02 2021-01-01T12:36:38 522.762 2022-01-01T11:30:38 2022-01-01
3 1302 55702967 17754445280 1.392932911 superman 2024-01-02 2022-01-01T12:36:38 52.862 3022-01-01T11:30:38 3022-01-01
4 1303 56054326 15669391193 12919291.129191137 xxabcd 2025-01-02 2023-01-01T12:36:38 552.872 4022-01-01T11:30:38 4022-01-01
5 1304 36548425 15229335116 991129292901.111380000 dd 2120-01-02 2024-01-01T12:36:38 652.692 5022-01-01T11:30:38 5022-01-01

-- !stmt_read5_1 --
1 1300 55356821 15982329875 119291.110000000 abcd \N 2020-01-01T12:36:38 \N 1022-01-01T11:30:38 1022-01-01
2 1301 56052706 14285329801 12222.991211350 doris 2023-01-02 2021-01-01T12:36:38 522.762 2022-01-01T11:30:38 2022-01-01
3 1302 55702967 17754445280 1.392932911 superman 2024-01-02 2022-01-01T12:36:38 52.862 3022-01-01T11:30:38 3022-01-01
4 1303 56054326 15669391193 12919291.129191137 xxabcd 2025-01-02 2023-01-01T12:36:38 552.872 4022-01-01T11:30:38 4022-01-01
5 1304 36548425 15229335116 991129292901.111380000 dd 2120-01-02 2024-01-01T12:36:38 652.692 5022-01-01T11:30:38 5022-01-01

-- !stmt_read6_1 --
1 1300 55356821 15982329875 119291.110000000 abcd \N 2020-01-01T12:36:38 \N 1022-01-01T11:30:38 1022-01-01
2 1301 56052706 14285329801 12222.991211350 doris 2023-01-02 2021-01-01T12:36:38 522.762 2022-01-01T11:30:38 2022-01-01
3 1302 55702967 17754445280 1.392932911 superman 2024-01-02 2022-01-01T12:36:38 52.862 3022-01-01T11:30:38 3022-01-01
4 1303 56054326 15669391193 12919291.129191137 xxabcd 2025-01-02 2023-01-01T12:36:38 552.872 4022-01-01T11:30:38 4022-01-01
6 1305 56054803 18031831909 100320.111390000 haha abcd 2220-01-02 2025-01-01T12:36:38 2.7692 6022-01-01T11:30:38 6022-01-01

-- !stmt_read7_1 --
2 1301 56052706 14285329801 12222.991211350 doris 2023-01-02 2021-01-01T12:36:38 522.762 2022-01-01T11:30:38 2022-01-01
3 1302 55702967 17754445280 1.392932911 superman 2024-01-02 2022-01-01T12:36:38 52.862 3022-01-01T11:30:38 3022-01-01
4 1303 56054326 15669391193 12919291.129191137 xxabcd 2025-01-02 2023-01-01T12:36:38 552.872 4022-01-01T11:30:38 4022-01-01
5 1304 36548425 15229335116 991129292901.111380000 dd 2120-01-02 2024-01-01T12:36:38 652.692 5022-01-01T11:30:38 5022-01-01
7 1306 56055112 13777918563 120939.111300000 a abcd 2030-01-02 2026-01-01T12:36:38 22.822 7022-01-01T11:30:38 7022-01-01

-- !stmt_read7_2 --
2 1301 56052706 14285329801 12222.991211350 doris 2023-01-02 2021-01-01T12:36:38 522.762 2022-01-01T11:30:38 2022-01-01
3 1302 55702967 17754445280 1.392932911 superman 2024-01-02 2022-01-01T12:36:38 52.862 3022-01-01T11:30:38 3022-01-01
4 1303 56054326 15669391193 12919291.129191137 xxabcd 2025-01-02 2023-01-01T12:36:38 552.872 4022-01-01T11:30:38 4022-01-01
5 1304 36548425 15229335116 991129292901.111380000 dd 2120-01-02 2024-01-01T12:36:38 652.692 5022-01-01T11:30:38 5022-01-01
7 1306 56055112 13777918563 120939.111300000 a abcd 2030-01-02 2026-01-01T12:36:38 22.822 7022-01-01T11:30:38 7022-01-01

-- !stmt_read8_1 --
1 1300 55356821 15982329875 119291.110000000 abcd \N 2020-01-01T12:36:38 \N 1022-01-01T11:30:38 1022-01-01
2 1301 56052706 14285329801 12222.991211350 doris 2023-01-02 2021-01-01T12:36:38 522.762 2022-01-01T11:30:38 2022-01-01
3 1302 55702967 17754445280 1.392932911 superman 2024-01-02 2022-01-01T12:36:38 52.862 3022-01-01T11:30:38 3022-01-01
4 1303 56054326 15669391193 12919291.129191137 xxabcd 2025-01-02 2023-01-01T12:36:38 552.872 4022-01-01T11:30:38 4022-01-01
5 1304 36548425 15229335116 991129292901.111380000 dd 2120-01-02 2024-01-01T12:36:38 652.692 5022-01-01T11:30:38 5022-01-01

-- !stmt_read8_2 --
1 1300 55356821 15982329875 119291.110000000 abcd \N 2020-01-01T12:36:38 \N 1022-01-01T11:30:38 1022-01-01
2 1301 56052706 14285329801 12222.991211350 doris 2023-01-02 2021-01-01T12:36:38 522.762 2022-01-01T11:30:38 2022-01-01
3 1302 55702967 17754445280 1.392932911 superman 2024-01-02 2022-01-01T12:36:38 52.862 3022-01-01T11:30:38 3022-01-01
4 1303 56054326 15669391193 12919291.129191137 xxabcd 2025-01-02 2023-01-01T12:36:38 552.872 4022-01-01T11:30:38 4022-01-01
5 1304 36548425 15229335116 991129292901.111380000 dd 2120-01-02 2024-01-01T12:36:38 652.692 5022-01-01T11:30:38 5022-01-01

-- !stmt_read9_1 --
2 1301 56052706 14285329801 12222.991211350 doris 2023-01-02 2021-01-01T12:36:38 522.762 2022-01-01T11:30:38 2022-01-01
3 1302 55702967 17754445280 1.392932911 superman 2024-01-02 2022-01-01T12:36:38 52.862 3022-01-01T11:30:38 3022-01-01
4 1303 56054326 15669391193 12919291.129191137 xxabcd 2025-01-02 2023-01-01T12:36:38 552.872 4022-01-01T11:30:38 4022-01-01
5 1304 36548425 15229335116 991129292901.111380000 dd 2120-01-02 2024-01-01T12:36:38 652.692 5022-01-01T11:30:38 5022-01-01
6 1305 56054803 18031831909 100320.111390000 haha abcd 2220-01-02 2025-01-01T12:36:38 2.7692 6022-01-01T11:30:38 6022-01-01

-- !stmt_read10_1 --
2 1301 56052706 14285329801 12222.991211350 doris 2023-01-02 2021-01-01T12:36:38 522.762 2022-01-01T11:30:38 2022-01-01
3 1302 55702967 17754445280 1.392932911 superman 2024-01-02 2022-01-01T12:36:38 52.862 3022-01-01T11:30:38 3022-01-01
4 1303 56054326 15669391193 12919291.129191137 xxabcd 2025-01-02 2023-01-01T12:36:38 552.872 4022-01-01T11:30:38 4022-01-01
5 1304 36548425 15229335116 991129292901.111380000 dd 2120-01-02 2024-01-01T12:36:38 652.692 5022-01-01T11:30:38 5022-01-01
6 1305 56054803 18031831909 100320.111390000 haha abcd 2220-01-02 2025-01-01T12:36:38 2.7692 6022-01-01T11:30:38 6022-01-01

-- !stmt_read10_2 --
2 1301 56052706 14285329801 12222.991211350 doris 2023-01-02 2021-01-01T12:36:38 522.762 2022-01-01T11:30:38 2022-01-01
3 1302 55702967 17754445280 1.392932911 superman 2024-01-02 2022-01-01T12:36:38 52.862 3022-01-01T11:30:38 3022-01-01
4 1303 56054326 15669391193 12919291.129191137 xxabcd 2025-01-02 2023-01-01T12:36:38 552.872 4022-01-01T11:30:38 4022-01-01
5 1304 36548425 15229335116 991129292901.111380000 dd 2120-01-02 2024-01-01T12:36:38 652.692 5022-01-01T11:30:38 5022-01-01
6 1305 56054803 18031831909 100320.111390000 haha abcd 2220-01-02 2025-01-01T12:36:38 2.7692 6022-01-01T11:30:38 6022-01-01

Loading