This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new b445c783ebd [test](tvf) move p2 tvf tests from p2 to p0 (#37081)
(#37152)
b445c783ebd is described below
commit b445c783ebda9fea892b2da10a8727dc072cb536
Author: Tiewei Fang <43782773+bepppo...@users.noreply.github.com>
AuthorDate: Tue Jul 2 22:38:22 2024 +0800
[test](tvf) move p2 tvf tests from p2 to p0 (#37081) (#37152)
bp: #37081
---
.../data/external_table_p0/tvf/test_tvf_view.out | 28 ++++++++++++++++++++++
.../external_table_p2/tvf/test_tvf_view_p2.out | 28 ----------------------
.../tvf/test_tvf_view.groovy} | 12 +++++-----
.../tvf/test_tvf_view_count.groovy} | 10 ++++----
4 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/regression-test/data/external_table_p0/tvf/test_tvf_view.out
b/regression-test/data/external_table_p0/tvf/test_tvf_view.out
new file mode 100644
index 00000000000..ddf5113bbf1
--- /dev/null
+++ b/regression-test/data/external_table_p0/tvf/test_tvf_view.out
@@ -0,0 +1,28 @@
+-- This file is automatically generated. You should know what you did if you
want to edit this
+-- !1 --
+100490
+
+-- !2 --
+1 goldenrod lavender spring chocolate lace Manufacturer#1
Brand#13 PROMO BURNISHED COPPER 7 JUMBO PKG 901.00 ly.
slyly ironi
+2 blush thistle blue yellow saddle Manufacturer#1 Brand#13
LARGE BRUSHED BRASS 1 LG CASE 902.00 lar accounts amo
+3 spring green yellow purple cornsilk Manufacturer#4 Brand#42
STANDARD POLISHED BRASS 21 WRAP CASE 903.00 egular deposits hag
+4 cornflower chocolate smoke green pink Manufacturer#3 Brand#34
SMALL PLATED BRASS 14 MED DRUM 904.00 p furiously r
+5 forest brown coral puff cream Manufacturer#3 Brand#32
STANDARD POLISHED TIN 15 SM PKG 905.00 wake carefully
+6 bisque cornflower lawn forest magenta Manufacturer#2 Brand#24
PROMO PLATED STEEL 4 MED BAG 906.00 sual a
+7 moccasin green thistle khaki floral Manufacturer#1 Brand#11
SMALL PLATED COPPER 45 SM BAG 907.00 lyly. ex
+8 misty lace thistle snow royal Manufacturer#4 Brand#44 PROMO
BURNISHED TIN 41 LG DRUM 908.00 eposi
+9 thistle dim navajo dark gainsboro Manufacturer#4 Brand#43
SMALL BURNISHED STEEL 12 WRAP CASE 909.00 ironic foxe
+10 linen pink saddle puff powder Manufacturer#5 Brand#54 LARGE
BURNISHED STEEL 44 LG CAN 910.01 ithely final deposit
+
+-- !3 --
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+
diff --git a/regression-test/data/external_table_p2/tvf/test_tvf_view_p2.out
b/regression-test/data/external_table_p2/tvf/test_tvf_view_p2.out
deleted file mode 100644
index 02304fb57ab..00000000000
--- a/regression-test/data/external_table_p2/tvf/test_tvf_view_p2.out
+++ /dev/null
@@ -1,28 +0,0 @@
--- This file is automatically generated. You should know what you did if you
want to edit this
--- !1 --
-852910
-
--- !2 --
-199147091 plum blush violet orange bisque Manufacturer#5 Brand#51
MEDIUM ANODIZED NICKEL 28 SM DRUM 1128.14 nding, final decoy
-199147092 brown tan chocolate moccasin peru Manufacturer#4
Brand#44 STANDARD BRUSHED COPPER 40 JUMBO PKG 1129.14 ully
even acc
-199147093 white sandy burlywood orange powder Manufacturer#2
Brand#23 MEDIUM PLATED COPPER 15 MED PACK 1130.14
furiously special
-199147094 cyan almond olive steel navajo Manufacturer#1 Brand#15
ECONOMY BRUSHED STEEL 12 WRAP PACK 1131.14 dolites.
-199147095 linen moccasin snow deep dim Manufacturer#2 Brand#22
STANDARD POLISHED TIN 37 LG CASE 1132.14 furious
-199147096 dim violet ivory cream drab Manufacturer#4 Brand#44
MEDIUM ANODIZED COPPER 20 JUMBO CAN 1133.14 ions. sometime
-199147097 steel khaki smoke beige sienna Manufacturer#2 Brand#21
STANDARD BRUSHED BRASS 36 WRAP CASE 1134.14 und the blithely iron
-199147098 cornsilk red brown cyan moccasin Manufacturer#4
Brand#43 MEDIUM ANODIZED TIN 12 SM BOX 1135.14 hely across the
-199147099 slate wheat sienna almond spring Manufacturer#2
Brand#25 LARGE BURNISHED TIN 1 SM CAN 1136.14 uriously ironic
packag
-199147100 orange gainsboro chocolate ivory grey Manufacturer#4
Brand#45 PROMO POLISHED BRASS 42 MED DRUM 1137.15 sual req
-
--- !3 --
-199147091
-199147092
-199147093
-199147094
-199147095
-199147096
-199147097
-199147098
-199147099
-199147100
-
diff --git
a/regression-test/suites/external_table_p2/tvf/test_tvf_view_p2.groovy
b/regression-test/suites/external_table_p0/tvf/test_tvf_view.groovy
similarity index 85%
rename from regression-test/suites/external_table_p2/tvf/test_tvf_view_p2.groovy
rename to regression-test/suites/external_table_p0/tvf/test_tvf_view.groovy
index 8939154bb53..25f70961074 100644
--- a/regression-test/suites/external_table_p2/tvf/test_tvf_view_p2.groovy
+++ b/regression-test/suites/external_table_p0/tvf/test_tvf_view.groovy
@@ -15,18 +15,18 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_tvf_view_p2",
"p2,external,tvf,external_remote,external_remote_tvf") {
- String enabled = context.config.otherConfigs.get("enableExternalHiveTest")
+suite("test_tvf_view", "p0,external,tvf,external_docker,hive") {
+ String enabled = context.config.otherConfigs.get("enableHiveTest")
if (enabled != null && enabled.equalsIgnoreCase("true")) {
- String nameNodeHost = context.config.otherConfigs.get("extHiveHmsHost")
- String hdfsPort = context.config.otherConfigs.get("extHdfsPort")
+ String nameNodeHost = context.config.otherConfigs.get("externalEnvIp")
+ String hdfsPort = context.config.otherConfigs.get("hive2HdfsPort")
sql """drop database if exists test_tvf_view_p2"""
sql """create database test_tvf_view_p2"""
sql """use test_tvf_view_p2"""
sql """set enable_fallback_to_original_planner=false"""
sql """create view tvf_view as select * from hdfs (
-
"uri"="hdfs://${nameNodeHost}:${hdfsPort}/usr/hive/warehouse/tpch_1000_parquet.db/part/000091_0",
+
"uri"="hdfs://${nameNodeHost}:${hdfsPort}/user/doris/tpch1.db/tpch1_parquet/part/part-00000-cb9099f7-a053-4f9a-80af-c659cfa947cc-c000.snappy.parquet",
"hadoop.username" = "hadoop",
"format"="parquet");"""
@@ -47,7 +47,7 @@ suite("test_tvf_view_p2",
"p2,external,tvf,external_remote,external_remote_tvf")
}
explain{
sql("select * from hdfs (\n" +
- "
\"uri\"=\"hdfs://${nameNodeHost}:${hdfsPort}/usr/hive/warehouse/tpch_1000_parquet.db/part/000091_0\",\n"
+
+ "
\"uri\"=\"hdfs://${nameNodeHost}:${hdfsPort}/user/doris/tpch1.db/tpch1_parquet/part/part-00000-cb9099f7-a053-4f9a-80af-c659cfa947cc-c000.snappy.parquet\",\n"
+
" \"hadoop.username\" = \"hadoop\",\n" +
" \"format\"=\"parquet\")")
contains("_table_valued_function_hdfs.p_partkey")
diff --git
a/regression-test/suites/external_table_p2/tvf/test_tvf_view_count_p2.groovy
b/regression-test/suites/external_table_p0/tvf/test_tvf_view_count.groovy
similarity index 79%
rename from
regression-test/suites/external_table_p2/tvf/test_tvf_view_count_p2.groovy
rename to
regression-test/suites/external_table_p0/tvf/test_tvf_view_count.groovy
index e7df2f28089..415b7cfe354 100644
--- a/regression-test/suites/external_table_p2/tvf/test_tvf_view_count_p2.groovy
+++ b/regression-test/suites/external_table_p0/tvf/test_tvf_view_count.groovy
@@ -15,18 +15,18 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_tvf_view_count_p2",
"p2,external,tvf,external_remote,external_remote_tvf") {
- String enabled = context.config.otherConfigs.get("enableExternalHiveTest")
+suite("test_tvf_view_count", "p0,external,tvf,external_docker,hive") {
+ String enabled = context.config.otherConfigs.get("enableHiveTest")
if (enabled != null && enabled.equalsIgnoreCase("true")) {
- String nameNodeHost = context.config.otherConfigs.get("extHiveHmsHost")
- String hdfsPort = context.config.otherConfigs.get("extHdfsPort")
+ String nameNodeHost = context.config.otherConfigs.get("externalEnvIp")
+ String hdfsPort = context.config.otherConfigs.get("hive2HdfsPort")
sql """drop database if exists test_tvf_view_count_p2"""
sql """create database test_tvf_view_count_p2"""
sql """use test_tvf_view_count_p2"""
sql """set enable_nereids_planner=false"""
sql """create view tvf_view_count as select * from hdfs (
-
"uri"="hdfs://${nameNodeHost}:${hdfsPort}/usr/hive/warehouse/tpch_1000_parquet.db/part/000091_0",
+
"uri"="hdfs://${nameNodeHost}:${hdfsPort}/user/doris/tpch1.db/tpch1_parquet/part/part-00000-cb9099f7-a053-4f9a-80af-c659cfa947cc-c000.snappy.parquet",
"hadoop.username" = "hadoop",
"format"="parquet");"""
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
