This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new bf984c1e80 [test] Add drop force to cases associated with ALTER
operations (#10049)
bf984c1e80 is described below
commit bf984c1e809f1b508fda6767e1dcc117274a449f
Author: zy-kkk <815574...@qq.com>
AuthorDate: Sun Jun 12 08:27:44 2022 -0500
[test] Add drop force to cases associated with ALTER operations (#10049)
---
.../correctness/test_bucket_join_with_colocate_table.out | 2 +-
.../correctness/test_bucket_join_with_colocate_table.groovy | 2 +-
regression-test/suites/index/test_bitmap_index.groovy | 6 +++---
regression-test/suites/rollup/test_materialized_view.groovy | 4 ++--
regression-test/suites/rollup/test_rollup_agg.groovy | 5 +++--
.../suites/schema_change/test_alter_table_column.groovy | 13 +++++++------
6 files changed, 17 insertions(+), 15 deletions(-)
diff --git
a/regression-test/data/correctness/test_bucket_join_with_colocate_table.out
b/regression-test/data/correctness/test_bucket_join_with_colocate_table.out
index 0cf6530614..1a938861b6 100644
--- a/regression-test/data/correctness/test_bucket_join_with_colocate_table.out
+++ b/regression-test/data/correctness/test_bucket_join_with_colocate_table.out
@@ -1,7 +1,7 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
-- !select --
-2 2 2 2 2
1 1 1 1 1
+2 2 2 2 2
3 3 3 3 3
\N \N \N 4 4
diff --git
a/regression-test/suites/correctness/test_bucket_join_with_colocate_table.groovy
b/regression-test/suites/correctness/test_bucket_join_with_colocate_table.groovy
index 4c8f0d0f18..4b721c0806 100644
---
a/regression-test/suites/correctness/test_bucket_join_with_colocate_table.groovy
+++
b/regression-test/suites/correctness/test_bucket_join_with_colocate_table.groovy
@@ -75,6 +75,6 @@
// test_vectorized
sql """ set enable_vectorized_engine = true; """
- qt_select """ select * from ${colocateTableName} right outer join
${rightTable} on ${colocateTableName}.c1 = ${rightTable}.k1; """
+ qt_select """ select * from ${colocateTableName} right outer join
${rightTable} on ${colocateTableName}.c1 = ${rightTable}.k1 order by k1; """
}
diff --git a/regression-test/suites/index/test_bitmap_index.groovy
b/regression-test/suites/index/test_bitmap_index.groovy
index 2e58be4d70..6ff77d49f7 100644
--- a/regression-test/suites/index/test_bitmap_index.groovy
+++ b/regression-test/suites/index/test_bitmap_index.groovy
@@ -86,7 +86,7 @@ suite("test_bitmap_index", "index") {
}
}
}
- sql "DROP TABLE ${tbName1};"
+ sql "DROP TABLE ${tbName1} FORCE;"
def tbName2 = "test_bitmap_index_agg"
@@ -161,7 +161,7 @@ suite("test_bitmap_index", "index") {
}
}
}
- sql "DROP TABLE ${tbName2};"
+ sql "DROP TABLE ${tbName2} FORCE;"
def tbName3 = "test_bitmap_index_unique"
sql "DROP TABLE IF EXISTS ${tbName3}"
@@ -232,5 +232,5 @@ suite("test_bitmap_index", "index") {
}
}
}
- sql "DROP TABLE ${tbName3};"
+ sql "DROP TABLE ${tbName3} FORCE;"
}
diff --git a/regression-test/suites/rollup/test_materialized_view.groovy
b/regression-test/suites/rollup/test_materialized_view.groovy
index 761c47b30a..ea42f0e7fa 100644
--- a/regression-test/suites/rollup/test_materialized_view.groovy
+++ b/regression-test/suites/rollup/test_materialized_view.groovy
@@ -106,8 +106,8 @@ suite("test_materialized_view", "rollup") {
}
sql "SELECT store_id, count(sale_amt) FROM ${tbName1} GROUP BY store_id;"
- sql "DROP TABLE ${tbName1}"
- sql "DROP TABLE ${tbName2}"
+ sql "DROP TABLE ${tbName1} FORCE;"
+ sql "DROP TABLE ${tbName2} FORCE;"
}
diff --git a/regression-test/suites/rollup/test_rollup_agg.groovy
b/regression-test/suites/rollup/test_rollup_agg.groovy
index f880abd7f2..1292d15411 100644
--- a/regression-test/suites/rollup/test_rollup_agg.groovy
+++ b/regression-test/suites/rollup/test_rollup_agg.groovy
@@ -51,6 +51,7 @@ suite("test_rollup_agg", "rollup") {
}
}
}
+ Thread.sleep(200)
sql "ALTER TABLE ${tbName} ADD COLUMN vv BIGINT SUM NULL DEFAULT '0' TO
rollup_city;"
max_try_secs = 60
while (max_try_secs--) {
@@ -74,6 +75,6 @@ suite("test_rollup_agg", "rollup") {
contains("rollup: rollup_city")
}
qt_sql "SELECT citycode,SUM(pv) FROM ${tbName} GROUP BY citycode"
- sql "ALTER TABLE ${tbName} DROP ROLLUP rollup_city"
- sql "DROP TABLE ${tbName}"
+ sql "ALTER TABLE ${tbName} DROP ROLLUP rollup_city;"
+ sql "DROP TABLE ${tbName} FORCE;"
}
diff --git
a/regression-test/suites/schema_change/test_alter_table_column.groovy
b/regression-test/suites/schema_change/test_alter_table_column.groovy
index 3cd3fdb6b7..446df2d231 100644
--- a/regression-test/suites/schema_change/test_alter_table_column.groovy
+++ b/regression-test/suites/schema_change/test_alter_table_column.groovy
@@ -51,6 +51,7 @@ suite("test_alter_table_column", "schema_change") {
}
}
}
+ Thread.sleep(200)
sql """
ALTER TABLE ${tbName1}
ORDER BY(k1,k2,value1,value2,value3),
@@ -73,9 +74,9 @@ suite("test_alter_table_column", "schema_change") {
sql "SHOW ALTER TABLE COLUMN;"
sql "insert into ${tbName1} values(1,1,10,20);"
sql "insert into ${tbName1} values(1,1,30,40);"
- qt_sql "desc ${tbName1}"
- qt_sql "select * from ${tbName1}"
- sql "DROP TABLE ${tbName1}"
+ qt_sql "desc ${tbName1};"
+ qt_sql "select * from ${tbName1};"
+ sql "DROP TABLE ${tbName1} FORCE;"
def tbName2 = "alter_table_column_agg"
sql "DROP TABLE IF EXISTS ${tbName2}"
@@ -109,7 +110,7 @@ suite("test_alter_table_column", "schema_change") {
sql "SHOW ALTER TABLE COLUMN"
sql "insert into ${tbName2} values(1,1,10,20);"
sql "insert into ${tbName2} values(1,1,30,40);"
- qt_sql "desc ${tbName2}"
- qt_sql "select * from ${tbName2}"
- sql "DROP TABLE ${tbName2}"
+ qt_sql "desc ${tbName2};"
+ qt_sql "select * from ${tbName2};"
+ sql "DROP TABLE ${tbName2} FORCE;"
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
