[GIE Compiler] revert changes with 'Date' in groot DataType

alibaba · Oct 17, 2023 · c77777b · c77777b
1 parent 5875cef
commit c77777b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/...ine/common/src/main/java/com/alibaba/graphscope/groot/common/schema/wrapper/DataType.java b/...ine/common/src/main/java/com/alibaba/graphscope/groot/common/schema/wrapper/DataType.java
@@ -35,7 +35,7 @@ public enum DataType {
     DOUBLE_LIST(13),
     STRING_LIST(14),
     BYTES_LIST(15),
-    DATE32(16),
+    DATE(16), // represent DATE32
     TIME32(17),
     TIMESTAMP(18);
 

diff --git a/..._engine/common/src/main/java/com/alibaba/graphscope/groot/common/util/IrSchemaParser.java b/..._engine/common/src/main/java/com/alibaba/graphscope/groot/common/util/IrSchemaParser.java
@@ -144,7 +144,7 @@ private int getDataTypeId(DataType dataType) {
                 return 8;
             case STRING_LIST:
                 return 9;
-            case DATE32:
+            case DATE:
                 return 12;
             case TIME32:
                 return 13;

diff --git a/...ne/compiler/src/main/java/com/alibaba/graphscope/common/ir/meta/schema/GraphOptTable.java b/...ne/compiler/src/main/java/com/alibaba/graphscope/common/ir/meta/schema/GraphOptTable.java
@@ -124,7 +124,7 @@ private RelDataType deriveType(GraphProperty property) {
                 return typeFactory.createSqlType(SqlTypeName.FLOAT);
             case DOUBLE:
                 return typeFactory.createSqlType(SqlTypeName.DOUBLE);
-            case DATE32:
+            case DATE:
                 return typeFactory.createSqlType(SqlTypeName.DATE);
             case TIME32:
                 return typeFactory.createSqlType(SqlTypeName.TIME);

diff --git a/...ive_engine/compiler/src/main/java/com/alibaba/graphscope/common/ir/meta/schema/Utils.java b/...ive_engine/compiler/src/main/java/com/alibaba/graphscope/common/ir/meta/schema/Utils.java
@@ -160,7 +160,7 @@ public static DataType toDataType(Object type) {
                     case "DT_STRING":
                         return DataType.STRING;
                     case "DT_DATE32":
-                        return DataType.DATE32;
+                        return DataType.DATE;
                     case "DT_TIME32":
                         return DataType.TIME32;
                     case "TIMESTAMP":
@@ -273,7 +273,7 @@ public static final DataType toDataType(int ordinal) {
             case 9:
                 return DataType.STRING_LIST;
             case 12:
-                return DataType.DATE32;
+                return DataType.DATE;
             case 13:
                 return DataType.TIME32;
             case 14:

diff --git a/...ve_engine/compiler/src/test/java/com/alibaba/graphscope/common/config/YamlConfigTest.java b/...ve_engine/compiler/src/test/java/com/alibaba/graphscope/common/config/YamlConfigTest.java
@@ -91,7 +91,7 @@ public void schema_config_test() throws Exception {
                         + " propertyList=[DefaultGraphProperty{id=0, name=id, dataType=LONG},"
                         + " DefaultGraphProperty{id=1, name=name, dataType=STRING},"
                         + " DefaultGraphProperty{id=2, name=lang, dataType=STRING},"
-                        + " DefaultGraphProperty{id=3, name=creationDate, dataType=DATE32}],"
+                        + " DefaultGraphProperty{id=3, name=creationDate, dataType=DATE}],"
                         + " primaryKeyList=[id]}",
                 graphSchema.getElement("software").toString());
     }