This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 0e3ad5cd9de [fix](parquet) fix time zone error(isAdjustedToUTC=true)
in parquet reader (#33675) (#33924)
0e3ad5cd9de is described below
commit 0e3ad5cd9de52563e8ba2499a6dee8373b2a9959
Author: Mingyu Chen <morning...@163.com>
AuthorDate: Sat Apr 20 19:06:54 2024 +0800
[fix](parquet) fix time zone error(isAdjustedToUTC=true) in parquet reader
(#33675) (#33924)
bp (#33675)
Co-authored-by: Ashin Gau <ashin...@users.noreply.github.com>
---
.../exec/format/parquet/parquet_column_convert.h | 11 +-
be/src/vec/exec/format/parquet/parquet_pred_cmp.h | 2 +-
.../hive/test_hive_basic_type.out | 24 ++---
.../tvf/test_s3_tvf_parquet_compress.out | 120 ++++++++++-----------
.../hive/test_external_catalog_hive.out | 17 +--
.../paimon/paimon_timestamp_types.groovy | 5 +-
6 files changed, 94 insertions(+), 85 deletions(-)
diff --git a/be/src/vec/exec/format/parquet/parquet_column_convert.h
b/be/src/vec/exec/format/parquet/parquet_column_convert.h
index bc7dbe1fcbc..ede6e426488 100644
--- a/be/src/vec/exec/format/parquet/parquet_column_convert.h
+++ b/be/src/vec/exec/format/parquet/parquet_column_convert.h
@@ -30,9 +30,9 @@
namespace doris::vectorized::parquet {
struct ConvertParams {
- // schema.logicalType.TIMESTAMP.isAdjustedToUTC == true
+ // schema.logicalType.TIMESTAMP.isAdjustedToUTC == false
static const cctz::time_zone utc0;
- // schema.logicalType.TIMESTAMP.isAdjustedToUTC == false, we should set
local time zone
+ // schema.logicalType.TIMESTAMP.isAdjustedToUTC == true, we should set
local time zone
cctz::time_zone* ctz = nullptr;
size_t offset_days = 0;
int64_t second_mask = 1;
@@ -72,8 +72,13 @@ struct ConvertParams {
const auto& schema = field_schema->parquet_schema;
if (schema.__isset.logicalType &&
schema.logicalType.__isset.TIMESTAMP) {
const auto& timestamp_info = schema.logicalType.TIMESTAMP;
- if (timestamp_info.isAdjustedToUTC) {
+ if (!timestamp_info.isAdjustedToUTC) {
// should set timezone to utc+0
+ // Reference:
https://github.com/apache/parquet-format/blob/master/LogicalTypes.md#instant-semantics-timestamps-normalized-to-utc
+ // If isAdjustedToUTC = false, the reader should display the
same value no mater what local time zone is. For example:
+ // When a timestamp is stored as `1970-01-03 12:00:00`,
+ // if isAdjustedToUTC = true, UTC8 should read as `1970-01-03
20:00:00`, UTC6 should read as `1970-01-03 18:00:00`
+ // if isAdjustedToUTC = false, UTC8 and UTC6 should read as
`1970-01-03 12:00:00`, which is the same as `1970-01-03 12:00:00` in UTC0
ctz = const_cast<cctz::time_zone*>(&utc0);
}
const auto& time_unit = timestamp_info.unit;
diff --git a/be/src/vec/exec/format/parquet/parquet_pred_cmp.h
b/be/src/vec/exec/format/parquet/parquet_pred_cmp.h
index 754b597b1d6..1f80aa7ecd5 100644
--- a/be/src/vec/exec/format/parquet/parquet_pred_cmp.h
+++ b/be/src/vec/exec/format/parquet/parquet_pred_cmp.h
@@ -278,7 +278,7 @@ private:
const auto& schema = col_schema->parquet_schema;
if (schema.__isset.logicalType &&
schema.logicalType.__isset.TIMESTAMP) {
const auto& timestamp_info = schema.logicalType.TIMESTAMP;
- if (timestamp_info.isAdjustedToUTC) {
+ if (!timestamp_info.isAdjustedToUTC) {
// should set timezone to utc+0
resolved_ctz = cctz::utc_time_zone();
}
diff --git
a/regression-test/data/external_table_p0/hive/test_hive_basic_type.out
b/regression-test/data/external_table_p0/hive/test_hive_basic_type.out
index f921b9d0d1c..2c0ca8d2e41 100644
--- a/regression-test/data/external_table_p0/hive/test_hive_basic_type.out
+++ b/regression-test/data/external_table_p0/hive/test_hive_basic_type.out
@@ -108,30 +108,30 @@ test DATETIME(6) Yes true \N
-- !28 --
\N
-1969-12-31T23:43:20
-1970-01-01T00:00:00.001
-1970-01-01T00:00:00.003
-2023-04-20T07:51:49
+1970-01-01T07:43:20
+1970-01-01T08:00:00.001
+1970-01-01T08:00:00.003
+2023-04-20T15:51:49
-- !29 --
test DATETIME(6) Yes true \N
-- !30 --
\N
-1969-12-31T23:43:20
-1970-01-01T00:00:00.000001
-1970-01-01T00:00:00.000003
-2023-04-20T07:51:49
+1970-01-01T07:43:20
+1970-01-01T08:00:00.000001
+1970-01-01T08:00:00.000003
+2023-04-20T15:51:49
-- !31 --
test DATETIME(6) Yes true \N
-- !32 --
\N
-1969-12-31T23:59:59
-1970-01-01T00:00
-1970-01-01T00:00
-2023-04-20T07:51:49
+1970-01-01T07:59:59
+1970-01-01T08:00
+1970-01-01T08:00
+2023-04-20T15:51:49
-- !7 --
\N \N \N \N \N \N \N \N \N \N
test test
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
[...]
diff --git
a/regression-test/data/external_table_p0/tvf/test_s3_tvf_parquet_compress.out
b/regression-test/data/external_table_p0/tvf/test_s3_tvf_parquet_compress.out
index 10ff75a914c..3e0cbc3dad9 100644
---
a/regression-test/data/external_table_p0/tvf/test_s3_tvf_parquet_compress.out
+++
b/regression-test/data/external_table_p0/tvf/test_s3_tvf_parquet_compress.out
@@ -6,16 +6,16 @@
-- !gzip_3 --
-- !gzip_4 --
-185 193 53 56605217928 5.451878E7 1.9952208284243374E10
false ylOkeCpMZmsAdfMZKU SLWxRpdBGB iqGOSxAYdFcGicLkovFewsIsp
2031-06-05 2023-12-09T12:40:37 94603.01
-295 417 20 148276324771 4.7573584E7 1.606954292368833E10
false McFVbRNqw GWLZYJnSAm JRdtgaVkQFpuQfeShCtmsKQVs
2033-10-21 2023-12-13T22:23:37 103618.10
-352 272 50 132842035948 3.9088484E7 1.4114080886312649E10
false YStkfSPLEW ZjhIqBBkqF VZTwrLVdgfWkfprNXhGgclQKg
2024-05-28 2023-12-24T09:05:37 153759.13
-361 410 73 80944806602 4.0352936E7 1.2128315118429937E10
false OX tnYxueTSNX AYQmNmBAaLGzTfLifPwEQQftT 2020-11-22
2023-12-14T14:01:37 129452.40
-415 215 22 65540407472 3625543.2 1.0412365247547463E9
false OAfCmDFdnjHq SSQXXGOcvi ClHKPGmpfmtJNrapLLvkddEtt
2027-03-27 2023-12-01T14:56:37 152754.22
-49 78 54 26445927221 5.1698004E7 1.4099392773994835E10
false cRIntlcdDaGWbSGEbaFB gxwUYJirCB waWtBfdOtbKMXKaKpbGYEhqFN
2033-08-11 2023-12-16T02:45:37 83181.72
-490 103 54 119509966565 2.4116646E7 1.9869840205733356E10
true dRqNdTPkzDAbqqmzn uSrGbvtVdi QJOncduXQYNfwoMaNDKSnyhcg
2029-07-02 2023-12-25T20:03:37 67311.03
-626 457 47 72797784919 4.8966996E7 2.565888388726609E9
true uT aKNykzWDJs nHrOUfGgcFnnYcKhJbxLhCLIl 2029-02-03
2023-11-29T21:04:37 174501.34
-717 122 27 59784778057 3.564988E7 1.1160980469798027E10
false odeCVHNGbZUGRl TVjEIrOOMu OsRMnfURWsiKKFrQtjyUXmQQn
2020-07-15 2023-12-15T00:51:37 196108.06
-745 325 20 78752727055 1.5183382E7 1.4748467499527681E10
true RhpEbfrQGGxLL dYqOOUfWfh NQQSFeDTyPKGaphBPcUGwlRhm
2021-08-15 2023-12-03T05:28:37 93769.74
+185 193 53 56605217928 5.451878E7 1.9952208284243374E10
false ylOkeCpMZmsAdfMZKU SLWxRpdBGB iqGOSxAYdFcGicLkovFewsIsp
2031-06-05 2023-12-09T04:40:37 94603.01
+295 417 20 148276324771 4.7573584E7 1.606954292368833E10
false McFVbRNqw GWLZYJnSAm JRdtgaVkQFpuQfeShCtmsKQVs
2033-10-21 2023-12-13T14:23:37 103618.10
+352 272 50 132842035948 3.9088484E7 1.4114080886312649E10
false YStkfSPLEW ZjhIqBBkqF VZTwrLVdgfWkfprNXhGgclQKg
2024-05-28 2023-12-24T01:05:37 153759.13
+361 410 73 80944806602 4.0352936E7 1.2128315118429937E10
false OX tnYxueTSNX AYQmNmBAaLGzTfLifPwEQQftT 2020-11-22
2023-12-14T06:01:37 129452.40
+415 215 22 65540407472 3625543.2 1.0412365247547463E9
false OAfCmDFdnjHq SSQXXGOcvi ClHKPGmpfmtJNrapLLvkddEtt
2027-03-27 2023-12-01T06:56:37 152754.22
+49 78 54 26445927221 5.1698004E7 1.4099392773994835E10
false cRIntlcdDaGWbSGEbaFB gxwUYJirCB waWtBfdOtbKMXKaKpbGYEhqFN
2033-08-11 2023-12-15T18:45:37 83181.72
+490 103 54 119509966565 2.4116646E7 1.9869840205733356E10
true dRqNdTPkzDAbqqmzn uSrGbvtVdi QJOncduXQYNfwoMaNDKSnyhcg
2029-07-02 2023-12-25T12:03:37 67311.03
+626 457 47 72797784919 4.8966996E7 2.565888388726609E9
true uT aKNykzWDJs nHrOUfGgcFnnYcKhJbxLhCLIl 2029-02-03
2023-11-29T13:04:37 174501.34
+717 122 27 59784778057 3.564988E7 1.1160980469798027E10
false odeCVHNGbZUGRl TVjEIrOOMu OsRMnfURWsiKKFrQtjyUXmQQn
2020-07-15 2023-12-14T16:51:37 196108.06
+745 325 20 78752727055 1.5183382E7 1.4748467499527681E10
true RhpEbfrQGGxLL dYqOOUfWfh NQQSFeDTyPKGaphBPcUGwlRhm
2021-08-15 2023-12-02T21:28:37 93769.74
-- !gzip_5 --
@@ -26,16 +26,16 @@
-- !lz42_3 --
-- !lz42_4 --
-12 25 23 37690551367 1739118.0 1.5796150955205643E10
false CRYGKFUJbGBIe hzxdvVhixg dKsFlyxrgmWgUPubvFMiEVAMw
2025-09-25 2023-11-30T17:03:35 191265.80
-13 101 46 114744069847 9.9938768E7 1.4837020807992098E10
false gfCNYXL ZbPnzJwYeK jCbLcczVZCXQLIrWzKLSrzCdP 2021-02-09
2023-12-16T07:15:35 64827.72
-2 185 42 149520919149 3.4833664E7 1.1822608934606503E10
false IcdmGgK cEfdjzUnlR POxVvslyyYrPzvqMnPdIyWsYc 2024-05-12
2023-12-16T01:47:35 142341.23
-26 32 38 60671962182 7531824.5 1.4733848060344421E10
true KOYetyhzellUqvUVqN dikJqNhnFx ndvjDRNIMrJHIvSldXaEvFXLT
2021-09-09 2023-12-11T04:05:35 193323.54
-34 327 13 77750585316 5.2026716E7 1.3565608513727581E10
false wNPvbSoifnwLtHTqoEi YZjfEkKIGV FmUQtlZsMnbGcotsabDCuZzCv
2031-11-30 2023-12-14T03:25:35 66427.85
-34 471 26 135806034349 8076124.0 1.0066063806334663E10
false rKYxkXtBaGerDm GVJmQKDnEG GhZmOjSBgagfERePNKqrfRPZP
2033-02-27 2023-12-09T09:50:35 108043.94
-39 353 62 132230399602 6.4890496E7 1.4364807353729563E10
true VndnuqCCaOtRKUKWopUp VlPHqQRqYm wMidbmfhIEojjzjwECenSMHGs
2027-02-15 2023-12-21T18:23:35 183030.50
-45 26 68 53752579002 8.9017168E7 1.9340340329838943E10
true OINGDCPkvdhkdmcS YkepCHrjOr SZYiGERTakzzzMMKpNQdhqLOc
2030-09-21 2023-12-13T04:08:35 130910.41
-53 72 65 146006164519 6.6903E7 2.0507334388700092E10
false TPJuvqCXK qSHjDEfYui lOZFyOETtUFghsoMcckCdEMcf
2024-06-23 2023-12-13T22:40:35 165043.20
-55 347 32 75539160521 1353359.8 1.2653349834209116E10
false zkaBxLzoya bsAfSUONxQ bdTgPzPbidbAlEaYYKgTckHYn
2030-06-14 2023-11-30T03:10:35 188584.20
+12 25 23 37690551367 1739118.0 1.5796150955205643E10
false CRYGKFUJbGBIe hzxdvVhixg dKsFlyxrgmWgUPubvFMiEVAMw
2025-09-25 2023-11-30T09:03:35 191265.80
+13 101 46 114744069847 9.9938768E7 1.4837020807992098E10
false gfCNYXL ZbPnzJwYeK jCbLcczVZCXQLIrWzKLSrzCdP 2021-02-09
2023-12-15T23:15:35 64827.72
+2 185 42 149520919149 3.4833664E7 1.1822608934606503E10
false IcdmGgK cEfdjzUnlR POxVvslyyYrPzvqMnPdIyWsYc 2024-05-12
2023-12-15T17:47:35 142341.23
+26 32 38 60671962182 7531824.5 1.4733848060344421E10
true KOYetyhzellUqvUVqN dikJqNhnFx ndvjDRNIMrJHIvSldXaEvFXLT
2021-09-09 2023-12-10T20:05:35 193323.54
+34 327 13 77750585316 5.2026716E7 1.3565608513727581E10
false wNPvbSoifnwLtHTqoEi YZjfEkKIGV FmUQtlZsMnbGcotsabDCuZzCv
2031-11-30 2023-12-13T19:25:35 66427.85
+34 471 26 135806034349 8076124.0 1.0066063806334663E10
false rKYxkXtBaGerDm GVJmQKDnEG GhZmOjSBgagfERePNKqrfRPZP
2033-02-27 2023-12-09T01:50:35 108043.94
+39 353 62 132230399602 6.4890496E7 1.4364807353729563E10
true VndnuqCCaOtRKUKWopUp VlPHqQRqYm wMidbmfhIEojjzjwECenSMHGs
2027-02-15 2023-12-21T10:23:35 183030.50
+45 26 68 53752579002 8.9017168E7 1.9340340329838943E10
true OINGDCPkvdhkdmcS YkepCHrjOr SZYiGERTakzzzMMKpNQdhqLOc
2030-09-21 2023-12-12T20:08:35 130910.41
+53 72 65 146006164519 6.6903E7 2.0507334388700092E10
false TPJuvqCXK qSHjDEfYui lOZFyOETtUFghsoMcckCdEMcf
2024-06-23 2023-12-13T14:40:35 165043.20
+55 347 32 75539160521 1353359.8 1.2653349834209116E10
false zkaBxLzoya bsAfSUONxQ bdTgPzPbidbAlEaYYKgTckHYn
2030-06-14 2023-11-29T19:10:35 188584.20
-- !no_null_none_1 --
@@ -88,16 +88,16 @@
-- !no_null_snappy_3 --
-- !no_null_snappy_4 --
-1 154 47 56558270788 5.4536948E7 1.3217071820869438E10
false XfvMcpmTrBwVVUFBTfv UpvjnTPFYK VCsoIshvMNTdAKzAmrpopbBnR
2025-07-30 2023-12-04T17:05:39 130077.82
-21 279 45 100090340220 5.3739808E7 1.6962735429451965E10
true vau YstuEEpUYl BqDxtlDptzwYLnFbBsHBSyVEj 2031-12-05
2023-12-01T15:26:39 158763.22
-22 147 37 38451482962 5.7348188E7 6.709969882160862E9
false UsMqGSrPdhvPv YKKcbDNgAY XuineFLOuEKDopqiOrRRWFkON
2031-01-08 2023-12-06T09:52:39 62344.33
-26 314 66 48416066859 5.075556E7 1.2613108635303028E10
true HzZTVwGWlDzZ lKrSRRzJEk eLMsGzGoiLirCeHtUkBFTJTJy
2033-03-30 2023-11-29T04:01:39 61085.83
-35 41 6 74116293939 9.5409224E7 3.0375883609755764E9
true iHalWMyJKwcCcnXIZc oRmnkittIB qOoLzOpilUqAOvQBOyYlPoiIr
2034-03-02 2023-12-12T17:21:39 18991.90
-35 96 33 129564598321 5.8018556E7 1.7037885810063845E10
true gjVoXOHOQndHncvaFQC WgMShQxLQL VvyPxLnaEZeOemJbosqSkSvEl
2021-01-31 2023-12-19T16:06:39 152296.20
-36 256 59 34966299569 9.0360968E7 1.6050368291434975E10
false cxDqSdYXQXcUgizXbq mQsNaawIJP pbjcFsDoRAzvmMNphXQoBtmzb
2031-10-27 2023-12-26T05:18:39 140767.55
-4 417 21 32611494638 5.462062E7 2.392456171662606E9
true JPMliq ouZEKYBjoH GNsUsuuGbynVCwJeexZdaQnCl 2027-10-06
2023-12-18T19:43:39 121553.06
-43 179 36 147307082013 3.8981628E7 2.0026077534463943E10
true JPBDURDCLAbeKg lurvLFZwae aVuYHsksMZhapxxdmyfFcDSgd
2020-04-08 2023-12-16T16:12:39 60879.14
-46 281 4 81012784171 5.5589576E7 1.9537200475225827E8
true LTKJwkcwNdKRfpUxxe aSgtpzTLKj ynECHVHsichYRKumIUELddPOl
2031-11-10 2023-12-18T10:30:39 137501.43
+1 154 47 56558270788 5.4536948E7 1.3217071820869438E10
false XfvMcpmTrBwVVUFBTfv UpvjnTPFYK VCsoIshvMNTdAKzAmrpopbBnR
2025-07-30 2023-12-04T09:05:39 130077.82
+21 279 45 100090340220 5.3739808E7 1.6962735429451965E10
true vau YstuEEpUYl BqDxtlDptzwYLnFbBsHBSyVEj 2031-12-05
2023-12-01T07:26:39 158763.22
+22 147 37 38451482962 5.7348188E7 6.709969882160862E9
false UsMqGSrPdhvPv YKKcbDNgAY XuineFLOuEKDopqiOrRRWFkON
2031-01-08 2023-12-06T01:52:39 62344.33
+26 314 66 48416066859 5.075556E7 1.2613108635303028E10
true HzZTVwGWlDzZ lKrSRRzJEk eLMsGzGoiLirCeHtUkBFTJTJy
2033-03-30 2023-11-28T20:01:39 61085.83
+35 41 6 74116293939 9.5409224E7 3.0375883609755764E9
true iHalWMyJKwcCcnXIZc oRmnkittIB qOoLzOpilUqAOvQBOyYlPoiIr
2034-03-02 2023-12-12T09:21:39 18991.90
+35 96 33 129564598321 5.8018556E7 1.7037885810063845E10
true gjVoXOHOQndHncvaFQC WgMShQxLQL VvyPxLnaEZeOemJbosqSkSvEl
2021-01-31 2023-12-19T08:06:39 152296.20
+36 256 59 34966299569 9.0360968E7 1.6050368291434975E10
false cxDqSdYXQXcUgizXbq mQsNaawIJP pbjcFsDoRAzvmMNphXQoBtmzb
2031-10-27 2023-12-25T21:18:39 140767.55
+4 417 21 32611494638 5.462062E7 2.392456171662606E9
true JPMliq ouZEKYBjoH GNsUsuuGbynVCwJeexZdaQnCl 2027-10-06
2023-12-18T11:43:39 121553.06
+43 179 36 147307082013 3.8981628E7 2.0026077534463943E10
true JPBDURDCLAbeKg lurvLFZwae aVuYHsksMZhapxxdmyfFcDSgd
2020-04-08 2023-12-16T08:12:39 60879.14
+46 281 4 81012784171 5.5589576E7 1.9537200475225827E8
true LTKJwkcwNdKRfpUxxe aSgtpzTLKj ynECHVHsichYRKumIUELddPOl
2031-11-10 2023-12-18T02:30:39 137501.43
-- !none2_1 --
@@ -106,16 +106,16 @@
-- !none2_3 --
-- !none2_4 --
-10 133 23 110735234104 4.1348184E7 6.724669852415883E9
true qylrxSiSgrKu fXIxvHGluy eklOsykJrnQGIRLaIEelHwdzm
2024-03-02 2023-12-22T13:49:04 176211.72
-11 394 66 99624300897 2.274807E7 4.963466594895596E9
true mVdYGIMifFUBHNatRyM KRqNQRaSDg dylbZDzYyzsqShMkWFpDAYSCU
2021-04-05 2023-12-20T02:30:04 147684.86
-12 477 37 63993096030 5.7643764E7 2.0866619972258877E10
false wNKtMCuCVaDcwu WVFlxBfRpW kwpESPDNaofDFMnOviauLBAIl
2026-12-09 2023-12-09T07:50:04 140885.38
-12 52 50 13187171725 4.328852E7 1.439178560256354E9
false GfUoPlFQvfNaLdk HFpbCrThUT JjjCcBGUUMpkyXRbjrhSYpfSx
2030-06-14 2023-12-27T02:02:04 88542.26
-15 499 46 41312302840 5.216176E7 1.9019488905673557E10
true tahGGPipseDsw bHtFJxGJmZ wQyXJUELxYRbgjbHaVIrUQCks
2029-09-19 2023-12-01T05:09:04 26654.48
-4 160 11 119904143312 6.7974712E7 1.866353471070769E10
true GNJyKlQlBoDlvy agZHVaqlIU SYZxyOTcjCDfaHSksJaoDYxIA
2034-05-15 2023-12-05T02:43:04 130407.15
-41 394 40 49490189808 1.2031474E7 3.1199659364367003E9
false GLUtKxYhrX aPyQlkqHsn KhpRXlHRPHvCbmlRWrpKwYuuX
2024-02-11 2023-12-02T03:02:04 83410.50
-45 439 31 67121611959 3.5429484E7 7.620345797982114E9
false uhSD qHGFMshLLp rONGaSIkJJQPlFBfhBsEwcqMe 2022-02-02
2023-12-05T03:43:04 936.05
-47 290 34 19180961481 2.3980818E7 8.905338300548578E9
false JynKEvLPvFHGKvyDVv mScFpzPIrA BMLACiTfOubXNgJAiVUfhvtVt
2024-06-21 2023-12-16T23:41:04 49807.06
-9 92 36 145734369838 2.6161538E7 1.7063014826469292E10
false yjeyyDOEgViRwbRVArt yGxosmUWEC tqLZwzBiPPltSdbpVChwkWNRF
2025-06-22 2023-12-06T05:26:04 146649.97
+10 133 23 110735234104 4.1348184E7 6.724669852415883E9
true qylrxSiSgrKu fXIxvHGluy eklOsykJrnQGIRLaIEelHwdzm
2024-03-02 2023-12-22T05:49:04 176211.72
+11 394 66 99624300897 2.274807E7 4.963466594895596E9
true mVdYGIMifFUBHNatRyM KRqNQRaSDg dylbZDzYyzsqShMkWFpDAYSCU
2021-04-05 2023-12-19T18:30:04 147684.86
+12 477 37 63993096030 5.7643764E7 2.0866619972258877E10
false wNKtMCuCVaDcwu WVFlxBfRpW kwpESPDNaofDFMnOviauLBAIl
2026-12-09 2023-12-08T23:50:04 140885.38
+12 52 50 13187171725 4.328852E7 1.439178560256354E9
false GfUoPlFQvfNaLdk HFpbCrThUT JjjCcBGUUMpkyXRbjrhSYpfSx
2030-06-14 2023-12-26T18:02:04 88542.26
+15 499 46 41312302840 5.216176E7 1.9019488905673557E10
true tahGGPipseDsw bHtFJxGJmZ wQyXJUELxYRbgjbHaVIrUQCks
2029-09-19 2023-11-30T21:09:04 26654.48
+4 160 11 119904143312 6.7974712E7 1.866353471070769E10
true GNJyKlQlBoDlvy agZHVaqlIU SYZxyOTcjCDfaHSksJaoDYxIA
2034-05-15 2023-12-04T18:43:04 130407.15
+41 394 40 49490189808 1.2031474E7 3.1199659364367003E9
false GLUtKxYhrX aPyQlkqHsn KhpRXlHRPHvCbmlRWrpKwYuuX
2024-02-11 2023-12-01T19:02:04 83410.50
+45 439 31 67121611959 3.5429484E7 7.620345797982114E9
false uhSD qHGFMshLLp rONGaSIkJJQPlFBfhBsEwcqMe 2022-02-02
2023-12-04T19:43:04 936.05
+47 290 34 19180961481 2.3980818E7 8.905338300548578E9
false JynKEvLPvFHGKvyDVv mScFpzPIrA BMLACiTfOubXNgJAiVUfhvtVt
2024-06-21 2023-12-16T15:41:04 49807.06
+9 92 36 145734369838 2.6161538E7 1.7063014826469292E10
false yjeyyDOEgViRwbRVArt yGxosmUWEC tqLZwzBiPPltSdbpVChwkWNRF
2025-06-22 2023-12-05T21:26:04 146649.97
-- !none2_5 --
@@ -126,16 +126,16 @@
-- !zstd2_3 --
-- !zstd2_4 --
-25 108 31 149098682156 4.8272672E7 5.930003546336057E9
true dAtUCcFxXKk sQIGXEgYNT ZPbhiaUnywWcJErUhjWJlTuja
2028-02-17 2023-12-05T21:00:09 104331.10
-25 217 18 114185433037 7.6510376E7 1.0861182565773449E10
false Dfnwto wPnPnVkuVc OxCVhlSZORwnIvoBTUzyZayLF 2019-03-26
2023-12-23T13:47:09 64693.45
-58 331 36 59407318513 1.4188228E7 1.0117605147311861E10
false kflDCVAYbcs ipNFhPgRKv rMRGLlJXRXUnZesnAQboIFmaA
2021-08-17 2023-12-17T23:08:09 183820.26
-65 147 38 21817494173 6070327.5 1.5818161359746944E10
true RFtD BsehDZuGNw QBIDYmMhQvghksPLjTDkXdEvu 2033-08-20
2023-12-18T05:12:09 54614.36
-7 12 47 71342719085 4613431.5 1.3705618365178734E10
true XenTgJvpZFFiriibVE oxAlQKcypL iFNqxDRELyNOWhWEgvhDOUwBs
2033-04-11 2023-12-17T01:33:09 161342.39
-79 95 64 90406816348 8.6113624E7 9.057061555897038E9
true TuEKTQzaZecgnk CnTjiGIdvo KjxJGDlSdpTntCnGgHQWjYeMK
2034-04-14 2023-12-17T02:59:09 176973.77
-81 128 73 25218454317 9.3758232E7 4.90567313620045E9
true scj KRJIgLpBZg xygkYhTRmAmVhXUxSnaseltsb 2028-10-25
2023-11-29T08:41:09 164248.11
-83 52 67 122533885998 3.7610484E7 9.136770151694872E9
true rzKkvolDCKDKhf MyDYVefDpx edPSYNkjtKXmAvqLLLvfhiBzV
2028-09-02 2023-12-20T15:25:09 58108.15
-87 272 39 127196423938 2.3952176E7 7.701823624333466E9
false xvVAbRaqWwGKmr OJakVHUwPp ejlHDXfcoftCkWVyDRsgYmmwi
2030-01-12 2023-12-21T10:11:09 151881.70
-99 252 8 99743310755 5003965.5 1.7335544354242287E10
true SrXh oLATQNrFUt wWrkNwanllbGArJbLtkBtaRRw 2020-12-31
2023-12-16T10:24:09 94944.45
+25 108 31 149098682156 4.8272672E7 5.930003546336057E9
true dAtUCcFxXKk sQIGXEgYNT ZPbhiaUnywWcJErUhjWJlTuja
2028-02-17 2023-12-05T13:00:09 104331.10
+25 217 18 114185433037 7.6510376E7 1.0861182565773449E10
false Dfnwto wPnPnVkuVc OxCVhlSZORwnIvoBTUzyZayLF 2019-03-26
2023-12-23T05:47:09 64693.45
+58 331 36 59407318513 1.4188228E7 1.0117605147311861E10
false kflDCVAYbcs ipNFhPgRKv rMRGLlJXRXUnZesnAQboIFmaA
2021-08-17 2023-12-17T15:08:09 183820.26
+65 147 38 21817494173 6070327.5 1.5818161359746944E10
true RFtD BsehDZuGNw QBIDYmMhQvghksPLjTDkXdEvu 2033-08-20
2023-12-17T21:12:09 54614.36
+7 12 47 71342719085 4613431.5 1.3705618365178734E10
true XenTgJvpZFFiriibVE oxAlQKcypL iFNqxDRELyNOWhWEgvhDOUwBs
2033-04-11 2023-12-16T17:33:09 161342.39
+79 95 64 90406816348 8.6113624E7 9.057061555897038E9
true TuEKTQzaZecgnk CnTjiGIdvo KjxJGDlSdpTntCnGgHQWjYeMK
2034-04-14 2023-12-16T18:59:09 176973.77
+81 128 73 25218454317 9.3758232E7 4.90567313620045E9
true scj KRJIgLpBZg xygkYhTRmAmVhXUxSnaseltsb 2028-10-25
2023-11-29T00:41:09 164248.11
+83 52 67 122533885998 3.7610484E7 9.136770151694872E9
true rzKkvolDCKDKhf MyDYVefDpx edPSYNkjtKXmAvqLLLvfhiBzV
2028-09-02 2023-12-20T07:25:09 58108.15
+87 272 39 127196423938 2.3952176E7 7.701823624333466E9
false xvVAbRaqWwGKmr OJakVHUwPp ejlHDXfcoftCkWVyDRsgYmmwi
2030-01-12 2023-12-21T02:11:09 151881.70
+99 252 8 99743310755 5003965.5 1.7335544354242287E10
true SrXh oLATQNrFUt wWrkNwanllbGArJbLtkBtaRRw 2020-12-31
2023-12-16T02:24:09 94944.45
-- !lz4_1 --
@@ -160,16 +160,16 @@
-- !no_null_zstd_4 --
-- !no_null_zstd_5 --
-15 248 15 21558482213 6487986.5 1.0939869723964705E9
true RJTQHTtGIHlKVlzk FcbxoaqqpI WJucDRirckTPgbZLjsEKplAWn
2024-08-13 2023-11-30T09:25:54 34141.57
-25 83 72 149711605439 6.2890304E7 7.440117092023224E9
false hjXuMtPQ VZqPglUMPk HbNzdUJAHaizFkXxNEYBYPYCf
2019-11-18 2023-12-12T11:05:54 86166.27
-28 462 50 99515493604 1.0113E8 1.5197217619216759E10
true VaRiy RUZwanoIXS wGJmjlsrtktJGzGTvtRleomHv 2020-09-28
2023-12-20T11:23:54 160536.09
-35 72 32 15905879451 8.3402976E7 2.174744968486151E10
false zkd dQkISTxetN gpbemtjhvejdkPDXyDjjrWXrG 2028-02-21
2023-12-22T01:19:54 181969.97
-39 104 67 102858005915 3883196.2 7.698795111611849E9
false oANcFYcWwftK riOYGAuzYa jBrKXHbKuRgqJQUyiorbcVmEc
2028-09-17 2023-12-05T11:11:54 58245.11
-41 102 53 81432267997 8.3292832E7 1.832442879595766E10
false qtwQtWGokDPkkCzfO nwrNOwzvSF qXNCoYVdIEoEdVhMXUsUoXBWf
2024-12-31 2023-12-09T00:26:54 143405.87
-43 66 31 103368561997 4.2050856E7 1.7742240298212337E10
false WxcDOdxJl kXpBppqAlP sSltbkkDZdIRDSzHOxJgsMtOl
2029-04-15 2023-12-20T09:49:54 84059.39
-47 442 43 113416931027 7.6058776E7 4.766215418628829E9
false CFdWIVEcmp TUBoxBcSfR wnbIuqmKRHfZJWzzvmpEnwDic
2033-01-08 2023-11-29T15:52:54 82430.94
-8 181 34 95477376121 7.5397792E7 1.6273298833350899E10
false vkgWftEsKYXEliikl TNwWzMduUG AImvOcOGQjanpfPhWQzNcEfds
2024-04-25 2023-12-28T18:11:54 66374.37
-9 388 37 141886807584 9965839.0 4.2909144426083784E9
true DIvqtxxgyUr SrTKPJUfzO YPfKKFCOPSMQeePQvFCACzeSG
2025-11-22 2023-12-03T06:55:54 189986.54
+15 248 15 21558482213 6487986.5 1.0939869723964705E9
true RJTQHTtGIHlKVlzk FcbxoaqqpI WJucDRirckTPgbZLjsEKplAWn
2024-08-13 2023-11-30T01:25:54 34141.57
+25 83 72 149711605439 6.2890304E7 7.440117092023224E9
false hjXuMtPQ VZqPglUMPk HbNzdUJAHaizFkXxNEYBYPYCf
2019-11-18 2023-12-12T03:05:54 86166.27
+28 462 50 99515493604 1.0113E8 1.5197217619216759E10
true VaRiy RUZwanoIXS wGJmjlsrtktJGzGTvtRleomHv 2020-09-28
2023-12-20T03:23:54 160536.09
+35 72 32 15905879451 8.3402976E7 2.174744968486151E10
false zkd dQkISTxetN gpbemtjhvejdkPDXyDjjrWXrG 2028-02-21
2023-12-21T17:19:54 181969.97
+39 104 67 102858005915 3883196.2 7.698795111611849E9
false oANcFYcWwftK riOYGAuzYa jBrKXHbKuRgqJQUyiorbcVmEc
2028-09-17 2023-12-05T03:11:54 58245.11
+41 102 53 81432267997 8.3292832E7 1.832442879595766E10
false qtwQtWGokDPkkCzfO nwrNOwzvSF qXNCoYVdIEoEdVhMXUsUoXBWf
2024-12-31 2023-12-08T16:26:54 143405.87
+43 66 31 103368561997 4.2050856E7 1.7742240298212337E10
false WxcDOdxJl kXpBppqAlP sSltbkkDZdIRDSzHOxJgsMtOl
2029-04-15 2023-12-20T01:49:54 84059.39
+47 442 43 113416931027 7.6058776E7 4.766215418628829E9
false CFdWIVEcmp TUBoxBcSfR wnbIuqmKRHfZJWzzvmpEnwDic
2033-01-08 2023-11-29T07:52:54 82430.94
+8 181 34 95477376121 7.5397792E7 1.6273298833350899E10
false vkgWftEsKYXEliikl TNwWzMduUG AImvOcOGQjanpfPhWQzNcEfds
2024-04-25 2023-12-28T10:11:54 66374.37
+9 388 37 141886807584 9965839.0 4.2909144426083784E9
true DIvqtxxgyUr SrTKPJUfzO YPfKKFCOPSMQeePQvFCACzeSG
2025-11-22 2023-12-02T22:55:54 189986.54
-- !no_null_zstd_6 --
diff --git
a/regression-test/data/external_table_p2/hive/test_external_catalog_hive.out
b/regression-test/data/external_table_p2/hive/test_external_catalog_hive.out
index 5966e24ef94..51442aedd82 100644
--- a/regression-test/data/external_table_p2/hive/test_external_catalog_hive.out
+++ b/regression-test/data/external_table_p2/hive/test_external_catalog_hive.out
@@ -163,11 +163,12 @@ Z6n2t4XA2n7CXTECJ,PE,iBbsCh0RE1Dd2A,z48
-- !par_fields_in_file_parquet5 --
-- !parquet_adjusted_utc --
-1997-09-21 1999-01-12T15:12:31.235784
-1998-01-12 1993-06-11T11:33:12.356500
-2002-09-29 2001-01-17T13:23:42.120
-2008-08-07 2023-09-23T03:12:17.458
-2009-11-13 2011-11-11T17:23:06.986
-2012-07-08 2023-11-09T12:21:16.321
-2017-09-13 2009-09-20T20:23:14.309124
-2024-03-23 2024-02-01T13:11:09.170
+1997-09-21 1999-01-12T15:12:31.235784
+1998-01-12 1993-06-11T11:33:12.356500
+2002-09-29 2001-01-17T21:23:42.120
+2008-08-07 2023-09-23T11:12:17.458
+2009-11-13 2011-11-12T01:23:06.986
+2012-07-08 2023-11-09T20:21:16.321
+2017-09-13 2009-09-21T04:23:14.309124
+2024-03-23 2024-02-01T21:11:09.170
+
diff --git
a/regression-test/suites/external_table_p2/paimon/paimon_timestamp_types.groovy
b/regression-test/suites/external_table_p2/paimon/paimon_timestamp_types.groovy
index 0a96a7ad187..6701130b2ad 100644
---
a/regression-test/suites/external_table_p2/paimon/paimon_timestamp_types.groovy
+++
b/regression-test/suites/external_table_p2/paimon/paimon_timestamp_types.groovy
@@ -21,7 +21,10 @@ suite("paimon_timestamp_types",
"p2,external,paimon,external_remote,external_rem
def ts_parquet = """select * from ts_parquet"""
String enabled =
context.config.otherConfigs.get("enableExternalPaimonTest")
- if (enabled != null && enabled.equalsIgnoreCase("true")) {
+ if (enabled != null && enabled.equalsIgnoreCase("enable_deprecated_case"))
{
+ // The timestamp type of paimon has no logical or converted type,
+ // and is conflict with column type change from bigint to timestamp.
+ // Deprecated currently.
String catalog_name = "paimon_timestamp_catalog"
String user_name = context.config.otherConfigs.get("extHiveHmsUser")
String hiveHost = context.config.otherConfigs.get("extHiveHmsHost")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
