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 be3f3978c8 [enhancement](test) remove sf1DataPath conf from
regression-conf.groovy (#13861)
be3f3978c8 is described below
commit be3f3978c852c78443d51fa98347a6b338591e07
Author: AlexYue <yj976240...@gmail.com>
AuthorDate: Thu Dec 8 11:24:25 2022 +0800
[enhancement](test) remove sf1DataPath conf from regression-conf.groovy
(#13861)
---
regression-test/conf/regression-conf.groovy | 2 --
.../src/main/groovy/org/apache/doris/regression/Config.groovy | 11 +----------
.../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 | 5 ++++-
regression-test/pipeline/p1/conf/regression-conf.groovy | 5 ++++-
regression-test/suites/datev2/ssb_sf1_p1/load.groovy | 3 ++-
regression-test/suites/datev2/tpcds_sf1_p1/load.groovy | 2 +-
regression-test/suites/datev2/tpch_sf1_p1/load.groovy | 5 +++--
.../suites/datev2/tpch_sf1_p1/tpch_sf1/load.groovy | 5 +++--
regression-test/suites/decimalv3/tpch_sf1_p1/load.groovy | 4 ++--
regression-test/suites/index_p0/load.groovy | 5 ++++-
.../ssb_unique_load_zstd_p0/four/load_four_step.groovy | 11 +++++++++--
.../ssb_unique_load_zstd_p0/one/load_one_step.groovy | 5 ++++-
.../ssb_unique_load_zstd_p0/three/load_three_step.groovy | 5 ++++-
.../ssb_unique_load_zstd_p0/two/load_two_step.groovy | 5 ++++-
.../suites/primary_index/ssb_unique_sql_zstd_p0/load.groovy | 4 +++-
.../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 | 8 ++++++--
regression-test/suites/ssb_sf1_p2/load.groovy | 4 +++-
.../suites/ssb_unique_load_zstd_p0/load_four_step/load.groovy | 10 ++++++++--
.../suites/ssb_unique_load_zstd_p0/load_one_step/load.groovy | 5 ++++-
.../ssb_unique_load_zstd_p0/load_three_step/load.groovy | 5 ++++-
.../suites/ssb_unique_load_zstd_p0/load_two_step/load.groovy | 5 ++++-
regression-test/suites/ssb_unique_sql_zstd_p0/load.groovy | 4 +++-
regression-test/suites/tpcds_sf1_p1/load.groovy | 3 ++-
regression-test/suites/tpcds_sf1_unique_p1/load.groovy | 3 ++-
regression-test/suites/tpch_sf0.1_p1/load.groovy | 2 +-
regression-test/suites/tpch_sf0.1_unique_p1/load.groovy | 2 +-
regression-test/suites/tpch_sf1_p2/load.groovy | 6 ++++--
regression-test/suites/tpch_sf1_unique_p2/load.groovy | 4 ++--
33 files changed, 94 insertions(+), 60 deletions(-)
diff --git a/regression-test/conf/regression-conf.groovy
b/regression-test/conf/regression-conf.groovy
index aa8e8b34a7..209dd24a3c 100644
--- a/regression-test/conf/regression-conf.groovy
+++ b/regression-test/conf/regression-conf.groovy
@@ -37,8 +37,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-build-hk-1308700295.cos.ap-hongkong.myqcloud.com/regression";
// will test <group>/<suite>.groovy
// empty group will test all group
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 562996a040..3220701262 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
@@ -50,7 +50,6 @@ class Config {
public String suitePath
public String dataPath
public String realDataPath
- public String sf1DataPath
public String cacheDataPath
public String pluginPath
@@ -88,7 +87,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
@@ -102,7 +101,6 @@ class Config {
this.suitePath = suitePath
this.dataPath = dataPath
this.realDataPath = realDataPath
- this.sf1DataPath = sf1DataPath
this.cacheDataPath = cacheDataPath
this.testGroups = testGroups
this.excludeGroups = excludeGroups
@@ -136,7 +134,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)
@@ -239,7 +236,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 +316,6 @@ class Config {
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"
log.info("Set cacheDataPath to '${config.cacheDataPath}' because
not specify.".toString())
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..574ab0a131 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
@@ -39,7 +39,6 @@ class ConfigOptions {
static Option pathOpt
static Option dataOpt
static Option realDataOpt
- static Option sf1DataOpt
static Option cacheDataOpt
static Option pluginOpt
static Option suiteOpt
@@ -132,14 +131,6 @@ 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 d5aab7431f..dfdf4e421d 100644
--- a/regression-test/pipeline/p0/conf/regression-conf.groovy
+++ b/regression-test/pipeline/p0/conf/regression-conf.groovy
@@ -77,5 +77,8 @@ pg_14_port=7121
enableHiveTest=false
hms_port=7141
-sf1DataPath = "/data"
cacheDataPath = "/data/regression/"
+
+s3Endpoint = "cos.ap-hongkong.myqcloud.com"
+s3BucketName = "doris-build-hk-1308700295"
+s3Region = "ap-hongkong"
\ No newline at end of file
diff --git a/regression-test/pipeline/p1/conf/regression-conf.groovy
b/regression-test/pipeline/p1/conf/regression-conf.groovy
index f734b6776e..5aa8731fe6 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
@@ -43,3 +42,7 @@ testGroups = ""
testSuites = ""
cacheDataPath="/data/regression/"
+
+s3Endpoint = "cos.ap-hongkong.myqcloud.com"
+s3BucketName = "doris-build-hk-1308700295"
+s3Region = "ap-hongkong"
\ No newline at end of file
diff --git a/regression-test/suites/datev2/ssb_sf1_p1/load.groovy
b/regression-test/suites/datev2/ssb_sf1_p1/load.groovy
index e9f78b419f..6a9992177e 100644
--- a/regression-test/suites/datev2/ssb_sf1_p1/load.groovy
+++ b/regression-test/suites/datev2/ssb_sf1_p1/load.groovy
@@ -57,9 +57,10 @@ suite("load") {
set 'column_separator', '|'
set 'compress_type', 'GZ'
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()}/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 6225c19cba..7215cbed6e 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()}/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..fba0f7a849 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()}/tpch/sf1/${tableName}.csv.split00.gz"""
time 10000 // limit inflight 10s
@@ -76,9 +76,10 @@ suite("load") {
set 'column_separator', '|'
set 'compress_type', 'GZ'
+
// 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()}/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..c9eed04dc4 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()}/tpch/sf1/${tableName}.csv.split00.gz"""
time 10000 // limit inflight 10s
@@ -85,9 +85,10 @@ suite("load") {
set 'column_separator', '|'
set 'compress_type', 'GZ'
+
// 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()}/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..6b29d016ad 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()}/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()}/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..174339f148 100644
--- a/regression-test/suites/index_p0/load.groovy
+++ b/regression-test/suites/index_p0/load.groovy
@@ -38,7 +38,10 @@ suite("test_bitmap_index_load") {
table "${tbName}"
set 'column_separator', '|'
set 'columns', 'a,temp'
- file """${context.sf1DataPath}/regression/bitmap_index_test.csv"""
+
+ // 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 """${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..e40a4a8ed8 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,11 @@ 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"""
+
+ // 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 """${getS3Url()}/ssb/sf0.1/${tableName}.tbl.gz"""
+
time 10000 // limit inflight 10s
@@ -90,7 +94,10 @@ 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"""
+
+ // 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 """${getS3Url()}/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..ec253abda9 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,10 @@ suite("load_one_step") {
set 'column_separator', '|'
set 'compress_type', 'GZ'
set 'columns', "${rows[0]}"
- file """${context.sf1DataPath}/ssb/sf0.1/${tableName}.tbl.gz"""
+
+ // 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 """${getS3Url()}/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..0f7b3bec69 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,10 @@ 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"""
+
+ // 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 """${getS3Url()}/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..5aa9a80f26 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,10 @@ 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"""
+
+ // 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 """${getS3Url()}/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..dd6bee5e53 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
@@ -52,9 +52,11 @@ suite("load") {
set 'column_separator', '|'
set 'compress_type', 'GZ'
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()}/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..75919e18b9 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()}/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 ebcb544926..2372cd6d0f 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()}/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 c020ce6f87..b846f2833a 100644
--- a/regression-test/suites/ssb_sf1/load.groovy
+++ b/regression-test/suites/ssb_sf1/load.groovy
@@ -55,9 +55,11 @@ suite("load") {
set 'column_separator', '|'
set 'compress_type', 'GZ'
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()}/ssb/sf1/${tableName}.tbl.split00.gz"""
time 10000 // limit inflight 10s
@@ -89,9 +91,11 @@ suite("load") {
set 'column_separator', '|'
set 'compress_type', 'GZ'
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()}/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 e9f78b419f..bdd329dd8a 100644
--- a/regression-test/suites/ssb_sf1_p2/load.groovy
+++ b/regression-test/suites/ssb_sf1_p2/load.groovy
@@ -57,9 +57,11 @@ suite("load") {
set 'column_separator', '|'
set 'compress_type', 'GZ'
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()}/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..432b60e8d2 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,10 @@ 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"""
+
+ // 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 """${getS3Url()}/ssb/sf0.1/${tableName}.tbl.gz"""
time 10000 // limit inflight 10s
@@ -75,7 +78,10 @@ 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"""
+
+ // 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 """${getS3Url()}/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..838ee1e150 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,10 @@ suite("load_one_step") {
set 'column_separator', '|'
set 'compress_type', 'GZ'
set 'columns', rows[0]
- file """${context.sf1DataPath}/ssb/sf0.1/${tableName}.tbl.gz"""
+
+ // 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 """${getS3Url()}/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..572c41dfdf 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,10 @@ 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"""
+
+ // 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 """${getS3Url()}/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..addf0e943c 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,10 @@ 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"""
+
+ // 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 """${getS3Url()}/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..bf6b0796a2 100644
--- a/regression-test/suites/ssb_unique_sql_zstd_p0/load.groovy
+++ b/regression-test/suites/ssb_unique_sql_zstd_p0/load.groovy
@@ -52,9 +52,11 @@ suite("load") {
set 'column_separator', '|'
set 'compress_type', 'GZ'
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()}/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 6225c19cba..92839df67d 100644
--- a/regression-test/suites/tpcds_sf1_p1/load.groovy
+++ b/regression-test/suites/tpcds_sf1_p1/load.groovy
@@ -76,9 +76,10 @@ suite("load") {
set "columns", columnsMap[tableName]
}
+
// 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()}/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 2f9484af6c..a39613f0a4 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/load.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_p1/load.groovy
@@ -115,9 +115,10 @@ suite("load") {
set "columns", columnsMap[tableName]
}
+
// 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()}/tpcds/sf1/${tableName}.dat.gz"""
time 10000 // limit inflight 10s
diff --git a/regression-test/suites/tpch_sf0.1_p1/load.groovy
b/regression-test/suites/tpch_sf0.1_p1/load.groovy
index 1211d0906f..f5dc6d9b71 100644
--- a/regression-test/suites/tpch_sf0.1_p1/load.groovy
+++ b/regression-test/suites/tpch_sf0.1_p1/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}/tpch/sf0.1/${tableName}.tbl.gz"""
+ file """${getS3Url()}/tpch/sf0.1/${tableName}.tbl.gz"""
time 10000 // limit inflight 10s
diff --git a/regression-test/suites/tpch_sf0.1_unique_p1/load.groovy
b/regression-test/suites/tpch_sf0.1_unique_p1/load.groovy
index 1211d0906f..f5dc6d9b71 100644
--- a/regression-test/suites/tpch_sf0.1_unique_p1/load.groovy
+++ b/regression-test/suites/tpch_sf0.1_unique_p1/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}/tpch/sf0.1/${tableName}.tbl.gz"""
+ file """${getS3Url()}/tpch/sf0.1/${tableName}.tbl.gz"""
time 10000 // limit inflight 10s
diff --git a/regression-test/suites/tpch_sf1_p2/load.groovy
b/regression-test/suites/tpch_sf1_p2/load.groovy
index 9de43b3612..26ad7f4c55 100644
--- a/regression-test/suites/tpch_sf1_p2/load.groovy
+++ b/regression-test/suites/tpch_sf1_p2/load.groovy
@@ -51,9 +51,10 @@ suite("load") {
set 'column_separator', '|'
set 'compress_type', 'GZ'
+
// 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()}/tpch/sf1/${tableName}.csv.split00.gz"""
time 10000 // limit inflight 10s
@@ -85,9 +86,10 @@ suite("load") {
set 'column_separator', '|'
set 'compress_type', 'GZ'
+
// 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()}/tpch/sf1/${tableName}.csv.split01.gz"""
time 10000 // limit inflight 10s
diff --git a/regression-test/suites/tpch_sf1_unique_p2/load.groovy
b/regression-test/suites/tpch_sf1_unique_p2/load.groovy
index dad3a7dc73..6b29d016ad 100644
--- a/regression-test/suites/tpch_sf1_unique_p2/load.groovy
+++ b/regression-test/suites/tpch_sf1_unique_p2/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()}/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()}/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
