twalthr commented on a change in pull request #9243: [FLINK-13335][sql-parser]
Align the SQL CREATE TABLE DDL with FLIP-37
URL: https://github.com/apache/flink/pull/9243#discussion_r309172263
##########
File path:
flink-table/flink-sql-parser/src/main/codegen/includes/parserImpls.ftl
##########
@@ -367,53 +375,299 @@ SqlDrop SqlDropView(Span s, boolean replace) :
}
}
+SqlIdentifier FlinkCollectionsTypeName() :
+{
+}
+{
+ LOOKAHEAD(2)
+ <MULTISET> {
+ return new SqlIdentifier(SqlTypeName.MULTISET.name(), getPos());
+ }
+|
+ <ARRAY> {
+ return new SqlIdentifier(SqlTypeName.ARRAY.name(), getPos());
+ }
+}
+
+SqlIdentifier FlinkTypeName() :
+{
+ final SqlTypeName sqlTypeName;
+ final SqlIdentifier typeName;
+ final Span s = Span.of();
+}
+{
+ (
+<#-- additional types are included here -->
+<#-- make custom data types in front of Calcite core data types -->
+<#list parser.flinkDataTypeParserMethods as method>
+ <#if (method?index > 0)>
+ |
+ </#if>
+ LOOKAHEAD(2)
+ typeName = ${method}
+</#list>
+ |
+ LOOKAHEAD(2)
+ sqlTypeName = SqlTypeName(s) {
+ typeName = new SqlIdentifier(sqlTypeName.name(), s.end(this));
+ }
+ |
+ LOOKAHEAD(2)
+ typeName = FlinkCollectionsTypeName()
+ |
+ typeName = CompoundIdentifier() {
+ throw new ParseException("UDT in DDL is not supported yet.");
+ }
+ )
+ {
+ return typeName;
+ }
+}
+
+/**
+* Parse a Flink data type with nullable options, NULL -> nullable, NOT NULL ->
not nullable.
+* Default to be nullable.
+*/
+SqlDataTypeSpec FlinkDataType() :
+{
+ final SqlIdentifier typeName;
+ SqlIdentifier collectionTypeName = null;
+ int scale = -1;
+ int precision = -1;
+ String charSetName = null;
+ final Span s;
+ boolean nullable = true;
+ boolean elementNullable = true;
+}
+{
+ typeName = FlinkTypeName() {
+ s = span();
+ }
+ [
+ <LPAREN>
+ precision = UnsignedIntLiteral()
+ [
+ <COMMA>
+ scale = UnsignedIntLiteral()
+ ]
+ <RPAREN>
+ ]
+ [
+ <CHARACTER> <SET>
+ charSetName = Identifier()
+ ]
+ elementNullable = NullableOpt()
+ [
+ collectionTypeName = FlinkCollectionsTypeName()
+ nullable = NullableOpt()
+ ]
+ {
+ if (null != collectionTypeName) {
+ return new FlinkSqlDataTypeSpec(
+ collectionTypeName,
+ typeName,
+ precision,
+ scale,
+ charSetName,
+ nullable,
+ elementNullable,
+ s.end(collectionTypeName));
+ }
+ nullable = elementNullable;
+ return new FlinkSqlDataTypeSpec(typeName,
+ precision,
+ scale,
+ charSetName,
+ null,
+ nullable,
+ elementNullable,
+ s.end(this));
+ }
+}
+
+SqlIdentifier SqlStringType() :
+{
+}
+{
+ <STRING> { return new SqlStringType(getPos()); }
+}
+
+SqlIdentifier SqlBytesType() :
+{
+}
+{
+ <BYTES> { return new SqlBytesType(getPos()); }
+}
+
+boolean WithLocalTimeZone() :
+{
+}
+{
+ <WITHOUT> <TIME> <ZONE> { return false; }
+|
+ <WITH>
+ (
+ <LOCAL> <TIME> <ZONE> { return true; }
+ |
+ <TIME> <ZONE> {
+ throw new ParseException("'WITH TIME ZONE' is not supported yet,
options: " +
+ "'WITHOUT TIME ZONE', 'WITH LOCAL TIME ZONE'.");
+ }
+ )
+|
+ { return false; }
+}
+
+SqlIdentifier SqlZonedTimeType() :
+{
+ int precision = -1;
+ boolean withLocalTimeZone = false;
+}
+{
+ <TIME>
+ (
+ <LPAREN> precision = UnsignedIntLiteral() <RPAREN>
+ |
+ { precision = -1; }
+ )
+ withLocalTimeZone = WithLocalTimeZone()
+ { return new SqlZonedTimeType(getPos(), precision, withLocalTimeZone); }
+}
+
+SqlIdentifier SqlZonedTimestampType() :
+{
+ int precision = -1;
+ boolean withLocalTimeZone = false;
+}
+{
+ <TIMESTAMP>
+ (
+ <LPAREN> precision = UnsignedIntLiteral() <RPAREN>
+ |
+ { precision = -1; }
+ )
+ withLocalTimeZone = WithLocalTimeZone()
+ { return new SqlZonedTimestampType(getPos(), precision,
withLocalTimeZone); }
+}
+
SqlIdentifier SqlArrayType() :
{
SqlParserPos pos;
SqlDataTypeSpec elementType;
+ boolean nullable = true;
}
{
<ARRAY> { pos = getPos(); }
- <LT> elementType = DataType()
+ <LT>
+ elementType = FlinkDataType()
<GT>
{
return new SqlArrayType(pos, elementType);
}
}
+SqlIdentifier SqlMultiSetType() :
+{
+ SqlParserPos pos;
+ SqlDataTypeSpec elementType;
+ boolean nullable = true;
+}
+{
+ <MULTISET> { pos = getPos(); }
+ <LT>
+ elementType = FlinkDataType()
+ <GT>
+ {
+ return new SqlMultiSetType(pos, elementType);
+ }
+}
+
SqlIdentifier SqlMapType() :
{
SqlDataTypeSpec keyType;
SqlDataTypeSpec valType;
+ boolean nullable = true;
}
{
<MAP>
- <LT> keyType = DataType()
- <COMMA> valType = DataType()
+ <LT>
+ keyType = FlinkDataType()
+ <COMMA>
+ valType = FlinkDataType()
<GT>
{
return new SqlMapType(getPos(), keyType, valType);
}
}
+/**
+* Parse a "name1 type1, name2 type2 ..." list.
+*/
+void FieldNameTypeCommaList(
+ List<SqlIdentifier> fieldNames,
+ List<SqlDataTypeSpec> fieldTypes,
+ List<SqlCharStringLiteral> comments) :
+{
+ SqlIdentifier fName;
+ SqlDataTypeSpec fType;
+}
+{
+ [
+ fName = SimpleIdentifier()
+ fType = FlinkDataType()
+ {
+ fieldNames.add(fName);
+ fieldTypes.add(fType);
+ }
+ (
+ <QUOTED_STRING> {
Review comment:
Update comment because it seems you are parsing more than explained above.
----------------------------------------------------------------
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:
us...@infra.apache.org
With regards,
Apache Git Services
