[
https://issues.apache.org/jira/browse/BEAM-4044?focusedWorklogId=89646&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-89646
]
ASF GitHub Bot logged work on BEAM-4044:
----------------------------------------
Author: ASF GitHub Bot
Created on: 10/Apr/18 22:04
Start Date: 10/Apr/18 22:04
Worklog Time Spent: 10m
Work Description: apilloud commented on a change in pull request #5040:
[BEAM-4044] [SQL] Refresh DDL from 1.16
URL: https://github.com/apache/beam/pull/5040#discussion_r180581448
##########
File path: sdks/java/extensions/sql/src/main/codegen/includes/parserImpls.ftl
##########
@@ -1,106 +1,154 @@
-<#-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
- license agreements. See the NOTICE file distributed with this work for
additional
- information regarding copyright ownership. The ASF licenses this file to
- You under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
+<#--
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+-->
+boolean IfNotExistsOpt() :
+{
+}
+{
+ <IF> <NOT> <EXISTS> { return true; }
+|
+ { return false; }
+}
-private void ColumnDef(List<ColumnDefinition> list) :
+boolean IfExistsOpt() :
{
- SqlParserPos pos;
- SqlIdentifier name;
- SqlDataTypeSpec type;
- ColumnConstraint constraint = null;
- SqlNode comment = null;
}
{
- name = SimpleIdentifier() { pos = getPos(); }
- type = DataType()
- [
- <PRIMARY> <KEY>
- { constraint = new ColumnConstraint.PrimaryKey(getPos()); }
- ]
+ <IF> <EXISTS> { return true; }
+|
+ { return false; }
+}
+
+SqlNodeList Options() :
+{
+ final Span s;
+ final List<SqlNode> list = Lists.newArrayList();
+}
+{
+ <OPTIONS> { s = span(); } <LPAREN>
[
- <COMMENT> comment = StringLiteral()
+ Option(list)
+ (
+ <COMMA>
+ Option(list)
+ )*
]
- {
- list.add(new ColumnDefinition(name, type, constraint, comment, pos));
+ <RPAREN> {
+ return new SqlNodeList(list, s.end(this));
}
}
-SqlNodeList ColumnDefinitionList() :
+void Option(List<SqlNode> list) :
{
- SqlParserPos pos;
- List<ColumnDefinition> list = Lists.newArrayList();
+ final SqlIdentifier id;
+ final SqlNode value;
}
{
- <LPAREN> { pos = getPos(); }
- ColumnDef(list)
- ( <COMMA> ColumnDef(list) )*
+ id = SimpleIdentifier()
+ value = Literal() {
+ list.add(id);
+ list.add(value);
+ }
+}
+
+SqlNodeList TableElementList() :
+{
+ final Span s;
+ final List<SqlNode> list = Lists.newArrayList();
+}
+{
+ <LPAREN> { s = span(); }
+ TableElement(list)
+ (
+ <COMMA> TableElement(list)
+ )*
<RPAREN> {
- return new SqlNodeList(list, pos.plus(getPos()));
+ return new SqlNodeList(list, s.end(this));
+ }
+}
+
+void TableElement(List<SqlNode> list) :
+{
+ final SqlIdentifier id;
+ final SqlDataTypeSpec type;
+ final boolean nullable;
+ SqlNode comment = null;
+ final Span s = Span.of();
+}
+{
+ id = SimpleIdentifier()
+ (
+ type = DataType()
+ (
+ <NULL> { nullable = true; }
+ |
+ <NOT> <NULL> { nullable = false; }
+ |
+ { nullable = true; }
+ )
+ [ <COMMENT> comment = StringLiteral() ]
+ {
+ list.add(
+ SqlDdlNodes.column(s.add(id).end(this), id,
+ type.withNullable(nullable), comment));
+ }
+ |
+ { list.add(id); }
+ )
+|
+ id = SimpleIdentifier() {
+ list.add(id);
}
}
-/**
- * CREATE TABLE ( IF NOT EXISTS )?
- * ( database_name '.' )? table_name ( '(' column_def ( ',' column_def )* ')'
- * ( STORED AS INPUTFORMAT input_format_classname OUTPUTFORMAT
output_format_classname )?
- * LOCATION location_uri
- * ( TBLPROPERTIES tbl_properties )?
- * ( AS select_stmt )
Review comment:
The comments were wrong before this change, so I didn't add them back. I
also think they add very little value as the parser template is readable. I can
add them back if you still want them.
----------------------------------------------------------------
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: 89646)
Time Spent: 1h (was: 50m)
> Take advantage of Calcite DDL
> -----------------------------
>
> Key: BEAM-4044
> URL: https://issues.apache.org/jira/browse/BEAM-4044
> Project: Beam
> Issue Type: New Feature
> Components: dsl-sql
> Reporter: Andrew Pilloud
> Assignee: Andrew Pilloud
> Priority: Major
> Time Spent: 1h
> Remaining Estimate: 0h
>
> In Calcite 1.15 support for abstract DDL moved into calcite core. We should
> take advantage of that.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
