This is an automated email from the ASF dual-hosted git repository. yiguolei 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 dd7ec8f4ca [improvement](test) add tpch1 orc for hive catalog and refactor some test dir (#14669) dd7ec8f4ca is described below commit dd7ec8f4cae4ca8fceef76cc268edbe416c8829d Author: Mingyu Chen <morning...@163.com> AuthorDate: Wed Nov 30 10:03:58 2022 +0800 [improvement](test) add tpch1 orc for hive catalog and refactor some test dir (#14669) Add tpch 1g orc test case in hive docker Refactor some suites dir of catalog test cases. And "-internal" for dlf endpoint, to support access oss with aliyun vpc. --- .licenserc.yaml | 6 +- .../{create.hql => create_preinstalled_table.hql} | 186 ++------------------- .../hive/scripts/create_tpch1_orc.hql | 183 ++++++++++++++++++++ .../hive/scripts/create_tpch1_parquet.hql | 160 ++++++++++++++++++ .../docker-compose/hive/scripts/hive-metastore.sh | 32 ++-- .../csv_format_test/all_types.csv | 0 .../csv_format_test/array_malformat.csv | 0 .../csv_format_test/array_normal.csv | 0 .../csv_format_test/student.csv | 0 .../csv_format_test/student_with_names.csv | 0 .../student_with_names_and_types.csv | 0 .../table_with_vertical_line/dt=2022-11-24/1.txt | 0 .../table_with_vertical_line/dt=2022-11-25/2.txt | 0 .../table_with_x01/dt=2022-11-10/3.txt | 0 .../data_case/account_fund/data_file | 0 .../data_case/hive01/data_file | 0 .../data_case/lineorder/data_file | 0 .../data_case/sale_table/data_file | 0 .../data_case/string_table/data_file | 0 .../data_case/student/data_file | 0 .../data_case/t_hive/data_file | 0 .../data_case/test1/data_file | 0 .../data_case/test2/data_file | 0 .../data_case/test_hive_doris/data_file | 0 .../preinstalled_data/hdfs_tvf/test_orc.snappy.orc | Bin 0 -> 2538668 bytes .../hdfs_tvf/test_parquet.snappy.parquet | Bin 0 -> 399762 bytes .../json_format_test/multi_line_json.json | 0 .../multi_line_json_lack_column.json | 0 .../json_format_test/multi_line_json_unorder.json | 0 .../json_format_test/nest_json.json | 0 .../json_format_test/one_array_json.json | 0 .../json_format_test/simple_object_json.json | 0 ...0032_9ch4x_5b6acedf-02e6-4b4e-9de2-ae050ddb7c35 | Bin ...0032_9ch4x_f45472a3-a935-4ff7-9340-b977d51ef3a2 | Bin ...0032_9ch4x_e5a56983-f7e1-4b66-8d7d-134cd8a3b5d4 | Bin ...0032_9ch4x_d3313b2c-f4da-468a-b3b0-7627b7dd6398 | Bin ...0032_9ch4x_91eb689b-3053-4630-9f72-7e068afd3302 | Bin ...0032_9ch4x_fbdd6369-e923-47ff-af40-d023687b7d88 | Bin ...0032_9ch4x_02ec7d8c-ecb8-49f4-ad32-6a0fa0915743 | Bin ...0032_9ch4x_311f132e-20d2-4e1a-82c1-c0edbc3e7903 | Bin ...0032_9ch4x_feb65e62-844e-4890-b326-3aa48ceb917f | Bin ...0032_9ch4x_2f09f727-20f2-4e4c-adec-6a624df8c9f5 | Bin ...0032_9ch4x_de0f05f9-2fd4-4bd6-886a-434ac3349ca1 | Bin ...0032_9ch4x_099556fa-095b-4a70-8718-912c59154582 | Bin ...0032_9ch4x_3340eb7c-fb57-4cc4-a3ed-fc55eb2674f9 | Bin ...0032_9ch4x_ef0c50af-d5c4-4375-ad11-106c64ca7903 | Bin ...0032_9ch4x_45fd0f90-ca2f-4f89-832b-5b99395e7081 | Bin ...0032_9ch4x_d7af1778-dd22-4e08-804d-be1e462fca25 | Bin ...0032_9ch4x_78760342-f3b8-415c-aaf5-be7a7ed38b4c | Bin ...0032_9ch4x_bbb15063-ee62-4fd3-9602-3e9ce04f72ef | Bin .../nation=cn/city=beijing/beijing1 | Bin .../nation=cn/city=shanghai/shanghai1 | Bin .../partition_table/nation=jp/city=tokyo/tokyo1 | Bin .../partition_table/nation=rus/city=moscow/moscow1 | Bin .../nation=us/city=chicago/chicago1 | Bin .../nation=us/city=washington/washington1 | Bin .../developer-guide/regression-testing.md | 10 +- .../doris/catalog/HiveMetaStoreClientHelper.java | 5 +- .../hive/test_hive_other.out} | 0 .../hive_catalog_orc.out} | 0 .../hive_catalog_parquet.out} | 0 .../table_valued_function/test_hdfs_tvf.groovy | 30 ++-- .../hive/test_hive_other.groovy} | 2 +- .../load_p0/stream_load/test_hdfs_json_load.groovy | 2 +- .../hive_catalog_orc.groovy} | 5 +- .../hive_catalog_parquet.groovy} | 5 +- 66 files changed, 408 insertions(+), 218 deletions(-) diff --git a/.licenserc.yaml b/.licenserc.yaml index cbe2aac376..d458e45269 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -72,7 +72,9 @@ header: - "regression-test/script/README" - "regression-test/suites/load_p0/stream_load/data" - "docker/thirdparties/docker-compose/hive/scripts/README" - - "docker/thirdparties/docker-compose/hive/scripts/create.hql" - - "docker/thirdparties/docker-compose/hive/scripts/data_case/*/*" + - "docker/thirdparties/docker-compose/hive/scripts/create_preinstalled_table.hql" + - "docker/thirdparties/docker-compose/hive/scripts/create_tpch1_orc.hql" + - "docker/thirdparties/docker-compose/hive/scripts/create_tpch1_parquet.hql" + - "docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/" comment: on-failure diff --git a/docker/thirdparties/docker-compose/hive/scripts/create.hql b/docker/thirdparties/docker-compose/hive/scripts/create_preinstalled_table.hql similarity index 56% rename from docker/thirdparties/docker-compose/hive/scripts/create.hql rename to docker/thirdparties/docker-compose/hive/scripts/create_preinstalled_table.hql index 5af6c10dab..dfab9b0d1f 100644 --- a/docker/thirdparties/docker-compose/hive/scripts/create.hql +++ b/docker/thirdparties/docker-compose/hive/scripts/create_preinstalled_table.hql @@ -1,162 +1,5 @@ use default; -CREATE TABLE `customer`( - `c_custkey` int, - `c_name` string, - `c_address` string, - `c_nationkey` int, - `c_phone` string, - `c_acctbal` decimal(12,2), - `c_mktsegment` string, - `c_comment` string) -ROW FORMAT SERDE - 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' -STORED AS INPUTFORMAT - 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' -OUTPUTFORMAT - 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' -LOCATION - '/user/doris/tpch1.db/customer/' -TBLPROPERTIES ( - 'transient_lastDdlTime'='1661955829'); - -CREATE TABLE `lineitem`( - `l_orderkey` int, - `l_partkey` int, - `l_suppkey` int, - `l_linenumber` int, - `l_quantity` decimal(12,2), - `l_extendedprice` decimal(12,2), - `l_discount` decimal(12,2), - `l_tax` decimal(12,2), - `l_returnflag` string, - `l_linestatus` string, - `l_shipdate` date, - `l_commitdate` date, - `l_receiptdate` date, - `l_shipinstruct` string, - `l_shipmode` string, - `l_comment` string) -ROW FORMAT SERDE - 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' -STORED AS INPUTFORMAT - 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' -OUTPUTFORMAT - 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' -LOCATION - '/user/doris/tpch1.db/lineitem' -TBLPROPERTIES ( - 'transient_lastDdlTime'='1661955829'); - -CREATE TABLE `nation`( - `n_nationkey` int, - `n_name` string, - `n_regionkey` int, - `n_comment` string) -ROW FORMAT SERDE - 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' -STORED AS INPUTFORMAT - 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' -OUTPUTFORMAT - 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' -LOCATION - '/user/doris/tpch1.db/nation' -TBLPROPERTIES ( - 'transient_lastDdlTime'='1661955829'); - -CREATE TABLE `orders`( - `o_orderkey` int, - `o_custkey` int, - `o_orderstatus` string, - `o_totalprice` decimal(12,2), - `o_orderdate` date, - `o_orderpriority` string, - `o_clerk` string, - `o_shippriority` int, - `o_comment` string) -ROW FORMAT SERDE - 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' -STORED AS INPUTFORMAT - 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' -OUTPUTFORMAT - 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' -LOCATION - '/user/doris/tpch1.db/orders' -TBLPROPERTIES ( - 'transient_lastDdlTime'='1661955829'); - -CREATE TABLE `part`( - `p_partkey` int, - `p_name` string, - `p_mfgr` string, - `p_brand` string, - `p_type` string, - `p_size` int, - `p_container` string, - `p_retailprice` decimal(12,2), - `p_comment` string) -ROW FORMAT SERDE - 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' -STORED AS INPUTFORMAT - 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' -OUTPUTFORMAT - 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' -LOCATION - '/user/doris/tpch1.db/part' -TBLPROPERTIES ( - 'transient_lastDdlTime'='1661955829'); - -CREATE TABLE `partsupp`( - `ps_partkey` int, - `ps_suppkey` int, - `ps_availqty` int, - `ps_supplycost` decimal(12,2), - `ps_comment` string) -ROW FORMAT SERDE - 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' -STORED AS INPUTFORMAT - 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' -OUTPUTFORMAT - 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' -LOCATION - '/user/doris/tpch1.db/partsupp' -TBLPROPERTIES ( - 'transient_lastDdlTime'='1661955829'); - -CREATE TABLE `region`( - `r_regionkey` int, - `r_name` string, - `r_comment` string) -ROW FORMAT SERDE - 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' -STORED AS INPUTFORMAT - 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' -OUTPUTFORMAT - 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' -LOCATION - '/user/doris/tpch1.db/region' -TBLPROPERTIES ( - 'transient_lastDdlTime'='1661955829'); - -CREATE TABLE `supplier`( - `s_suppkey` int, - `s_name` string, - `s_address` string, - `s_nationkey` int, - `s_phone` string, - `s_acctbal` decimal(12,2), - `s_comment` string) -ROW FORMAT SERDE - 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' -STORED AS INPUTFORMAT - 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' -OUTPUTFORMAT - 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' -LOCATION - '/user/doris/tpch1.db/supplier' -TBLPROPERTIES ( - 'transient_lastDdlTime'='1661955829'); - CREATE TABLE `partition_table`( `l_orderkey` int, `l_partkey` int, @@ -182,7 +25,7 @@ STORED AS INPUTFORMAT OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' LOCATION - '/user/doris/parquet/partition_table' + '/user/doris/preinstalled_data/parquet/partition_table' TBLPROPERTIES ( 'transient_lastDdlTime'='1661955829'); @@ -215,7 +58,7 @@ STORED AS INPUTFORMAT OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat' LOCATION - '/user/doris/orc/orc_all_types'; + '/user/doris/preinstalled_data/orc/orc_all_types'; msck repair table orc_all_types; @@ -228,7 +71,7 @@ CREATE TABLE `student` ( phone varchar(50) ) ROW FORMAT DELIMITED FIELDS TERMINATED by ',' -LOCATION '/user/doris/data_case/student' +LOCATION '/user/doris/preinstalled_data/data_case/student' TBLPROPERTIES ('transient_lastDdlTime'='1658816839'); CREATE TABLE `lineorder` ( @@ -251,7 +94,7 @@ CREATE TABLE `lineorder` ( `lo_shipmode` varchar(11) ) ROW FORMAT DELIMITED FIELDS TERMINATED by ',' -LOCATION '/user/doris/data_case/lineorder' +LOCATION '/user/doris/preinstalled_data/data_case/lineorder' TBLPROPERTIES ('transient_lastDdlTime'='1658816839'); CREATE TABLE `test1` ( @@ -262,7 +105,7 @@ CREATE TABLE `test1` ( col_5 varchar(20) ) ROW FORMAT DELIMITED FIELDS TERMINATED by ',' -LOCATION '/user/doris/data_case/test1' +LOCATION '/user/doris/preinstalled_data/data_case/test1' TBLPROPERTIES ('transient_lastDdlTime'='1658816839'); CREATE TABLE `string_table` ( @@ -277,7 +120,7 @@ CREATE TABLE `string_table` ( p_comment string ) ROW FORMAT DELIMITED FIELDS TERMINATED by ',' -LOCATION '/user/doris/data_case/string_table' +LOCATION '/user/doris/preinstalled_data/data_case/string_table' TBLPROPERTIES ('transient_lastDdlTime'='1658816839'); CREATE TABLE `account_fund` ( @@ -298,7 +141,7 @@ STORED AS INPUTFORMAT OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' LOCATION - '/user/doris/data_case/account_fund' + '/user/doris/preinstalled_data/data_case/account_fund' TBLPROPERTIES ('transient_lastDdlTime'='1658816839'); create table sale_table ( @@ -315,7 +158,7 @@ STORED AS INPUTFORMAT OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat' LOCATION - '/user/doris/data_case/sale_table' + '/user/doris/preinstalled_data/data_case/sale_table' TBLPROPERTIES ('transient_lastDdlTime'='1658816839'); create table t_hive ( @@ -331,7 +174,7 @@ STORED AS INPUTFORMAT OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' LOCATION - '/user/doris/data_case/t_hive' + '/user/doris/preinstalled_data/data_case/t_hive' TBLPROPERTIES ('transient_lastDdlTime'='1658816839'); create table hive01 ( @@ -342,7 +185,7 @@ create table hive01 ( ) ROW FORMAT DELIMITED FIELDS TERMINATED by ',' LOCATION - '/user/doris/data_case/hive01' + '/user/doris/preinstalled_data/data_case/hive01' TBLPROPERTIES ('transient_lastDdlTime'='1658816839'); CREATE TABLE test2 ( @@ -354,7 +197,7 @@ dt date ) row format delimited fields terminated by ',' stored as textfile -LOCATION '/user/doris/data_case/test2' +LOCATION '/user/doris/preinstalled_data/data_case/test2' TBLPROPERTIES ('transient_lastDdlTime'='1658816839'); create table test_hive_doris( @@ -363,7 +206,7 @@ age varchar(100) ) row format delimited fields terminated by ',' stored as textfile -LOCATION '/user/doris/data_case/test_hive_doris' +LOCATION '/user/doris/preinstalled_data/data_case/test_hive_doris' TBLPROPERTIES ('transient_lastDdlTime'='1658816839'); CREATE external TABLE `table_with_vertical_line`( @@ -394,7 +237,7 @@ STORED AS INPUTFORMAT OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat' LOCATION - '/user/doris/csv_partition_table/table_with_vertical_line/' + '/user/doris/preinstalled_data/csv_partition_table/table_with_vertical_line/' TBLPROPERTIES ( 'transient_lastDdlTime'='1669304897'); @@ -425,11 +268,10 @@ STORED AS INPUTFORMAT OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat' LOCATION - '/user/doris/csv_partition_table/table_with_x01/' + '/user/doris/preinstalled_data/csv_partition_table/table_with_x01/' TBLPROPERTIES ( 'transient_lastDdlTime'='1669360080'); msck repair table table_with_x01; show tables; - diff --git a/docker/thirdparties/docker-compose/hive/scripts/create_tpch1_orc.hql b/docker/thirdparties/docker-compose/hive/scripts/create_tpch1_orc.hql new file mode 100644 index 0000000000..5c9fcceb1f --- /dev/null +++ b/docker/thirdparties/docker-compose/hive/scripts/create_tpch1_orc.hql @@ -0,0 +1,183 @@ +create database tpch1_orc; +use tpch1_orc; + +CREATE TABLE `customer`( + `c_custkey` int, + `c_name` string, + `c_address` string, + `c_nationkey` int, + `c_phone` string, + `c_acctbal` decimal(12,2), + `c_mktsegment` string, + `c_comment` string) +ROW FORMAT SERDE + 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' +WITH SERDEPROPERTIES ( + 'orc.compress'='snappy', + 'path'='/user/doris/tpch1.db/tpch1_orc/customer') +STORED AS INPUTFORMAT + 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat' +OUTPUTFORMAT + 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat' +LOCATION + '/user/doris/tpch1.db/tpch1_orc/customer/' +TBLPROPERTIES ( + 'transient_lastDdlTime'='1661955829'); + +CREATE TABLE `lineitem`( + `l_orderkey` int, + `l_partkey` int, + `l_suppkey` int, + `l_linenumber` int, + `l_quantity` decimal(12,2), + `l_extendedprice` decimal(12,2), + `l_discount` decimal(12,2), + `l_tax` decimal(12,2), + `l_returnflag` string, + `l_linestatus` string, + `l_shipdate` date, + `l_commitdate` date, + `l_receiptdate` date, + `l_shipinstruct` string, + `l_shipmode` string, + `l_comment` string) +ROW FORMAT SERDE + 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' +WITH SERDEPROPERTIES ( + 'orc.compress'='snappy', + 'path'='/user/doris/tpch1.db/tpch1_orc/customer') +STORED AS INPUTFORMAT + 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat' +OUTPUTFORMAT + 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat' +LOCATION + '/user/doris/tpch1.db/tpch1_orc/lineitem' +TBLPROPERTIES ( + 'transient_lastDdlTime'='1661955829'); + +CREATE TABLE `nation`( + `n_nationkey` int, + `n_name` string, + `n_regionkey` int, + `n_comment` string) +ROW FORMAT SERDE + 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' +WITH SERDEPROPERTIES ( + 'orc.compress'='snappy', + 'path'='/user/doris/tpch1.db/tpch1_orc/customer') +STORED AS INPUTFORMAT + 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat' +OUTPUTFORMAT + 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat' +LOCATION + '/user/doris/tpch1.db/tpch1_orc/nation' +TBLPROPERTIES ( + 'transient_lastDdlTime'='1661955829'); + +CREATE TABLE `orders`( + `o_orderkey` int, + `o_custkey` int, + `o_orderstatus` string, + `o_totalprice` decimal(12,2), + `o_orderdate` date, + `o_orderpriority` string, + `o_clerk` string, + `o_shippriority` int, + `o_comment` string) +ROW FORMAT SERDE + 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' +WITH SERDEPROPERTIES ( + 'orc.compress'='snappy', + 'path'='/user/doris/tpch1.db/tpch1_orc/customer') +STORED AS INPUTFORMAT + 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat' +OUTPUTFORMAT + 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat' +LOCATION + '/user/doris/tpch1.db/tpch1_orc/orders' +TBLPROPERTIES ( + 'transient_lastDdlTime'='1661955829'); + +CREATE TABLE `part`( + `p_partkey` int, + `p_name` string, + `p_mfgr` string, + `p_brand` string, + `p_type` string, + `p_size` int, + `p_container` string, + `p_retailprice` decimal(12,2), + `p_comment` string) +ROW FORMAT SERDE + 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' +WITH SERDEPROPERTIES ( + 'orc.compress'='snappy', + 'path'='/user/doris/tpch1.db/tpch1_orc/customer') +STORED AS INPUTFORMAT + 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat' +OUTPUTFORMAT + 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat' +LOCATION + '/user/doris/tpch1.db/tpch1_orc/part' +TBLPROPERTIES ( + 'transient_lastDdlTime'='1661955829'); + +CREATE TABLE `partsupp`( + `ps_partkey` int, + `ps_suppkey` int, + `ps_availqty` int, + `ps_supplycost` decimal(12,2), + `ps_comment` string) +ROW FORMAT SERDE + 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' +WITH SERDEPROPERTIES ( + 'orc.compress'='snappy', + 'path'='/user/doris/tpch1.db/tpch1_orc/customer') +STORED AS INPUTFORMAT + 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat' +OUTPUTFORMAT + 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat' +LOCATION + '/user/doris/tpch1.db/tpch1_orc/partsupp' +TBLPROPERTIES ( + 'transient_lastDdlTime'='1661955829'); + +CREATE TABLE `region`( + `r_regionkey` int, + `r_name` string, + `r_comment` string) +ROW FORMAT SERDE + 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' +WITH SERDEPROPERTIES ( + 'orc.compress'='snappy', + 'path'='/user/doris/tpch1.db/tpch1_orc/customer') +STORED AS INPUTFORMAT + 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat' +OUTPUTFORMAT + 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat' +LOCATION + '/user/doris/tpch1.db/tpch1_orc/region' +TBLPROPERTIES ( + 'transient_lastDdlTime'='1661955829'); + +CREATE TABLE `supplier`( + `s_suppkey` int, + `s_name` string, + `s_address` string, + `s_nationkey` int, + `s_phone` string, + `s_acctbal` decimal(12,2), + `s_comment` string) +ROW FORMAT SERDE + 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' +WITH SERDEPROPERTIES ( + 'orc.compress'='snappy', + 'path'='/user/doris/tpch1.db/tpch1_orc/customer') +STORED AS INPUTFORMAT + 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat' +OUTPUTFORMAT + 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat' +LOCATION + '/user/doris/tpch1.db/tpch1_orc/supplier' +TBLPROPERTIES ( + 'transient_lastDdlTime'='1661955829'); diff --git a/docker/thirdparties/docker-compose/hive/scripts/create_tpch1_parquet.hql b/docker/thirdparties/docker-compose/hive/scripts/create_tpch1_parquet.hql new file mode 100644 index 0000000000..c007945fc5 --- /dev/null +++ b/docker/thirdparties/docker-compose/hive/scripts/create_tpch1_parquet.hql @@ -0,0 +1,160 @@ +create database tpch1_parquet; +use tpch1_parquet; + +CREATE TABLE `customer`( + `c_custkey` int, + `c_name` string, + `c_address` string, + `c_nationkey` int, + `c_phone` string, + `c_acctbal` decimal(12,2), + `c_mktsegment` string, + `c_comment` string) +ROW FORMAT SERDE + 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' +STORED AS INPUTFORMAT + 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' +OUTPUTFORMAT + 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' +LOCATION + '/user/doris/tpch1.db/tpch1_parquet/customer/' +TBLPROPERTIES ( + 'transient_lastDdlTime'='1661955829'); + +CREATE TABLE `lineitem`( + `l_orderkey` int, + `l_partkey` int, + `l_suppkey` int, + `l_linenumber` int, + `l_quantity` decimal(12,2), + `l_extendedprice` decimal(12,2), + `l_discount` decimal(12,2), + `l_tax` decimal(12,2), + `l_returnflag` string, + `l_linestatus` string, + `l_shipdate` date, + `l_commitdate` date, + `l_receiptdate` date, + `l_shipinstruct` string, + `l_shipmode` string, + `l_comment` string) +ROW FORMAT SERDE + 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' +STORED AS INPUTFORMAT + 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' +OUTPUTFORMAT + 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' +LOCATION + '/user/doris/tpch1.db/tpch1_parquet/lineitem' +TBLPROPERTIES ( + 'transient_lastDdlTime'='1661955829'); + +CREATE TABLE `nation`( + `n_nationkey` int, + `n_name` string, + `n_regionkey` int, + `n_comment` string) +ROW FORMAT SERDE + 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' +STORED AS INPUTFORMAT + 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' +OUTPUTFORMAT + 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' +LOCATION + '/user/doris/tpch1.db/tpch1_parquet/nation' +TBLPROPERTIES ( + 'transient_lastDdlTime'='1661955829'); + +CREATE TABLE `orders`( + `o_orderkey` int, + `o_custkey` int, + `o_orderstatus` string, + `o_totalprice` decimal(12,2), + `o_orderdate` date, + `o_orderpriority` string, + `o_clerk` string, + `o_shippriority` int, + `o_comment` string) +ROW FORMAT SERDE + 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' +STORED AS INPUTFORMAT + 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' +OUTPUTFORMAT + 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' +LOCATION + '/user/doris/tpch1.db/tpch1_parquet/orders' +TBLPROPERTIES ( + 'transient_lastDdlTime'='1661955829'); + +CREATE TABLE `part`( + `p_partkey` int, + `p_name` string, + `p_mfgr` string, + `p_brand` string, + `p_type` string, + `p_size` int, + `p_container` string, + `p_retailprice` decimal(12,2), + `p_comment` string) +ROW FORMAT SERDE + 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' +STORED AS INPUTFORMAT + 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' +OUTPUTFORMAT + 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' +LOCATION + '/user/doris/tpch1.db/tpch1_parquet/part' +TBLPROPERTIES ( + 'transient_lastDdlTime'='1661955829'); + +CREATE TABLE `partsupp`( + `ps_partkey` int, + `ps_suppkey` int, + `ps_availqty` int, + `ps_supplycost` decimal(12,2), + `ps_comment` string) +ROW FORMAT SERDE + 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' +STORED AS INPUTFORMAT + 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' +OUTPUTFORMAT + 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' +LOCATION + '/user/doris/tpch1.db/tpch1_parquet/partsupp' +TBLPROPERTIES ( + 'transient_lastDdlTime'='1661955829'); + +CREATE TABLE `region`( + `r_regionkey` int, + `r_name` string, + `r_comment` string) +ROW FORMAT SERDE + 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' +STORED AS INPUTFORMAT + 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' +OUTPUTFORMAT + 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' +LOCATION + '/user/doris/tpch1.db/tpch1_parquet/region' +TBLPROPERTIES ( + 'transient_lastDdlTime'='1661955829'); + +CREATE TABLE `supplier`( + `s_suppkey` int, + `s_name` string, + `s_address` string, + `s_nationkey` int, + `s_phone` string, + `s_acctbal` decimal(12,2), + `s_comment` string) +ROW FORMAT SERDE + 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' +STORED AS INPUTFORMAT + 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' +OUTPUTFORMAT + 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' +LOCATION + '/user/doris/tpch1.db/tpch1_parquet/supplier' +TBLPROPERTIES ( + 'transient_lastDdlTime'='1661955829'); + diff --git a/docker/thirdparties/docker-compose/hive/scripts/hive-metastore.sh b/docker/thirdparties/docker-compose/hive/scripts/hive-metastore.sh index 1e72eda081..b23485dbab 100755 --- a/docker/thirdparties/docker-compose/hive/scripts/hive-metastore.sh +++ b/docker/thirdparties/docker-compose/hive/scripts/hive-metastore.sh @@ -24,31 +24,25 @@ if [[ ! -d "/mnt/scripts/tpch1.db" ]]; then fi # put data file +## put tpch1 echo "hadoop fs -mkdir /user/doris/" hadoop fs -mkdir -p /user/doris/ echo "hadoop fs -put /mnt/scripts/tpch1.db /user/doris/" hadoop fs -put /mnt/scripts/tpch1.db /user/doris/ -echo "hadoop fs -put /mnt/scripts/json_format_test /user/doris/" -hadoop fs -put /mnt/scripts/json_format_test /user/doris/ -echo "hadoop fs -put /mnt/scripts/parquet /user/doris/" -hadoop fs -put /mnt/scripts/parquet /user/doris/ -echo "hadoop fs -put /mnt/scripts/orc /user/doris/" -hadoop fs -put /mnt/scripts/orc /user/doris/ -echo "hadoop fs -put /mnt/scripts/csv_format_test /user/doris/" -hadoop fs -put /mnt/scripts/csv_format_test /user/doris/ -echo "hadoop fs -put /mnt/scripts/data_case /user/doris/" -hadoop fs -put /mnt/scripts/data_case /user/doris/ - -echo "hadoop fs -mkdir -p /user/doris/csv_partition_table" -hadoop fs -mkdir -p /user/doris/csv_partition_table -echo "hadoop fs -put /mnt/scripts/csv_partition_table/table_with_vertical_line/ /user/doris/csv_partition_table/" -hadoop fs -put /mnt/scripts/csv_partition_table/table_with_vertical_line/ /user/doris/csv_partition_table/ -echo "hadoop fs -put /mnt/scripts/csv_partition_table/table_with_x01/ /user/doris/csv_partition_table/" -hadoop fs -put /mnt/scripts/csv_partition_table/table_with_x01/ /user/doris/csv_partition_table/ + +## put other preinstalled data +echo "hadoop fs -put /mnt/scripts/preinstalled_data /user/doris/" +hadoop fs -put /mnt/scripts/preinstalled_data /user/doris/ # create table -echo "hive -f /mnt/scripts/create.hql" -hive -f /mnt/scripts/create.hql +echo "hive -f /mnt/scripts/create_tpch1_orc.hql" +hive -f /mnt/scripts/create_tpch1_orc.hql + +echo "hive -f /mnt/scripts/create_tpch1_parquet.hql" +hive -f /mnt/scripts/create_tpch1_parquet.hql + +echo "hive -f /mnt/scripts/create_preinstalled_table.hql" +hive -f /mnt/scripts/create_preinstalled_table.hql echo "touch /mnt/SUCCESS" touch /mnt/SUCCESS diff --git a/docker/thirdparties/docker-compose/hive/scripts/csv_format_test/all_types.csv b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/csv_format_test/all_types.csv similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/csv_format_test/all_types.csv rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/csv_format_test/all_types.csv diff --git a/docker/thirdparties/docker-compose/hive/scripts/csv_format_test/array_malformat.csv b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/csv_format_test/array_malformat.csv similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/csv_format_test/array_malformat.csv rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/csv_format_test/array_malformat.csv diff --git a/docker/thirdparties/docker-compose/hive/scripts/csv_format_test/array_normal.csv b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/csv_format_test/array_normal.csv similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/csv_format_test/array_normal.csv rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/csv_format_test/array_normal.csv diff --git a/docker/thirdparties/docker-compose/hive/scripts/csv_format_test/student.csv b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/csv_format_test/student.csv similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/csv_format_test/student.csv rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/csv_format_test/student.csv diff --git a/docker/thirdparties/docker-compose/hive/scripts/csv_format_test/student_with_names.csv b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/csv_format_test/student_with_names.csv similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/csv_format_test/student_with_names.csv rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/csv_format_test/student_with_names.csv diff --git a/docker/thirdparties/docker-compose/hive/scripts/csv_format_test/student_with_names_and_types.csv b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/csv_format_test/student_with_names_and_types.csv similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/csv_format_test/student_with_names_and_types.csv rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/csv_format_test/student_with_names_and_types.csv diff --git a/docker/thirdparties/docker-compose/hive/scripts/csv_partition_table/table_with_vertical_line/dt=2022-11-24/1.txt b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/csv_partition_table/table_with_vertical_line/dt=2022-11-24/1.txt similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/csv_partition_table/table_with_vertical_line/dt=2022-11-24/1.txt rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/csv_partition_table/table_with_vertical_line/dt=2022-11-24/1.txt diff --git a/docker/thirdparties/docker-compose/hive/scripts/csv_partition_table/table_with_vertical_line/dt=2022-11-25/2.txt b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/csv_partition_table/table_with_vertical_line/dt=2022-11-25/2.txt similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/csv_partition_table/table_with_vertical_line/dt=2022-11-25/2.txt rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/csv_partition_table/table_with_vertical_line/dt=2022-11-25/2.txt diff --git a/docker/thirdparties/docker-compose/hive/scripts/csv_partition_table/table_with_x01/dt=2022-11-10/3.txt b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/csv_partition_table/table_with_x01/dt=2022-11-10/3.txt similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/csv_partition_table/table_with_x01/dt=2022-11-10/3.txt rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/csv_partition_table/table_with_x01/dt=2022-11-10/3.txt diff --git a/docker/thirdparties/docker-compose/hive/scripts/data_case/account_fund/data_file b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/data_case/account_fund/data_file similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/data_case/account_fund/data_file rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/data_case/account_fund/data_file diff --git a/docker/thirdparties/docker-compose/hive/scripts/data_case/hive01/data_file b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/data_case/hive01/data_file similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/data_case/hive01/data_file rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/data_case/hive01/data_file diff --git a/docker/thirdparties/docker-compose/hive/scripts/data_case/lineorder/data_file b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/data_case/lineorder/data_file similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/data_case/lineorder/data_file rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/data_case/lineorder/data_file diff --git a/docker/thirdparties/docker-compose/hive/scripts/data_case/sale_table/data_file b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/data_case/sale_table/data_file similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/data_case/sale_table/data_file rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/data_case/sale_table/data_file diff --git a/docker/thirdparties/docker-compose/hive/scripts/data_case/string_table/data_file b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/data_case/string_table/data_file similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/data_case/string_table/data_file rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/data_case/string_table/data_file diff --git a/docker/thirdparties/docker-compose/hive/scripts/data_case/student/data_file b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/data_case/student/data_file similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/data_case/student/data_file rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/data_case/student/data_file diff --git a/docker/thirdparties/docker-compose/hive/scripts/data_case/t_hive/data_file b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/data_case/t_hive/data_file similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/data_case/t_hive/data_file rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/data_case/t_hive/data_file diff --git a/docker/thirdparties/docker-compose/hive/scripts/data_case/test1/data_file b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/data_case/test1/data_file similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/data_case/test1/data_file rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/data_case/test1/data_file diff --git a/docker/thirdparties/docker-compose/hive/scripts/data_case/test2/data_file b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/data_case/test2/data_file similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/data_case/test2/data_file rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/data_case/test2/data_file diff --git a/docker/thirdparties/docker-compose/hive/scripts/data_case/test_hive_doris/data_file b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/data_case/test_hive_doris/data_file similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/data_case/test_hive_doris/data_file rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/data_case/test_hive_doris/data_file diff --git a/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/hdfs_tvf/test_orc.snappy.orc b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/hdfs_tvf/test_orc.snappy.orc new file mode 100644 index 0000000000..d2ed763405 Binary files /dev/null and b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/hdfs_tvf/test_orc.snappy.orc differ diff --git a/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/hdfs_tvf/test_parquet.snappy.parquet b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/hdfs_tvf/test_parquet.snappy.parquet new file mode 100644 index 0000000000..11283684e5 Binary files /dev/null and b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/hdfs_tvf/test_parquet.snappy.parquet differ diff --git a/docker/thirdparties/docker-compose/hive/scripts/json_format_test/multi_line_json.json b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/json_format_test/multi_line_json.json similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/json_format_test/multi_line_json.json rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/json_format_test/multi_line_json.json diff --git a/docker/thirdparties/docker-compose/hive/scripts/json_format_test/multi_line_json_lack_column.json b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/json_format_test/multi_line_json_lack_column.json similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/json_format_test/multi_line_json_lack_column.json rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/json_format_test/multi_line_json_lack_column.json diff --git a/docker/thirdparties/docker-compose/hive/scripts/json_format_test/multi_line_json_unorder.json b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/json_format_test/multi_line_json_unorder.json similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/json_format_test/multi_line_json_unorder.json rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/json_format_test/multi_line_json_unorder.json diff --git a/docker/thirdparties/docker-compose/hive/scripts/json_format_test/nest_json.json b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/json_format_test/nest_json.json similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/json_format_test/nest_json.json rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/json_format_test/nest_json.json diff --git a/docker/thirdparties/docker-compose/hive/scripts/json_format_test/one_array_json.json b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/json_format_test/one_array_json.json similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/json_format_test/one_array_json.json rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/json_format_test/one_array_json.json diff --git a/docker/thirdparties/docker-compose/hive/scripts/json_format_test/simple_object_json.json b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/json_format_test/simple_object_json.json similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/json_format_test/simple_object_json.json rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/json_format_test/simple_object_json.json diff --git a/docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=desktops/p2_col=bigint_col/20221027_110128_00032_9ch4x_5b6acedf-02e6-4b4e-9de2-ae050ddb7c35 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=desktops/p2_col=bigint_col/20221027_110128_00032_9ch4x_5b6acedf-02e6-4b4e-9de2-ae050ddb7c35 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=desktops/p2_col=bigint_col/20221027_110128_00032_9ch4x_5b6acedf-02e6-4b4e-9de2-ae050ddb7c35 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=desktops/p2_col=bigint_col/20221027_110128_00032_9ch4x_5b6acedf-02e6-4b4e-9de2-ae050ddb7c35 diff --git a/docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=desktops/p2_col=boolean_col/20221027_110128_00032_9ch4x_f45472a3-a935-4ff7-9340-b977d51ef3a2 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=desktops/p2_col=boolean_col/20221027_110128_00032_9ch4x_f45472a3-a935-4ff7-9340-b977d51ef3a2 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=desktops/p2_col=boolean_col/20221027_110128_00032_9ch4x_f45472a3-a935-4ff7-9340-b977d51ef3a2 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=desktops/p2_col=boolean_col/20221027_110128_00032_9ch4x_f45472a3-a935-4ff7-9340-b977d51ef3a2 diff --git a/docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=desktops/p2_col=float_col/20221027_110128_00032_9ch4x_e5a56983-f7e1-4b66-8d7d-134cd8a3b5d4 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=desktops/p2_col=float_col/20221027_110128_00032_9ch4x_e5a56983-f7e1-4b66-8d7d-134cd8a3b5d4 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=desktops/p2_col=float_col/20221027_110128_00032_9ch4x_e5a56983-f7e1-4b66-8d7d-134cd8a3b5d4 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=desktops/p2_col=float_col/20221027_110128_00032_9ch4x_e5a56983-f7e1-4b66-8d7d-134cd8a3b5d4 diff --git a/docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=desktops/p2_col=int_col/20221027_110128_00032_9ch4x_d3313b2c-f4da-468a-b3b0-7627b7dd6398 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=desktops/p2_col=int_col/20221027_110128_00032_9ch4x_d3313b2c-f4da-468a-b3b0-7627b7dd6398 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=desktops/p2_col=int_col/20221027_110128_00032_9ch4x_d3313b2c-f4da-468a-b3b0-7627b7dd6398 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=desktops/p2_col=int_col/20221027_110128_00032_9ch4x_d3313b2c-f4da-468a-b3b0-7627b7dd6398 diff --git a/docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=desktops/p2_col=smallint_col/20221027_110128_00032_9ch4x_91eb689b-3053-4630-9f72-7e068afd3302 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=desktops/p2_col=smallint_col/20221027_110128_00032_9ch4x_91eb689b-3053-4630-9f72-7e068afd3302 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=desktops/p2_col=smallint_col/20221027_110128_00032_9ch4x_91eb689b-3053-4630-9f72-7e068afd3302 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=desktops/p2_col=smallint_col/20221027_110128_00032_9ch4x_91eb689b-3053-4630-9f72-7e068afd3302 diff --git a/docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=desktops/p2_col=tinyint_col/20221027_110128_00032_9ch4x_fbdd6369-e923-47ff-af40-d023687b7d88 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=desktops/p2_col=tinyint_col/20221027_110128_00032_9ch4x_fbdd6369-e923-47ff-af40-d023687b7d88 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=desktops/p2_col=tinyint_col/20221027_110128_00032_9ch4x_fbdd6369-e923-47ff-af40-d023687b7d88 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=desktops/p2_col=tinyint_col/20221027_110128_00032_9ch4x_fbdd6369-e923-47ff-af40-d023687b7d88 diff --git a/docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=phones/p2_col=bigint_col/20221027_110128_00032_9ch4x_02ec7d8c-ecb8-49f4-ad32-6a0fa0915743 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=phones/p2_col=bigint_col/20221027_110128_00032_9ch4x_02ec7d8c-ecb8-49f4-ad32-6a0fa0915743 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=phones/p2_col=bigint_col/20221027_110128_00032_9ch4x_02ec7d8c-ecb8-49f4-ad32-6a0fa0915743 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=phones/p2_col=bigint_col/20221027_110128_00032_9ch4x_02ec7d8c-ecb8-49f4-ad32-6a0fa0915743 diff --git a/docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=phones/p2_col=boolean_col/20221027_110128_00032_9ch4x_311f132e-20d2-4e1a-82c1-c0edbc3e7903 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=phones/p2_col=boolean_col/20221027_110128_00032_9ch4x_311f132e-20d2-4e1a-82c1-c0edbc3e7903 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=phones/p2_col=boolean_col/20221027_110128_00032_9ch4x_311f132e-20d2-4e1a-82c1-c0edbc3e7903 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=phones/p2_col=boolean_col/20221027_110128_00032_9ch4x_311f132e-20d2-4e1a-82c1-c0edbc3e7903 diff --git a/docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=phones/p2_col=float_col/20221027_110128_00032_9ch4x_feb65e62-844e-4890-b326-3aa48ceb917f b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=phones/p2_col=float_col/20221027_110128_00032_9ch4x_feb65e62-844e-4890-b326-3aa48ceb917f similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=phones/p2_col=float_col/20221027_110128_00032_9ch4x_feb65e62-844e-4890-b326-3aa48ceb917f rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=phones/p2_col=float_col/20221027_110128_00032_9ch4x_feb65e62-844e-4890-b326-3aa48ceb917f diff --git a/docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=phones/p2_col=int_col/20221027_110128_00032_9ch4x_2f09f727-20f2-4e4c-adec-6a624df8c9f5 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=phones/p2_col=int_col/20221027_110128_00032_9ch4x_2f09f727-20f2-4e4c-adec-6a624df8c9f5 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=phones/p2_col=int_col/20221027_110128_00032_9ch4x_2f09f727-20f2-4e4c-adec-6a624df8c9f5 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=phones/p2_col=int_col/20221027_110128_00032_9ch4x_2f09f727-20f2-4e4c-adec-6a624df8c9f5 diff --git a/docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=phones/p2_col=smallint_col/20221027_110128_00032_9ch4x_de0f05f9-2fd4-4bd6-886a-434ac3349ca1 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=phones/p2_col=smallint_col/20221027_110128_00032_9ch4x_de0f05f9-2fd4-4bd6-886a-434ac3349ca1 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=phones/p2_col=smallint_col/20221027_110128_00032_9ch4x_de0f05f9-2fd4-4bd6-886a-434ac3349ca1 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=phones/p2_col=smallint_col/20221027_110128_00032_9ch4x_de0f05f9-2fd4-4bd6-886a-434ac3349ca1 diff --git a/docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=phones/p2_col=tinyint_col/20221027_110128_00032_9ch4x_099556fa-095b-4a70-8718-912c59154582 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=phones/p2_col=tinyint_col/20221027_110128_00032_9ch4x_099556fa-095b-4a70-8718-912c59154582 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=phones/p2_col=tinyint_col/20221027_110128_00032_9ch4x_099556fa-095b-4a70-8718-912c59154582 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=phones/p2_col=tinyint_col/20221027_110128_00032_9ch4x_099556fa-095b-4a70-8718-912c59154582 diff --git a/docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=tablets/p2_col=bigint_col/20221027_110128_00032_9ch4x_3340eb7c-fb57-4cc4-a3ed-fc55eb2674f9 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=tablets/p2_col=bigint_col/20221027_110128_00032_9ch4x_3340eb7c-fb57-4cc4-a3ed-fc55eb2674f9 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=tablets/p2_col=bigint_col/20221027_110128_00032_9ch4x_3340eb7c-fb57-4cc4-a3ed-fc55eb2674f9 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=tablets/p2_col=bigint_col/20221027_110128_00032_9ch4x_3340eb7c-fb57-4cc4-a3ed-fc55eb2674f9 diff --git a/docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=tablets/p2_col=boolean_col/20221027_110128_00032_9ch4x_ef0c50af-d5c4-4375-ad11-106c64ca7903 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=tablets/p2_col=boolean_col/20221027_110128_00032_9ch4x_ef0c50af-d5c4-4375-ad11-106c64ca7903 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=tablets/p2_col=boolean_col/20221027_110128_00032_9ch4x_ef0c50af-d5c4-4375-ad11-106c64ca7903 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=tablets/p2_col=boolean_col/20221027_110128_00032_9ch4x_ef0c50af-d5c4-4375-ad11-106c64ca7903 diff --git a/docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=tablets/p2_col=float_col/20221027_110128_00032_9ch4x_45fd0f90-ca2f-4f89-832b-5b99395e7081 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=tablets/p2_col=float_col/20221027_110128_00032_9ch4x_45fd0f90-ca2f-4f89-832b-5b99395e7081 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=tablets/p2_col=float_col/20221027_110128_00032_9ch4x_45fd0f90-ca2f-4f89-832b-5b99395e7081 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=tablets/p2_col=float_col/20221027_110128_00032_9ch4x_45fd0f90-ca2f-4f89-832b-5b99395e7081 diff --git a/docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=tablets/p2_col=int_col/20221027_110128_00032_9ch4x_d7af1778-dd22-4e08-804d-be1e462fca25 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=tablets/p2_col=int_col/20221027_110128_00032_9ch4x_d7af1778-dd22-4e08-804d-be1e462fca25 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=tablets/p2_col=int_col/20221027_110128_00032_9ch4x_d7af1778-dd22-4e08-804d-be1e462fca25 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=tablets/p2_col=int_col/20221027_110128_00032_9ch4x_d7af1778-dd22-4e08-804d-be1e462fca25 diff --git a/docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=tablets/p2_col=smallint_col/20221027_110128_00032_9ch4x_78760342-f3b8-415c-aaf5-be7a7ed38b4c b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=tablets/p2_col=smallint_col/20221027_110128_00032_9ch4x_78760342-f3b8-415c-aaf5-be7a7ed38b4c similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=tablets/p2_col=smallint_col/20221027_110128_00032_9ch4x_78760342-f3b8-415c-aaf5-be7a7ed38b4c rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=tablets/p2_col=smallint_col/20221027_110128_00032_9ch4x_78760342-f3b8-415c-aaf5-be7a7ed38b4c diff --git a/docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=tablets/p2_col=tinyint_col/20221027_110128_00032_9ch4x_bbb15063-ee62-4fd3-9602-3e9ce04f72ef b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=tablets/p2_col=tinyint_col/20221027_110128_00032_9ch4x_bbb15063-ee62-4fd3-9602-3e9ce04f72ef similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/orc/orc_all_types/p1_col=tablets/p2_col=tinyint_col/20221027_110128_00032_9ch4x_bbb15063-ee62-4fd3-9602-3e9ce04f72ef rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/orc/orc_all_types/p1_col=tablets/p2_col=tinyint_col/20221027_110128_00032_9ch4x_bbb15063-ee62-4fd3-9602-3e9ce04f72ef diff --git a/docker/thirdparties/docker-compose/hive/scripts/parquet/partition_table/nation=cn/city=beijing/beijing1 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet/partition_table/nation=cn/city=beijing/beijing1 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/parquet/partition_table/nation=cn/city=beijing/beijing1 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet/partition_table/nation=cn/city=beijing/beijing1 diff --git a/docker/thirdparties/docker-compose/hive/scripts/parquet/partition_table/nation=cn/city=shanghai/shanghai1 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet/partition_table/nation=cn/city=shanghai/shanghai1 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/parquet/partition_table/nation=cn/city=shanghai/shanghai1 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet/partition_table/nation=cn/city=shanghai/shanghai1 diff --git a/docker/thirdparties/docker-compose/hive/scripts/parquet/partition_table/nation=jp/city=tokyo/tokyo1 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet/partition_table/nation=jp/city=tokyo/tokyo1 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/parquet/partition_table/nation=jp/city=tokyo/tokyo1 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet/partition_table/nation=jp/city=tokyo/tokyo1 diff --git a/docker/thirdparties/docker-compose/hive/scripts/parquet/partition_table/nation=rus/city=moscow/moscow1 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet/partition_table/nation=rus/city=moscow/moscow1 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/parquet/partition_table/nation=rus/city=moscow/moscow1 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet/partition_table/nation=rus/city=moscow/moscow1 diff --git a/docker/thirdparties/docker-compose/hive/scripts/parquet/partition_table/nation=us/city=chicago/chicago1 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet/partition_table/nation=us/city=chicago/chicago1 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/parquet/partition_table/nation=us/city=chicago/chicago1 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet/partition_table/nation=us/city=chicago/chicago1 diff --git a/docker/thirdparties/docker-compose/hive/scripts/parquet/partition_table/nation=us/city=washington/washington1 b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet/partition_table/nation=us/city=washington/washington1 similarity index 100% rename from docker/thirdparties/docker-compose/hive/scripts/parquet/partition_table/nation=us/city=washington/washington1 rename to docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet/partition_table/nation=us/city=washington/washington1 diff --git a/docs/zh-CN/community/developer-guide/regression-testing.md b/docs/zh-CN/community/developer-guide/regression-testing.md index dd7c4fc9ce..53eba39099 100644 --- a/docs/zh-CN/community/developer-guide/regression-testing.md +++ b/docs/zh-CN/community/developer-guide/regression-testing.md @@ -645,7 +645,11 @@ Doris 支持一些外部署数据源的查询。所以回归框架也提供了 4. Elasticsearch - TODO + 包括 ES6,ES7,ES8 三个版本的 docker 镜像。docker/thirdparties/docker-compose/elasticsearch/ 下。 + + * `es.yaml`:Docker compose文件。包括 ES6,ES7,ES8 三个版本。无需修改。 + * `es.env`:配置文件,需配置 ES 的端口号。 + * `scripts` 目录下存放了启动镜像后的初始化脚本。 2. 运行回归测试 @@ -655,6 +659,10 @@ Doris 支持一些外部署数据源的查询。所以回归框架也提供了 * `mysql_57_port` 和 `pg_14_port` 分别对应 MySQL 和 Postgresql 的对外端口,默认为 3316 和 5442。 * `enableHiveTest`:开启 hive 外表测试,需要启动 hive 的 container。 * `hms_port` 对应 hive metastore 的对外端口,默认为 9183。 + * `enableEsTest`:开启 es 外表测试。需要启动 es 的 container。 + * `es_6_port`:ES6 的端口。 + * `es_7_port`:ES7 的端口。 + * `es_8_port`:ES8 的端口。 3. 如何在同一台机器上启动多套 Container。 diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/HiveMetaStoreClientHelper.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/HiveMetaStoreClientHelper.java index ad9e6ed037..be75a1c983 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/HiveMetaStoreClientHelper.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/HiveMetaStoreClientHelper.java @@ -897,8 +897,11 @@ public class HiveMetaStoreClientHelper { // 1. region and endpoint. eg: cn-beijing String region = hiveConf.get("dlf.catalog.region"); if (!Strings.isNullOrEmpty(region)) { + // See: https://help.aliyun.com/document_detail/31837.html + // And add "-internal" to access oss within vpc + // TODO: find to way to access oss on public? res.put(HiveTable.AWS_REGION, "oss-" + region); - res.put(HiveTable.S3_ENDPOINT, "http://oss-" + region + ".aliyuncs.com"); + res.put(HiveTable.S3_ENDPOINT, "http://oss-" + region + "-internal.aliyuncs.com"); } // 2. ak and sk diff --git a/regression-test/data/hive_catalog_p0/hive_catalog_case.out b/regression-test/data/external_catalog_p0/hive/test_hive_other.out similarity index 100% rename from regression-test/data/hive_catalog_p0/hive_catalog_case.out rename to regression-test/data/external_catalog_p0/hive/test_hive_other.out diff --git a/regression-test/data/tpch_sf1_p0/multi_catalog_query_parquet/hive_catalog.out b/regression-test/data/tpch_sf1_p0/multi_catalog_query/hive_catalog_orc.out similarity index 100% copy from regression-test/data/tpch_sf1_p0/multi_catalog_query_parquet/hive_catalog.out copy to regression-test/data/tpch_sf1_p0/multi_catalog_query/hive_catalog_orc.out diff --git a/regression-test/data/tpch_sf1_p0/multi_catalog_query_parquet/hive_catalog.out b/regression-test/data/tpch_sf1_p0/multi_catalog_query/hive_catalog_parquet.out similarity index 100% rename from regression-test/data/tpch_sf1_p0/multi_catalog_query_parquet/hive_catalog.out rename to regression-test/data/tpch_sf1_p0/multi_catalog_query/hive_catalog_parquet.out diff --git a/regression-test/suites/correctness_p0/table_valued_function/test_hdfs_tvf.groovy b/regression-test/suites/correctness_p0/table_valued_function/test_hdfs_tvf.groovy index a11a4160fa..65996cca81 100644 --- a/regression-test/suites/correctness_p0/table_valued_function/test_hdfs_tvf.groovy +++ b/regression-test/suites/correctness_p0/table_valued_function/test_hdfs_tvf.groovy @@ -29,7 +29,7 @@ suite("test_hdfs_tvf") { sql """ADMIN SET FRONTEND CONFIG ("enable_new_load_scan_node" = "true");""" // test csv foramt - uri = "${defaultFS}" + "/user/doris/csv_format_test/all_types.csv" + uri = "${defaultFS}" + "/user/doris/preinstalled_data/csv_format_test/all_types.csv" format = "csv" qt_csv_all_types """ select * from HDFS( "uri" = "${uri}", @@ -38,7 +38,7 @@ suite("test_hdfs_tvf") { "format" = "${format}") order by c1; """ - uri = "${defaultFS}" + "/user/doris/csv_format_test/student.csv" + uri = "${defaultFS}" + "/user/doris/preinstalled_data/csv_format_test/student.csv" format = "csv" qt_csv_student """ select cast(c1 as INT) as id, c2 as name, c3 as age from HDFS( "uri" = "${uri}", @@ -46,7 +46,7 @@ suite("test_hdfs_tvf") { "hadoop.username" = "${hdfsUserName}", "format" = "${format}") order by id; """ - uri = "${defaultFS}" + "/user/doris/csv_format_test/array_malformat.csv" + uri = "${defaultFS}" + "/user/doris/preinstalled_data/csv_format_test/array_malformat.csv" format = "csv" qt_csv_array_malformat """ select * from HDFS( "URI" = "${uri}", @@ -55,7 +55,7 @@ suite("test_hdfs_tvf") { "format" = "csv", "column_separator" = "|") order by c1; """ - uri = "${defaultFS}" + "/user/doris/csv_format_test/array_normal.csv" + uri = "${defaultFS}" + "/user/doris/preinstalled_data/csv_format_test/array_normal.csv" format = "csv" qt_csv_array_normal """ select * from HDFS("URI" = "${uri}", "fs.defaultFS"= "${defaultFS}", @@ -64,7 +64,7 @@ suite("test_hdfs_tvf") { "column_separator" = "|") order by c1; """ // test csv_with_names file format - uri = "${defaultFS}" + "/user/doris/csv_format_test/student_with_names.csv" + uri = "${defaultFS}" + "/user/doris/preinstalled_data/csv_format_test/student_with_names.csv" format = "csv_with_names" qt_csv_names """ select cast(id as INT) as id, name, age from HDFS( "uri" = "${uri}", @@ -73,7 +73,7 @@ suite("test_hdfs_tvf") { "format" = "${format}") order by id; """ // test csv_with_names_and_types file format - uri = "${defaultFS}" + "/user/doris/csv_format_test/student_with_names_and_types.csv" + uri = "${defaultFS}" + "/user/doris/preinstalled_data/csv_format_test/student_with_names_and_types.csv" format = "csv_with_names_and_types" qt_csv_names_types """ select cast(id as INT) as id, name, age from HDFS( "uri" = "${uri}", @@ -83,7 +83,7 @@ suite("test_hdfs_tvf") { // test parquet - uri = "${defaultFS}" + "/user/doris/tpch1.db/hdfs_tvf/test_parquet.snappy.parquet" + uri = "${defaultFS}" + "/user/doris/preinstalled_data/hdfs_tvf/test_parquet.snappy.parquet" format = "parquet" qt_parquet """ select * from HDFS( "uri" = "${uri}", @@ -92,7 +92,7 @@ suite("test_hdfs_tvf") { "format" = "${format}") order by s_suppkey limit 20; """ // test orc - uri = "${defaultFS}" + "/user/doris/tpch1.db/hdfs_tvf/test_orc.snappy.orc" + uri = "${defaultFS}" + "/user/doris/preinstalled_data/hdfs_tvf/test_orc.snappy.orc" format = "orc" qt_orc """ select * from HDFS( "uri" = "${uri}", @@ -102,7 +102,7 @@ suite("test_hdfs_tvf") { // test josn format - uri = "${defaultFS}" + "/user/doris/json_format_test/simple_object_json.json" + uri = "${defaultFS}" + "/user/doris/preinstalled_data/json_format_test/simple_object_json.json" format = "json" qt_json """ select * from HDFS( "uri" = "${uri}", @@ -113,7 +113,7 @@ suite("test_hdfs_tvf") { "read_json_by_line" = "true") order by id; """ // test json root - uri = "${defaultFS}" + "/user/doris/json_format_test/nest_json.json" + uri = "${defaultFS}" + "/user/doris/preinstalled_data/json_format_test/nest_json.json" format = "json" qt_json_root """ select cast(id as INT) as id, city, cast(code as INT) as code from HDFS( "uri" = "${uri}", @@ -125,7 +125,7 @@ suite("test_hdfs_tvf") { "json_root" = "\$.item") order by id; """ // test json paths - uri = "${defaultFS}" + "/user/doris/json_format_test/simple_object_json.json" + uri = "${defaultFS}" + "/user/doris/preinstalled_data/json_format_test/simple_object_json.json" format = "json" qt_json_paths """ select cast(id as INT) as id, cast(code as INT) as code from HDFS( "uri" = "${uri}", @@ -137,7 +137,7 @@ suite("test_hdfs_tvf") { "jsonpaths" = "[\\"\$.id\\", \\"\$.code\\"]") order by id; """ // test non read_json_by_line - uri = "${defaultFS}" + "/user/doris/json_format_test/one_array_json.json" + uri = "${defaultFS}" + "/user/doris/preinstalled_data/json_format_test/one_array_json.json" format = "json" qt_one_array """ select cast(id as INT) as id, city, cast(code as INT) as code from HDFS( "uri" = "${uri}", @@ -149,7 +149,7 @@ suite("test_hdfs_tvf") { // test cast to int - uri = "${defaultFS}" + "/user/doris/json_format_test/simple_object_json.json" + uri = "${defaultFS}" + "/user/doris/preinstalled_data/json_format_test/simple_object_json.json" format = "json" qt_cast """ select cast(id as INT) as id, city, cast(code as INT) as code from HDFS( "uri" = "${uri}", @@ -176,7 +176,7 @@ suite("test_hdfs_tvf") { assertTrue(result1[0].size() == 1) assertTrue(result1[0][0] == 0, "Create table should update 0 rows") - uri = "${defaultFS}" + "/user/doris/json_format_test/nest_json.json" + uri = "${defaultFS}" + "/user/doris/preinstalled_data/json_format_test/nest_json.json" format = "json" def result2 = sql """ insert into ${testTable}(id,city,code) select cast (id as INT) as id, city, cast (code as INT) as code @@ -196,4 +196,4 @@ suite("test_hdfs_tvf") { sql """ADMIN SET FRONTEND CONFIG ("enable_new_load_scan_node" = "false");""" } } -} \ No newline at end of file +} diff --git a/regression-test/suites/hive_catalog_p0/hive_catalog_case.groovy b/regression-test/suites/external_catalog_p0/hive/test_hive_other.groovy similarity index 99% rename from regression-test/suites/hive_catalog_p0/hive_catalog_case.groovy rename to regression-test/suites/external_catalog_p0/hive/test_hive_other.groovy index 3c21e97825..b5ec9ad652 100644 --- a/regression-test/suites/hive_catalog_p0/hive_catalog_case.groovy +++ b/regression-test/suites/external_catalog_p0/hive/test_hive_other.groovy @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -suite("hive_catalog_case", "p0") { +suite("test_hive_other", "p0") { def q01 = { qt_q24 """ select name, count(1) as c from student group by name order by c desc;""" diff --git a/regression-test/suites/load_p0/stream_load/test_hdfs_json_load.groovy b/regression-test/suites/load_p0/stream_load/test_hdfs_json_load.groovy index be543a0ea3..5c79cf1b97 100644 --- a/regression-test/suites/load_p0/stream_load/test_hdfs_json_load.groovy +++ b/regression-test/suites/load_p0/stream_load/test_hdfs_json_load.groovy @@ -47,7 +47,7 @@ suite("test_hdfs_json_load", "p0") { // should be delete after new_load_scan is ready sql """ADMIN SET FRONTEND CONFIG ("enable_new_load_scan_node" = "${new_json_reader_flag}");""" - def hdfsFilePath = "${fsPath}/user/doris/json_format_test/${fileName}" + def hdfsFilePath = "${fsPath}/user/doris/preinstalled_data/json_format_test/${fileName}" def result1= sql """ LOAD LABEL ${label} ( DATA INFILE("${hdfsFilePath}") diff --git a/regression-test/suites/tpch_sf1_p0/multi_catalog_query_parquet/hive_catalog.groovy b/regression-test/suites/tpch_sf1_p0/multi_catalog_query/hive_catalog_orc.groovy similarity index 99% copy from regression-test/suites/tpch_sf1_p0/multi_catalog_query_parquet/hive_catalog.groovy copy to regression-test/suites/tpch_sf1_p0/multi_catalog_query/hive_catalog_orc.groovy index eb17e806ab..a22760d583 100644 --- a/regression-test/suites/tpch_sf1_p0/multi_catalog_query_parquet/hive_catalog.groovy +++ b/regression-test/suites/tpch_sf1_p0/multi_catalog_query/hive_catalog_orc.groovy @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -suite("test_catalog_hive", "p0") { +suite("test_catalog_hive_orc", "p0") { def q01 = { sql """set exec_mem_limit=8589934592""" @@ -835,8 +835,7 @@ order by ); """ sql """switch hive""" - sql """use `default`""" - // order_qt_show_tables """show tables""" + sql """use `tpch1_orc`""" q01() q02() diff --git a/regression-test/suites/tpch_sf1_p0/multi_catalog_query_parquet/hive_catalog.groovy b/regression-test/suites/tpch_sf1_p0/multi_catalog_query/hive_catalog_parquet.groovy similarity index 99% rename from regression-test/suites/tpch_sf1_p0/multi_catalog_query_parquet/hive_catalog.groovy rename to regression-test/suites/tpch_sf1_p0/multi_catalog_query/hive_catalog_parquet.groovy index eb17e806ab..5cae823968 100644 --- a/regression-test/suites/tpch_sf1_p0/multi_catalog_query_parquet/hive_catalog.groovy +++ b/regression-test/suites/tpch_sf1_p0/multi_catalog_query/hive_catalog_parquet.groovy @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -suite("test_catalog_hive", "p0") { +suite("test_catalog_hive_parquet", "p0") { def q01 = { sql """set exec_mem_limit=8589934592""" @@ -835,8 +835,7 @@ order by ); """ sql """switch hive""" - sql """use `default`""" - // order_qt_show_tables """show tables""" + sql """use `tpch1_parquet`""" q01() q02() --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org