lsyldliu commented on code in PR #20242:
URL: https://github.com/apache/flink/pull/20242#discussion_r921761281
##########
flink-table/flink-sql-parser/src/main/codegen/includes/parserImpls.ftl:
##########
@@ -2203,3 +2203,81 @@ SqlNode TryCastFunctionCall() :
return operator.createCall(s.end(this), args);
}
}
+
+/**
+* Parses a partition key/value,
+* e.g. p or p = '10'.
+*/
+SqlPair PartitionKeyValuePair():
+{
+ SqlIdentifier key;
+ SqlNode value = null;
+ SqlParserPos pos;
+}
+{
+ key = SimpleIdentifier() { pos = getPos(); }
+ [
+ LOOKAHEAD(1)
+ <EQ> value = Literal()
+ ]
+ {
+ return new SqlPair(key, value, pos);
+ }
+}
+
+/**
+* Parses a partition specifications statement,
+* e.g. ANALYZE TABLE tbl1 partition(col1='val1', col2='val2') xxx
+* or
+* ANALYZE TABLE tbl1 partition(col1, col2) xxx.
+*/
+void ExtendedPartitionSpecCommaList(SqlNodeList list) :
+{
+ SqlPair keyValuePair;
+}
+{
+ <LPAREN>
+ keyValuePair = PartitionKeyValuePair()
+ {
+ list.add(keyValuePair);
+ }
+ (
+ <COMMA> keyValuePair = PartitionKeyValuePair()
+ {
+ list.add(keyValuePair);
+ }
+ )*
+ <RPAREN>
+}
+
+/** Parses an ANALYZE TABLE statement. */
+SqlNode SqlAnalyzeTable():
+{
+ Span s;
Review Comment:
final
##########
flink-table/flink-sql-parser/src/main/codegen/includes/parserImpls.ftl:
##########
@@ -2203,3 +2203,81 @@ SqlNode TryCastFunctionCall() :
return operator.createCall(s.end(this), args);
}
}
+
+/**
+* Parses a partition key/value,
+* e.g. p or p = '10'.
+*/
+SqlPair PartitionKeyValuePair():
+{
+ SqlIdentifier key;
+ SqlNode value = null;
+ SqlParserPos pos;
+}
+{
+ key = SimpleIdentifier() { pos = getPos(); }
+ [
+ LOOKAHEAD(1)
+ <EQ> value = Literal()
+ ]
+ {
+ return new SqlPair(key, value, pos);
+ }
+}
+
+/**
+* Parses a partition specifications statement,
+* e.g. ANALYZE TABLE tbl1 partition(col1='val1', col2='val2') xxx
+* or
+* ANALYZE TABLE tbl1 partition(col1, col2) xxx.
+*/
+void ExtendedPartitionSpecCommaList(SqlNodeList list) :
+{
+ SqlPair keyValuePair;
+}
+{
+ <LPAREN>
+ keyValuePair = PartitionKeyValuePair()
+ {
+ list.add(keyValuePair);
+ }
+ (
+ <COMMA> keyValuePair = PartitionKeyValuePair()
+ {
+ list.add(keyValuePair);
+ }
+ )*
+ <RPAREN>
+}
+
+/** Parses an ANALYZE TABLE statement. */
+SqlNode SqlAnalyzeTable():
+{
+ Span s;
+ SqlIdentifier tableName;
+ SqlNodeList partitionSpec = null;
+ SqlNodeList columns = null;
+ boolean allColumns = false;
+}
+{
+ <ANALYZE> <TABLE> { s = span(); }
+ tableName = CompoundIdentifier()
+ [
+ <PARTITION> {
+ partitionSpec = new SqlNodeList(getPos());
+ ExtendedPartitionSpecCommaList(partitionSpec);
+ }
+ ]
+
+ <COMPUTE> <STATISTICS> [
+ (
Review Comment:
>
<FOR>
(
<COLUMNS> { columns = ParenthesizedSimpleIdentifierList(); }
|
<ALL> <COLUMNS> { allColumns = true; }
)
##########
flink-table/flink-sql-parser/src/main/java/org/apache/flink/sql/parser/ddl/SqlAnalyzeTable.java:
##########
@@ -0,0 +1,122 @@
+/*
+ * 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.
+ */
+
+package org.apache.flink.sql.parser.ddl;
+
+import org.apache.flink.sql.parser.SqlPartitionUtils;
+
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlIdentifier;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlNodeList;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.SqlSpecialOperator;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.parser.SqlParserPos;
+import org.apache.calcite.util.ImmutableNullableList;
+
+import javax.annotation.Nonnull;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+
+/** ANALYZE TABLE to compute the statistics for a given table. */
+public class SqlAnalyzeTable extends SqlCall {
+ public static final SqlSpecialOperator OPERATOR =
+ new SqlSpecialOperator("ANALYZE TABLE", SqlKind.OTHER_DDL);
+
+ private final SqlIdentifier tableName;
+ private final SqlNodeList partitions;
+ private final SqlNodeList columns;
+ private final boolean allColumns;
+
+ public SqlAnalyzeTable(
+ SqlParserPos pos,
+ SqlIdentifier tableName,
+ SqlNodeList partitions,
+ SqlNodeList columns,
+ boolean allColumns) {
+ super(pos);
+ this.tableName = tableName;
+ this.partitions = partitions;
+ this.columns = columns;
+ this.allColumns = allColumns;
+ }
+
+ public String[] fullTableName() {
+ return tableName.names.toArray(new String[0]);
+ }
+
+ /** Get partition spec as key-value strings. */
+ public LinkedHashMap<String, String> getPartitionKVs() {
+ return SqlPartitionUtils.getPartitionKVs(partitions);
Review Comment:
The element type in partitions is `SqlPair`, call this method will occur
error.
##########
flink-table/flink-sql-parser/src/main/java/org/apache/flink/sql/parser/SqlPair.java:
##########
@@ -0,0 +1,94 @@
+/*
+ * 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.
+ */
+
+package org.apache.flink.sql.parser;
+
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlIdentifier;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlLiteral;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.SqlSpecialOperator;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.parser.SqlParserPos;
+import org.apache.calcite.util.ImmutableNullableList;
+import org.apache.calcite.util.NlsString;
+
+import java.util.List;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Properties of PartitionSpec, a key-value pair with key as component
identifier and value as
+ * string literal. Different from {@link SqlProperty}, {@link SqlPair} allows
the value is null.
+ */
+public class SqlPair extends SqlCall {
Review Comment:
If you can't get a generic class name, I think use a name suitable for its
use case may also be better. Maybe `SqlPartitionSpecProperty` more meaningful?
##########
flink-table/flink-sql-parser/src/main/java/org/apache/flink/sql/parser/ddl/SqlAnalyzeTable.java:
##########
@@ -0,0 +1,122 @@
+/*
+ * 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.
+ */
+
+package org.apache.flink.sql.parser.ddl;
+
+import org.apache.flink.sql.parser.SqlPartitionUtils;
+
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlIdentifier;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlNodeList;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.SqlSpecialOperator;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.parser.SqlParserPos;
+import org.apache.calcite.util.ImmutableNullableList;
+
+import javax.annotation.Nonnull;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+
+/** ANALYZE TABLE to compute the statistics for a given table. */
+public class SqlAnalyzeTable extends SqlCall {
+ public static final SqlSpecialOperator OPERATOR =
+ new SqlSpecialOperator("ANALYZE TABLE", SqlKind.OTHER_DDL);
Review Comment:
This is not a DDL, maybe `SqlKind.OTHER` is more suitable? Spark archive
this to auxiliary statements
##########
flink-table/flink-sql-parser/src/main/codegen/includes/parserImpls.ftl:
##########
@@ -2203,3 +2203,81 @@ SqlNode TryCastFunctionCall() :
return operator.createCall(s.end(this), args);
}
}
+
+/**
+* Parses a partition key/value,
+* e.g. p or p = '10'.
+*/
+SqlPair PartitionKeyValuePair():
+{
+ SqlIdentifier key;
+ SqlNode value = null;
+ SqlParserPos pos;
+}
+{
+ key = SimpleIdentifier() { pos = getPos(); }
+ [
+ LOOKAHEAD(1)
+ <EQ> value = Literal()
+ ]
+ {
+ return new SqlPair(key, value, pos);
+ }
+}
+
+/**
+* Parses a partition specifications statement,
+* e.g. ANALYZE TABLE tbl1 partition(col1='val1', col2='val2') xxx
+* or
+* ANALYZE TABLE tbl1 partition(col1, col2) xxx.
+*/
+void ExtendedPartitionSpecCommaList(SqlNodeList list) :
+{
+ SqlPair keyValuePair;
+}
+{
+ <LPAREN>
+ keyValuePair = PartitionKeyValuePair()
+ {
+ list.add(keyValuePair);
+ }
+ (
+ <COMMA> keyValuePair = PartitionKeyValuePair()
+ {
+ list.add(keyValuePair);
+ }
+ )*
+ <RPAREN>
+}
+
+/** Parses an ANALYZE TABLE statement. */
+SqlNode SqlAnalyzeTable():
+{
+ Span s;
+ SqlIdentifier tableName;
+ SqlNodeList partitionSpec = null;
+ SqlNodeList columns = null;
Review Comment:
```suggestion
SqlNodeList columns = SqlNodeList.EMPTY;
```
##########
flink-table/flink-sql-parser/src/main/java/org/apache/flink/sql/parser/ddl/SqlAnalyzeTable.java:
##########
@@ -0,0 +1,122 @@
+/*
+ * 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.
+ */
+
+package org.apache.flink.sql.parser.ddl;
+
+import org.apache.flink.sql.parser.SqlPartitionUtils;
+
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlIdentifier;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlNodeList;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.SqlSpecialOperator;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.parser.SqlParserPos;
+import org.apache.calcite.util.ImmutableNullableList;
+
+import javax.annotation.Nonnull;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+
+/** ANALYZE TABLE to compute the statistics for a given table. */
+public class SqlAnalyzeTable extends SqlCall {
+ public static final SqlSpecialOperator OPERATOR =
+ new SqlSpecialOperator("ANALYZE TABLE", SqlKind.OTHER_DDL);
+
+ private final SqlIdentifier tableName;
+ private final SqlNodeList partitions;
+ private final SqlNodeList columns;
+ private final boolean allColumns;
+
+ public SqlAnalyzeTable(
+ SqlParserPos pos,
+ SqlIdentifier tableName,
+ SqlNodeList partitions,
+ SqlNodeList columns,
+ boolean allColumns) {
+ super(pos);
+ this.tableName = tableName;
+ this.partitions = partitions;
+ this.columns = columns;
+ this.allColumns = allColumns;
+ }
+
+ public String[] fullTableName() {
+ return tableName.names.toArray(new String[0]);
+ }
+
+ /** Get partition spec as key-value strings. */
+ public LinkedHashMap<String, String> getPartitionKVs() {
+ return SqlPartitionUtils.getPartitionKVs(partitions);
+ }
+
+ public String[] getColumnNames() {
+ if (columns == null) {
+ return new String[0];
+ }
+ return columns.getList().stream()
+ .map(col -> ((SqlIdentifier) col).getSimple())
+ .toArray(String[]::new);
+ }
+
+ public boolean isAllColumns() {
+ return allColumns;
+ }
+
+ @Nonnull
+ @Override
+ public SqlOperator getOperator() {
+ return OPERATOR;
+ }
+
+ @Nonnull
+ @Override
+ public List<SqlNode> getOperandList() {
+ return ImmutableNullableList.of(tableName, partitions, columns);
+ }
+
+ public void unparse(SqlWriter writer, int leftPrec, int rightPrec) {
+ writer.keyword("ANALYZE");
+ writer.keyword("TABLE");
+ final int opLeft = getOperator().getLeftPrec();
+ final int opRight = getOperator().getRightPrec();
+ tableName.unparse(writer, opLeft, opRight);
+
+ if (partitions != null && partitions.size() > 0) {
+ writer.keyword("PARTITION");
+ partitions.unparse(writer, opLeft, opRight);
+ }
+
+ writer.keyword("COMPUTE");
+ writer.keyword("STATISTICS");
+
+ if (columns != null && columns.size() > 0) {
+ writer.keyword("FOR");
+ writer.keyword("COLUMNS");
+ columns.unparse(writer, opLeft, opRight);
+ }
+ if (allColumns) {
+ writer.keyword("FOR");
Review Comment:
It would be better `writer.keyword("FOR ALL COLUMNS");`
##########
flink-table/flink-sql-parser/src/main/java/org/apache/flink/sql/parser/ddl/SqlAnalyzeTable.java:
##########
@@ -0,0 +1,122 @@
+/*
+ * 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.
+ */
+
+package org.apache.flink.sql.parser.ddl;
+
+import org.apache.flink.sql.parser.SqlPartitionUtils;
+
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlIdentifier;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlNodeList;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.SqlSpecialOperator;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.parser.SqlParserPos;
+import org.apache.calcite.util.ImmutableNullableList;
+
+import javax.annotation.Nonnull;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+
+/** ANALYZE TABLE to compute the statistics for a given table. */
+public class SqlAnalyzeTable extends SqlCall {
+ public static final SqlSpecialOperator OPERATOR =
+ new SqlSpecialOperator("ANALYZE TABLE", SqlKind.OTHER_DDL);
+
+ private final SqlIdentifier tableName;
+ private final SqlNodeList partitions;
+ private final SqlNodeList columns;
+ private final boolean allColumns;
+
+ public SqlAnalyzeTable(
+ SqlParserPos pos,
+ SqlIdentifier tableName,
+ SqlNodeList partitions,
+ SqlNodeList columns,
+ boolean allColumns) {
+ super(pos);
+ this.tableName = tableName;
+ this.partitions = partitions;
+ this.columns = columns;
+ this.allColumns = allColumns;
+ }
+
+ public String[] fullTableName() {
+ return tableName.names.toArray(new String[0]);
+ }
+
+ /** Get partition spec as key-value strings. */
+ public LinkedHashMap<String, String> getPartitionKVs() {
+ return SqlPartitionUtils.getPartitionKVs(partitions);
+ }
+
+ public String[] getColumnNames() {
+ if (columns == null) {
+ return new String[0];
+ }
+ return columns.getList().stream()
+ .map(col -> ((SqlIdentifier) col).getSimple())
+ .toArray(String[]::new);
+ }
+
+ public boolean isAllColumns() {
+ return allColumns;
+ }
+
+ @Nonnull
+ @Override
+ public SqlOperator getOperator() {
+ return OPERATOR;
+ }
+
+ @Nonnull
+ @Override
+ public List<SqlNode> getOperandList() {
+ return ImmutableNullableList.of(tableName, partitions, columns);
+ }
+
+ public void unparse(SqlWriter writer, int leftPrec, int rightPrec) {
+ writer.keyword("ANALYZE");
+ writer.keyword("TABLE");
+ final int opLeft = getOperator().getLeftPrec();
+ final int opRight = getOperator().getRightPrec();
+ tableName.unparse(writer, opLeft, opRight);
+
+ if (partitions != null && partitions.size() > 0) {
+ writer.keyword("PARTITION");
+ partitions.unparse(writer, opLeft, opRight);
+ }
+
+ writer.keyword("COMPUTE");
Review Comment:
It would better `writer.keyword("COMPUTE STATISTICS");`
##########
flink-table/flink-sql-parser/src/main/java/org/apache/flink/sql/parser/ddl/SqlAnalyzeTable.java:
##########
@@ -0,0 +1,122 @@
+/*
+ * 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.
+ */
+
+package org.apache.flink.sql.parser.ddl;
+
+import org.apache.flink.sql.parser.SqlPartitionUtils;
+
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlIdentifier;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlNodeList;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.SqlSpecialOperator;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.parser.SqlParserPos;
+import org.apache.calcite.util.ImmutableNullableList;
+
+import javax.annotation.Nonnull;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+
+/** ANALYZE TABLE to compute the statistics for a given table. */
+public class SqlAnalyzeTable extends SqlCall {
+ public static final SqlSpecialOperator OPERATOR =
+ new SqlSpecialOperator("ANALYZE TABLE", SqlKind.OTHER_DDL);
+
+ private final SqlIdentifier tableName;
+ private final SqlNodeList partitions;
+ private final SqlNodeList columns;
+ private final boolean allColumns;
+
+ public SqlAnalyzeTable(
+ SqlParserPos pos,
+ SqlIdentifier tableName,
+ SqlNodeList partitions,
+ SqlNodeList columns,
+ boolean allColumns) {
+ super(pos);
+ this.tableName = tableName;
+ this.partitions = partitions;
+ this.columns = columns;
+ this.allColumns = allColumns;
+ }
+
+ public String[] fullTableName() {
+ return tableName.names.toArray(new String[0]);
+ }
+
+ /** Get partition spec as key-value strings. */
+ public LinkedHashMap<String, String> getPartitionKVs() {
+ return SqlPartitionUtils.getPartitionKVs(partitions);
+ }
+
+ public String[] getColumnNames() {
Review Comment:
Why not return List?
##########
flink-table/flink-sql-parser/src/main/java/org/apache/flink/sql/parser/ddl/SqlAnalyzeTable.java:
##########
@@ -0,0 +1,122 @@
+/*
+ * 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.
+ */
+
+package org.apache.flink.sql.parser.ddl;
+
+import org.apache.flink.sql.parser.SqlPartitionUtils;
+
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlIdentifier;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlNodeList;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.SqlSpecialOperator;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.parser.SqlParserPos;
+import org.apache.calcite.util.ImmutableNullableList;
+
+import javax.annotation.Nonnull;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+
+/** ANALYZE TABLE to compute the statistics for a given table. */
+public class SqlAnalyzeTable extends SqlCall {
+ public static final SqlSpecialOperator OPERATOR =
+ new SqlSpecialOperator("ANALYZE TABLE", SqlKind.OTHER_DDL);
+
+ private final SqlIdentifier tableName;
+ private final SqlNodeList partitions;
+ private final SqlNodeList columns;
+ private final boolean allColumns;
+
+ public SqlAnalyzeTable(
+ SqlParserPos pos,
+ SqlIdentifier tableName,
+ SqlNodeList partitions,
+ SqlNodeList columns,
+ boolean allColumns) {
+ super(pos);
+ this.tableName = tableName;
+ this.partitions = partitions;
+ this.columns = columns;
+ this.allColumns = allColumns;
+ }
+
+ public String[] fullTableName() {
+ return tableName.names.toArray(new String[0]);
+ }
+
+ /** Get partition spec as key-value strings. */
+ public LinkedHashMap<String, String> getPartitionKVs() {
+ return SqlPartitionUtils.getPartitionKVs(partitions);
+ }
+
+ public String[] getColumnNames() {
+ if (columns == null) {
Review Comment:
The `columns ` default value is `SqlNodeList.EMPTY`, otherwise you should
`@Nullable` annotation.
##########
flink-table/flink-sql-parser/src/main/java/org/apache/flink/sql/parser/ddl/SqlAnalyzeTable.java:
##########
@@ -0,0 +1,122 @@
+/*
+ * 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.
+ */
+
+package org.apache.flink.sql.parser.ddl;
+
+import org.apache.flink.sql.parser.SqlPartitionUtils;
+
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlIdentifier;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlNodeList;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.SqlSpecialOperator;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.parser.SqlParserPos;
+import org.apache.calcite.util.ImmutableNullableList;
+
+import javax.annotation.Nonnull;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+
+/** ANALYZE TABLE to compute the statistics for a given table. */
+public class SqlAnalyzeTable extends SqlCall {
+ public static final SqlSpecialOperator OPERATOR =
+ new SqlSpecialOperator("ANALYZE TABLE", SqlKind.OTHER_DDL);
+
+ private final SqlIdentifier tableName;
+ private final SqlNodeList partitions;
+ private final SqlNodeList columns;
+ private final boolean allColumns;
+
+ public SqlAnalyzeTable(
+ SqlParserPos pos,
+ SqlIdentifier tableName,
+ SqlNodeList partitions,
+ SqlNodeList columns,
+ boolean allColumns) {
+ super(pos);
+ this.tableName = tableName;
+ this.partitions = partitions;
+ this.columns = columns;
+ this.allColumns = allColumns;
+ }
+
+ public String[] fullTableName() {
+ return tableName.names.toArray(new String[0]);
+ }
+
+ /** Get partition spec as key-value strings. */
+ public LinkedHashMap<String, String> getPartitionKVs() {
+ return SqlPartitionUtils.getPartitionKVs(partitions);
+ }
+
+ public String[] getColumnNames() {
+ if (columns == null) {
+ return new String[0];
+ }
+ return columns.getList().stream()
+ .map(col -> ((SqlIdentifier) col).getSimple())
+ .toArray(String[]::new);
+ }
+
+ public boolean isAllColumns() {
+ return allColumns;
+ }
+
+ @Nonnull
+ @Override
+ public SqlOperator getOperator() {
+ return OPERATOR;
+ }
+
+ @Nonnull
+ @Override
+ public List<SqlNode> getOperandList() {
+ return ImmutableNullableList.of(tableName, partitions, columns);
+ }
+
+ public void unparse(SqlWriter writer, int leftPrec, int rightPrec) {
+ writer.keyword("ANALYZE");
+ writer.keyword("TABLE");
+ final int opLeft = getOperator().getLeftPrec();
+ final int opRight = getOperator().getRightPrec();
+ tableName.unparse(writer, opLeft, opRight);
+
+ if (partitions != null && partitions.size() > 0) {
+ writer.keyword("PARTITION");
+ partitions.unparse(writer, opLeft, opRight);
+ }
+
+ writer.keyword("COMPUTE");
+ writer.keyword("STATISTICS");
+
+ if (columns != null && columns.size() > 0) {
+ writer.keyword("FOR");
Review Comment:
It would be better `writer.keyword("FOR COLUMNS");`
##########
flink-table/flink-sql-parser/src/main/codegen/includes/parserImpls.ftl:
##########
@@ -2203,3 +2203,81 @@ SqlNode TryCastFunctionCall() :
return operator.createCall(s.end(this), args);
}
}
+
+/**
+* Parses a partition key/value,
+* e.g. p or p = '10'.
+*/
+SqlPair PartitionKeyValuePair():
+{
+ SqlIdentifier key;
+ SqlNode value = null;
+ SqlParserPos pos;
+}
+{
+ key = SimpleIdentifier() { pos = getPos(); }
+ [
+ LOOKAHEAD(1)
+ <EQ> value = Literal()
+ ]
+ {
+ return new SqlPair(key, value, pos);
+ }
+}
+
+/**
+* Parses a partition specifications statement,
+* e.g. ANALYZE TABLE tbl1 partition(col1='val1', col2='val2') xxx
+* or
+* ANALYZE TABLE tbl1 partition(col1, col2) xxx.
+*/
+void ExtendedPartitionSpecCommaList(SqlNodeList list) :
+{
+ SqlPair keyValuePair;
+}
+{
+ <LPAREN>
+ keyValuePair = PartitionKeyValuePair()
+ {
+ list.add(keyValuePair);
+ }
+ (
+ <COMMA> keyValuePair = PartitionKeyValuePair()
+ {
+ list.add(keyValuePair);
+ }
+ )*
+ <RPAREN>
+}
+
+/** Parses an ANALYZE TABLE statement. */
+SqlNode SqlAnalyzeTable():
+{
+ Span s;
+ SqlIdentifier tableName;
+ SqlNodeList partitionSpec = null;
Review Comment:
```suggestion
SqlNodeList partitionSpecs = SqlNodeList.EMPTY;
```
##########
flink-table/flink-sql-parser/src/main/java/org/apache/flink/sql/parser/ddl/SqlAnalyzeTable.java:
##########
@@ -0,0 +1,122 @@
+/*
+ * 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.
+ */
+
+package org.apache.flink.sql.parser.ddl;
+
+import org.apache.flink.sql.parser.SqlPartitionUtils;
+
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlIdentifier;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlNodeList;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.SqlSpecialOperator;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.parser.SqlParserPos;
+import org.apache.calcite.util.ImmutableNullableList;
+
+import javax.annotation.Nonnull;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+
+/** ANALYZE TABLE to compute the statistics for a given table. */
+public class SqlAnalyzeTable extends SqlCall {
+ public static final SqlSpecialOperator OPERATOR =
+ new SqlSpecialOperator("ANALYZE TABLE", SqlKind.OTHER_DDL);
+
+ private final SqlIdentifier tableName;
+ private final SqlNodeList partitions;
+ private final SqlNodeList columns;
+ private final boolean allColumns;
+
+ public SqlAnalyzeTable(
+ SqlParserPos pos,
+ SqlIdentifier tableName,
+ SqlNodeList partitions,
+ SqlNodeList columns,
+ boolean allColumns) {
+ super(pos);
+ this.tableName = tableName;
+ this.partitions = partitions;
+ this.columns = columns;
+ this.allColumns = allColumns;
+ }
+
+ public String[] fullTableName() {
+ return tableName.names.toArray(new String[0]);
+ }
+
+ /** Get partition spec as key-value strings. */
+ public LinkedHashMap<String, String> getPartitionKVs() {
+ return SqlPartitionUtils.getPartitionKVs(partitions);
+ }
+
+ public String[] getColumnNames() {
+ if (columns == null) {
+ return new String[0];
+ }
+ return columns.getList().stream()
+ .map(col -> ((SqlIdentifier) col).getSimple())
+ .toArray(String[]::new);
+ }
+
+ public boolean isAllColumns() {
+ return allColumns;
+ }
+
+ @Nonnull
+ @Override
+ public SqlOperator getOperator() {
+ return OPERATOR;
+ }
+
+ @Nonnull
+ @Override
+ public List<SqlNode> getOperandList() {
+ return ImmutableNullableList.of(tableName, partitions, columns);
+ }
+
+ public void unparse(SqlWriter writer, int leftPrec, int rightPrec) {
+ writer.keyword("ANALYZE");
Review Comment:
It would be better `writer.keyword("ANALYZE TABLE");`
##########
flink-table/flink-sql-parser/src/main/java/org/apache/flink/sql/parser/SqlPair.java:
##########
@@ -0,0 +1,94 @@
+/*
+ * 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.
+ */
+
+package org.apache.flink.sql.parser;
+
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlIdentifier;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlLiteral;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.SqlSpecialOperator;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.parser.SqlParserPos;
+import org.apache.calcite.util.ImmutableNullableList;
+import org.apache.calcite.util.NlsString;
+
+import java.util.List;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * Properties of PartitionSpec, a key-value pair with key as component
identifier and value as
+ * string literal. Different from {@link SqlProperty}, {@link SqlPair} allows
the value is null.
+ */
+public class SqlPair extends SqlCall {
+
+ /** Use this operator only if you don't have a better one. */
+ protected static final SqlOperator OPERATOR = new
SqlSpecialOperator("Pair", SqlKind.OTHER);
+
+ private final SqlIdentifier key;
+ private final SqlNode value;
Review Comment:
@Nullable
##########
flink-table/flink-sql-parser/src/main/java/org/apache/flink/sql/parser/ddl/SqlAnalyzeTable.java:
##########
@@ -0,0 +1,122 @@
+/*
+ * 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.
+ */
+
+package org.apache.flink.sql.parser.ddl;
+
+import org.apache.flink.sql.parser.SqlPartitionUtils;
+
+import org.apache.calcite.sql.SqlCall;
+import org.apache.calcite.sql.SqlIdentifier;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlNodeList;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.SqlSpecialOperator;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.parser.SqlParserPos;
+import org.apache.calcite.util.ImmutableNullableList;
+
+import javax.annotation.Nonnull;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+
+/** ANALYZE TABLE to compute the statistics for a given table. */
+public class SqlAnalyzeTable extends SqlCall {
+ public static final SqlSpecialOperator OPERATOR =
+ new SqlSpecialOperator("ANALYZE TABLE", SqlKind.OTHER_DDL);
+
+ private final SqlIdentifier tableName;
+ private final SqlNodeList partitions;
Review Comment:
The `partitions ` default value is `SqlNodeList.EMPTY`, otherwise you should
@Nullable annotation.
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
