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 155cbffe62 [fix](regression) Parameterize the S3 info for
segcompaction regression (#16731) (#17391)
155cbffe62 is described below
commit 155cbffe6237a01a01c646aa1c2648fd0d3d674f
Author: zhengyu <[email protected]>
AuthorDate: Mon Mar 6 10:33:22 2023 +0800
[fix](regression) Parameterize the S3 info for segcompaction regression
(#16731) (#17391)
Use regression conf instead hard-coded S3 info.
Signed-off-by: freemandealer <[email protected]>
---
.../segcompaction_p1/test_segcompaction_agg_keys.groovy | 11 +++++++----
.../segcompaction_p1/test_segcompaction_dup_keys.groovy | 11 +++++++----
.../segcompaction_p1/test_segcompaction_unique_keys.groovy | 11 +++++++----
.../test_segcompaction_unique_keys_mow.groovy | 11 +++++++----
4 files changed, 28 insertions(+), 16 deletions(-)
diff --git
a/regression-test/suites/segcompaction_p1/test_segcompaction_agg_keys.groovy
b/regression-test/suites/segcompaction_p1/test_segcompaction_agg_keys.groovy
index da58cfa759..107ca01911 100644
--- a/regression-test/suites/segcompaction_p1/test_segcompaction_agg_keys.groovy
+++ b/regression-test/suites/segcompaction_p1/test_segcompaction_agg_keys.groovy
@@ -21,6 +21,9 @@ suite("test_segcompaction_agg_keys") {
def tableName = "segcompaction_agg_keys_regression_test"
String ak = getS3AK()
String sk = getS3SK()
+ String endpoint = getS3Endpoint()
+ String region = getS3Region()
+ String bucket = getS3BucketName()
try {
@@ -79,14 +82,14 @@ suite("test_segcompaction_agg_keys") {
"""
def uuid = UUID.randomUUID().toString().replace("-", "0")
- def path =
"oss://doris-build-hk-1308700295/regression/segcompaction_test/segcompaction_test.orc"
+ def path =
"oss://$bucket/regression/segcompaction_test/segcompaction_test.orc"
def columns = "col_0, col_1, col_2, col_3, col_4, col_5, col_6, col_7,
col_8, col_9, col_10, col_11, col_12, col_13, col_14, col_15, col_16, col_17,
col_18, col_19, col_20, col_21, col_22, col_23, col_24, col_25, col_26, col_27,
col_28, col_29, col_30, col_31, col_32, col_33, col_34, col_35, col_36, col_37,
col_38, col_39, col_40, col_41, col_42, col_43, col_44, col_45, col_46, col_47,
col_48, col_49"
String columns_str = ("$columns" != "") ? "($columns)" : "";
sql """
LOAD LABEL $uuid (
- DATA
INFILE("s3://doris-build-hk-1308700295/regression/segcompaction/segcompaction.orc")
+ DATA
INFILE("s3://$bucket/regression/segcompaction/segcompaction.orc")
INTO TABLE $tableName
FORMAT AS "ORC"
$columns_str
@@ -94,8 +97,8 @@ suite("test_segcompaction_agg_keys") {
WITH S3 (
"AWS_ACCESS_KEY" = "$ak",
"AWS_SECRET_KEY" = "$sk",
- "AWS_ENDPOINT" = "cos.ap-hongkong.myqcloud.com",
- "AWS_REGION" = "ap-hongkong"
+ "AWS_ENDPOINT" = "$endpoint",
+ "AWS_REGION" = "$region"
)
properties(
"use_new_load_scan_node" = "true"
diff --git
a/regression-test/suites/segcompaction_p1/test_segcompaction_dup_keys.groovy
b/regression-test/suites/segcompaction_p1/test_segcompaction_dup_keys.groovy
index 4dbe4a67f3..a180634b1e 100644
--- a/regression-test/suites/segcompaction_p1/test_segcompaction_dup_keys.groovy
+++ b/regression-test/suites/segcompaction_p1/test_segcompaction_dup_keys.groovy
@@ -21,6 +21,9 @@ suite("test_segcompaction_dup_keys") {
def tableName = "segcompaction_dup_keys_regression_test"
String ak = getS3AK()
String sk = getS3SK()
+ String endpoint = getS3Endpoint()
+ String region = getS3Region()
+ String bucket = getS3BucketName()
try {
@@ -79,14 +82,14 @@ suite("test_segcompaction_dup_keys") {
"""
def uuid = UUID.randomUUID().toString().replace("-", "0")
- def path =
"oss://doris-build-hk-1308700295/regression/segcompaction_test/segcompaction_test.orc"
+ def path =
"oss://$bucket/regression/segcompaction_test/segcompaction_test.orc"
def columns = "col_0, col_1, col_2, col_3, col_4, col_5, col_6, col_7,
col_8, col_9, col_10, col_11, col_12, col_13, col_14, col_15, col_16, col_17,
col_18, col_19, col_20, col_21, col_22, col_23, col_24, col_25, col_26, col_27,
col_28, col_29, col_30, col_31, col_32, col_33, col_34, col_35, col_36, col_37,
col_38, col_39, col_40, col_41, col_42, col_43, col_44, col_45, col_46, col_47,
col_48, col_49"
String columns_str = ("$columns" != "") ? "($columns)" : "";
sql """
LOAD LABEL $uuid (
- DATA
INFILE("s3://doris-build-hk-1308700295/regression/segcompaction/segcompaction.orc")
+ DATA
INFILE("s3://$bucket/regression/segcompaction/segcompaction.orc")
INTO TABLE $tableName
FORMAT AS "ORC"
$columns_str
@@ -94,8 +97,8 @@ suite("test_segcompaction_dup_keys") {
WITH S3 (
"AWS_ACCESS_KEY" = "$ak",
"AWS_SECRET_KEY" = "$sk",
- "AWS_ENDPOINT" = "cos.ap-hongkong.myqcloud.com",
- "AWS_REGION" = "ap-hongkong"
+ "AWS_ENDPOINT" = "$endpoint",
+ "AWS_REGION" = "$region"
)
properties(
"use_new_load_scan_node" = "true"
diff --git
a/regression-test/suites/segcompaction_p1/test_segcompaction_unique_keys.groovy
b/regression-test/suites/segcompaction_p1/test_segcompaction_unique_keys.groovy
index a990d5d6e2..d3d56e0931 100644
---
a/regression-test/suites/segcompaction_p1/test_segcompaction_unique_keys.groovy
+++
b/regression-test/suites/segcompaction_p1/test_segcompaction_unique_keys.groovy
@@ -21,6 +21,9 @@ suite("test_segcompaction_unique_keys") {
def tableName = "segcompaction_unique_keys_regression_test"
String ak = getS3AK()
String sk = getS3SK()
+ String endpoint = getS3Endpoint()
+ String region = getS3Region()
+ String bucket = getS3BucketName()
try {
@@ -79,14 +82,14 @@ suite("test_segcompaction_unique_keys") {
"""
def uuid = UUID.randomUUID().toString().replace("-", "0")
- def path =
"oss://doris-build-hk-1308700295/regression/segcompaction_test/segcompaction_test.orc"
+ def path =
"oss://$bucket/regression/segcompaction_test/segcompaction_test.orc"
def columns = "col_0, col_1, col_2, col_3, col_4, col_5, col_6, col_7,
col_8, col_9, col_10, col_11, col_12, col_13, col_14, col_15, col_16, col_17,
col_18, col_19, col_20, col_21, col_22, col_23, col_24, col_25, col_26, col_27,
col_28, col_29, col_30, col_31, col_32, col_33, col_34, col_35, col_36, col_37,
col_38, col_39, col_40, col_41, col_42, col_43, col_44, col_45, col_46, col_47,
col_48, col_49"
String columns_str = ("$columns" != "") ? "($columns)" : "";
sql """
LOAD LABEL $uuid (
- DATA
INFILE("s3://doris-build-hk-1308700295/regression/segcompaction/segcompaction.orc")
+ DATA
INFILE("s3://$bucket/regression/segcompaction/segcompaction.orc")
INTO TABLE $tableName
FORMAT AS "ORC"
$columns_str
@@ -94,8 +97,8 @@ suite("test_segcompaction_unique_keys") {
WITH S3 (
"AWS_ACCESS_KEY" = "$ak",
"AWS_SECRET_KEY" = "$sk",
- "AWS_ENDPOINT" = "cos.ap-hongkong.myqcloud.com",
- "AWS_REGION" = "ap-hongkong"
+ "AWS_ENDPOINT" = "$endpoint",
+ "AWS_REGION" = "$region"
)
properties(
"use_new_load_scan_node" = "true"
diff --git
a/regression-test/suites/segcompaction_p1/test_segcompaction_unique_keys_mow.groovy
b/regression-test/suites/segcompaction_p1/test_segcompaction_unique_keys_mow.groovy
index 39ac856ae0..055336f246 100644
---
a/regression-test/suites/segcompaction_p1/test_segcompaction_unique_keys_mow.groovy
+++
b/regression-test/suites/segcompaction_p1/test_segcompaction_unique_keys_mow.groovy
@@ -21,6 +21,9 @@ suite("test_segcompaction_unique_keys_mow") {
def tableName = "segcompaction_unique_keys_regression_test_mow"
String ak = getS3AK()
String sk = getS3SK()
+ String endpoint = getS3Endpoint()
+ String region = getS3Region()
+ String bucket = getS3BucketName()
try {
@@ -83,14 +86,14 @@ suite("test_segcompaction_unique_keys_mow") {
def uuid = UUID.randomUUID().toString().replace("-", "0")
- def path =
"oss://doris-build-hk-1308700295/regression/segcompaction_test/segcompaction_test.orc"
+ def path =
"oss://$bucket/regression/segcompaction_test/segcompaction_test.orc"
def columns = "col_0, col_1, col_2, col_3, col_4, col_5, col_6, col_7,
col_8, col_9, col_10, col_11, col_12, col_13, col_14, col_15, col_16, col_17,
col_18, col_19, col_20, col_21, col_22, col_23, col_24, col_25, col_26, col_27,
col_28, col_29, col_30, col_31, col_32, col_33, col_34, col_35, col_36, col_37,
col_38, col_39, col_40, col_41, col_42, col_43, col_44, col_45, col_46, col_47,
col_48, col_49"
String columns_str = ("$columns" != "") ? "($columns)" : "";
sql """
LOAD LABEL $uuid (
- DATA
INFILE("s3://doris-build-hk-1308700295/regression/segcompaction/segcompaction.orc")
+ DATA
INFILE("s3://$bucket/regression/segcompaction/segcompaction.orc")
INTO TABLE $tableName
FORMAT AS "ORC"
$columns_str
@@ -98,8 +101,8 @@ suite("test_segcompaction_unique_keys_mow") {
WITH S3 (
"AWS_ACCESS_KEY" = "$ak",
"AWS_SECRET_KEY" = "$sk",
- "AWS_ENDPOINT" = "cos.ap-hongkong.myqcloud.com",
- "AWS_REGION" = "ap-hongkong"
+ "AWS_ENDPOINT" = "$endpoint",
+ "AWS_REGION" = "$region"
)
properties(
"use_new_load_scan_node" = "true"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
