You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by da...@apache.org on 2022/10/01 13:26:57 UTC
[doris] branch master updated: [fix](test) add sync for some cases and adjust data path for tpch_unique_sql_zstd_p0 (#13102)
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 6fb9337095 [fix](test) add sync for some cases and adjust data path for tpch_unique_sql_zstd_p0 (#13102)
6fb9337095 is described below
commit 6fb9337095f341262f7ee492b41ee67a249735e2
Author: Yongqiang YANG <98...@users.noreply.github.com>
AuthorDate: Sat Oct 1 21:26:50 2022 +0800
[fix](test) add sync for some cases and adjust data path for tpch_unique_sql_zstd_p0 (#13102)
---
.../load_p0/stream_load/load_json_with_jsonpath.groovy | 2 ++
.../suites/load_p0/stream_load/test_json_load.groovy | 12 ++++++++++++
regression-test/suites/tpcds_sf1_unique_p1/load.groovy | 1 +
regression-test/suites/tpch_unique_sql_zstd_p0/load.groovy | 2 +-
4 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/regression-test/suites/load_p0/stream_load/load_json_with_jsonpath.groovy b/regression-test/suites/load_p0/stream_load/load_json_with_jsonpath.groovy
index c9e8732960..b2fa65d8f0 100644
--- a/regression-test/suites/load_p0/stream_load/load_json_with_jsonpath.groovy
+++ b/regression-test/suites/load_p0/stream_load/load_json_with_jsonpath.groovy
@@ -86,6 +86,7 @@ suite("test_load_json_with_jsonpath", "p0") {
load_array_data.call(testTable, 'true', '', 'json', '', '["$.k1", "$.v1"]', '', '', '', '', 'test_load_with_jsonpath.json')
// select the table and check whether the data is correct
+ sql "sync"
qt_select "select * from ${testTable} order by k1"
} finally {
@@ -100,6 +101,7 @@ suite("test_load_json_with_jsonpath", "p0") {
load_array_data.call(testTable, 'true', '', 'json', '', '["$.k1", "$.v1"]', '', '', '', '', 'test_load_with_jsonpath.json')
+ sql "sync"
// select the table and check whether the data is correct
qt_select "select * from ${testTable} order by k1"
diff --git a/regression-test/suites/load_p0/stream_load/test_json_load.groovy b/regression-test/suites/load_p0/stream_load/test_json_load.groovy
index 1bca4f9687..8474635d0e 100644
--- a/regression-test/suites/load_p0/stream_load/test_json_load.groovy
+++ b/regression-test/suites/load_p0/stream_load/test_json_load.groovy
@@ -162,6 +162,7 @@ suite("test_json_load", "p0") {
while(max_try_milli_secs) {
result = sql "show load where label = '${checklabel}'"
if(result[0][2] == "FINISHED") {
+ sql "sync"
qt_select "select * from ${testTablex} order by id"
break
} else {
@@ -182,6 +183,7 @@ suite("test_json_load", "p0") {
load_json_data.call('true', '', 'json', '', '', '', '', '', 'simple_json.json')
+ sql "sync"
qt_select "select * from ${testTable} order by id"
} finally {
@@ -196,6 +198,7 @@ suite("test_json_load", "p0") {
load_json_data.call('true', '', 'json', 'id= id * 10', '', '', '', '', 'simple_json.json')
+ sql "sync"
qt_select "select * from ${testTable} order by id"
} finally {
@@ -211,6 +214,7 @@ suite("test_json_load", "p0") {
load_json_data.call('true', '', 'json', '', '[\"$.id\", \"$.code\"]',
'', '', '', 'simple_json.json')
+ sql "sync"
qt_select "select * from ${testTable} order by id"
} finally {
@@ -226,6 +230,7 @@ suite("test_json_load", "p0") {
load_json_data.call('true', '', 'json', 'code = id * 10 + 200', '[\"$.id\"]',
'', '', '', 'simple_json.json')
+ sql "sync"
qt_select "select * from ${testTable} order by id"
} finally {
@@ -241,6 +246,7 @@ suite("test_json_load", "p0") {
load_json_data.call('true', 'true', 'json', '', '[\"$.id\", \"$.code\"]',
'', '', '', 'multi_line_json.json')
+ sql "sync"
qt_select "select * from ${testTable} order by id"
} finally {
@@ -256,6 +262,7 @@ suite("test_json_load", "p0") {
load_json_data.call('true', 'true', 'json', 'id= id * 10', '[\"$.id\", \"$.code\"]',
'', '', '', 'multi_line_json.json')
+ sql "sync"
qt_select "select * from ${testTable} order by id"
} finally {
@@ -271,6 +278,7 @@ suite("test_json_load", "p0") {
load_json_data.call('true', 'true', 'json', 'id= id * 10', '[\"$.id\", \"$.code\"]',
'', 'id > 50', '', 'multi_line_json.json')
+ sql "sync"
qt_select "select * from ${testTable} order by id"
} finally {
@@ -286,6 +294,7 @@ suite("test_json_load", "p0") {
load_json_data.call('true', 'true', 'json', 'id= id * 10', '[\"$.id\", \"$.code\"]',
'', 'id > 50', 'true', 'multi_line_json.json')
+ sql "sync"
qt_select "select * from ${testTable} order by id"
} finally {
@@ -301,6 +310,7 @@ suite("test_json_load", "p0") {
load_json_data.call('', 'true', 'json', 'id= id * 10', '',
'$.item', '', 'true', 'nest_json.json')
+ sql "sync"
qt_select "select * from ${testTable} order by id"
} finally {
@@ -315,6 +325,7 @@ suite("test_json_load", "p0") {
load_json_data.call('', 'true', 'json', 'id= id * 10', '',
'$.item', '', 'true', 'invalid_json.json', true)
+ sql "sync"
qt_select "select * from ${testTable} order by id"
} finally {
@@ -368,6 +379,7 @@ suite("test_json_load", "p0") {
load_json_data.call('true', '', 'json', '', '',
'', '', '', 'invalid_json_array.json', true)
+ sql "sync"
qt_select "select * from ${testTable}"
} finally {
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/load.groovy b/regression-test/suites/tpcds_sf1_unique_p1/load.groovy
index 86b7eccac8..167c0c08e8 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/load.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/load.groovy
@@ -139,6 +139,7 @@ suite("load") {
}
// CREATE-TABLE-AS-SELECT
+ sql "drop table if exists t;"
sql "create table t properties('replication_num'='1') as select * from item;"
def origin_count = sql "select count(*) from item"
def new_count = sql "select count(*) from t"
diff --git a/regression-test/suites/tpch_unique_sql_zstd_p0/load.groovy b/regression-test/suites/tpch_unique_sql_zstd_p0/load.groovy
index 3f0b97c35d..8c3e114ebb 100644
--- a/regression-test/suites/tpch_unique_sql_zstd_p0/load.groovy
+++ b/regression-test/suites/tpch_unique_sql_zstd_p0/load.groovy
@@ -54,7 +54,7 @@ suite("load") {
// relate to ${DORIS_HOME}/regression-test/data/demo/streamload_input.csv.
// also, you can stream load a http stream, e.g. http://xxx/some.csv
- file """${context.sf1DataPath}/regression/tpch/sf0.1/${tableName}.tbl.gz"""
+ file """${getS3Url()}/regression/tpch/sf0.1/${tableName}.tbl.gz"""
time 10000 // limit inflight 10s
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org