update

zhangstar333 · zhangstar333 · commit 3f83aab47360 · 2026-01-13T11:38:37.000+08:00
diff --git a/be/src/vec/exec/format/parquet/schema_desc.cpp b/be/src/vec/exec/format/parquet/schema_desc.cpp
@@ -315,12 +315,8 @@ std::pair<DataTypePtr, bool> FieldDescriptor::convert_to_doris_type(
     } else if (logicalType.__isset.JSON) {
         ans.first = DataTypeFactory::instance().create_data_type(TYPE_STRING, nullable);
     } else if (logicalType.__isset.UUID) {
-        if (_enable_mapping_varbinary) {
-            ans.first = DataTypeFactory::instance().create_data_type(TYPE_VARBINARY, nullable, -1,
-                                                                     -1, 16);
-        } else {
-            ans.first = DataTypeFactory::instance().create_data_type(TYPE_STRING, nullable);
-        }
+        ans.first =
+                DataTypeFactory::instance().create_data_type(TYPE_VARBINARY, nullable, -1, -1, 16);
     } else if (logicalType.__isset.FLOAT16) {
         ans.first = DataTypeFactory::instance().create_data_type(TYPE_FLOAT, nullable);
     } else {
diff --git a/docker/thirdparties/docker-compose/mysql/init/01-drop-db.sql b/docker/thirdparties/docker-compose/mysql/init/01-drop-db.sql
@@ -18,3 +18,4 @@
 drop database if exists doris_test;
 drop database if exists show_test_do_not_modify;
 drop database if exists test_varbinary_db;
+drop database if exists test_timestamp_tz_db;
diff --git a/docker/thirdparties/docker-compose/mysql/init/02-create-db.sql b/docker/thirdparties/docker-compose/mysql/init/02-create-db.sql
@@ -21,3 +21,4 @@ create database Doris;
 create database doris;
 create database show_test_do_not_modify;
 create database test_varbinary_db;
+create database test_timestamp_tz_db;
diff --git a/docker/thirdparties/docker-compose/mysql/init/03-create-table.sql b/docker/thirdparties/docker-compose/mysql/init/03-create-table.sql
@@ -528,3 +528,10 @@ CREATE TABLE test_varbinary_db.`test_varbinary_udf` (
   `varbinary_c` varbinary(100)
 );
 
+CREATE TABLE test_timestamp_tz_db.ts_test (
+    id INT,
+    ts_ts TIMESTAMP NULL,
+    ts_dt DATETIME NULL
+);
+
+
diff --git a/docker/thirdparties/docker-compose/mysql/init/04-insert.sql b/docker/thirdparties/docker-compose/mysql/init/04-insert.sql
@@ -1212,6 +1212,15 @@ INSERT INTO doris_test.`test_cast` VALUES (2, '2', '2022-01-02', '2022-01-02 00:
 INSERT INTO test_varbinary_db.`test_varbinary` VALUES (1, X'48656C6C6F20576F726C64'), (2, X'48656C6C6F20576F726C6421');
 INSERT INTO test_varbinary_db.`test_varbinary_udf` VALUES (1, X'48656C6C6F20576F726C64'), (2, X'48656C6C6F20576F726C6421'), (3, NULL), (4, X'AB'), (5, X'ABCDEF');
 
+
+
+
+
+
+SET time_zone = '+08:00';
+INSERT INTO test_timestamp_tz_db.ts_test VALUES (1,'2025-01-01 12:00:00','2025-01-01 12:00:00');
+INSERT INTO test_timestamp_tz_db.ts_test VALUES (2,NULL,NULL);
+
 ANALYZE TABLE Doris.doris;
 ANALYZE TABLE Doris.DORIS;
 ANALYZE TABLE Doris.Doris;
diff --git a/docker/thirdparties/docker-compose/oracle/init/03-create-table.sql b/docker/thirdparties/docker-compose/oracle/init/03-create-table.sql
@@ -263,3 +263,8 @@ CREATE TABLE doris_test.varbinary_test(
 "NAME" VARCHAR2(20),
 "BLOB_COL" BLOB
 );
+
+CREATE TABLE doris_test.ltz_test (
+    id     NUMBER,
+    ts_ltz TIMESTAMP WITH LOCAL TIME ZONE
+);
diff --git a/docker/thirdparties/docker-compose/oracle/init/04-insert.sql b/docker/thirdparties/docker-compose/oracle/init/04-insert.sql
@@ -159,4 +159,10 @@ INSERT INTO doris_test.varbinary_test VALUES (1, 'empty', EMPTY_BLOB());
 INSERT INTO doris_test.varbinary_test VALUES (2, 'NULL', NULL);
 INSERT INTO doris_test.varbinary_test VALUES (3, 'normal', HEXTORAW('48656C6C6F20576F726C64'));
 
+
+ALTER SESSION SET TIME_ZONE = '+08:00';
+INSERT INTO doris_test.ltz_test VALUES (1,TIMESTAMP '2025-01-01 12:00:00 +08:00');
+INSERT INTO doris_test.ltz_test VALUES (NULL,NULL);
+
+
 commit;
diff --git a/docker/thirdparties/docker-compose/postgresql/init/01-create-schema.sql b/docker/thirdparties/docker-compose/postgresql/init/01-create-schema.sql
@@ -18,3 +18,4 @@
 create schema doris_test;
 create schema catalog_pg_test;
 create schema cdc_test;
+create schema test_timestamp_tz_db;
diff --git a/docker/thirdparties/docker-compose/postgresql/init/02-create-table.sql b/docker/thirdparties/docker-compose/postgresql/init/02-create-table.sql
@@ -431,3 +431,10 @@ CREATE TABLE catalog_pg_test.extreme_test_multi_block (
     uuid_val uuid
 );
 
+CREATE TABLE test_timestamp_tz_db.ts_test (
+    id      int,
+    ts_tz   timestamptz NULL,
+    ts_ntz  timestamp NULL
+);
+
+
diff --git a/docker/thirdparties/docker-compose/postgresql/init/04-insert.sql b/docker/thirdparties/docker-compose/postgresql/init/04-insert.sql
@@ -3020,3 +3020,8 @@ insert into catalog_pg_test.extreme_test_multi_block select * from catalog_pg_te
 insert into catalog_pg_test.extreme_test_multi_block select * from catalog_pg_test.extreme_test_multi_block;
 insert into catalog_pg_test.extreme_test_multi_block select * from catalog_pg_test.extreme_test_multi_block;
 insert into catalog_pg_test.extreme_test_multi_block select * from catalog_pg_test.extreme_test;
+
+
+SET TIME ZONE 'Asia/Shanghai';
+INSERT INTO test_timestamp_tz_db.ts_test VALUES (1,'2025-01-01 12:00:00+08','2025-01-01 12:00:00');
+INSERT INTO test_timestamp_tz_db.ts_test VALUES (2,NULL,NULL);
diff --git a/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/BaseJdbcExecutor.java b/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/BaseJdbcExecutor.java
@@ -622,6 +622,10 @@ private void insertColumn(int rowIdx, int colIdx, VectorColumn column) throws SQ
                 preparedStatement.setTimestamp(
                         parameterIndex, Timestamp.valueOf(column.getDateTime(rowIdx)));
                 break;
+            case TIMESTAMPTZ:
+                preparedStatement.setObject(
+                        parameterIndex, Timestamp.valueOf(column.getTimeStampTz(rowIdx)));
+                break;
             case CHAR:
             case VARCHAR:
             case STRING:
@@ -675,6 +679,9 @@ private void insertNullColumn(int parameterIndex, ColumnType.Type dorisType)
             case DATETIMEV2:
                 preparedStatement.setNull(parameterIndex, Types.TIMESTAMP);
                 break;
+            case TIMESTAMPTZ:
+                preparedStatement.setNull(parameterIndex, Types.TIMESTAMP_WITH_TIMEZONE);
+                break;
             case CHAR:
             case VARCHAR:
             case STRING:
diff --git a/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/MySQLJdbcExecutor.java b/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/MySQLJdbcExecutor.java
@@ -167,6 +167,9 @@ protected Object getColumnValue(int columnIndex, ColumnType type, String[] repla
                 }
                 return data;
             }
+            case TIMESTAMPTZ: {
+                return resultSet.getObject(columnIndex + 1, LocalDateTime.class);
+            }
             default:
                 throw new IllegalArgumentException("Unsupported column type: " + type.getType());
         }
