This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
commit f98ed4e4c5bf11d2c16eb2092d0b9f7445d02949
Author: wuwenchi <wuwenchi...@hotmail.com>
AuthorDate: Mon May 27 10:44:35 2024 +0800
[bugfix](hive)Misspelling of class names (#34981)
---
.../org/apache/doris/datasource/hive/HiveUtil.java | 2 +-
.../external_table_p0/hive/ddl/test_hive_ctas.out | 184 +++++++++++++++++++++
.../hive/ddl/test_hive_ctas.groovy | 21 ++-
3 files changed, 204 insertions(+), 3 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveUtil.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveUtil.java
index 5ca42dd0245..c12bdcfb473 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveUtil.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveUtil.java
@@ -263,7 +263,7 @@ public final class HiveUtil {
serDe = "org.apache.hadoop.hive.ql.io.orc.OrcSerde";
} else if (fileFormat.equalsIgnoreCase("parquet")) {
inputFormat =
"org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat";
- outputFormat =
"'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat";
+ outputFormat =
"org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat";
serDe =
"org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe";
} else {
throw new IllegalArgumentException("Creating table with an
unsupported file format: " + fileFormat);
diff --git a/regression-test/data/external_table_p0/hive/ddl/test_hive_ctas.out
b/regression-test/data/external_table_p0/hive/ddl/test_hive_ctas.out
index d9fa227a59c..160c99248fe 100644
--- a/regression-test/data/external_table_p0/hive/ddl/test_hive_ctas.out
+++ b/regression-test/data/external_table_p0/hive/ddl/test_hive_ctas.out
@@ -3,42 +3,82 @@
2
3
+-- !hive_docker_ctas_01 --
+2
+3
+
-- !ctas_02 --
2
3
+-- !hive_docker_ctas_02 --
+2
+3
+
-- !ctas_03 --
22 value_for_pt11 value_for_pt22
+-- !hive_docker_ctas_03 --
+22 value_for_pt11 value_for_pt22
+
-- !ctas_04 --
22 value_for_pt11 value_for_pt22
+-- !hive_docker_ctas_04 --
+22 value_for_pt11 value_for_pt22
+
-- !ctas_05 --
11 value_for_pt1 value_for_pt2
22 value_for_pt11 value_for_pt22
+-- !hive_docker_ctas_05 --
+11 value_for_pt1 value_for_pt2
+22 value_for_pt11 value_for_pt22
+
-- !ctas_06 --
11 value_for_pt1 value_for_pt2
22 value_for_pt11 value_for_pt22
+-- !hive_docker_ctas_06 --
+11 value_for_pt1 value_for_pt2
+22 value_for_pt11 value_for_pt22
+
-- !ctas_ex01 --
2
3
+-- !hive_docker_ctas_ex01 --
+2
+3
+
-- !ctas_ex02 --
11 value_for_pt1 value_for_pt2
22 value_for_pt11 \N
22 value_for_pt11 value_for_pt22
+-- !hive_docker_ctas_ex02 --
+11 value_for_pt1 value_for_pt2
+22 value_for_pt11 __HIVE_DEFAULT_PARTITION__
+22 value_for_pt11 value_for_pt22
+
-- !ctas_03 --
\N another string value for col2
\N string value for col2
\N yet another string value for col2
+-- !hive_docker_ctas_ex03 --
+\N another string value for col2
+\N string value for col2
+\N yet another string value for col2
+
-- !ctas_04 --
\N 11 value_for_pt1
\N 22 value_for_pt11
+-- !hive_docker_ctas_ex04 --
+\N 11 value_for_pt1
+\N 22 value_for_pt11
+
-- !qualified_table1 --
11 value_for_pt1
22 value_for_pt11
@@ -50,49 +90,95 @@
-- !ctas_types_01 --
true 127 32767 2147483647 9223372036854775807 default
22.12345 3.141592653 99999.9999 default default 2023-05-29
2023-05-29T23:19:34
+-- !hive_docker_ctas_types_01 --
+true 127 32767 2147483647 9223372036854775807 default
22.12345 3.141592653 99999.9999 default default 2023-05-29
2023-05-29 23:19:34.0
+
-- !ctas_types_02 --
true 127 32767 2147483647 default 22.12345 3.141592653
99999.9999 default
+-- !hive_docker_ctas_types_02 --
+true 127 32767 2147483647 default 22.12345 3.141592653
99999.9999 default
+
-- !ctas_01 --
2
3
+-- !hive_docker_ctas_01 --
+2
+3
+
-- !ctas_02 --
2
3
+-- !hive_docker_ctas_02 --
+2
+3
+
-- !ctas_03 --
22 value_for_pt11 value_for_pt22
+-- !hive_docker_ctas_03 --
+22 value_for_pt11 value_for_pt22
+
-- !ctas_04 --
22 value_for_pt11 value_for_pt22
+-- !hive_docker_ctas_04 --
+22 value_for_pt11 value_for_pt22
+
-- !ctas_05 --
11 value_for_pt1 value_for_pt2
22 value_for_pt11 value_for_pt22
+-- !hive_docker_ctas_05 --
+11 value_for_pt1 value_for_pt2
+22 value_for_pt11 value_for_pt22
+
-- !ctas_06 --
11 value_for_pt1 value_for_pt2
22 value_for_pt11 value_for_pt22
+-- !hive_docker_ctas_06 --
+11 value_for_pt1 value_for_pt2
+22 value_for_pt11 value_for_pt22
+
-- !ctas_ex01 --
2
3
+-- !hive_docker_ctas_ex01 --
+2
+3
+
-- !ctas_ex02 --
11 value_for_pt1 value_for_pt2
22 value_for_pt11 \N
22 value_for_pt11 value_for_pt22
+-- !hive_docker_ctas_ex02 --
+11 value_for_pt1 value_for_pt2
+22 value_for_pt11 __HIVE_DEFAULT_PARTITION__
+22 value_for_pt11 value_for_pt22
+
-- !ctas_03 --
\N another string value for col2
\N string value for col2
\N yet another string value for col2
+-- !hive_docker_ctas_ex03 --
+\N another string value for col2
+\N string value for col2
+\N yet another string value for col2
+
-- !ctas_04 --
\N 11 value_for_pt1
\N 22 value_for_pt11
+-- !hive_docker_ctas_ex04 --
+\N 11 value_for_pt1
+\N 22 value_for_pt11
+
-- !qualified_table1 --
11 value_for_pt1
22 value_for_pt11
@@ -104,49 +190,95 @@ true 127 32767 2147483647 default
22.12345 3.141592653 99999.9999 default
-- !ctas_types_01 --
true 127 32767 2147483647 9223372036854775807 default
22.12345 3.141592653 99999.9999 default default 2023-05-29
2023-05-29T23:19:34
+-- !hive_docker_ctas_types_01 --
+true 127 32767 2147483647 9223372036854775807 default
22.12345 3.141592653 99999.9999 default default 2023-05-29
2023-05-29 23:19:34.0
+
-- !ctas_types_02 --
true 127 32767 2147483647 default 22.12345 3.141592653
99999.9999 default
+-- !hive_docker_ctas_types_02 --
+true 127 32767 2147483647 default 22.12345 3.141592653
99999.9999 default
+
-- !ctas_01 --
2
3
+-- !hive_docker_ctas_01 --
+2
+3
+
-- !ctas_02 --
2
3
+-- !hive_docker_ctas_02 --
+2
+3
+
-- !ctas_03 --
22 value_for_pt11 value_for_pt22
+-- !hive_docker_ctas_03 --
+22 value_for_pt11 value_for_pt22
+
-- !ctas_04 --
22 value_for_pt11 value_for_pt22
+-- !hive_docker_ctas_04 --
+22 value_for_pt11 value_for_pt22
+
-- !ctas_05 --
11 value_for_pt1 value_for_pt2
22 value_for_pt11 value_for_pt22
+-- !hive_docker_ctas_05 --
+11 value_for_pt1 value_for_pt2
+22 value_for_pt11 value_for_pt22
+
-- !ctas_06 --
11 value_for_pt1 value_for_pt2
22 value_for_pt11 value_for_pt22
+-- !hive_docker_ctas_06 --
+11 value_for_pt1 value_for_pt2
+22 value_for_pt11 value_for_pt22
+
-- !ctas_ex01 --
2
3
+-- !hive_docker_ctas_ex01 --
+2
+3
+
-- !ctas_ex02 --
11 value_for_pt1 value_for_pt2
22 value_for_pt11 \N
22 value_for_pt11 value_for_pt22
+-- !hive_docker_ctas_ex02 --
+11 value_for_pt1 value_for_pt2
+22 value_for_pt11 __HIVE_DEFAULT_PARTITION__
+22 value_for_pt11 value_for_pt22
+
-- !ctas_03 --
\N another string value for col2
\N string value for col2
\N yet another string value for col2
+-- !hive_docker_ctas_ex03 --
+\N another string value for col2
+\N string value for col2
+\N yet another string value for col2
+
-- !ctas_04 --
\N 11 value_for_pt1
\N 22 value_for_pt11
+-- !hive_docker_ctas_ex04 --
+\N 11 value_for_pt1
+\N 22 value_for_pt11
+
-- !qualified_table1 --
11 value_for_pt1
22 value_for_pt11
@@ -158,49 +290,95 @@ true 127 32767 2147483647 default
22.12345 3.141592653 99999.9999 default
-- !ctas_types_01 --
true 127 32767 2147483647 9223372036854775807 default
22.12345 3.141592653 99999.9999 default default 2023-05-29
2023-05-29T23:19:34
+-- !hive_docker_ctas_types_01 --
+true 127 32767 2147483647 9223372036854775807 default
22.12345 3.141592653 99999.9999 default default 2023-05-29
2023-05-29 23:19:34.0
+
-- !ctas_types_02 --
true 127 32767 2147483647 default 22.12345 3.141592653
99999.9999 default
+-- !hive_docker_ctas_types_02 --
+true 127 32767 2147483647 default 22.12345 3.141592653
99999.9999 default
+
-- !ctas_01 --
2
3
+-- !hive_docker_ctas_01 --
+2
+3
+
-- !ctas_02 --
2
3
+-- !hive_docker_ctas_02 --
+2
+3
+
-- !ctas_03 --
22 value_for_pt11 value_for_pt22
+-- !hive_docker_ctas_03 --
+22 value_for_pt11 value_for_pt22
+
-- !ctas_04 --
22 value_for_pt11 value_for_pt22
+-- !hive_docker_ctas_04 --
+22 value_for_pt11 value_for_pt22
+
-- !ctas_05 --
11 value_for_pt1 value_for_pt2
22 value_for_pt11 value_for_pt22
+-- !hive_docker_ctas_05 --
+11 value_for_pt1 value_for_pt2
+22 value_for_pt11 value_for_pt22
+
-- !ctas_06 --
11 value_for_pt1 value_for_pt2
22 value_for_pt11 value_for_pt22
+-- !hive_docker_ctas_06 --
+11 value_for_pt1 value_for_pt2
+22 value_for_pt11 value_for_pt22
+
-- !ctas_ex01 --
2
3
+-- !hive_docker_ctas_ex01 --
+2
+3
+
-- !ctas_ex02 --
11 value_for_pt1 value_for_pt2
22 value_for_pt11 \N
22 value_for_pt11 value_for_pt22
+-- !hive_docker_ctas_ex02 --
+11 value_for_pt1 value_for_pt2
+22 value_for_pt11 __HIVE_DEFAULT_PARTITION__
+22 value_for_pt11 value_for_pt22
+
-- !ctas_03 --
\N another string value for col2
\N string value for col2
\N yet another string value for col2
+-- !hive_docker_ctas_ex03 --
+\N another string value for col2
+\N string value for col2
+\N yet another string value for col2
+
-- !ctas_04 --
\N 11 value_for_pt1
\N 22 value_for_pt11
+-- !hive_docker_ctas_ex04 --
+\N 11 value_for_pt1
+\N 22 value_for_pt11
+
-- !qualified_table1 --
11 value_for_pt1
22 value_for_pt11
@@ -212,6 +390,12 @@ true 127 32767 2147483647 default
22.12345 3.141592653 99999.9999 default
-- !ctas_types_01 --
true 127 32767 2147483647 9223372036854775807 default
22.12345 3.141592653 99999.9999 default default 2023-05-29
2023-05-29T23:19:34
+-- !hive_docker_ctas_types_01 --
+true 127 32767 2147483647 9223372036854775807 default
22.12345 3.141592653 99999.9999 default default 2023-05-29
2023-05-29 23:19:34.0
+
-- !ctas_types_02 --
true 127 32767 2147483647 default 22.12345 3.141592653
99999.9999 default
+-- !hive_docker_ctas_types_02 --
+true 127 32767 2147483647 default 22.12345 3.141592653
99999.9999 default
+
diff --git
a/regression-test/suites/external_table_p0/hive/ddl/test_hive_ctas.groovy
b/regression-test/suites/external_table_p0/hive/ddl/test_hive_ctas.groovy
index d7d9b33c474..694eff26560 100644
--- a/regression-test/suites/external_table_p0/hive/ddl/test_hive_ctas.groovy
+++ b/regression-test/suites/external_table_p0/hive/ddl/test_hive_ctas.groovy
@@ -24,6 +24,7 @@ suite("test_hive_ctas",
"p0,external,hive,external_docker,external_docker_hive")
for (String hivePrefix : ["hive2", "hive3"]) {
def file_formats = ["parquet", "orc"]
+ setHivePrefix(hivePrefix)
def generateSrcDDLForCTAS = { String file_format, String catalog_name
->
sql """ switch `${catalog_name}` """
sql """ create database if not exists `test_ctas` """;
@@ -92,6 +93,7 @@ suite("test_hive_ctas",
"p0,external,hive,external_docker,external_docker_hive")
(3, 'yet another string value for col2');
"""
+ sql """ DROP TABLE IF EXISTS `test_ctas`.part_ctas_src """
sql """
CREATE TABLE `part_ctas_src`(
`col1` INT COMMENT 'col1',
@@ -129,6 +131,7 @@ suite("test_hive_ctas",
"p0,external,hive,external_docker,external_docker_hive")
try {
sql """ switch `${catalog_name}` """
sql """ use test_ctas """
+ String db = "test_ctas"
// 1. external to external un-partitioned table
sql """ CREATE TABLE hive_ctas1 ENGINE=hive AS SELECT col1
FROM unpart_ctas_src;
"""
@@ -139,6 +142,7 @@ suite("test_hive_ctas",
"p0,external,hive,external_docker,external_docker_hive")
"""
order_qt_ctas_01 """ SELECT * FROM hive_ctas1 """
+ order_qt_hive_docker_ctas_01 """ SELECT * FROM
${db}.hive_ctas1 """
sql """ DROP TABLE hive_ctas1 """
// 2. external to external un-partitioned table with columns
@@ -150,6 +154,7 @@ suite("test_hive_ctas",
"p0,external,hive,external_docker,external_docker_hive")
sql """ INSERT OVERWRITE TABLE hive_ctas2 SELECT col1 FROM
unpart_ctas_src WHERE col1 > 1;
"""
order_qt_ctas_02 """ SELECT * FROM hive_ctas2 """
+ order_qt_hive_docker_ctas_02 """ SELECT * FROM
${db}.hive_ctas2 """
sql """ DROP TABLE hive_ctas2 """
// 3. external to external partitioned table
@@ -161,6 +166,7 @@ suite("test_hive_ctas",
"p0,external,hive,external_docker,external_docker_hive")
sql """ INSERT OVERWRITE TABLE hive_ctas3 SELECT col1,pt1,pt2
FROM part_ctas_src WHERE col1>=22;
"""
order_qt_ctas_03 """ SELECT * FROM hive_ctas3 """
+ order_qt_hive_docker_ctas_03 """ SELECT * FROM
${db}.hive_ctas3 """
sql """ DROP TABLE hive_ctas3 """
sql """ CREATE TABLE hive_ctas4 AS SELECT * FROM part_ctas_src
WHERE col1>0;
@@ -170,7 +176,8 @@ suite("test_hive_ctas",
"p0,external,hive,external_docker,external_docker_hive")
"""
sql """ INSERT OVERWRITE TABLE hive_ctas4 SELECT * FROM
part_ctas_src WHERE col1>=22;
"""
- order_qt_ctas_04 """ SELECT * FROM
${catalog_name}.test_ctas.hive_ctas4 """
+ order_qt_ctas_04 """ SELECT * FROM
${catalog_name}.test_ctas.hive_ctas4 """
+ order_qt_hive_docker_ctas_04 """ SELECT * FROM
${db}.hive_ctas4 """
sql """ DROP TABLE hive_ctas4 """
// 4. external to external partitioned table with partitions
and cols
@@ -183,6 +190,7 @@ suite("test_hive_ctas",
"p0,external,hive,external_docker,external_docker_hive")
sql """ INSERT OVERWRITE TABLE hive_ctas5 SELECT col1,pt1,pt2
FROM part_ctas_src WHERE col1>=22;
"""
order_qt_ctas_05 """ SELECT * FROM hive_ctas5 """
+ order_qt_hive_docker_ctas_05 """ SELECT * FROM
${db}.hive_ctas5 """
sql """ DROP TABLE hive_ctas5 """
sql """ CREATE TABLE hive_ctas6 PARTITION BY LIST (pt1, pt2) ()
@@ -193,7 +201,8 @@ suite("test_hive_ctas",
"p0,external,hive,external_docker,external_docker_hive")
"""
sql """ INSERT OVERWRITE TABLE hive_ctas6 SELECT * FROM
part_ctas_src WHERE col1>=22;
"""
- order_qt_ctas_06 """ SELECT * FROM
${catalog_name}.test_ctas.hive_ctas6 """
+ order_qt_ctas_06 """ SELECT * FROM
${catalog_name}.test_ctas.hive_ctas6 """
+ order_qt_hive_docker_ctas_06 """ SELECT * FROM
${db}.hive_ctas6 """
sql """ DROP TABLE hive_ctas6 """
} finally {
@@ -219,6 +228,7 @@ suite("test_hive_ctas",
"p0,external,hive,external_docker,external_docker_hive")
)
""";
sql """ use `${catalog_name}`.`test_ctas_ex` """
+ String db = "test_ctas_ex"
// 1. external to external un-partitioned table
sql """ DROP TABLE IF EXISTS
${catalog_name}.test_ctas_ex.hive_ctas1 """
@@ -236,6 +246,7 @@ suite("test_hive_ctas",
"p0,external,hive,external_docker,external_docker_hive")
SELECT col1 FROM test_ctas.unpart_ctas_src WHERE col1
> 1;
"""
order_qt_ctas_ex01 """ SELECT * FROM hive_ctas1 """
+ order_qt_hive_docker_ctas_ex01 """ SELECT * FROM
${db}.hive_ctas1 """
sql """ DROP TABLE hive_ctas1 """
// 2. external to external partitioned table
@@ -259,6 +270,7 @@ suite("test_hive_ctas",
"p0,external,hive,external_docker,external_docker_hive")
SELECT pt1,col1 FROM test_ctas.part_ctas_src WHERE
col1>=22;
"""
order_qt_ctas_ex02 """ SELECT * FROM hive_ctas2 """
+ order_qt_hive_docker_ctas_ex02 """ SELECT * FROM
${db}.hive_ctas2 """
sql """ DROP TABLE hive_ctas2 """
// 3. internal to external un-partitioned table
@@ -278,6 +290,7 @@ suite("test_hive_ctas",
"p0,external,hive,external_docker,external_docker_hive")
SELECT col2 FROM
internal.test_ctas_olap.unpart_ctas_olap_src;
"""
order_qt_ctas_03 """ SELECT * FROM ctas_o1 """
+ order_qt_hive_docker_ctas_ex03 """ SELECT * FROM ${db}.ctas_o1
"""
sql """ DROP TABLE ctas_o1 """
// 4. internal to external partitioned table
@@ -301,6 +314,7 @@ suite("test_hive_ctas",
"p0,external,hive,external_docker,external_docker_hive")
SELECT pt1,col1 FROM
internal.test_ctas_olap.part_ctas_olap_src;
"""
order_qt_ctas_04 """ SELECT * FROM ctas_o2 """
+ order_qt_hive_docker_ctas_ex04 """ SELECT * FROM ${db}.ctas_o2
"""
sql """ DROP TABLE ctas_o2 """
sql """ DROP DATABASE IF EXISTS test_ctas_ex """
} finally {
@@ -417,6 +431,7 @@ suite("test_hive_ctas",
"p0,external,hive,external_docker,external_docker_hive")
sql """ switch `${catalog_name}` """
sql """ CREATE DATABASE IF NOT EXISTS `test_ctas_all_type` """;
sql """ use test_ctas_all_type """;
+ String db = "test_ctas_all_type"
// TODO: work on hive3
// sql """
// CREATE TABLE IF NOT EXISTS
all_types_ctas_${file_format}_with_dv(
@@ -502,6 +517,7 @@ suite("test_hive_ctas",
"p0,external,hive,external_docker,external_docker_hive")
INSERT OVERWRITE TABLE all_types_ctas1 SELECT * FROM
all_types_ctas_${file_format}
"""
order_qt_ctas_types_01 """ SELECT * FROM all_types_ctas1 """
+ order_qt_hive_docker_ctas_types_01 """ SELECT * FROM
${db}.all_types_ctas1 """
sql """
DROP TABLE all_types_ctas1
"""
@@ -519,6 +535,7 @@ suite("test_hive_ctas",
"p0,external,hive,external_docker,external_docker_hive")
SELECT col1, col2, col3, col4, col6, col7, col8, col9,
col11 FROM all_types_ctas_${file_format}
"""
order_qt_ctas_types_02 """ SELECT * FROM all_types_ctas2 """
+ order_qt_hive_docker_ctas_types_02 """ SELECT * FROM
${db}.all_types_ctas2 """
sql """
DROP TABLE all_types_ctas2
"""
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
