Merge pull request #13205: [BEAM-11145] Upgrade to ZetaSQL 2020.10.1
diff --git a/sdks/java/extensions/sql/zetasql/build.gradle b/sdks/java/extensions/sql/zetasql/build.gradle
index 2cf39b2..db409f1 100644
--- a/sdks/java/extensions/sql/zetasql/build.gradle
+++ b/sdks/java/extensions/sql/zetasql/build.gradle
@@ -28,7 +28,7 @@
description = "Apache Beam :: SDKs :: Java :: Extensions :: SQL :: ZetaSQL"
ext.summary = "ZetaSQL to Calcite translator"
-def zetasql_version = "2020.08.1"
+def zetasql_version = "2020.10.1"
dependencies {
compile project(":sdks:java:core")
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 77b525d..eb7aff0 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
@@ -433,7 +433,7 @@
public RexCall convertTableValuedFunction(
RelNode input,
TableValuedFunction tvf,
- List<ResolvedNodes.ResolvedTVFArgument> argumentList,
+ List<ResolvedNodes.ResolvedFunctionArgument> argumentList,
List<ResolvedColumn> inputTableColumns) {
ResolvedColumn wmCol;
// Handle builtin windowing TVF.
diff --git a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/TVFScanConverter.java b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/TVFScanConverter.java
index 5a9d124..0c30c99 100644
--- a/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/TVFScanConverter.java
+++ b/sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/translation/TVFScanConverter.java
@@ -22,8 +22,8 @@
import com.google.zetasql.TableValuedFunction.FixedOutputSchemaTVF;
import com.google.zetasql.ZetaSQLResolvedNodeKind.ResolvedNodeKind;
import com.google.zetasql.resolvedast.ResolvedNode;
+import com.google.zetasql.resolvedast.ResolvedNodes.ResolvedFunctionArgument;
import com.google.zetasql.resolvedast.ResolvedNodes.ResolvedLiteral;
-import com.google.zetasql.resolvedast.ResolvedNodes.ResolvedTVFArgument;
import com.google.zetasql.resolvedast.ResolvedNodes.ResolvedTVFScan;
import java.util.ArrayList;
import java.util.Collections;
@@ -72,7 +72,7 @@
inputs.add(context.getUserDefinedTableValuedFunctions().get(zetaNode.getTvf().getNamePath()));
}
- for (ResolvedTVFArgument argument : zetaNode.getArgumentList()) {
+ for (ResolvedFunctionArgument argument : zetaNode.getArgumentList()) {
if (argument.getScan() != null) {
inputs.add(argument.getScan());
}
@@ -86,8 +86,9 @@
for (int i = 0; i < tableValuedFunctionProto.getSignature().getArgumentList().size(); i++) {
String argumentName =
tableValuedFunctionProto.getSignature().getArgument(i).getOptions().getArgumentName();
- if (zetaNode.getArgumentList().get(i).nodeKind() == ResolvedNodeKind.RESOLVED_TVFARGUMENT) {
- ResolvedTVFArgument resolvedTVFArgument = zetaNode.getArgumentList().get(i);
+ if (zetaNode.getArgumentList().get(i).nodeKind()
+ == ResolvedNodeKind.RESOLVED_FUNCTION_ARGUMENT) {
+ ResolvedFunctionArgument resolvedTVFArgument = zetaNode.getArgumentList().get(i);
if (resolvedTVFArgument.getExpr().nodeKind() == ResolvedNodeKind.RESOLVED_LITERAL) {
ResolvedLiteral literal = (ResolvedLiteral) resolvedTVFArgument.getExpr();
context.addToFunctionArgumentRefMapping(
