database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[Fix](Nereids)add need forward for enable_nereids_dml and format some cases (#22888)

Browse Source
This commit is contained in:
mch_ucchi
2023-08-11 19:35:29 +08:00
committed by GitHub
parent 045843991a
commit 130c47e669
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
View File

@ -635,7 +635,7 @@ public class SessionVariable implements Serializable, Writable {
@VariableMgr.VarAttr(name = EXTRACT_WIDE_RANGE_EXPR, needForward = true)
public boolean extractWideRangeExpr = true;
@VariableMgr.VarAttr(name = ENABLE_NEREIDS_DML)
@VariableMgr.VarAttr(name = ENABLE_NEREIDS_DML, needForward = true)
public boolean enableNereidsDML = false;
@VariableMgr.VarAttr(name = ENABLE_STRICT_CONSISTENCY_DML, needForward = true)

14
regression-test/suites/nereids_p0/delete/delete_mow_partial_update.groovy
View File

@ -48,9 +48,9 @@ suite('nereids_delete_mow_partial_update') {
"replication_num" = "1"
);"""
sql "insert into ${tableName1} values(1,1),(2,2),(3,3),(4,4),(5,5);"
sql "insert into ${tableName1} values(1, 1), (2, 2), (3, 3), (4, 4), (5, 5);"
qt_sql "select * from ${tableName1} order by uid;"
sql "insert into ${tableName2} values(1),(2),(3);"
sql "insert into ${tableName2} values(1), (2), (3);"
sql "delete from ${tableName1} A using ${tableName2} B where A.uid=B.uid;"
qt_sql "select * from ${tableName1} order by uid;"
// when using parital update insert stmt for delete stmt, it will use delete bitmap or delete sign rather than
@ -63,7 +63,7 @@ suite('nereids_delete_mow_partial_update') {
sql "set skip_storage_engine_merge=true;"
sql "set skip_delete_bitmap=true;"
sql "sync"
qt_sql "select uid,v1,__DORIS_DELETE_SIGN__ from ${tableName1} order by uid,v1,__DORIS_DELETE_SIGN__;"
qt_sql "select uid, v1, __DORIS_DELETE_SIGN__ from ${tableName1} order by uid, v1, __DORIS_DELETE_SIGN__;"
sql "drop table if exists ${tableName1};"
sql "drop table if exists ${tableName2};"
@ -86,8 +86,8 @@ suite('nereids_delete_mow_partial_update') {
"disable_auto_compaction" = "true",
"replication_num" = "1"
);"""
sql "insert into ${tableName3} values(1,1,1,1,1),(2,2,2,2,2),(3,3,3,3,3),(4,4,4,4,4),(5,5,5,5,5);"
qt_sql "select k1,c1,c2,c3,c4 from ${tableName3} order by k1,c1,c2,c3,c4;"
sql "insert into ${tableName3} values(1, 1, 1, 1, 1), (2, 2, 2, 2, 2), (3, 3, 3, 3, 3), (4, 4, 4, 4, 4), (5, 5, 5, 5, 5);"
qt_sql "select k1, c1, c2, c3, c4 from ${tableName3} order by k1, c1, c2, c3, c4;"
streamLoad {
table "${tableName3}"
@ -101,11 +101,11 @@ suite('nereids_delete_mow_partial_update') {
time 10000
}
sql "sync"
qt_sql "select k1,c1,c2,c3,c4 from ${tableName3} order by k1,c1,c2,c3,c4;"
qt_sql "select k1, c1, c2, c3, c4 from ${tableName3} order by k1, c1, c2, c3, c4;"
sql "set skip_delete_sign=true;"
sql "set skip_storage_engine_merge=true;"
sql "set skip_delete_bitmap=true;"
sql "sync"
qt_sql "select k1,c1,c2,c3,c4,__DORIS_DELETE_SIGN__ from ${tableName3} order by k1,c1,c2,c3,c4,__DORIS_DELETE_SIGN__;"
qt_sql "select k1, c1, c2, c3, c4, __DORIS_DELETE_SIGN__ from ${tableName3} order by k1, c1, c2, c3, c4, __DORIS_DELETE_SIGN__;"
sql "drop table if exists ${tableName3};"
}