[minor](show_export) make result of file url usable (apache#27209)

* [minor](show_export) make result of file url usable * update regression-test * update regression-test
seawinde · Nov 28, 2023 · f15cc90 · f15cc90
1 parent 376be5d
commit f15cc90
Show file tree

Hide file tree

Showing 17 changed files with 131 additions and 128 deletions.
diff --git a/be/src/vec/sink/writer/vfile_result_writer.cpp b/be/src/vec/sink/writer/vfile_result_writer.cpp
@@ -305,6 +305,9 @@ Status VFileResultWriter::_send_result() {
     row_buffer.push_bigint(_written_data_bytes->value());   // file size
     std::string file_url;
     static_cast<void>(_get_file_url(&file_url));
+    std::stringstream ss;
+    ss << file_url << "*";
+    file_url = ss.str();
     row_buffer.push_string(file_url.c_str(), file_url.length()); // url
 
     std::unique_ptr<TFetchDataResult> result = std::make_unique<TFetchDataResult>();

diff --git a/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_array_type.groovy b/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_array_type.groovy
@@ -93,7 +93,7 @@ suite("test_outfile_csv_array_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load1 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -126,7 +126,7 @@ suite("test_outfile_csv_array_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load2 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -158,7 +158,7 @@ suite("test_outfile_csv_array_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load_date """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -190,7 +190,7 @@ suite("test_outfile_csv_array_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load_datetime """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -225,7 +225,7 @@ suite("test_outfile_csv_array_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load_varchar """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -259,7 +259,7 @@ suite("test_outfile_csv_array_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_smallint """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -292,7 +292,7 @@ suite("test_outfile_csv_array_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load_tinyint """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -325,7 +325,7 @@ suite("test_outfile_csv_array_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load_boolean """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -358,7 +358,7 @@ suite("test_outfile_csv_array_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load_bigint """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -390,7 +390,7 @@ suite("test_outfile_csv_array_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load_largeint """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -423,7 +423,7 @@ suite("test_outfile_csv_array_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load_float """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -455,7 +455,7 @@ suite("test_outfile_csv_array_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load_double """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -487,7 +487,7 @@ suite("test_outfile_csv_array_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load_CHAR """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -520,7 +520,7 @@ suite("test_outfile_csv_array_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load_decimal """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",

diff --git a/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_complex_type.groovy b/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_complex_type.groovy
@@ -94,7 +94,7 @@ suite("test_outfile_csv_complex_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load1 """ SELECT * FROM S3 (
-                            "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                            "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                             "ACCESS_KEY"= "${ak}",
                             "SECRET_KEY" = "${sk}",
                             "format" = "csv",
@@ -128,7 +128,7 @@ suite("test_outfile_csv_complex_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load2 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -160,7 +160,7 @@ suite("test_outfile_csv_complex_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load3 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -190,7 +190,7 @@ suite("test_outfile_csv_complex_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load4 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -226,7 +226,7 @@ suite("test_outfile_csv_complex_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load5 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -258,7 +258,7 @@ suite("test_outfile_csv_complex_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load6 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -299,7 +299,7 @@ suite("test_outfile_csv_complex_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load1 """ SELECT * FROM S3 (
-                            "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                            "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                             "ACCESS_KEY"= "${ak}",
                             "SECRET_KEY" = "${sk}",
                             "format" = "csv",

diff --git a/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_map_type.groovy b/regression-test/suites/export_p0/outfile/csv/test_outfile_csv_map_type.groovy
@@ -92,7 +92,7 @@ suite("test_outfile_csv_map_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load1 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -128,7 +128,7 @@ suite("test_outfile_csv_map_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load2 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -164,7 +164,7 @@ suite("test_outfile_csv_map_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load3 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -199,7 +199,7 @@ suite("test_outfile_csv_map_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load4 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -237,7 +237,7 @@ suite("test_outfile_csv_map_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load5 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -273,7 +273,7 @@ suite("test_outfile_csv_map_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load6 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -308,7 +308,7 @@ suite("test_outfile_csv_map_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load7 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -343,7 +343,7 @@ suite("test_outfile_csv_map_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load8 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -379,7 +379,7 @@ suite("test_outfile_csv_map_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load9 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -415,7 +415,7 @@ suite("test_outfile_csv_map_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load10 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -450,7 +450,7 @@ suite("test_outfile_csv_map_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load11 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -485,7 +485,7 @@ suite("test_outfile_csv_map_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load12 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -520,7 +520,7 @@ suite("test_outfile_csv_map_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load13 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -555,7 +555,7 @@ suite("test_outfile_csv_map_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load14 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -592,7 +592,7 @@ suite("test_outfile_csv_map_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load15 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -629,7 +629,7 @@ suite("test_outfile_csv_map_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load16 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -665,7 +665,7 @@ suite("test_outfile_csv_map_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load17 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",
@@ -701,7 +701,7 @@ suite("test_outfile_csv_map_type", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_load18 """ SELECT * FROM S3 (
-                "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.csv",
+                "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.csv",
                 "ACCESS_KEY"= "${ak}",
                 "SECRET_KEY" = "${sk}",
                 "format" = "csv",

diff --git a/regression-test/suites/export_p0/outfile/orc/test_outfile_orc_timestamp.groovy b/regression-test/suites/export_p0/outfile/orc/test_outfile_orc_timestamp.groovy
@@ -97,7 +97,7 @@ suite("test_outfile_orc_timestamp", "p0") {
         def outfile_url = outfile_to_S3()
 
         qt_select_tvf1 """ SELECT * FROM S3 (
-                            "uri" = "http://${s3_endpoint}${outfile_url.substring(4)}0.orc",
+                            "uri" = "http://${s3_endpoint}${outfile_url.substring(4, outfile_url.length() - 1)}0.orc",
                             "ACCESS_KEY"= "${ak}",
                             "SECRET_KEY" = "${sk}",
                             "format" = "orc",
@@ -107,4 +107,4 @@ suite("test_outfile_orc_timestamp", "p0") {
 
     } finally {
     }
-}
+}