This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
new f15cc828e5 [improvement](regression) remove sf1DataPath item of
config to make data sources uniform (#22934)
f15cc828e5 is described below
commit f15cc828e5a4520a183a621539c99edb0427f080
Author: zgxme <m...@zgx.io>
AuthorDate: Mon Aug 14 15:02:40 2023 +0800
[improvement](regression) remove sf1DataPath item of config to make data
sources uniform (#22934)
---
.../main/groovy/org/apache/doris/regression/Config.groovy | 13 +++----------
.../groovy/org/apache/doris/regression/ConfigOptions.groovy | 9 +--------
.../org/apache/doris/regression/suite/ScriptContext.groovy | 2 --
.../org/apache/doris/regression/suite/SuiteContext.groovy | 1 -
regression-test/pipeline/p0/conf/regression-conf.groovy | 3 ---
regression-test/pipeline/p1/conf/regression-conf.groovy | 1 -
regression-test/suites/datev2/ssb_sf1_p1/load.groovy | 2 +-
regression-test/suites/datev2/tpcds_sf1_p1/load.groovy | 2 +-
regression-test/suites/datev2/tpch_sf1_p1/load.groovy | 4 ++--
.../suites/datev2/tpch_sf1_p1/tpch_sf1/load.groovy | 4 ++--
regression-test/suites/decimalv3/tpch_sf1_p1/load.groovy | 4 ++--
regression-test/suites/index_p0/load.groovy | 2 +-
.../ssb_unique_load_zstd_p0/four/load_four_step.groovy | 4 ++--
.../ssb_unique_load_zstd_p0/one/load_one_step.groovy | 2 +-
.../ssb_unique_load_zstd_p0/three/load_three_step.groovy | 2 +-
.../ssb_unique_load_zstd_p0/two/load_two_step.groovy | 2 +-
.../suites/primary_index/ssb_unique_sql_zstd_p0/load.groovy | 2 +-
.../suites/primary_index/test_unique_mow_sequence.groovy | 2 +-
regression-test/suites/ssb_sf0.1_p1/load.groovy | 2 +-
regression-test/suites/ssb_sf1/load.groovy | 4 ++--
regression-test/suites/ssb_sf1_p2/load.groovy | 2 +-
.../ssb_unique_load_zstd_p0/load_four_step/load.groovy | 4 ++--
.../ssb_unique_load_zstd_p0/load_one_step/load.groovy | 2 +-
.../ssb_unique_load_zstd_p0/load_three_step/load.groovy | 2 +-
.../ssb_unique_load_zstd_p0/load_two_step/load.groovy | 2 +-
regression-test/suites/ssb_unique_sql_zstd_p0/load.groovy | 2 +-
regression-test/suites/tpcds_sf1_p1/load.groovy | 2 +-
regression-test/suites/tpcds_sf1_unique_p1/load.groovy | 2 +-
regression-test/suites/tpch_sf1_p1/load.groovy | 4 ++--
regression-test/suites/tpch_sf1_unique_p1/load.groovy | 4 ++--
30 files changed, 36 insertions(+), 57 deletions(-)
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
index 34a65d8b12..355c58f2df 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
@@ -51,7 +51,7 @@ class Config {
public String suitePath
public String dataPath
public String realDataPath
- public String sf1DataPath
+
public String cacheDataPath
public String pluginPath
@@ -89,7 +89,7 @@ class Config {
Config(String defaultDb, String jdbcUrl, String jdbcUser, String
jdbcPassword,
String feHttpAddress, String feHttpUser, String feHttpPassword,
String metaServiceHttpAddress,
- String suitePath, String dataPath, String realDataPath, String
sf1DataPath, String cacheDataPath,
+ String suitePath, String dataPath, String realDataPath, String
cacheDataPath,
String testGroups, String excludeGroups, String testSuites, String
excludeSuites,
String testDirectories, String excludeDirectories, String
pluginPath) {
this.defaultDb = defaultDb
@@ -103,7 +103,6 @@ class Config {
this.suitePath = suitePath
this.dataPath = dataPath
this.realDataPath = realDataPath
- this.sf1DataPath = sf1DataPath
this.cacheDataPath = cacheDataPath
this.testGroups = testGroups
this.excludeGroups = excludeGroups
@@ -137,7 +136,6 @@ class Config {
config.suitePath =
FileUtils.getCanonicalPath(cmd.getOptionValue(pathOpt, config.suitePath))
config.dataPath =
FileUtils.getCanonicalPath(cmd.getOptionValue(dataOpt, config.dataPath))
config.realDataPath =
FileUtils.getCanonicalPath(cmd.getOptionValue(realDataOpt, config.realDataPath))
- config.sf1DataPath = cmd.getOptionValue(sf1DataOpt, config.sf1DataPath)
config.cacheDataPath = cmd.getOptionValue(cacheDataOpt,
config.cacheDataPath)
config.pluginPath =
FileUtils.getCanonicalPath(cmd.getOptionValue(pluginOpt, config.pluginPath))
config.suiteWildcard = cmd.getOptionValue(suiteOpt, config.testSuites)
@@ -240,7 +238,6 @@ class Config {
configToString(obj.suitePath),
configToString(obj.dataPath),
configToString(obj.realDataPath),
- configToString(obj.sf1DataPath),
configToString(obj.cacheDataPath),
configToString(obj.testGroups),
configToString(obj.excludeGroups),
@@ -320,11 +317,7 @@ class Config {
config.realDataPath = "regression-test/realData"
log.info("Set realDataPath to '${config.realDataPath}' because not
specify.".toString())
}
-
- if (config.sf1DataPath == null) {
- config.sf1DataPath = "regression-test/sf1Data"
- log.info("Set sf1DataPath to '${config.sf1DataPath}' because not
specify.".toString())
- }
+
if (config.cacheDataPath == null) {
config.cacheDataPath = "regression-test/cacheData"
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/ConfigOptions.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/ConfigOptions.groovy
index bcb0743db7..4fa7552e09 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/ConfigOptions.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/ConfigOptions.groovy
@@ -132,14 +132,7 @@ class ConfigOptions {
.longOpt("realDataPath")
.desc("the real data path")
.build()
- sf1DataOpt = Option.builder("SD")
- .argName("sf1DataPath")
- .required(false)
- .hasArg(true)
- .type(String.class)
- .longOpt("sf1DataPath")
- .desc("the sf1 data path contains data file for ssb_sf1,
tpcds_sf1 and tpch_sf1 cases")
- .build()
+
cacheDataOpt = Option.builder("CD")
.argName("cacheDataPath")
.required(false)
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/ScriptContext.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/ScriptContext.groovy
index dd706c3d96..3b90089a4f 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/ScriptContext.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/ScriptContext.groovy
@@ -33,7 +33,6 @@ class ScriptContext implements Closeable {
public final File file
public final Config config
public final File dataPath
- public final String sf1DataPath
public final File outputFile
public final String name
public final String flowName
@@ -63,7 +62,6 @@ class ScriptContext implements Closeable {
def outputRelativePath = path.substring(0, path.lastIndexOf(".")) +
".out"
this.outputFile = new File(new File(config.dataPath),
outputRelativePath)
this.dataPath = this.outputFile.getParentFile().getCanonicalFile()
- this.sf1DataPath = config.sf1DataPath
}
private final synchronized Suite newSuite(String suiteName, String group) {
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/SuiteContext.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/SuiteContext.groovy
index d3c6ee0e50..1f02ae2d22 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/SuiteContext.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/SuiteContext.groovy
@@ -69,7 +69,6 @@ class SuiteContext implements Closeable {
def path = new File(config.suitePath).relativePath(file)
def realPath = new File(config.suitePath).relativePath(file)
- def sf1DataPath = config.sf1DataPath
def outputRelativePath = path.substring(0, path.lastIndexOf(".")) +
".out"
def realOutputRelativePath = path.substring(0,
realPath.lastIndexOf(".")) + ".out"
this.outputFile = new File(new File(config.dataPath),
outputRelativePath)
diff --git a/regression-test/pipeline/p0/conf/regression-conf.groovy
b/regression-test/pipeline/p0/conf/regression-conf.groovy
index b8e643b115..ecdbfba739 100644
--- a/regression-test/pipeline/p0/conf/regression-conf.groovy
+++ b/regression-test/pipeline/p0/conf/regression-conf.groovy
@@ -34,8 +34,6 @@ suitePath = "${DORIS_HOME}/regression-test/suites"
dataPath = "${DORIS_HOME}/regression-test/data"
pluginPath = "${DORIS_HOME}/regression-test/plugins"
realDataPath = "${DORIS_HOME}/regression-test/realdata"
-// sf1DataPath can be url like
"https://doris-community-test-1308700295.cos.ap-hongkong.myqcloud.com"; or local
path like "/data"
-//sf1DataPath =
"https://doris-community-test-1308700295.cos.ap-hongkong.myqcloud.com";
// will test <group>/<suite>.groovy
// empty group will test all group
@@ -77,5 +75,4 @@ pg_14_port=7121
enableHiveTest=false
hms_port=7141
-sf1DataPath = "/data"
cacheDataPath = "/data/regression/"
diff --git a/regression-test/pipeline/p1/conf/regression-conf.groovy
b/regression-test/pipeline/p1/conf/regression-conf.groovy
index 3f2be7f6c5..0405b31c19 100644
--- a/regression-test/pipeline/p1/conf/regression-conf.groovy
+++ b/regression-test/pipeline/p1/conf/regression-conf.groovy
@@ -34,7 +34,6 @@ beHttpAddress = "172.19.0.2:8142"
// e.g. java -DDORIS_HOME=./
suitePath = "${DORIS_HOME}/regression-test/suites"
dataPath = "${DORIS_HOME}/regression-test/data"
-sf1DataPath = "/data"
// will test <group>/<suite>.groovy
// empty group will test all group
diff --git a/regression-test/suites/datev2/ssb_sf1_p1/load.groovy
b/regression-test/suites/datev2/ssb_sf1_p1/load.groovy
index 26b1f6fcbb..f5e81c3e7b 100644
--- a/regression-test/suites/datev2/ssb_sf1_p1/load.groovy
+++ b/regression-test/suites/datev2/ssb_sf1_p1/load.groovy
@@ -59,7 +59,7 @@ suite("load") {
set 'columns', columns[i]
// 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}/ssb/sf1/${tableName}.tbl.gz"""
+ file """${getS3Url()}/regression/ssb/sf1/${tableName}.tbl.gz"""
time 10000 // limit inflight 10s
diff --git a/regression-test/suites/datev2/tpcds_sf1_p1/load.groovy
b/regression-test/suites/datev2/tpcds_sf1_p1/load.groovy
index b42374e9ac..d370954f73 100644
--- a/regression-test/suites/datev2/tpcds_sf1_p1/load.groovy
+++ b/regression-test/suites/datev2/tpcds_sf1_p1/load.groovy
@@ -78,7 +78,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}/tpcds/sf1/${tableName}.dat.gz"""
+ file """${getS3Url()}/regression/tpcds/sf1/${tableName}.dat.gz"""
time 10000 // limit inflight 10s
diff --git a/regression-test/suites/datev2/tpch_sf1_p1/load.groovy
b/regression-test/suites/datev2/tpch_sf1_p1/load.groovy
index dad3a7dc73..e36598bb3b 100644
--- a/regression-test/suites/datev2/tpch_sf1_p1/load.groovy
+++ b/regression-test/suites/datev2/tpch_sf1_p1/load.groovy
@@ -44,7 +44,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}/tpch/sf1/${tableName}.csv.split00.gz"""
+ file
"""${getS3Url()}/regression/tpch/sf1/${tableName}.csv.split00.gz"""
time 10000 // limit inflight 10s
@@ -78,7 +78,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}/tpch/sf1/${tableName}.csv.split01.gz"""
+ file
"""${getS3Url()}/regression/tpch/sf1/${tableName}.csv.split01.gz"""
time 10000 // limit inflight 10s
diff --git a/regression-test/suites/datev2/tpch_sf1_p1/tpch_sf1/load.groovy
b/regression-test/suites/datev2/tpch_sf1_p1/tpch_sf1/load.groovy
index 9de43b3612..fc2255d3f4 100644
--- a/regression-test/suites/datev2/tpch_sf1_p1/tpch_sf1/load.groovy
+++ b/regression-test/suites/datev2/tpch_sf1_p1/tpch_sf1/load.groovy
@@ -53,7 +53,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}/tpch/sf1/${tableName}.csv.split00.gz"""
+ file
"""${getS3Url()}/regression/tpch/sf1/${tableName}.csv.split00.gz"""
time 10000 // limit inflight 10s
@@ -87,7 +87,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}/tpch/sf1/${tableName}.csv.split01.gz"""
+ file
"""${getS3Url()}/regression/tpch/sf1/${tableName}.csv.split01.gz"""
time 10000 // limit inflight 10s
diff --git a/regression-test/suites/decimalv3/tpch_sf1_p1/load.groovy
b/regression-test/suites/decimalv3/tpch_sf1_p1/load.groovy
index dad3a7dc73..e36598bb3b 100644
--- a/regression-test/suites/decimalv3/tpch_sf1_p1/load.groovy
+++ b/regression-test/suites/decimalv3/tpch_sf1_p1/load.groovy
@@ -44,7 +44,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}/tpch/sf1/${tableName}.csv.split00.gz"""
+ file
"""${getS3Url()}/regression/tpch/sf1/${tableName}.csv.split00.gz"""
time 10000 // limit inflight 10s
@@ -78,7 +78,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}/tpch/sf1/${tableName}.csv.split01.gz"""
+ file
"""${getS3Url()}/regression/tpch/sf1/${tableName}.csv.split01.gz"""
time 10000 // limit inflight 10s
diff --git a/regression-test/suites/index_p0/load.groovy
b/regression-test/suites/index_p0/load.groovy
index 306a283d8b..fda892a641 100644
--- a/regression-test/suites/index_p0/load.groovy
+++ b/regression-test/suites/index_p0/load.groovy
@@ -38,7 +38,7 @@ suite("test_bitmap_index_load") {
table "${tbName}"
set 'column_separator', '|'
set 'columns', 'a,temp'
- file """${context.sf1DataPath}/regression/bitmap_index_test.csv"""
+ file """${getS3Url()}/regression/bitmap_index_test.csv"""
time 10000 // limit inflight 10s
// if declared a check callback, the default check condition will
ignore.
diff --git
a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/four/load_four_step.groovy
b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/four/load_four_step.groovy
index 5fbd0d88e0..0600d977ae 100644
---
a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/four/load_four_step.groovy
+++
b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/four/load_four_step.groovy
@@ -36,7 +36,7 @@ suite("load_four_step") {
set 'compress_type', 'GZ'
set 'columns', rows[0]
set 'function_column.sequence_col', rows[2]
- file """${context.sf1DataPath}/ssb/sf0.1/${tableName}.tbl.gz"""
+ file
"""${getS3Url()}/regression/ssb/sf0.1/${tableName}.tbl.gz"""
time 10000 // limit inflight 10s
@@ -90,7 +90,7 @@ suite("load_four_step") {
set 'compress_type', 'GZ'
set 'columns', rows[0]
set 'function_column.sequence_col', rows[2]
- file """${context.sf1DataPath}/ssb/sf0.1/${tableName}.tbl.gz"""
+ file """${getS3Url()}/regression/ssb/sf0.1/${tableName}.tbl.gz"""
time 10000 // limit inflight 10s
diff --git
a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/one/load_one_step.groovy
b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/one/load_one_step.groovy
index eb8b5a7e9f..c1cdd15f55 100644
---
a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/one/load_one_step.groovy
+++
b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/one/load_one_step.groovy
@@ -31,7 +31,7 @@ suite("load_one_step") {
set 'column_separator', '|'
set 'compress_type', 'GZ'
set 'columns', "${rows[0]}"
- file """${context.sf1DataPath}/ssb/sf0.1/${tableName}.tbl.gz"""
+ file """${getS3Url()}/regression/ssb/sf0.1/${tableName}.tbl.gz"""
time 10000 // limit inflight 10s
diff --git
a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/three/load_three_step.groovy
b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/three/load_three_step.groovy
index 672174d504..b6ee2c6a42 100644
---
a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/three/load_three_step.groovy
+++
b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/three/load_three_step.groovy
@@ -33,7 +33,7 @@ suite("load_three_step") {
set 'compress_type', 'GZ'
set 'columns', rows[0]
set 'function_column.sequence_col', rows[2]
- file """${context.sf1DataPath}/ssb/sf0.1/${tableName}.tbl.gz"""
+ file
"""${getS3Url()}/regression/ssb/sf0.1/${tableName}.tbl.gz"""
time 10000 // limit inflight 10s
diff --git
a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/two/load_two_step.groovy
b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/two/load_two_step.groovy
index ade9581fd1..d7b45b6b9a 100644
---
a/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/two/load_two_step.groovy
+++
b/regression-test/suites/primary_index/ssb_unique_load_zstd_p0/two/load_two_step.groovy
@@ -32,7 +32,7 @@ suite("load_two_step") {
set 'compress_type', 'GZ'
set 'columns', rows[0]
set 'function_column.sequence_col', rows[2]
- file """${context.sf1DataPath}/ssb/sf0.1/${tableName}.tbl.gz"""
+ file """${getS3Url()}/regression/ssb/sf0.1/${tableName}.tbl.gz"""
time 10000 // limit inflight 10s
diff --git
a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/load.groovy
b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/load.groovy
index f0b795f83d..81dd5d463f 100644
--- a/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/load.groovy
+++ b/regression-test/suites/primary_index/ssb_unique_sql_zstd_p0/load.groovy
@@ -54,7 +54,7 @@ suite("load") {
set 'columns', columns[i]
// 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}/ssb/sf0.1/${tableName}.tbl.gz"""
+ file """${getS3Url()}/regression/ssb/sf0.1/${tableName}.tbl.gz"""
time 10000 // limit inflight 10s
diff --git
a/regression-test/suites/primary_index/test_unique_mow_sequence.groovy
b/regression-test/suites/primary_index/test_unique_mow_sequence.groovy
index 2612712165..e0ac2feca7 100644
--- a/regression-test/suites/primary_index/test_unique_mow_sequence.groovy
+++ b/regression-test/suites/primary_index/test_unique_mow_sequence.groovy
@@ -47,7 +47,7 @@ suite("test_unique_mow_sequence") {
set 'columns',
'c_custkey,c_name,c_address,c_city,c_nation,c_region,c_phone,c_mktsegment,no_use'
set 'function_column.sequence_col', 'c_custkey'
- file """${context.sf1DataPath}/ssb/sf0.1/customer.tbl.gz"""
+ file """${getS3Url()}/regression/ssb/sf0.1/customer.tbl.gz"""
time 10000 // limit inflight 10s
diff --git a/regression-test/suites/ssb_sf0.1_p1/load.groovy
b/regression-test/suites/ssb_sf0.1_p1/load.groovy
index 786c5493ea..811099101f 100644
--- a/regression-test/suites/ssb_sf0.1_p1/load.groovy
+++ b/regression-test/suites/ssb_sf0.1_p1/load.groovy
@@ -59,7 +59,7 @@ suite("load") {
set 'columns', columns[i]
// 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}/ssb/sf0.1/${tableName}.tbl.gz"""
+ file """${getS3Url()}/regression/ssb/sf0.1/${tableName}.tbl.gz"""
time 10000 // limit inflight 10s
diff --git a/regression-test/suites/ssb_sf1/load.groovy
b/regression-test/suites/ssb_sf1/load.groovy
index 029a13a826..cef5cd5604 100644
--- a/regression-test/suites/ssb_sf1/load.groovy
+++ b/regression-test/suites/ssb_sf1/load.groovy
@@ -57,7 +57,7 @@ suite("load") {
set 'columns', columns[i]
// 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}/ssb/sf1/${tableName}.tbl.split00.gz"""
+ file
"""${getS3Url()}/regression/ssb/sf1/${tableName}.tbl.split00.gz"""
time 10000 // limit inflight 10s
@@ -91,7 +91,7 @@ suite("load") {
set 'columns', columns[i]
// 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}/ssb/sf1/${tableName}.tbl.split01.gz"""
+ file
"""${getS3Url()}/regression/ssb/sf1/${tableName}.tbl.split01.gz"""
time 10000 // limit inflight 10s
diff --git a/regression-test/suites/ssb_sf1_p2/load.groovy
b/regression-test/suites/ssb_sf1_p2/load.groovy
index 26b1f6fcbb..f5e81c3e7b 100644
--- a/regression-test/suites/ssb_sf1_p2/load.groovy
+++ b/regression-test/suites/ssb_sf1_p2/load.groovy
@@ -59,7 +59,7 @@ suite("load") {
set 'columns', columns[i]
// 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}/ssb/sf1/${tableName}.tbl.gz"""
+ file """${getS3Url()}/regression/ssb/sf1/${tableName}.tbl.gz"""
time 10000 // limit inflight 10s
diff --git
a/regression-test/suites/ssb_unique_load_zstd_p0/load_four_step/load.groovy
b/regression-test/suites/ssb_unique_load_zstd_p0/load_four_step/load.groovy
index b3f5853388..81c0f27613 100644
--- a/regression-test/suites/ssb_unique_load_zstd_p0/load_four_step/load.groovy
+++ b/regression-test/suites/ssb_unique_load_zstd_p0/load_four_step/load.groovy
@@ -36,7 +36,7 @@ suite("load_four_step") {
set 'compress_type', 'GZ'
set 'columns', rows[0]
set 'function_column.sequence_col', rows[2]
- file """${context.sf1DataPath}/ssb/sf0.1/${tableName}.tbl.gz"""
+ file
"""${getS3Url()}/regression/ssb/sf0.1/${tableName}.tbl.gz"""
time 10000 // limit inflight 10s
@@ -75,7 +75,7 @@ suite("load_four_step") {
set 'compress_type', 'GZ'
set 'columns', rows[0]
set 'function_column.sequence_col', rows[2]
- file """${context.sf1DataPath}/ssb/sf0.1/${tableName}.tbl.gz"""
+ file """${getS3Url()}/regression/ssb/sf0.1/${tableName}.tbl.gz"""
time 10000 // limit inflight 10s
diff --git
a/regression-test/suites/ssb_unique_load_zstd_p0/load_one_step/load.groovy
b/regression-test/suites/ssb_unique_load_zstd_p0/load_one_step/load.groovy
index 621315c9b6..6a0e7c033f 100644
--- a/regression-test/suites/ssb_unique_load_zstd_p0/load_one_step/load.groovy
+++ b/regression-test/suites/ssb_unique_load_zstd_p0/load_one_step/load.groovy
@@ -33,7 +33,7 @@ suite("load_one_step") {
set 'column_separator', '|'
set 'compress_type', 'GZ'
set 'columns', rows[0]
- file """${context.sf1DataPath}/ssb/sf0.1/${tableName}.tbl.gz"""
+ file """${getS3Url()}/regression/ssb/sf0.1/${tableName}.tbl.gz"""
time 10000 // limit inflight 10s
diff --git
a/regression-test/suites/ssb_unique_load_zstd_p0/load_three_step/load.groovy
b/regression-test/suites/ssb_unique_load_zstd_p0/load_three_step/load.groovy
index bbd9e0f4ba..e746d28d27 100644
--- a/regression-test/suites/ssb_unique_load_zstd_p0/load_three_step/load.groovy
+++ b/regression-test/suites/ssb_unique_load_zstd_p0/load_three_step/load.groovy
@@ -33,7 +33,7 @@ suite("load_three_step") {
set 'compress_type', 'GZ'
set 'columns', rows[0]
set 'function_column.sequence_col', rows[2]
- file """${context.sf1DataPath}/ssb/sf0.1/${tableName}.tbl.gz"""
+ file
"""${getS3Url()}/regression/ssb/sf0.1/${tableName}.tbl.gz"""
time 10000 // limit inflight 10s
diff --git
a/regression-test/suites/ssb_unique_load_zstd_p0/load_two_step/load.groovy
b/regression-test/suites/ssb_unique_load_zstd_p0/load_two_step/load.groovy
index 4e2e7ae3b8..7b3c2d12b4 100644
--- a/regression-test/suites/ssb_unique_load_zstd_p0/load_two_step/load.groovy
+++ b/regression-test/suites/ssb_unique_load_zstd_p0/load_two_step/load.groovy
@@ -32,7 +32,7 @@ suite("load_two_step") {
set 'compress_type', 'GZ'
set 'columns', rows[0]
set 'function_column.sequence_col', rows[2]
- file """${context.sf1DataPath}/ssb/sf0.1/${tableName}.tbl.gz"""
+ file """${getS3Url()}/regression/ssb/sf0.1/${tableName}.tbl.gz"""
time 10000 // limit inflight 10s
diff --git a/regression-test/suites/ssb_unique_sql_zstd_p0/load.groovy
b/regression-test/suites/ssb_unique_sql_zstd_p0/load.groovy
index f0b795f83d..81dd5d463f 100644
--- a/regression-test/suites/ssb_unique_sql_zstd_p0/load.groovy
+++ b/regression-test/suites/ssb_unique_sql_zstd_p0/load.groovy
@@ -54,7 +54,7 @@ suite("load") {
set 'columns', columns[i]
// 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}/ssb/sf0.1/${tableName}.tbl.gz"""
+ file """${getS3Url()}/regression/ssb/sf0.1/${tableName}.tbl.gz"""
time 10000 // limit inflight 10s
diff --git a/regression-test/suites/tpcds_sf1_p1/load.groovy
b/regression-test/suites/tpcds_sf1_p1/load.groovy
index b42374e9ac..d370954f73 100644
--- a/regression-test/suites/tpcds_sf1_p1/load.groovy
+++ b/regression-test/suites/tpcds_sf1_p1/load.groovy
@@ -78,7 +78,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}/tpcds/sf1/${tableName}.dat.gz"""
+ file """${getS3Url()}/regression/tpcds/sf1/${tableName}.dat.gz"""
time 10000 // limit inflight 10s
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/load.groovy
b/regression-test/suites/tpcds_sf1_unique_p1/load.groovy
index 76554dc09e..03fa01eb4b 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/load.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/load.groovy
@@ -117,7 +117,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}/tpcds/sf1/${tableName}.dat.gz"""
+ file """${getS3Url()}/regression/tpcds/sf1/${tableName}.dat.gz"""
time 10000 // limit inflight 10s
diff --git a/regression-test/suites/tpch_sf1_p1/load.groovy
b/regression-test/suites/tpch_sf1_p1/load.groovy
index 9de43b3612..fc2255d3f4 100644
--- a/regression-test/suites/tpch_sf1_p1/load.groovy
+++ b/regression-test/suites/tpch_sf1_p1/load.groovy
@@ -53,7 +53,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}/tpch/sf1/${tableName}.csv.split00.gz"""
+ file
"""${getS3Url()}/regression/tpch/sf1/${tableName}.csv.split00.gz"""
time 10000 // limit inflight 10s
@@ -87,7 +87,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}/tpch/sf1/${tableName}.csv.split01.gz"""
+ file
"""${getS3Url()}/regression/tpch/sf1/${tableName}.csv.split01.gz"""
time 10000 // limit inflight 10s
diff --git a/regression-test/suites/tpch_sf1_unique_p1/load.groovy
b/regression-test/suites/tpch_sf1_unique_p1/load.groovy
index dad3a7dc73..e36598bb3b 100644
--- a/regression-test/suites/tpch_sf1_unique_p1/load.groovy
+++ b/regression-test/suites/tpch_sf1_unique_p1/load.groovy
@@ -44,7 +44,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}/tpch/sf1/${tableName}.csv.split00.gz"""
+ file
"""${getS3Url()}/regression/tpch/sf1/${tableName}.csv.split00.gz"""
time 10000 // limit inflight 10s
@@ -78,7 +78,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}/tpch/sf1/${tableName}.csv.split01.gz"""
+ file
"""${getS3Url()}/regression/tpch/sf1/${tableName}.csv.split01.gz"""
time 10000 // limit inflight 10s
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
