This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new bbb6d2758a [fix](regression-test) fix test_segment_iterator_delete
using order_qt_sql (#13192)
bbb6d2758a is described below
commit bbb6d2758ad0362cb8679d5905a8fb92d538637d
Author: Xin Liao <liaoxin...@126.com>
AuthorDate: Sun Oct 9 11:35:22 2022 +0800
[fix](regression-test) fix test_segment_iterator_delete using order_qt_sql
(#13192)
---
.../delete_p0/test_segment_iterator_delete.out | 4 +--
.../delete_p0/test_segment_iterator_delete.groovy | 30 +++++++++++-----------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/regression-test/data/delete_p0/test_segment_iterator_delete.out
b/regression-test/data/delete_p0/test_segment_iterator_delete.out
index 9dd338b435..76d7d3cd6b 100644
--- a/regression-test/data/delete_p0/test_segment_iterator_delete.out
+++ b/regression-test/data/delete_p0/test_segment_iterator_delete.out
@@ -1,16 +1,16 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
-- !sql --
2 2 2
-3 3 3
2 2 2
3 3 3
+3 3 3
4 4 4
-- !sql --
2 2 2
-3 3 3
2 2 2
3 3 3
+3 3 3
4 4 4
-- !sql --
diff --git
a/regression-test/suites/delete_p0/test_segment_iterator_delete.groovy
b/regression-test/suites/delete_p0/test_segment_iterator_delete.groovy
index 1a357bbff4..1da452af37 100644
--- a/regression-test/suites/delete_p0/test_segment_iterator_delete.groovy
+++ b/regression-test/suites/delete_p0/test_segment_iterator_delete.groovy
@@ -46,29 +46,29 @@ suite("test_segment_iterator_delete") {
// delete first key
sql """delete from ${tableName} where c1 = 1;"""
sql """INSERT INTO ${tableName} VALUES (4,4,4)"""
- qt_sql """select /*+ SET_VAR(enable_vectorized_engine=false) */ * from
${tableName};"""
- qt_sql """select /*+ SET_VAR(enable_vectorized_engine=true) */ * from
${tableName};"""
+ order_qt_sql """select /*+ SET_VAR(enable_vectorized_engine=false) */ *
from ${tableName};"""
+ order_qt_sql """select /*+ SET_VAR(enable_vectorized_engine=true) */ *
from ${tableName};"""
// delete second key
sql """delete from ${tableName} where c2 = 2;"""
- qt_sql """select /*+ SET_VAR(enable_vectorized_engine=false) */ * from
${tableName};"""
- qt_sql """select /*+ SET_VAR(enable_vectorized_engine=true) */ * from
${tableName};"""
+ order_qt_sql """select /*+ SET_VAR(enable_vectorized_engine=false) */ *
from ${tableName};"""
+ order_qt_sql """select /*+ SET_VAR(enable_vectorized_engine=true) */ *
from ${tableName};"""
// delete by multi columns
sql """INSERT INTO ${tableName} VALUES (5,5,5)"""
sql """INSERT INTO ${tableName} VALUES (6,6,6)"""
sql """delete from ${tableName} where c1 = 5 and c2=5;"""
sql """delete from ${tableName} where c1 = 5 and c2=6;"""
- qt_sql """select /*+ SET_VAR(enable_vectorized_engine=false) */ * from
${tableName};"""
- qt_sql """select /*+ SET_VAR(enable_vectorized_engine=true) */ * from
${tableName};"""
+ order_qt_sql """select /*+ SET_VAR(enable_vectorized_engine=false) */ *
from ${tableName};"""
+ order_qt_sql """select /*+ SET_VAR(enable_vectorized_engine=true) */ *
from ${tableName};"""
// delete by value columns
sql """INSERT INTO ${tableName} VALUES (7,7,7)"""
sql """INSERT INTO ${tableName} VALUES (8,8,8)"""
sql """delete from ${tableName} where c3 = 7;"""
- qt_sql """select /*+ SET_VAR(enable_vectorized_engine=false) */ * from
${tableName};"""
- qt_sql """select /*+ SET_VAR(enable_vectorized_engine=true) */ * from
${tableName};"""
+ order_qt_sql """select /*+ SET_VAR(enable_vectorized_engine=false) */ *
from ${tableName};"""
+ order_qt_sql """select /*+ SET_VAR(enable_vectorized_engine=true) */ *
from ${tableName};"""
sql """drop table ${tableName} force"""
@@ -86,26 +86,26 @@ suite("test_segment_iterator_delete") {
// delete first key
sql """delete from ${tableName} where c1 = 1;"""
sql """INSERT INTO ${tableName} VALUES (4,4,4)"""
- qt_sql """select /*+ SET_VAR(enable_vectorized_engine=false) */ * from
${tableName};"""
- qt_sql """select /*+ SET_VAR(enable_vectorized_engine=true) */ * from
${tableName};"""
+ order_qt_sql """select /*+ SET_VAR(enable_vectorized_engine=false) */ *
from ${tableName};"""
+ order_qt_sql """select /*+ SET_VAR(enable_vectorized_engine=true) */ *
from ${tableName};"""
// delete second key
sql """delete from ${tableName} where c2 = 2;"""
- qt_sql """select /*+ SET_VAR(enable_vectorized_engine=false) */ * from
${tableName};"""
- qt_sql """select /*+ SET_VAR(enable_vectorized_engine=true) */ * from
${tableName};"""
+ order_qt_sql """select /*+ SET_VAR(enable_vectorized_engine=false) */ *
from ${tableName};"""
+ order_qt_sql """select /*+ SET_VAR(enable_vectorized_engine=true) */ *
from ${tableName};"""
// delete by multi columns
sql """INSERT INTO ${tableName} VALUES (5,5,5)"""
sql """INSERT INTO ${tableName} VALUES (6,6,6)"""
sql """delete from ${tableName} where c1 = 5 and c2=5;"""
sql """delete from ${tableName} where c1 = 5 and c2=6;"""
- qt_sql """select /*+ SET_VAR(enable_vectorized_engine=false) */ * from
${tableName};"""
- qt_sql """select /*+ SET_VAR(enable_vectorized_engine=true) */ * from
${tableName};"""
+ order_qt_sql """select /*+ SET_VAR(enable_vectorized_engine=false) */ *
from ${tableName};"""
+ order_qt_sql """select /*+ SET_VAR(enable_vectorized_engine=true) */ *
from ${tableName};"""
sql """drop table ${tableName} force"""
// delete ColumnDictionary
sql """INSERT INTO ${tableName_dict} VALUES(1, 'dddd', 'adgs'), (1, 'SSS',
'sk6S0'), (1, 'ttt', 'zdges');"""
sql """delete from ${tableName_dict} where character_key < "sk6S0";"""
- qt_sql """select /*+ SET_VAR(enable_vectorized_engine=true) */ * from
${tableName_dict} order by tinyint_key, char_50_key;"""
+ order_qt_sql """select /*+ SET_VAR(enable_vectorized_engine=true) */ *
from ${tableName_dict} order by tinyint_key, char_50_key;"""
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
