From 3258d55d946668fd3e6f677c05d1b99fce8b3ea7 Mon Sep 17 00:00:00 2001 From: sohardforaname Date: Wed, 15 Mar 2023 14:55:59 +0800 Subject: [PATCH 1/6] 'fix-bugs' --- .../org/apache/doris/analysis/SelectStmt.java | 3 --- regression-test/certificate.p12 | Bin 2533 -> 0 bytes 2 files changed, 3 deletions(-) delete mode 100644 regression-test/certificate.p12 diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java index 107c7d8cefd170..0c0b9965de3543 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java @@ -2142,9 +2142,6 @@ private boolean checkSortNodeEliminable(Expr expr, List sortSlotRefs) { @Override public String toSql() { - if (sqlString != null) { - return sqlString; - } StringBuilder strBuilder = new StringBuilder(); if (withClause != null) { strBuilder.append(withClause.toSql()); diff --git a/regression-test/certificate.p12 b/regression-test/certificate.p12 deleted file mode 100644 index d54fde284b85bca1f553fffada35960ef515460e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2533 zcmY+^c{CJ^8V2y0F*8i|wJ?Q{WyIK3WX+ac$Wn|j!q`Uk!q~SVyYSh!BBE&!B3nND zl4Y_cCMt{(S-U#t-uvDA$9vv$p68tB&mR&8TLuAXkT_T+6eb>{8?(;{qy-k?U^!qM zEaNOrMdH9Z|5VT-99Zcrk^=z&XYcAi4G;;3p8NL#0}zU20@Hc+0@FXY=E;LVbbxRi z7@$2~Oy7`Si+0nKxmnOlG(biqJM=dGy1?IY||i$jAw&&TQDg;`~)HC^r2(uu!-?ALlc74%)EltjqrBi(jk@Al-(i1V)C5IOL`HM2U z9+^`NqlK$=ivG5uR_ctdJa2EuYJE?6lI=?j4#0#Y?J;LTk+7bR?{7*rCB^tLmLWgyS z-RmVYfb{VK=0eGf=hg?BMWt&`qgn~T{X!A{BKxYuY{7Dr45(6XMojbDh8djw*-)}x zGs}_)WdQp6w&|>!Gc`Zv#V|gclLi!Hmfa|N8S?F=Gmm}y^|G{U)w)nJ>rx1N$;UmH zG?Vqbtk+N#K1}lT`{CB`7XGAXnMF5t>v-Ir@g~nn@@{9aIKM!M1yUg(m$BC>f&=OWE+nbHt~hE2H#t`*~y+yG;7@U)m+~&Tb3vateW`y zN;kvD^G%qmFlFT%KsG?jp&Rtp*bIT(06`*b{DrUODaAZvk=scMpYZioMq_G(P0_ z%wn6QU|}5ZZa&r#Bf?L&07Zr#C9%D*mJ=@xPr;IAYJ?#J7(eCSeaGxBF~upy$rvap z7iPa;$&^+`Hz25tRV8aaIk3(ME7UwN^r)8Z_TE~$n^Yshy`b&nprJ^BYfSbxCDf46 znPmdBUg0sO7S31dngjxm|Or^cCADG)tgdPBcb- z)V`J{EPrmKRvi)!r%uR^^5=iin)98M-!t7r*O*`l?cUFh=%uAcBH||k^;1!w6P$CH zFIdusidp+l1E&22Zj7#+d;V&-@Lk2I!ma7PV{XSJsY}I~NO|xjjd`6n;S)JVwD~+H zC!u|pdQ!q#K=?<#w)Oh^22@7tLh1Daz^QxE_5yLIGkL8u2Z@8I{|^{NIEV}w2a!CB z#n0{vl>R?_oCAW+oY_1BX5;@$aMSV^$b;#d(}!or?SP7wZtd-+UlPdZmP83zCXw1b&C{` z3J;BEI{am-zFkY%KANb1AubZ`4ukb>1b;m7~S&AK9Ae+bW3 zJy}c9dO1tlGh2bP)|XdNRXS|rN_Lr-4T*%rK?>sMlj^GD*sh`94m4R(--k*I!??__ z^gD#t`QL|Byl-oXSOzGBlHBy+tWs*e#?fu32L%JhjR85zZhSB{Gw9dJoGeozjP?2E zpsl@8)BX!mdQLi9q;eNt+XW(91J+xCnWEBQcJI#a4)Uf$1c8OVd(mLV=K&38`IOXO z9aJ6|5u7GL``3ZdIV`{4E{oB6OEEk+6*{9btB)uiee3hEok;I-~iIhEbbR^;LlGM)2)-H(aRcq+zkCH#DNP)v05hMMfM zUFp@Qj^~ZG7-U1P!~s!@qI@#85@9T93GL^vpgqJ*0K@1}c_VS!FJtU}sl($Tss+5) zR`~7%1XMeJN7eWBdT5%;T@$(inqB%XQi2(cm7a;R2}-#c&1WNom7EEJWRXR+-VQUo zE0Uvk3gu3l67}RvoStKWSCKaMyu1-KIgu$D=o&owkvXC4VwSUG6>DzyV<+wrNnA&e zmaOdE!-EtSsRN}^I7VZd$|KN9m!u`##Cj>j_fotGnVFrjr*)0idJgfTJ+p?wdNO(s z?_rzeS9eXhi&#>oq0YIK;i!tdLU(?+LQkDFc8#(EbS)l2P2q_7i6!b{9t3r0Yxv05 zD9q(8(F9oF+oYHtqmZN#Zh^dvA0?0{rTr;s8jXCl{awM8{Z8R1$oBipC!~$s%k8a` zhuOO;RrD6Ys;e96Ytw@^4i%ZqgQG3Drm+ZC_dQSLX~vy#oF?{->NQtE_gVCvBlsbj#sh>Md7MJ=6;#`O6;o`9trkb}&G^t_^eaT1u*7DsXX8 z%Rv`3bF^35YqXHfB`u5;{I8BMPH8SM$1;Y{nW5EYLZBA6t7+~_Jymx0K}sV9kT56& t!9)Y%fdIf9S1T^1_J+F@Wd~sG__o&re~uDbz;pv_`TVwDS2X`9`7dZ2w-o>Y From ad5bd642dc12665b3b13bd4bb5a8f6b325e19801 Mon Sep 17 00:00:00 2001 From: sohardforaname Date: Wed, 15 Mar 2023 14:57:37 +0800 Subject: [PATCH 2/6] 'fix-bugs' --- regression-test/certificate.p12 | Bin 0 -> 2533 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 regression-test/certificate.p12 diff --git a/regression-test/certificate.p12 b/regression-test/certificate.p12 new file mode 100644 index 0000000000000000000000000000000000000000..d54fde284b85bca1f553fffada35960ef515460e GIT binary patch literal 2533 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 literal 0 HcmV?d00001 From 84352a8dfa7815c1914823cd62fd34e88b8e8918 Mon Sep 17 00:00:00 2001 From: sohardforaname Date: Wed, 15 Mar 2023 15:03:17 +0800 Subject: [PATCH 3/6] 'fix-bugs' --- .../sql_functions/window_functions/test_window_fn.groovy | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/regression-test/suites/query_p0/sql_functions/window_functions/test_window_fn.groovy b/regression-test/suites/query_p0/sql_functions/window_functions/test_window_fn.groovy index 181f597849e6cd..1cbab91a44e0f4 100644 --- a/regression-test/suites/query_p0/sql_functions/window_functions/test_window_fn.groovy +++ b/regression-test/suites/query_p0/sql_functions/window_functions/test_window_fn.groovy @@ -356,6 +356,14 @@ suite("test_window_fn") { from example_window_tb order by u_id; """ + sql """ + create view v as select row_number() over(partition by u_city order by u_salary) as wf from example_window_tb + """ + + sql """ + drop view v + """ + sql "DROP TABLE IF EXISTS example_window_tb;" } From 0dae8af3cd269bc13ffab872919964b116b8a88f Mon Sep 17 00:00:00 2001 From: sohardforaname Date: Wed, 15 Mar 2023 17:22:22 +0800 Subject: [PATCH 4/6] 'fix-bugs' --- .../src/test/java/org/apache/doris/planner/QueryPlanTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java index 206456e18819f0..8f2362fbb4fc25 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java @@ -1008,7 +1008,7 @@ public void testJoinPredicateTransitivityWithSubqueryInWhereClause() throws Exce String explainString = getSQLPlanOrErrorMsg("explain " + sql); Assert.assertTrue(explainString.contains("PLAN FRAGMENT")); Assert.assertTrue(explainString.contains("NESTED LOOP JOIN")); - Assert.assertTrue(!explainString.contains("PREDICATES") || explainString.contains("PREDICATES: TRUE")); + Assert.assertTrue(explainString.contains("PREDICATES") && !explainString.contains("PREDICATES: TRUE")); } @Test From 6b2be31b05b71ae5c70a7f7e3571edc322a7a77e Mon Sep 17 00:00:00 2001 From: sohardforaname Date: Wed, 15 Mar 2023 22:27:27 +0800 Subject: [PATCH 5/6] 'fix-bugs' --- .../src/test/java/org/apache/doris/planner/QueryPlanTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java index 8f2362fbb4fc25..206456e18819f0 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java @@ -1008,7 +1008,7 @@ public void testJoinPredicateTransitivityWithSubqueryInWhereClause() throws Exce String explainString = getSQLPlanOrErrorMsg("explain " + sql); Assert.assertTrue(explainString.contains("PLAN FRAGMENT")); Assert.assertTrue(explainString.contains("NESTED LOOP JOIN")); - Assert.assertTrue(explainString.contains("PREDICATES") && !explainString.contains("PREDICATES: TRUE")); + Assert.assertTrue(!explainString.contains("PREDICATES") || explainString.contains("PREDICATES: TRUE")); } @Test From c129f3f66dbc0343b05f4ad1e8f8514bfc361fe1 Mon Sep 17 00:00:00 2001 From: sohardforaname Date: Wed, 22 Mar 2023 11:39:38 +0800 Subject: [PATCH 6/6] 'fix-bugs' --- .../src/main/java/org/apache/doris/analysis/SelectStmt.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java index 0c0b9965de3543..2f2ebaf9e89cd8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java @@ -42,6 +42,7 @@ import org.apache.doris.common.TreeNode; import org.apache.doris.common.UserException; import org.apache.doris.common.util.SqlUtils; +import org.apache.doris.common.util.ToSqlContext; import org.apache.doris.qe.ConnectContext; import org.apache.doris.rewrite.ExprRewriter; import org.apache.doris.rewrite.mvrewrite.MVSelectFailedException; @@ -2142,6 +2143,11 @@ private boolean checkSortNodeEliminable(Expr expr, List sortSlotRefs) { @Override public String toSql() { + if (sqlString != null) { + if (ToSqlContext.get() == null || ToSqlContext.get().isNeedSlotRefId()) { + return sqlString; + } + } StringBuilder strBuilder = new StringBuilder(); if (withClause != null) { strBuilder.append(withClause.toSql());