[beam] branch master updated: [BEAM-9212] fix zetasql struct exception

[ib...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new cc4054c  [BEAM-9212] fix zetasql struct exception
     new c1817f4  Merge pull request #10707 from ibzib/zetasql-error-str
cc4054c is described below

commit cc4054c73bece31f509c60d057e2d669a7016131
Author: Kyle Weaver <kc...@google.com>
AuthorDate: Thu Feb 13 15:59:21 2020 -0800

    [BEAM-9212] fix zetasql struct exception
---
 .../sql/zetasql/translation/ExpressionConverter.java          | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ExpressionConverter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ExpressionConverter.java
index feef354..814fb16 100644
--- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ExpressionConverter.java
+++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/ExpressionConverter.java
@@ -30,6 +30,7 @@ import static org.apache.beam.sdk.extensions.sql.zetasql.DateTimeUtils.safeMicro
 import static org.apache.beam.sdk.extensions.sql.zetasql.ZetaSQLCastFunctionImpl.ZETASQL_CAST_OP;
 
 import com.google.common.base.Ascii;
+import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -945,26 +946,18 @@ public class ExpressionConverter {
 
   private RexNode convertResolvedParameter(ResolvedParameter parameter) {
     Value value;
-    String identifier;
     switch (queryParams.getKind()) {
       case NAMED:
         value = ((Map<String, Value>) queryParams.named()).get(parameter.getName());
-        identifier = parameter.getName();
         break;
       case POSITIONAL:
         // parameter is 1-indexed, while parameter list is 0-indexed.
         value = ((List<Value>) queryParams.positional()).get((int) parameter.getPosition() - 1);
-        identifier = Long.toString(parameter.getPosition());
         break;
       default:
         throw new IllegalArgumentException("Found unexpected parameter " + parameter);
     }
-    if (!parameter.getType().equals(value.getType())) {
-      throw new SqlConversionException(
-          String.format(
-              "Expected resolved parameter %s to have type %s, but it has type %s",
-              identifier, value.getType(), parameter.getType()));
-    }
+    Preconditions.checkState(parameter.getType().equals(value.getType()));
     return convertValueToRexNode(value.getType(), value);
   }