[hudi] branch master updated: [HUDI-6526] Hoodie Hive catalog sync timestamp(3) as timestamp type into Hive (#9177)

[danny0405]

This is an automated email from the ASF dual-hosted git repository.

danny0405 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git


The following commit(s) were added to refs/heads/master by this push:
     new acc63fc4193 [HUDI-6526] Hoodie Hive catalog sync timestamp(3) as 
timestamp type into Hive (#9177)
acc63fc4193 is described below

commit acc63fc4193d06fe0c2d22263e3daebb36c5e812
Author: Danny Chan <yuzhao....@gmail.com>
AuthorDate: Wed Jul 12 20:13:07 2023 +0800

    [HUDI-6526] Hoodie Hive catalog sync timestamp(3) as timestamp type into 
Hive (#9177)
    
    After HUDI-6307, timestamp(3) is also synced as timestamp type in Hive.
---
 .../apache/hudi/table/catalog/TypeInfoLogicalTypeVisitor.java |  2 +-
 .../org/apache/hudi/table/catalog/TestHoodieHiveCatalog.java  | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git 
a/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/table/catalog/TypeInfoLogicalTypeVisitor.java
 
b/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/table/catalog/TypeInfoLogicalTypeVisitor.java
index e6b15788fe7..5fcd0977d24 100644
--- 
a/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/table/catalog/TypeInfoLogicalTypeVisitor.java
+++ 
b/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/table/catalog/TypeInfoLogicalTypeVisitor.java
@@ -137,7 +137,7 @@ public class TypeInfoLogicalTypeVisitor extends 
LogicalTypeDefaultVisitor<TypeIn
     int precision = timestampType.getPrecision();
     // see org.apache.hudi.hive.util.HiveSchemaUtil#convertField for details.
     // default supports timestamp
-    if (precision == 6) {
+    if (precision <= 6) {
       return TypeInfoFactory.timestampTypeInfo;
     } else {
       return TypeInfoFactory.longTypeInfo;
diff --git 
a/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/table/catalog/TestHoodieHiveCatalog.java
 
b/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/table/catalog/TestHoodieHiveCatalog.java
index 7695a205e2b..822ed54de77 100644
--- 
a/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/table/catalog/TestHoodieHiveCatalog.java
+++ 
b/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/table/catalog/TestHoodieHiveCatalog.java
@@ -85,7 +85,8 @@ public class TestHoodieHiveCatalog {
           .field("name", DataTypes.STRING())
           .field("age", DataTypes.INT())
           .field("par1", DataTypes.STRING())
-          .field("ts", DataTypes.BIGINT())
+          .field("ts_3", DataTypes.TIMESTAMP(3))
+          .field("ts_6", DataTypes.TIMESTAMP(6))
           .primaryKey("uuid")
           .build();
   List<String> partitions = Collections.singletonList("par1");
@@ -135,7 +136,8 @@ public class TestHoodieHiveCatalog {
         + "uuid:int,"
         + "name:string,"
         + "age:int,"
-        + "ts:bigint";
+        + "ts_3:timestamp,"
+        + "ts_6:timestamp";
     assertEquals(expectedFieldSchema, fieldSchema);
     String partitionSchema = hiveTable.getPartitionKeys().stream()
         .map(f -> f.getName() + ":" + f.getType())
@@ -153,7 +155,8 @@ public class TestHoodieHiveCatalog {
         + 
"{\"name\":\"uuid\",\"type\":\"integer\",\"nullable\":false,\"metadata\":{}},"
         + 
"{\"name\":\"name\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}},"
         + 
"{\"name\":\"age\",\"type\":\"integer\",\"nullable\":true,\"metadata\":{}},"
-        + 
"{\"name\":\"ts\",\"type\":\"long\",\"nullable\":true,\"metadata\":{}},"
+        + 
"{\"name\":\"ts_3\",\"type\":\"timestamp\",\"nullable\":true,\"metadata\":{}},"
+        + 
"{\"name\":\"ts_6\",\"type\":\"timestamp\",\"nullable\":true,\"metadata\":{}},"
         + 
"{\"name\":\"par1\",\"type\":\"string\",\"nullable\":true,\"metadata\":{}}]}";
     assertEquals(expectedAvroSchemaStr, avroSchemaStr);
 
@@ -166,7 +169,7 @@ public class TestHoodieHiveCatalog {
     String tableSchema = table1.getUnresolvedSchema().getColumns().stream()
         .map(Schema.UnresolvedColumn::toString)
         .collect(Collectors.joining(","));
-    String expectedTableSchema = "`uuid` INT NOT NULL,`name` STRING,`age` 
INT,`par1` STRING,`ts` BIGINT";
+    String expectedTableSchema = "`uuid` INT NOT NULL,`name` STRING,`age` 
INT,`par1` STRING,`ts_3` TIMESTAMP(3),`ts_6` TIMESTAMP(6)";
     assertEquals(expectedTableSchema, tableSchema);
     assertEquals(Collections.singletonList("uuid"), 
table1.getUnresolvedSchema().getPrimaryKey().get().getColumnNames());
     assertEquals(Collections.singletonList("par1"), ((CatalogTable) 
table1).getPartitionKeys());