[jira] [Work logged] (BEAM-5884) Allow nested types have null value.

[ASF GitHub Bot (JIRA)]

     [ 
https://issues.apache.org/jira/browse/BEAM-5884?focusedWorklogId=172181&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-172181
 ]

ASF GitHub Bot logged work on BEAM-5884:
----------------------------------------

                Author: ASF GitHub Bot
            Created on: 05/Dec/18 07:27
            Start Date: 05/Dec/18 07:27
    Worklog Time Spent: 10m 
      Work Description: reuvenlax closed pull request #7204:  [BEAM-5884] Fix 
FieldType comparison in BeamSQL
URL: https://github.com/apache/beam/pull/7204
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git 
a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/Schema.java 
b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/Schema.java
index a923c0ea16b4..d256b326e0f7 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/Schema.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/Schema.java
@@ -228,7 +228,8 @@ public boolean typesEqual(Schema other) {
     return true;
   }
 
-  enum EquivalenceNullablePolicy {
+  /** Control whether nullable is included in equivalence check. */
+  public enum EquivalenceNullablePolicy {
     SAME,
     WEAKEN,
     IGNORE
@@ -581,7 +582,8 @@ public boolean typesEqual(FieldType other) {
       return true;
     }
 
-    private boolean equivalent(FieldType other, EquivalenceNullablePolicy 
nullablePolicy) {
+    /** Check whether two types are equivalent. */
+    public boolean equivalent(FieldType other, EquivalenceNullablePolicy 
nullablePolicy) {
       if (nullablePolicy == EquivalenceNullablePolicy.SAME
           && !other.getNullable().equals(getNullable())) {
         return false;
diff --git 
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/pubsub/PubsubJsonTableProvider.java
 
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/pubsub/PubsubJsonTableProvider.java
index 66a952a08044..9c13c8a812d6 100644
--- 
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/pubsub/PubsubJsonTableProvider.java
+++ 
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/pubsub/PubsubJsonTableProvider.java
@@ -71,7 +71,8 @@ private void validatePubsubMessageSchema(Table 
tableDefinition) {
 
     if (schema.getFieldCount() != 3
         || !fieldPresent(schema, TIMESTAMP_FIELD, TIMESTAMP)
-        || !fieldPresent(schema, ATTRIBUTES_FIELD, 
Schema.FieldType.map(VARCHAR, VARCHAR))
+        || !fieldPresent(
+            schema, ATTRIBUTES_FIELD, 
Schema.FieldType.map(VARCHAR.withNullable(false), VARCHAR))
         || !(schema.hasField(PAYLOAD_FIELD)
             && 
ROW.equals(schema.getField(PAYLOAD_FIELD).getType().getTypeName()))) {
 
@@ -85,7 +86,9 @@ private void validatePubsubMessageSchema(Table 
tableDefinition) {
   }
 
   private boolean fieldPresent(Schema schema, String field, Schema.FieldType 
expectedType) {
-    return schema.hasField(field) && 
expectedType.equals(schema.getField(field).getType());
+    return schema.hasField(field)
+        && expectedType.equivalent(
+            schema.getField(field).getType(), 
Schema.EquivalenceNullablePolicy.IGNORE);
   }
 
   private void validateDlq(String deadLetterQueue) {


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


Issue Time Tracking
-------------------

    Worklog Id:     (was: 172181)
    Time Spent: 5h 40m  (was: 5.5h)

> Allow nested types have null value.
> -----------------------------------
>
>                 Key: BEAM-5884
>                 URL: https://issues.apache.org/jira/browse/BEAM-5884
>             Project: Beam
>          Issue Type: Bug
>          Components: dsl-sql
>            Reporter: Rui Wang
>            Assignee: Rui Wang
>            Priority: Major
>             Fix For: Not applicable
>
>          Time Spent: 5h 40m
>  Remaining Estimate: 0h
>
> We could allow arbitrary combination of nested types have null value.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)