diff --git a/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/PostgreSQLJdbcExecutor.java b/fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/PostgreSQLJdbcExecutor.java
@@ -47,7 +47,8 @@ protected void initializeBlock(int columnCount, String[] replaceStringList, int
             VectorTable outputTable) {
         for (int i = 0; i < columnCount; ++i) {
             if (outputTable.getColumnType(i).getType() == Type.DATETIME
-                    || outputTable.getColumnType(i).getType() == Type.DATETIMEV2) {
+                    || outputTable.getColumnType(i).getType() == Type.DATETIMEV2
+                    || outputTable.getColumnType(i).getType() == Type.TIMESTAMPTZ) {
                 block.add(new Object[batchSizeNum]);
             } else if (outputTable.getColumnType(i).getType() == Type.STRING
                     || outputTable.getColumnType(i).getType() == Type.ARRAY) {
@@ -89,6 +90,13 @@ protected Object getColumnValue(int columnIndex, ColumnType type, String[] repla
                 return resultSet.getObject(columnIndex + 1);
             case VARBINARY:
                 return resultSet.getBytes(columnIndex + 1);
+            case TIMESTAMPTZ:
+                OffsetDateTime offsetDateTime = resultSet.getObject(columnIndex + 1, OffsetDateTime.class);
+                if (offsetDateTime == null) {
+                    return null;
+                } else {
+                    return Timestamp.from(offsetDateTime.toInstant());
+                }
             case ARRAY:
                 java.sql.Array array = resultSet.getArray(columnIndex + 1);
                 return array == null ? null : convertArrayToList(array.getArray());
@@ -111,6 +119,14 @@ protected ColumnValueConverter getOutputConverter(ColumnType columnType, String
                         return input;
                     }
                 }, LocalDateTime.class);
+            case TIMESTAMPTZ:
+                return createConverter(input -> {
+                    if (input instanceof Timestamp) {
+                        return LocalDateTime.ofInstant(((Timestamp) input).toInstant(), java.time.ZoneOffset.UTC);
+                    } else {
+                        return input;
+                    }
+                }, LocalDateTime.class);
             case CHAR:
                 return createConverter(
                         input -> trimSpaces(input.toString()), String.class);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalTable.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalTable.java
@@ -727,7 +727,8 @@ private Optional<SchemaCacheValue> initHiveSchema() {
             String fieldName = field.getName().toLowerCase(Locale.ROOT);
             String defaultValue = colDefaultValues.getOrDefault(fieldName, null);
             columns.add(new Column(fieldName,
-                    HiveMetaStoreClientHelper.hiveTypeToDorisType(field.getType(), catalog.getEnableMappingVarbinary()),
+                    HiveMetaStoreClientHelper.hiveTypeToDorisType(field.getType(), catalog.getEnableMappingVarbinary(),
+                            catalog.getEnableMappingTimestampTz()),
                     true, null,
                     true, defaultValue, field.getComment(), true, -1));
         }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetaStoreClientHelper.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetaStoreClientHelper.java
@@ -614,15 +614,17 @@ public static String dorisTypeToHiveType(Type dorisType) {
     /**
      * Convert hive type to doris type.
      */
-    public static Type hiveTypeToDorisType(String hiveType, boolean enableMappingVarbinary) {
+    public static Type hiveTypeToDorisType(String hiveType, boolean enableMappingVarbinary,
+            boolean enableMappingTimeStampTz) {
         // use the largest scale as default time scale.
-        return hiveTypeToDorisType(hiveType, 6, enableMappingVarbinary);
+        return hiveTypeToDorisType(hiveType, 6, enableMappingVarbinary, enableMappingTimeStampTz);
     }
 
     /**
      * Convert hive type to doris type with timescale.
      */
-    public static Type hiveTypeToDorisType(String hiveType, int timeScale, boolean enableMappingVarbinary) {
+    public static Type hiveTypeToDorisType(String hiveType, int timeScale, boolean enableMappingVarbinary,
+            boolean enableMappingTimeStampTz) {
         String lowerCaseType = hiveType.toLowerCase();
         switch (lowerCaseType) {
             case "boolean":
@@ -655,7 +657,7 @@ public static Type hiveTypeToDorisType(String hiveType, int timeScale, boolean e
         if (lowerCaseType.startsWith("array")) {
             if (lowerCaseType.indexOf("<") == 5 && lowerCaseType.lastIndexOf(">") == lowerCaseType.length() - 1) {
                 Type innerType = hiveTypeToDorisType(lowerCaseType.substring(6, lowerCaseType.length() - 1),
-                        enableMappingVarbinary);
+                        enableMappingVarbinary, enableMappingTimeStampTz);
                 return ArrayType.create(innerType, true);
             }
         }
@@ -665,8 +667,11 @@ public static Type hiveTypeToDorisType(String hiveType, int timeScale, boolean e
                 String keyValue = lowerCaseType.substring(4, lowerCaseType.length() - 1);
                 int index = findNextNestedField(keyValue);
                 if (index != keyValue.length() && index != 0) {
-                    return new MapType(hiveTypeToDorisType(keyValue.substring(0, index), enableMappingVarbinary),
-                            hiveTypeToDorisType(keyValue.substring(index + 1), enableMappingVarbinary));
+                    return new MapType(
+                            hiveTypeToDorisType(keyValue.substring(0, index), enableMappingVarbinary,
+                                    enableMappingTimeStampTz),
+                            hiveTypeToDorisType(keyValue.substring(index + 1), enableMappingVarbinary,
+                                    enableMappingTimeStampTz));
                 }
             }
         }
@@ -680,7 +685,8 @@ public static Type hiveTypeToDorisType(String hiveType, int timeScale, boolean e
                     int pivot = listFields.indexOf(':');
                     if (pivot > 0 && pivot < listFields.length() - 1) {
                         fields.add(new StructField(listFields.substring(0, pivot),
-                                hiveTypeToDorisType(listFields.substring(pivot + 1, index), enableMappingVarbinary)));
+                                hiveTypeToDorisType(listFields.substring(pivot + 1, index), enableMappingVarbinary,
+                                        enableMappingTimeStampTz)));
                         listFields = listFields.substring(Math.min(index + 1, listFields.length()));
                     } else {
                         break;
@@ -717,6 +723,10 @@ public static Type hiveTypeToDorisType(String hiveType, int timeScale, boolean e
             }
             return ScalarType.createDecimalV3Type(precision, scale);
         }
+        if (lowerCaseType.startsWith("timestamp with local time zone")) {
+            return enableMappingTimeStampTz ? ScalarType.createTimeStampTzType(timeScale)
+                    : ScalarType.createDatetimeV2Type(timeScale);
+        }
         return Type.UNSUPPORTED;
     }
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcOracleClient.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcOracleClient.java
@@ -235,10 +235,6 @@ protected Type jdbcTypeToDoris(JdbcFieldSchema fieldSchema) {
             case "BLOB":
                 return enableMappingVarbinary ? ScalarType.createVarbinaryType(fieldSchema.requiredColumnSize())
                         : ScalarType.createStringType();
-            case "TIMESTAMP WITH LOCAL TIME ZONE": {
-                return enableMappingTimestampTz ? ScalarType.createTimeStampTzType(fieldSchema.requiredColumnSize())
-                        : ScalarType.createDatetimeV2Type(fieldSchema.requiredColumnSize());
-            }
             case "NCLOB":
             case "BFILE":
             case "BINARY_FLOAT":
diff --git a/regression-test/data/external_table_p0/jdbc/type_test/select/test_mysql_all_types_select.out b/regression-test/data/external_table_p0/jdbc/type_test/select/test_mysql_all_types_select.out
@@ -139,3 +139,30 @@ varbinary_c	varbinary(100)	Yes	true	\N
 4	\N
 5	0xAB
 
+-- !desc_timestamp_tz --
+id	int	Yes	true	\N	
+ts_ts	timestamptz	Yes	true	\N	
+ts_dt	datetime	Yes	true	\N	
+
+-- !select_timestamp_tz --
+1	2025-01-01 12:00:00+08:00	2025-01-01T12:00
+2	\N	\N
+
+-- !select_timestamp_tz2 --
+0
+
+-- !select_timestamp_tz3 --
+0
+
+-- !select_timestamp_tz5 --
+1	2025-01-01 12:00:00+08:00	2025-01-01T12:00
+2	\N	\N
+3	1999-10-10 12:00:00+08:00	1999-10-10T12:00
+4	\N	\N
+
+-- !select_timestamp_tz6 --
+1	2025-01-01 04:00:00+00:00	2025-01-01T12:00
+2	\N	\N
+3	1999-10-10 04:00:00+00:00	1999-10-10T12:00
+4	\N	\N
+
diff --git a/regression-test/data/external_table_p0/jdbc/type_test/select/test_pg_all_types_select.out b/regression-test/data/external_table_p0/jdbc/type_test/select/test_pg_all_types_select.out
@@ -35,3 +35,30 @@ uuid_val	text	Yes	true	\N
 -- !select_all_types_multi_block --
 4100
 
+-- !desc_timestamp_tz --
+id	int	Yes	true	\N	
+ts_tz	timestamptz(6)	Yes	true	\N	
+ts_ntz	datetime(6)	Yes	true	\N	
+
+-- !select_timestamp_tz --
+1	2025-01-01 12:00:00.000000+08:00	2025-01-01T12:00
+2	\N	\N
+
+-- !select_timestamp_tz2 --
+0
+
+-- !select_timestamp_tz3 --
+0
+
+-- !select_timestamp_tz5 --
+1	2025-01-01 12:00:00.000000+08:00	2025-01-01T12:00
+2	\N	\N
+3	1999-10-10 04:00:00.000000+08:00	1999-10-10T12:00
+4	\N	\N
+
+-- !select_timestamp_tz6 --
+1	2025-01-01 04:00:00.000000+00:00	2025-01-01T12:00
+2	\N	\N
+3	1999-10-09 20:00:00.000000+00:00	1999-10-10T12:00
+4	\N	\N
+
diff --git a/regression-test/suites/external_table_p0/jdbc/type_test/select/test_mysql_all_types_select.groovy b/regression-test/suites/external_table_p0/jdbc/type_test/select/test_mysql_all_types_select.groovy
@@ -58,5 +58,26 @@ suite("test_mysql_all_types_select", "p0,external,mysql,external_docker,external
         qt_select_varbinary_type5 """select * from test_varbinary order by id;"""
 
         sql """drop catalog if exists mysql_all_type_test """
+
+        sql """drop catalog if exists mysql_timestamp_tz_type_test """
+        sql """create catalog if not exists mysql_timestamp_tz_type_test properties(
+            "type"="jdbc",
+            "user"="root",
+            "password"="123456",
+            "jdbc_url" = "jdbc:mysql://${externalEnvIp}:${mysql_port}/doris_test?useSSL=false",
+            "driver_url" = "${driver_url}",
+            "driver_class" = "com.mysql.cj.jdbc.Driver",
+            "enable.mapping.varbinary" = "true",
+            "enable.mapping.timestamp_tz" = "true"
+        );"""
+        sql """SET time_zone = '+08:00';"""
+        sql """use mysql_timestamp_tz_type_test.test_timestamp_tz_db"""
+        qt_desc_timestamp_tz """desc ts_test;"""
+        qt_select_timestamp_tz """select * from ts_test order by id;"""
+        qt_select_timestamp_tz2 """insert into ts_test values(3,"1999-10-10 12:00:00+08:00","1999-10-10 12:00:00");"""
+        qt_select_timestamp_tz3 """insert into ts_test values(4,NULL, NULL);"""
+        qt_select_timestamp_tz5 """select * from ts_test order by id;"""
+        sql """SET time_zone = '+00:00';"""
+        qt_select_timestamp_tz6 """select * from ts_test order by id;"""
     }
 }
diff --git a/regression-test/suites/external_table_p0/jdbc/type_test/select/test_oracle_all_types_select.groovy b/regression-test/suites/external_table_p0/jdbc/type_test/select/test_oracle_all_types_select.groovy
@@ -20,8 +20,7 @@ suite("test_oracle_all_types_select", "p0,external,oracle,external_docker,extern
     String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
     String s3_endpoint = getS3Endpoint()
     String bucket = getS3BucketName()
-    String driver_url = "file:///mnt/disk1/zhangsida/install_data/ojdbc8.jar"
-    // String driver_url = "https://${bucket}.${s3_endpoint}/regression/jdbc_driver/ojdbc8.jar"
+    String driver_url = "https://${bucket}.${s3_endpoint}/regression/jdbc_driver/ojdbc8.jar"
     if (enabled != null && enabled.equalsIgnoreCase("true")) {
         String oracle_port = context.config.otherConfigs.get("oracle_11_port");
         String SID = "XE";
diff --git a/regression-test/suites/external_table_p0/jdbc/type_test/select/test_pg_all_types_select.groovy b/regression-test/suites/external_table_p0/jdbc/type_test/select/test_pg_all_types_select.groovy
@@ -72,5 +72,26 @@ suite("test_pg_all_types_select", "p0,external,pg,external_docker,external_docke
         qt_select_all_types_multi_block """select count(*) from catalog_pg_test.extreme_test_multi_block;"""
 
         sql """drop catalog if exists pg_all_type_test """
+
+        sql """drop catalog if exists pg_timestamp_tz_type_test """
+        sql """create catalog if not exists pg_timestamp_tz_type_test properties(
+            "type"="jdbc",
+            "user"="postgres",
+            "password"="123456",
+            "jdbc_url" = "jdbc:postgresql://${externalEnvIp}:${pg_port}/postgres?currentSchema=test_timestamp_tz_db&useSSL=false",
+            "driver_url" = "${driver_url}",
+            "driver_class" = "org.postgresql.Driver",
+            "enable.mapping.timestamp_tz" = "true"
+        );"""
+
+        sql """SET time_zone = '+08:00';"""
+        sql """use pg_timestamp_tz_type_test.test_timestamp_tz_db"""
+        qt_desc_timestamp_tz """desc ts_test;"""
+        qt_select_timestamp_tz """select * from ts_test order by id;"""
+        qt_select_timestamp_tz2 """insert into ts_test values(3,"1999-10-10 12:00:00+08:00","1999-10-10 12:00:00");"""
+        qt_select_timestamp_tz3 """insert into ts_test values(4,NULL, NULL);"""
+        qt_select_timestamp_tz5 """select * from ts_test order by id;"""
+        sql """SET time_zone = '+00:00';"""
+        qt_select_timestamp_tz6 """select * from ts_test order by id;"""
     }
 }
