You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2022/10/08 01:10:33 UTC
[doris] branch master updated: [fix](test) resolve tpch_sf100_unique_p2 and tpch_sf10_unique_p2 to run in parallel (#13138)
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/doris.git
The following commit(s) were added to refs/heads/master by this push:
new e0f17f217f [fix](test) resolve tpch_sf100_unique_p2 and tpch_sf10_unique_p2 to run in parallel (#13138)
e0f17f217f is described below
commit e0f17f217f22a958d1a189fee16516f55d1bd2d4
Author: Yongqiang YANG <98...@users.noreply.github.com>
AuthorDate: Sat Oct 8 09:10:22 2022 +0800
[fix](test) resolve tpch_sf100_unique_p2 and tpch_sf10_unique_p2 to run in parallel (#13138)
---
.../{load_four_step.groovy => load_four_step/load.groovy} | 10 +++++-----
.../{load_one_step.groovy => load_one_step/load.groovy} | 6 +++---
.../{load_three_step.groovy => load_three_step/load.groovy} | 8 ++++----
.../{load_two_step.groovy => load_two_step/load.groovy} | 6 +++---
.../{load_four_step.groovy => load_four_step/load.groovy} | 10 +++++-----
.../{load_one_step.groovy => load_one_step/load.groovy} | 6 +++---
.../{load_three_step.groovy => load_three_step/load.groovy} | 8 ++++----
.../{load_two_step.groovy => load_two_step/load.groovy} | 6 +++---
8 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/regression-test/suites/tpch_sf100_unique_p2/load_four_step.groovy b/regression-test/suites/tpch_sf100_unique_p2/load_four_step/load.groovy
similarity index 89%
rename from regression-test/suites/tpch_sf100_unique_p2/load_four_step.groovy
rename to regression-test/suites/tpch_sf100_unique_p2/load_four_step/load.groovy
index 29d1db9d79..d76a6afdd6 100644
--- a/regression-test/suites/tpch_sf100_unique_p2/load_four_step.groovy
+++ b/regression-test/suites/tpch_sf100_unique_p2/load_four_step/load.groovy
@@ -39,10 +39,10 @@ suite("load_four_step") {
tables.each { table, rows ->
sql """ DROP TABLE IF EXISTS $table """
// create table if not exists
- sql new File("""${context.file.parent}/ddl/${table}_sequence.sql""").text
+ sql new File("""${context.parentFile.parent}/ddl/${table}_sequence.sql""").text
def loadLabel1 = table + "_" + uniqueID1
// load data from cos
- def loadSql1 = new File("""${context.file.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
+ def loadSql1 = new File("""${context.parentFile.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
loadSql1 = loadSql1.replaceAll("\\\$\\{loadLabel\\}", loadLabel1) + s3WithProperties
sql loadSql1
// check load state
@@ -59,7 +59,7 @@ suite("load_four_step") {
assertTrue(loadRowCount[0][0] == rows[0])
}
def loadLabel2 = table + "_" + uniqueID2
- def loadSql2 = new File("""${context.file.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
+ def loadSql2 = new File("""${context.parentFile.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
loadSql2 = loadSql2.replaceAll("\\\$\\{loadLabel\\}", loadLabel2) + s3WithProperties
sql loadSql2
@@ -80,7 +80,7 @@ suite("load_four_step") {
sleep(5000)
}
- sql new File("""${context.file.parent}/ddl/${table}_part_delete.sql""").text
+ sql new File("""${context.parentFile.parent}/ddl/${table}_part_delete.sql""").text
sql 'sync'
for (int i = 1; i <= 5; i++) {
def loadRowCount = sql "select count(1) from ${table}"
@@ -89,7 +89,7 @@ suite("load_four_step") {
}
def loadLabel3 = table + "_" + uniqueID3
- def loadSql3 = new File("""${context.file.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
+ def loadSql3 = new File("""${context.parentFile.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
loadSql3 = loadSql3.replaceAll("\\\$\\{loadLabel\\}", loadLabel3) + s3WithProperties
sql loadSql3
diff --git a/regression-test/suites/tpch_sf100_unique_p2/load_one_step.groovy b/regression-test/suites/tpch_sf100_unique_p2/load_one_step/load.groovy
similarity index 90%
rename from regression-test/suites/tpch_sf100_unique_p2/load_one_step.groovy
rename to regression-test/suites/tpch_sf100_unique_p2/load_one_step/load.groovy
index e26ed7ea5e..79f4132bad 100644
--- a/regression-test/suites/tpch_sf100_unique_p2/load_one_step.groovy
+++ b/regression-test/suites/tpch_sf100_unique_p2/load_one_step/load.groovy
@@ -36,10 +36,10 @@ suite("load_one_step") {
tables.each { table, rows ->
sql """ DROP TABLE IF EXISTS $table """
// create table if not exists
- sql new File("""${context.file.parent}/ddl/${table}.sql""").text
+ sql new File("""${context.parentFile.parent}/ddl/${table}.sql""").text
def loadLabel = table + "_" + uniqueID
// load data from cos
- def loadSql = new File("""${context.file.parent}/ddl/${table}_load.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
+ def loadSql = new File("""${context.parentFile.parent}/ddl/${table}_load.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
loadSql = loadSql.replaceAll("\\\$\\{loadLabel\\}", loadLabel) + s3WithProperties
sql loadSql
@@ -56,7 +56,7 @@ suite("load_one_step") {
logger.info("select ${table} numbers: ${loadRowCount[0][0]}".toString())
assertTrue(loadRowCount[0][0] == rows)
}
- sql new File("""${context.file.parent}/ddl/${table}_delete.sql""").text
+ sql new File("""${context.parentFile.parent}/ddl/${table}_delete.sql""").text
for (int i = 1; i <= 5; i++) {
def loadRowCount = sql "select count(1) from ${table}"
logger.info("select ${table} numbers: ${loadRowCount[0][0]}".toString())
diff --git a/regression-test/suites/tpch_sf100_unique_p2/load_three_step.groovy b/regression-test/suites/tpch_sf100_unique_p2/load_three_step/load.groovy
similarity index 89%
rename from regression-test/suites/tpch_sf100_unique_p2/load_three_step.groovy
rename to regression-test/suites/tpch_sf100_unique_p2/load_three_step/load.groovy
index a70ca318fc..3b4a94858e 100644
--- a/regression-test/suites/tpch_sf100_unique_p2/load_three_step.groovy
+++ b/regression-test/suites/tpch_sf100_unique_p2/load_three_step/load.groovy
@@ -38,10 +38,10 @@ suite("load_three_step") {
tables.each { table, rows ->
sql """ DROP TABLE IF EXISTS $table """
// create table if not exists
- sql new File("""${context.file.parent}/ddl/${table}_sequence.sql""").text
+ sql new File("""${context.parentFile.parent}/ddl/${table}_sequence.sql""").text
def loadLabel1 = table + "_" + uniqueID1
// load data from cos
- def loadSql1 = new File("""${context.file.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
+ def loadSql1 = new File("""${context.parentFile.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
loadSql1 = loadSql1.replaceAll("\\\$\\{loadLabel\\}", loadLabel1) + s3WithProperties
sql loadSql1
// check load state
@@ -58,7 +58,7 @@ suite("load_three_step") {
assertTrue(loadRowCount[0][0] == rows)
}
def loadLabel2 = table + "_" + uniqueID2
- def loadSql2 = new File("""${context.file.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
+ def loadSql2 = new File("""${context.parentFile.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
loadSql2 = loadSql2.replaceAll("\\\$\\{loadLabel\\}", loadLabel2) + s3WithProperties
sql loadSql2
@@ -79,7 +79,7 @@ suite("load_three_step") {
sleep(5000)
}
- sql new File("""${context.file.parent}/ddl/${table}_delete.sql""").text
+ sql new File("""${context.parentFile.parent}/ddl/${table}_delete.sql""").text
sql 'sync'
for (int i = 1; i <= 5; i++) {
def loadRowCount = sql "select count(1) from ${table}"
diff --git a/regression-test/suites/tpch_sf100_unique_p2/load_two_step.groovy b/regression-test/suites/tpch_sf100_unique_p2/load_two_step/load.groovy
similarity index 90%
rename from regression-test/suites/tpch_sf100_unique_p2/load_two_step.groovy
rename to regression-test/suites/tpch_sf100_unique_p2/load_two_step/load.groovy
index 65ccbc9f76..9a2c4baa29 100644
--- a/regression-test/suites/tpch_sf100_unique_p2/load_two_step.groovy
+++ b/regression-test/suites/tpch_sf100_unique_p2/load_two_step/load.groovy
@@ -36,11 +36,11 @@ suite("load_two_step") {
tables.each { table, rows ->
sql """ DROP TABLE IF EXISTS $table """
// create table if not exists
- sql new File("""${context.file.parent}/ddl/${table}_sequence.sql""").text
+ sql new File("""${context.parentFile.parent}/ddl/${table}_sequence.sql""").text
def loadLabel = table + "_" + uniqueID
// load data from cos
- def loadSql = new File("""${context.file.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
+ def loadSql = new File("""${context.parentFile.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
loadSql = loadSql.replaceAll("\\\$\\{loadLabel\\}", loadLabel) + s3WithProperties
sql loadSql
@@ -57,7 +57,7 @@ suite("load_two_step") {
logger.info("select ${table} numbers: ${loadRowCount[0][0]}".toString())
assertTrue(loadRowCount[0][0] == rows)
}
- sql new File("""${context.file.parent}/ddl/${table}_delete.sql""").text
+ sql new File("""${context.parentFile.parent}/ddl/${table}_delete.sql""").text
sql 'sync'
for (int i = 1; i <= 5; i++) {
def loadRowCount = sql "select count(1) from ${table}"
diff --git a/regression-test/suites/tpch_sf10_unique_p2/load_four_step.groovy b/regression-test/suites/tpch_sf10_unique_p2/load_four_step/load.groovy
similarity index 89%
rename from regression-test/suites/tpch_sf10_unique_p2/load_four_step.groovy
rename to regression-test/suites/tpch_sf10_unique_p2/load_four_step/load.groovy
index 9a1073a6d8..57ac748d1a 100644
--- a/regression-test/suites/tpch_sf10_unique_p2/load_four_step.groovy
+++ b/regression-test/suites/tpch_sf10_unique_p2/load_four_step/load.groovy
@@ -39,10 +39,10 @@ suite("load_four_step") {
tables.each { table, rows ->
// create table if not exists
try{
- sql new File("""${context.file.parent}/ddl/${table}_sequence.sql""").text
+ sql new File("""${context.parentFile.parent}/ddl/${table}_sequence.sql""").text
def loadLabel1 = table + "_" + uniqueID1
// load data from cos
- def loadSql1 = new File("""${context.file.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
+ def loadSql1 = new File("""${context.parentFile.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
loadSql1 = loadSql1.replaceAll("\\\$\\{loadLabel\\}", loadLabel1) + s3WithProperties
sql loadSql1
// check load state
@@ -59,7 +59,7 @@ suite("load_four_step") {
assertTrue(loadRowCount[0][0] == rows[0])
}
def loadLabel2 = table + "_" + uniqueID2
- def loadSql2 = new File("""${context.file.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
+ def loadSql2 = new File("""${context.parentFile.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
loadSql2 = loadSql2.replaceAll("\\\$\\{loadLabel\\}", loadLabel2) + s3WithProperties
sql loadSql2
@@ -80,7 +80,7 @@ suite("load_four_step") {
sleep(5000)
}
- sql new File("""${context.file.parent}/ddl/${table}_part_delete.sql""").text
+ sql new File("""${context.parentFile.parent}/ddl/${table}_part_delete.sql""").text
for (int i = 1; i <= 5; i++) {
def loadRowCount = sql "select count(1) from ${table}"
logger.info("select ${table} numbers: ${loadRowCount[0][0]}".toString())
@@ -88,7 +88,7 @@ suite("load_four_step") {
}
def loadLabel3 = table + "_" + uniqueID3
- def loadSql3 = new File("""${context.file.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
+ def loadSql3 = new File("""${context.parentFile.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
loadSql3 = loadSql3.replaceAll("\\\$\\{loadLabel\\}", loadLabel3) + s3WithProperties
sql loadSql3
diff --git a/regression-test/suites/tpch_sf10_unique_p2/load_one_step.groovy b/regression-test/suites/tpch_sf10_unique_p2/load_one_step/load.groovy
similarity index 90%
rename from regression-test/suites/tpch_sf10_unique_p2/load_one_step.groovy
rename to regression-test/suites/tpch_sf10_unique_p2/load_one_step/load.groovy
index d2c6b813c2..ef175eea13 100644
--- a/regression-test/suites/tpch_sf10_unique_p2/load_one_step.groovy
+++ b/regression-test/suites/tpch_sf10_unique_p2/load_one_step/load.groovy
@@ -36,10 +36,10 @@ suite("load_one_step") {
tables.each { table, rows ->
// create table if not exists
try{
- sql new File("""${context.file.parent}/ddl/${table}.sql""").text
+ sql new File("""${context.parentFile.parent}/ddl/${table}.sql""").text
def loadLabel = table + "_" + uniqueID
// load data from cos
- def loadSql = new File("""${context.file.parent}/ddl/${table}_load.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
+ def loadSql = new File("""${context.parentFile.parent}/ddl/${table}_load.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
loadSql = loadSql.replaceAll("\\\$\\{loadLabel\\}", loadLabel) + s3WithProperties
sql loadSql
@@ -56,7 +56,7 @@ suite("load_one_step") {
logger.info("select ${table} numbers: ${loadRowCount[0][0]}".toString())
assertTrue(loadRowCount[0][0] == rows)
}
- sql new File("""${context.file.parent}/ddl/${table}_delete.sql""").text
+ sql new File("""${context.parentFile.parent}/ddl/${table}_delete.sql""").text
for (int i = 1; i <= 5; i++) {
def loadRowCount = sql "select count(1) from ${table}"
logger.info("select ${table} numbers: ${loadRowCount[0][0]}".toString())
diff --git a/regression-test/suites/tpch_sf10_unique_p2/load_three_step.groovy b/regression-test/suites/tpch_sf10_unique_p2/load_three_step/load.groovy
similarity index 89%
rename from regression-test/suites/tpch_sf10_unique_p2/load_three_step.groovy
rename to regression-test/suites/tpch_sf10_unique_p2/load_three_step/load.groovy
index f5afa7afe9..b2bcf88209 100644
--- a/regression-test/suites/tpch_sf10_unique_p2/load_three_step.groovy
+++ b/regression-test/suites/tpch_sf10_unique_p2/load_three_step/load.groovy
@@ -38,10 +38,10 @@ suite("load_three_step") {
tables.each { table, rows ->
// create table if not exists
try{
- sql new File("""${context.file.parent}/ddl/${table}_sequence.sql""").text
+ sql new File("""${context.parentFile.parent}/ddl/${table}_sequence.sql""").text
def loadLabel1 = table + "_" + uniqueID1
// load data from cos
- def loadSql1 = new File("""${context.file.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
+ def loadSql1 = new File("""${context.parentFile.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
loadSql1 = loadSql1.replaceAll("\\\$\\{loadLabel\\}", loadLabel1) + s3WithProperties
sql loadSql1
// check load state
@@ -58,7 +58,7 @@ suite("load_three_step") {
assertTrue(loadRowCount[0][0] == rows)
}
def loadLabel2 = table + "_" + uniqueID2
- def loadSql2 = new File("""${context.file.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
+ def loadSql2 = new File("""${context.parentFile.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
loadSql2 = loadSql2.replaceAll("\\\$\\{loadLabel\\}", loadLabel2) + s3WithProperties
sql loadSql2
@@ -79,7 +79,7 @@ suite("load_three_step") {
sleep(5000)
}
- sql new File("""${context.file.parent}/ddl/${table}_delete.sql""").text
+ sql new File("""${context.parentFile.parent}/ddl/${table}_delete.sql""").text
for (int i = 1; i <= 5; i++) {
sql 'sync'
def loadRowCount = sql "select count(1) from ${table}"
diff --git a/regression-test/suites/tpch_sf10_unique_p2/load_two_step.groovy b/regression-test/suites/tpch_sf10_unique_p2/load_two_step/load.groovy
similarity index 90%
rename from regression-test/suites/tpch_sf10_unique_p2/load_two_step.groovy
rename to regression-test/suites/tpch_sf10_unique_p2/load_two_step/load.groovy
index 3660894b78..4fa71e5d9d 100644
--- a/regression-test/suites/tpch_sf10_unique_p2/load_two_step.groovy
+++ b/regression-test/suites/tpch_sf10_unique_p2/load_two_step/load.groovy
@@ -36,11 +36,11 @@ suite("load_two_step") {
tables.each { table, rows ->
// create table if not exists
try{
- sql new File("""${context.file.parent}/ddl/${table}_sequence.sql""").text
+ sql new File("""${context.parentFile.parent}/ddl/${table}_sequence.sql""").text
def loadLabel = table + "_" + uniqueID
// load data from cos
- def loadSql = new File("""${context.file.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
+ def loadSql = new File("""${context.parentFile.parent}/ddl/${table}_load_sequence.sql""").text.replaceAll("\\\$\\{s3BucketName\\}", s3BucketName)
loadSql = loadSql.replaceAll("\\\$\\{loadLabel\\}", loadLabel) + s3WithProperties
sql loadSql
@@ -57,7 +57,7 @@ suite("load_two_step") {
logger.info("select ${table} numbers: ${loadRowCount[0][0]}".toString())
assertTrue(loadRowCount[0][0] == rows)
}
- sql new File("""${context.file.parent}/ddl/${table}_delete.sql""").text
+ sql new File("""${context.parentFile.parent}/ddl/${table}_delete.sql""").text
for (int i = 1; i <= 5; i++) {
def loadRowCount = sql "select count(1) from ${table}"
logger.info("select ${table} numbers: ${loadRowCount[0][0]}".toString())
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org