[fix](catalog) Fix ClickHouse DataTime64 precision parsing (apache#26977

)

docker/thirdparties/docker-compose/clickhouse/init/03-create-table.sql

@@ -279,4 +279,13 @@ CREATE TABLE doris_test.ts
     ts UInt64
 )
 ENGINE = MergeTree
+ORDER BY id;
+
+CREATE TABLE doris_test.dt_with_tz
+(
+    id Int64,
+    dt1 DateTime('Asia/Shanghai'),
+    dt2 DateTime64(6, 'Asia/Shanghai')
+)
+ENGINE = MergeTree
 ORDER BY id;

docker/thirdparties/docker-compose/clickhouse/init/04-insert.sql

@@ -54,4 +54,4 @@ INSERT INTO doris_test.final_test Values (1, 'second');
 
 INSERT INTO doris_test.ts values (1,1694438743);
 
-
+INSERT INTO doris_test.dt_with_tz values(1, '2022-01-02 00:00:00','2022-01-02 00:00:00.000000');

fe/be-java-extensions/jdbc-scanner/src/main/java/org/apache/doris/jdbc/JdbcExecutor.java

@@ -560,7 +560,8 @@ private ColumnValueConverter getOutputConverter(
                 }
                 if (OffsetDateTime.class.equals(clz)) {
                     return createConverter(
-                            input -> ((Timestamp) input).toLocalDateTime(), LocalDateTime.class);
+                            input -> ((OffsetDateTime) input).toLocalDateTime(),
+                            LocalDateTime.class);
                 }
                 if (oracle.sql.TIMESTAMP.class.equals(clz)) {
                     return createConverter(

fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClickHouseClient.java

@@ -73,20 +73,14 @@ protected Type jdbcTypeToDoris(JdbcFieldSchema fieldSchema) {
             if (ckType.startsWith("DateTime(") || ckType.equals("DateTime")) {
                 return ScalarType.createDatetimeV2Type(0);
             } else {
-                int indexStart = ckType.indexOf('(');
-                int indexEnd = ckType.indexOf(')');
-                if (indexStart != -1 && indexEnd != -1) {
-                    String scaleStr = ckType.substring(indexStart + 1, indexEnd);
-                    int scale = Integer.parseInt(scaleStr);
-                    if (scale > JDBC_DATETIME_SCALE) {
-                        scale = JDBC_DATETIME_SCALE;
-                    }
-                    // return with the actual scale
-                    return ScalarType.createDatetimeV2Type(scale);
-                } else {
-                    // default precision if not specified
-                    return ScalarType.createDatetimeV2Type(JDBC_DATETIME_SCALE);
+                // DateTime64 with millisecond precision
+                // Datetime64(6) / DateTime64(6, 'Asia/Shanghai')
+                String[] accuracy = ckType.substring(11, ckType.length() - 1).split(", ");
+                int precision = Integer.parseInt(accuracy[0]);
+                if (precision > 6) {
+                    precision = JDBC_DATETIME_SCALE;
                 }
+                return ScalarType.createDatetimeV2Type(precision);
             }
         }
 

regression-test/suites/external_table_p0/jdbc/test_clickhouse_jdbc_catalog.groovy

@@ -91,6 +91,8 @@ suite("test_clickhouse_jdbc_catalog", "p0,external,clickhouse,external_docker,ex
             contains """QUERY: SELECT "id", "ts" FROM "doris_test"."ts" WHERE ("ts" <= toUnixTimestamp(FROM_UNIXTIME(ts, '%Y-%m-%d')))"""
         }
 
+        order_qt_dt_with_tz """ select * from dt_with_tz order by id; """
+
         sql """ drop catalog if exists ${catalog_name} """
     }
 }