[
https://issues.apache.org/jira/browse/BEAM-9953?focusedWorklogId=453656&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-453656
]
ASF GitHub Bot logged work on BEAM-9953:
----------------------------------------
Author: ASF GitHub Bot
Created on: 01/Jul/20 21:05
Start Date: 01/Jul/20 21:05
Worklog Time Spent: 10m
Work Description: amaliujia commented on a change in pull request #12153:
URL: https://github.com/apache/beam/pull/12153#discussion_r448615855
##########
File path:
sdks/java/extensions/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSQLPlannerImpl.java
##########
@@ -130,30 +135,58 @@ public RelRoot rel(SqlNode sqlNode) throws
RelConversionException {
}
public RelRoot rel(String sql, QueryParameters params) {
- this.cluster = RelOptCluster.create(planner, new RexBuilder(typeFactory));
- this.expressionConverter = new ExpressionConverter(cluster, params);
+ RelOptCluster cluster = RelOptCluster.create(planner, new
RexBuilder(typeFactory));
QueryTrait trait = new QueryTrait();
- // Set up table providers that need to be pre-registered
- // TODO(https://issues.apache.org/jira/browse/BEAM-8817): share this logic
between dialects
- List<List<String>> tables = Analyzer.extractTableNamesFromStatement(sql);
- TableResolution.registerTables(this.defaultSchemaPlus, tables);
-
- ResolvedStatement statement =
+ SqlAnalyzer analyzer =
SqlAnalyzer.getBuilder()
.withQueryParams(params)
.withQueryTrait(trait)
.withCalciteContext(config.getContext())
.withTopLevelSchema(defaultSchemaPlus)
.withTypeFactory((JavaTypeFactory) cluster.getTypeFactory())
- .analyze(sql);
+ .build();
+
+ AnalyzerOptions options = SqlAnalyzer.initAnalyzerOptions(params);
+
+ // Set up table providers that need to be pre-registered
+ List<List<String>> tables = analyzer.extractTableNames(sql, options);
+ TableResolution.registerTables(this.defaultSchemaPlus, tables);
+ SimpleCatalog catalog =
+ analyzer.createPopulatedCatalog(defaultSchemaPlus.getName(), options,
tables);
+
+ ImmutableMap.Builder<String, ResolvedCreateFunctionStmt> udfBuilder =
ImmutableMap.builder();
+
+ ResolvedStatement statement;
+ ParseResumeLocation parseResumeLocation = new ParseResumeLocation(sql);
+ do {
+ statement = analyzer.analyzeNextStatement(parseResumeLocation, options,
catalog);
+ if (statement.nodeKind() == RESOLVED_CREATE_FUNCTION_STMT) {
+ ResolvedCreateFunctionStmt createFunctionStmt =
(ResolvedCreateFunctionStmt) statement;
+ // ResolvedCreateFunctionStmt does not include the full function name,
so build it here.
+ String functionFullName =
+ String.format(
+ "%s:%s",
+ SqlAnalyzer.USER_DEFINED_FUNCTIONS,
+ String.join(".", createFunctionStmt.getNamePath()));
+ udfBuilder.put(functionFullName, createFunctionStmt);
+ } else if (statement.nodeKind() == RESOLVED_QUERY_STMT) {
+ if (!SqlAnalyzer.isEndOfInput(parseResumeLocation)) {
Review comment:
+1
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 453656)
Time Spent: 1h 40m (was: 1.5h)
> Beam ZetaSQL supports multiple statements in a query
> ----------------------------------------------------
>
> Key: BEAM-9953
> URL: https://issues.apache.org/jira/browse/BEAM-9953
> Project: Beam
> Issue Type: Task
> Components: dsl-sql-zetasql
> Reporter: Rui Wang
> Assignee: Kyle Weaver
> Priority: P2
> Time Spent: 1h 40m
> Remaining Estimate: 0h
>
> One example of multiple statements query:
> {code:java}
> CREATE FUNCTION fun_a (param_1 INT64); SELECT fun_a(10);
> {code}
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
