[Coral-Schema] Add DATE type support in RelDataTypeToAvroType (#484)

linkedin · Jan 11, 2024 · 26cb90c · 26cb90c
1 parent dfec3ba
commit 26cb90c
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 5 deletions.
diff --git a/coral-schema/src/main/java/com/linkedin/coral/schema/avro/RelDataTypeToAvroType.java b/coral-schema/src/main/java/com/linkedin/coral/schema/avro/RelDataTypeToAvroType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2023 LinkedIn Corporation. All rights reserved.
+ * Copyright 2019-2024 LinkedIn Corporation. All rights reserved.
  * Licensed under the BSD-2 Clause license.
  * See LICENSE in the project root for license information.
  */
@@ -90,6 +90,7 @@ private static Schema relDataTypeToAvroType(RelDataType relDataType, String reco
   }
 
   private static Schema basicSqlTypeToAvroType(BasicSqlType relDataType) {
+    Schema schema;
     switch (relDataType.getSqlTypeName()) {
       case BOOLEAN:
         return Schema.create(Schema.Type.BOOLEAN);
@@ -110,9 +111,14 @@ private static Schema basicSqlTypeToAvroType(BasicSqlType relDataType) {
       case NULL:
         return Schema.create(Schema.Type.NULL);
       case TIMESTAMP:
-        Schema schema = Schema.create(Schema.Type.LONG);
+        schema = Schema.create(Schema.Type.LONG);
         schema.addProp("logicalType", "timestamp-millis");
         return schema;
+      case DATE:
+        // In Avro, "date" type is represented as {"type": "int", "logicalType": "date"}.
+        schema = Schema.create(Schema.Type.INT);
+        schema.addProp("logicalType", "date");
+        return schema;
       case DECIMAL:
         JsonNodeFactory factory = JsonNodeFactory.instance;
         Schema decimalSchema = Schema.create(Schema.Type.BYTES);

diff --git a/coral-schema/src/test/java/com/linkedin/coral/schema/avro/RelDataTypeToAvroTypeTests.java b/coral-schema/src/test/java/com/linkedin/coral/schema/avro/RelDataTypeToAvroTypeTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2023 LinkedIn Corporation. All rights reserved.
+ * Copyright 2020-2024 LinkedIn Corporation. All rights reserved.
  * Licensed under the BSD-2 Clause license.
  * See LICENSE in the project root for license information.
  */
@@ -78,4 +78,17 @@ public void testTimestampTypeField() {
     Assert.assertEquals(actualAvroType.toString(true),
         TestUtils.loadSchema("rel2avro-testTimestampTypeField-expected.avsc"));
   }
+
+  @Test
+  public void testDateTypeField() {
+    String viewSql = "CREATE VIEW v AS SELECT * FROM basedatetypefield";
+
+    TestUtils.executeCreateViewQuery("default", "v", viewSql);
+    RelNode relNode = hiveToRelConverter.convertView("default", "v");
+    Schema actualAvroType =
+        RelDataTypeToAvroType.relDataTypeToAvroTypeNonNullable(relNode.getRowType(), "dateTypeField");
+
+    Assert.assertEquals(actualAvroType.toString(true),
+        TestUtils.loadSchema("rel2avro-testDateTypeField-expected.avsc"));
+  }
 }
diff --git a/coral-schema/src/test/java/com/linkedin/coral/schema/avro/TestUtils.java b/coral-schema/src/test/java/com/linkedin/coral/schema/avro/TestUtils.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2023 LinkedIn Corporation. All rights reserved.
+ * Copyright 2019-2024 LinkedIn Corporation. All rights reserved.
  * Licensed under the BSD-2 Clause license.
  * See LICENSE in the project root for license information.
  */
@@ -96,6 +96,7 @@ private static void initializeTables() {
     String baseNestedComplexSchema = loadSchema("base-nested-complex.avsc");
     String baseNullTypeFieldSchema = loadSchema("base-null-type-field.avsc");
     String baseTimestampTypeFieldSchema = loadSchema("base-timestamp-type-field.avsc");
+    String baseDateTypeFieldSchema = loadSchema("base-date-type-field.avsc");
     String baseComplexUnionTypeSchema = loadSchema("base-complex-union-type.avsc");
     String baseNestedUnionSchema = loadSchema("base-nested-union.avsc");
     String baseComplexLowercase = loadSchema("base-complex-lowercase.avsc");
@@ -113,6 +114,7 @@ private static void initializeTables() {
     executeCreateTableQuery("default", "basenullability", baseNullabilitySchema);
     executeCreateTableQuery("default", "basenulltypefield", baseNullTypeFieldSchema);
     executeCreateTableQuery("default", "basetimestamptypefield", baseTimestampTypeFieldSchema);
+    executeCreateTableQuery("default", "basedatetypefield", baseDateTypeFieldSchema);
     executeCreateTableQuery("default", "basecomplexuniontype", baseComplexUnionTypeSchema);
     executeCreateTableQuery("default", "basenestedunion", baseNestedUnionSchema);
     executeCreateTableQuery("default", "basecomplexlowercase", baseComplexLowercase);

diff --git a/coral-schema/src/test/resources/base-date-type-field.avsc b/coral-schema/src/test/resources/base-date-type-field.avsc
@@ -0,0 +1,12 @@
+{
+  "type" : "record",
+  "name" : "basedatetypefield",
+  "namespace" : "coral.schema.avro.base.date.type.field",
+  "fields" : [ {
+    "name" : "Date_Field",
+    "type" : [ "null", {
+      "type" : "int",
+      "logicalType" : "date"
+    } ]
+  } ]
+}
diff --git a/coral-schema/src/test/resources/rel2avro-testDateTypeField-expected.avsc b/coral-schema/src/test/resources/rel2avro-testDateTypeField-expected.avsc
@@ -0,0 +1,13 @@
+{
+  "type" : "record",
+  "name" : "dateTypeField",
+  "namespace" : "rel_avro",
+  "fields" : [ {
+    "name" : "date_field",
+    "type" : [ "null", {
+      "type" : "int",
+      "logicalType" : "date"
+    } ],
+    "default" : null
+  } ]
+}
diff --git a/coral-trino/src/test/java/com/linkedin/coral/trino/rel2trino/HiveToTrinoConverterTest.java b/coral-trino/src/test/java/com/linkedin/coral/trino/rel2trino/HiveToTrinoConverterTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017-2023 LinkedIn Corporation. All rights reserved.
+ * Copyright 2017-2024 LinkedIn Corporation. All rights reserved.
  * Licensed under the BSD-2 Clause license.
  * See LICENSE in the project root for license information.
  */