This is an automated email from the ASF dual-hosted git repository.
morningman 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 fcc7e079dc9 [Test](hive-writer) Adjust test_hive_write_partitions
regression test to resolve special characters issue with git on windows.
(#34026)
fcc7e079dc9 is described below
commit fcc7e079dc9103de8e99c77bd3cd86d88c9c252e
Author: Qi Chen <kaka11.c...@gmail.com>
AuthorDate: Fri Apr 26 13:43:08 2024 +0800
[Test](hive-writer) Adjust test_hive_write_partitions regression test to
resolve special characters issue with git on windows. (#34026)
---
.../hive/scripts/create_preinstalled_table.hql | 13 +--
.../varchar_col=varchar_value1/000000_0 | Bin
.../varchar_col=varchar_value1/000000_0 | Bin
.../varchar_col=varchar_value1/000000_0 | Bin
.../hive/write/test_hive_write_partitions.out | 105 +++++++++++----------
.../hive/write/test_hive_write_partitions.groovy | 2 +-
6 files changed, 58 insertions(+), 62 deletions(-)
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/create_preinstalled_table.hql
b/docker/thirdparties/docker-compose/hive/scripts/create_preinstalled_table.hql
index dbeeab972f6..0ab4a204b84 100644
---
a/docker/thirdparties/docker-compose/hive/scripts/create_preinstalled_table.hql
+++
b/docker/thirdparties/docker-compose/hive/scripts/create_preinstalled_table.hql
@@ -2406,10 +2406,8 @@ CREATE TABLE `all_partition_types2_parquet_snappy_src`(
PARTITIONED BY (
`decimal_col` decimal(18,6),
`string_col` string,
- `binary_col` binary,
`date_col` date,
- `timestamp_col` timestamp,
- `char_col` char(50),
+ `char_col` char(11),
`varchar_col` varchar(50))
stored as parquet
LOCATION
@@ -2423,10 +2421,8 @@ CREATE TABLE `all_partition_types2_parquet_snappy`(
PARTITIONED BY (
`decimal_col` decimal(18,6),
`string_col` string,
- `binary_col` binary,
`date_col` date,
- `timestamp_col` timestamp,
- `char_col` char(50),
+ `char_col` char(11),
`varchar_col` varchar(50))
stored as parquet
TBLPROPERTIES('parquet.compression'='SNAPPY');
@@ -2437,10 +2433,9 @@ CREATE TABLE `all_partition_types2_orc_zlib`(
PARTITIONED BY (
`decimal_col` decimal(18,6),
`string_col` string,
- `binary_col` binary,
`date_col` date,
- `timestamp_col` timestamp,
- `char_col` char(50),
+ `char_col` char(11),
`varchar_col` varchar(50))
stored as orc
TBLPROPERTIES("orc.compress"="ZLIB");
+
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet_table/all_partition_types2_parquet_snappy_src/decimal_col=-123456.789012/string_col=string_value/binary_col=62
69 6e 61 72 79 5f 76 61 6c 75 65/date_col=2024-03-21/timestamp_col=2024-03-21
12%3A00%3A00/char_col=char_value1
/varchar_col=varchar_value1/000000_0
b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet_table/all_partition_types2_parqu
[...]
similarity index 100%
rename from
docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet_table/all_partition_types2_parquet_snappy_src/decimal_col=-123456.789012/string_col=string_value/binary_col=62
69 6e 61 72 79 5f 76 61 6c 75 65/date_col=2024-03-21/timestamp_col=2024-03-21
12%3A00%3A00/char_col=char_value1
/varchar_col=varchar_value1/000000_0
rename to
docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet_table/all_partition_types2_parquet_snappy_src/decimal_col=-123456.789012/string_col=string_value/date_col=2024-03-21/char_col=char_value1/varchar_col=varchar_value1/000000_0
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet_table/all_partition_types2_parquet_snappy_src/decimal_col=-123456.789012/string_col=string_value/binary_col=62
69 6e 61 72 79 5f 76 61 6c 75 65/date_col=2024-03-22/timestamp_col=2024-03-22
12%3A00%3A00/char_col=char_value1
/varchar_col=varchar_value1/000000_0
b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet_table/all_partition_types2_parqu
[...]
similarity index 100%
rename from
docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet_table/all_partition_types2_parquet_snappy_src/decimal_col=-123456.789012/string_col=string_value/binary_col=62
69 6e 61 72 79 5f 76 61 6c 75 65/date_col=2024-03-22/timestamp_col=2024-03-22
12%3A00%3A00/char_col=char_value1
/varchar_col=varchar_value1/000000_0
rename to
docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet_table/all_partition_types2_parquet_snappy_src/decimal_col=-123456.789012/string_col=string_value/date_col=2024-03-22/char_col=char_value1/varchar_col=varchar_value1/000000_0
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet_table/all_partition_types2_parquet_snappy_src/decimal_col=123456.789012/string_col=string_value/binary_col=62
69 6e 61 72 79 5f 76 61 6c 75 65/date_col=2024-03-20/timestamp_col=2024-03-20
12%3A00%3A00/char_col=char_value1
/varchar_col=varchar_value1/000000_0
b/docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet_table/all_partition_types2_parque
[...]
similarity index 100%
rename from
docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet_table/all_partition_types2_parquet_snappy_src/decimal_col=123456.789012/string_col=string_value/binary_col=62
69 6e 61 72 79 5f 76 61 6c 75 65/date_col=2024-03-20/timestamp_col=2024-03-20
12%3A00%3A00/char_col=char_value1
/varchar_col=varchar_value1/000000_0
rename to
docker/thirdparties/docker-compose/hive/scripts/preinstalled_data/parquet_table/all_partition_types2_parquet_snappy_src/decimal_col=123456.789012/string_col=string_value/date_col=2024-03-20/char_col=char_value1/varchar_col=varchar_value1/000000_0
diff --git
a/regression-test/data/external_table_p0/hive/write/test_hive_write_partitions.out
b/regression-test/data/external_table_p0/hive/write/test_hive_write_partitions.out
index c0e695544e2..1a81e07a2f3 100644
---
a/regression-test/data/external_table_p0/hive/write/test_hive_write_partitions.out
+++
b/regression-test/data/external_table_p0/hive/write/test_hive_write_partitions.out
@@ -41,27 +41,27 @@ true 127 32767 2147483647
9223372036854775807 123.45 123456.789 123456789 1234.5
7 true 127 32767 2147483647 9223372036854775807 123.45
123456.789
-- !q01 --
-1 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-22 2024-03-22T12:00 char_value1
varchar_value1
+1 -123456.789012 string_value 2024-03-22 char_value1
varchar_value1
-- !q02 --
-1 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-22 2024-03-22T12:00 char_value1
varchar_value1
-2 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-21 2024-03-21T12:00 char_value1
varchar_value1
+1 -123456.789012 string_value 2024-03-22 char_value1
varchar_value1
+2 -123456.789012 string_value 2024-03-21 char_value1
varchar_value1
-- !q03 --
-1 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-22 2024-03-22T12:00 char_value1
varchar_value1
-2 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-21 2024-03-21T12:00 char_value1
varchar_value1
-3 123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-20 2024-03-20T12:00 char_value1
varchar_value1
+1 -123456.789012 string_value 2024-03-22 char_value1
varchar_value1
+2 -123456.789012 string_value 2024-03-21 char_value1
varchar_value1
+3 123456.789012 string_value 2024-03-20 char_value1
varchar_value1
-- !q04 --
-1 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-22 2024-03-22T12:00 char_value1
varchar_value1
-2 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-21 2024-03-21T12:00 char_value1
varchar_value1
-3 123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-20 2024-03-20T12:00 char_value1
varchar_value1
-3 123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-20 2024-03-20T12:00 char_value1
varchar_value1
+1 -123456.789012 string_value 2024-03-22 char_value1
varchar_value1
+2 -123456.789012 string_value 2024-03-21 char_value1
varchar_value1
+3 123456.789012 string_value 2024-03-20 char_value1
varchar_value1
+3 123456.789012 string_value 2024-03-20 char_value1
varchar_value1
-- !q05 --
-1 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-22 2024-03-22T12:00 char_value1
varchar_value1
-2 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-21 2024-03-21T12:00 char_value1
varchar_value1
-7 123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-20 2024-03-20T12:00 char_value1
varchar_value1
+1 -123456.789012 string_value 2024-03-22 char_value1
varchar_value1
+2 -123456.789012 string_value 2024-03-21 char_value1
varchar_value1
+7 123456.789012 string_value 2024-03-20 char_value1
varchar_value1
-- !q01 --
1 \N -128 \N -2147483648 \N -123.45 \N
@@ -130,27 +130,27 @@ true 127 32767 2147483647
9223372036854775807 123.45 123456.789 123456789 1234.5
7 true 127 32767 2147483647 9223372036854775807 123.45
123456.789
-- !q01 --
-1 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-22 2024-03-22T12:00 char_value1
varchar_value1
+1 -123456.789012 string_value 2024-03-22 char_value1
varchar_value1
-- !q02 --
-1 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-22 2024-03-22T12:00 char_value1
varchar_value1
-2 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-21 2024-03-21T12:00 char_value1
varchar_value1
+1 -123456.789012 string_value 2024-03-22 char_value1
varchar_value1
+2 -123456.789012 string_value 2024-03-21 char_value1
varchar_value1
-- !q03 --
-1 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-22 2024-03-22T12:00 char_value1
varchar_value1
-2 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-21 2024-03-21T12:00 char_value1
varchar_value1
-3 123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-20 2024-03-20T12:00 char_value1
varchar_value1
+1 -123456.789012 string_value 2024-03-22 char_value1
varchar_value1
+2 -123456.789012 string_value 2024-03-21 char_value1
varchar_value1
+3 123456.789012 string_value 2024-03-20 char_value1
varchar_value1
-- !q04 --
-1 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-22 2024-03-22T12:00 char_value1
varchar_value1
-2 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-21 2024-03-21T12:00 char_value1
varchar_value1
-3 123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-20 2024-03-20T12:00 char_value1
varchar_value1
-3 123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-20 2024-03-20T12:00 char_value1
varchar_value1
+1 -123456.789012 string_value 2024-03-22 char_value1
varchar_value1
+2 -123456.789012 string_value 2024-03-21 char_value1
varchar_value1
+3 123456.789012 string_value 2024-03-20 char_value1
varchar_value1
+3 123456.789012 string_value 2024-03-20 char_value1
varchar_value1
-- !q05 --
-1 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-22 2024-03-22T12:00 char_value1
varchar_value1
-2 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-21 2024-03-21T12:00 char_value1
varchar_value1
-7 123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-20 2024-03-20T12:00 char_value1
varchar_value1
+1 -123456.789012 string_value 2024-03-22 char_value1
varchar_value1
+2 -123456.789012 string_value 2024-03-21 char_value1
varchar_value1
+7 123456.789012 string_value 2024-03-20 char_value1
varchar_value1
-- !q01 --
1 \N -128 \N -2147483648 \N -123.45 \N
@@ -219,27 +219,27 @@ true 127 32767 2147483647
9223372036854775807 123.45 123456.789 123456789 1234.5
7 true 127 32767 2147483647 9223372036854775807 123.45
123456.789
-- !q01 --
-1 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-22 2024-03-22T12:00 char_value1
varchar_value1
+1 -123456.789012 string_value 2024-03-22 char_value1
varchar_value1
-- !q02 --
-1 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-22 2024-03-22T12:00 char_value1
varchar_value1
-2 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-21 2024-03-21T12:00 char_value1
varchar_value1
+1 -123456.789012 string_value 2024-03-22 char_value1
varchar_value1
+2 -123456.789012 string_value 2024-03-21 char_value1
varchar_value1
-- !q03 --
-1 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-22 2024-03-22T12:00 char_value1
varchar_value1
-2 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-21 2024-03-21T12:00 char_value1
varchar_value1
-3 123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-20 2024-03-20T12:00 char_value1
varchar_value1
+1 -123456.789012 string_value 2024-03-22 char_value1
varchar_value1
+2 -123456.789012 string_value 2024-03-21 char_value1
varchar_value1
+3 123456.789012 string_value 2024-03-20 char_value1
varchar_value1
-- !q04 --
-1 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-22 2024-03-22T12:00 char_value1
varchar_value1
-2 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-21 2024-03-21T12:00 char_value1
varchar_value1
-3 123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-20 2024-03-20T12:00 char_value1
varchar_value1
-3 123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-20 2024-03-20T12:00 char_value1
varchar_value1
+1 -123456.789012 string_value 2024-03-22 char_value1
varchar_value1
+2 -123456.789012 string_value 2024-03-21 char_value1
varchar_value1
+3 123456.789012 string_value 2024-03-20 char_value1
varchar_value1
+3 123456.789012 string_value 2024-03-20 char_value1
varchar_value1
-- !q05 --
-1 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-22 2024-03-22T12:00 char_value1
varchar_value1
-2 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-21 2024-03-21T12:00 char_value1
varchar_value1
-7 123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-20 2024-03-20T12:00 char_value1
varchar_value1
+1 -123456.789012 string_value 2024-03-22 char_value1
varchar_value1
+2 -123456.789012 string_value 2024-03-21 char_value1
varchar_value1
+7 123456.789012 string_value 2024-03-20 char_value1
varchar_value1
-- !q01 --
1 \N -128 \N -2147483648 \N -123.45 \N
@@ -308,27 +308,27 @@ true 127 32767 2147483647
9223372036854775807 123.45 123456.789 123456789 1234.5
7 true 127 32767 2147483647 9223372036854775807 123.45
123456.789
-- !q01 --
-1 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-22 2024-03-22T12:00 char_value1
varchar_value1
+1 -123456.789012 string_value 2024-03-22 char_value1
varchar_value1
-- !q02 --
-1 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-22 2024-03-22T12:00 char_value1
varchar_value1
-2 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-21 2024-03-21T12:00 char_value1
varchar_value1
+1 -123456.789012 string_value 2024-03-22 char_value1
varchar_value1
+2 -123456.789012 string_value 2024-03-21 char_value1
varchar_value1
-- !q03 --
-1 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-22 2024-03-22T12:00 char_value1
varchar_value1
-2 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-21 2024-03-21T12:00 char_value1
varchar_value1
-3 123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-20 2024-03-20T12:00 char_value1
varchar_value1
+1 -123456.789012 string_value 2024-03-22 char_value1
varchar_value1
+2 -123456.789012 string_value 2024-03-21 char_value1
varchar_value1
+3 123456.789012 string_value 2024-03-20 char_value1
varchar_value1
-- !q04 --
-1 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-22 2024-03-22T12:00 char_value1
varchar_value1
-2 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-21 2024-03-21T12:00 char_value1
varchar_value1
-3 123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-20 2024-03-20T12:00 char_value1
varchar_value1
-3 123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-20 2024-03-20T12:00 char_value1
varchar_value1
+1 -123456.789012 string_value 2024-03-22 char_value1
varchar_value1
+2 -123456.789012 string_value 2024-03-21 char_value1
varchar_value1
+3 123456.789012 string_value 2024-03-20 char_value1
varchar_value1
+3 123456.789012 string_value 2024-03-20 char_value1
varchar_value1
-- !q05 --
-1 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-22 2024-03-22T12:00 char_value1
varchar_value1
-2 -123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-21 2024-03-21T12:00 char_value1
varchar_value1
-7 123456.789012 string_value 62 69 6e 61 72 79 5f 76 61 6c 75 65
2024-03-20 2024-03-20T12:00 char_value1
varchar_value1
+1 -123456.789012 string_value 2024-03-22 char_value1
varchar_value1
+2 -123456.789012 string_value 2024-03-21 char_value1
varchar_value1
+7 123456.789012 string_value 2024-03-20 char_value1
varchar_value1
-- !q01 --
1 \N -128 \N -2147483648 \N -123.45 \N
@@ -354,3 +354,4 @@ true 127 32767 2147483647
9223372036854775807 123.45 123456.789 123456789 1234.5
3 \N 127 \N 2147483647 \N 123.45 \N
3 \N 127 \N 2147483647 \N 123.45 \N
7 true 127 32767 2147483647 9223372036854775807 123.45
123456.789
+
diff --git
a/regression-test/suites/external_table_p0/hive/write/test_hive_write_partitions.groovy
b/regression-test/suites/external_table_p0/hive/write/test_hive_write_partitions.groovy
index 695b608e152..0435a68b09a 100644
---
a/regression-test/suites/external_table_p0/hive/write/test_hive_write_partitions.groovy
+++
b/regression-test/suites/external_table_p0/hive/write/test_hive_write_partitions.groovy
@@ -134,7 +134,7 @@ suite("test_hive_write_partitions",
"p0,external,hive,external_docker,external_d
sql """
INSERT OVERWRITE TABLE
all_partition_types2_${format_compression}_${catalog_name}_q03
- SELECT CAST(7 as INT) as id, decimal_col, string_col, binary_col,
date_col, timestamp_col, char_col, varchar_col FROM
all_partition_types2_parquet_snappy_src where id = 3;
+ SELECT CAST(7 as INT) as id, decimal_col, string_col, date_col,
char_col, varchar_col FROM all_partition_types2_parquet_snappy_src where id = 3;
"""
order_qt_q05 """ select * from
all_partition_types2_${format_compression}_${catalog_name}_q03;
"""
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
