[GitHub] [beam] kennknowles commented on a diff in pull request #24910: Attempt deserialize all non-standard portable logical types from proto

[GitBox <gi...@apache.org>]

kennknowles commented on code in PR #24910:
URL: https://github.com/apache/beam/pull/24910#discussion_r1063490794


##########
sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/SchemaTranslation.java:
##########
@@ -426,26 +431,33 @@ private static FieldType fieldTypeFromProtoWithoutNullable(SchemaApi.FieldType p
           return FieldType.DATETIME;
         } else if (urn.equals(URN_BEAM_LOGICAL_DECIMAL)) {
           return FieldType.DECIMAL;
-        } else if (urn.equals(URN_BEAM_LOGICAL_JAVASDK)) {
-          return FieldType.logicalType(
-              (LogicalType)
-                  SerializableUtils.deserializeFromByteArray(
-                      logicalType.getPayload().toByteArray(), "logicalType"));
-        } else {
-          @Nullable FieldType argumentType = null;
-          @Nullable Object argumentValue = null;
-          if (logicalType.hasArgumentType()) {
-            argumentType = fieldTypeFromProto(logicalType.getArgumentType());
-            argumentValue = fieldValueFromProto(argumentType, logicalType.getArgument());
+        } else if (urn.startsWith("beam:logical_type:")) {
+          try {
+            return FieldType.logicalType(
+                (LogicalType)
+                    SerializableUtils.deserializeFromByteArray(
+                        logicalType.getPayload().toByteArray(), "logicalType"));
+          } catch (IllegalArgumentException e) {
+            LOG.warn(
+                String.format(

Review Comment:
   `LOG.warn("Unable to deserialize the logical type {} from proto. Mark as UnknownLogicalType", urn)`



##########
sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/SchemaTranslationTest.java:
##########
@@ -395,6 +402,41 @@ public void typeInfoNotSet() {
     }
   }
 
+  @RunWith(JUnit4.class)
+  public static class LogicalTypesTest {
+    @Test
+    public void testPortableLogicalTypeSerializeDeserilizeCorrectly() {
+      List<Schema.FieldType> testCases =
+          ImmutableList.<Schema.FieldType>builder()
+              .add(FieldType.logicalType(SqlTypes.DATE))
+              .add(FieldType.logicalType(SqlTypes.TIME))
+              .add(FieldType.logicalType(SqlTypes.DATETIME))
+              .add(FieldType.logicalType(SqlTypes.TIMESTAMP))
+              .add(FieldType.logicalType(new NanosInstant()))
+              .add(FieldType.logicalType(new NanosDuration()))
+              .add(FieldType.logicalType(FixedBytes.of(10)))
+              .add(FieldType.logicalType(VariableBytes.of(10)))
+              .add(FieldType.logicalType(FixedString.of(10)))
+              .add(FieldType.logicalType(VariableString.of(10)))
+              .add(FieldType.logicalType(FixedPrecisionNumeric.of(10)))
+              .build();
+
+      for (Schema.FieldType fieldType : testCases) {

Review Comment:
   You can do this with `@RunWith(Parameterized.class)` as a cleanup.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@beam.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org