This is an automated email from the ASF dual-hosted git repository.
twalthr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 90f4239f4af [FLINK-29446][table-planner] Remove Calcite classes fixed
in 1.24
90f4239f4af is described below
commit 90f4239f4af58611ae4922a6b8d032a604cbc650
Author: snuyanzin <snuyan...@gmail.com>
AuthorDate: Tue Sep 27 13:10:59 2022 +0200
[FLINK-29446][table-planner] Remove Calcite classes fixed in 1.24
This closes #20909.
---
.../org/apache/calcite/sql/fun/SqlDotOperator.java | 198 ---------------------
.../apache/calcite/sql/fun/SqlItemOperator.java | 157 ----------------
.../calcite/sql/validate/AliasNamespace.java | 132 --------------
3 files changed, 487 deletions(-)
diff --git
a/flink-table/flink-table-planner/src/main/java/org/apache/calcite/sql/fun/SqlDotOperator.java
b/flink-table/flink-table-planner/src/main/java/org/apache/calcite/sql/fun/SqlDotOperator.java
deleted file mode 100644
index 1d6c0fbb56b..00000000000
---
a/flink-table/flink-table-planner/src/main/java/org/apache/calcite/sql/fun/SqlDotOperator.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * 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.calcite.sql.fun;
-
-import org.apache.calcite.rel.type.RelDataType;
-import org.apache.calcite.rel.type.RelDataTypeFactory;
-import org.apache.calcite.rel.type.RelDataTypeField;
-import org.apache.calcite.sql.SqlCall;
-import org.apache.calcite.sql.SqlCallBinding;
-import org.apache.calcite.sql.SqlKind;
-import org.apache.calcite.sql.SqlNode;
-import org.apache.calcite.sql.SqlOperandCountRange;
-import org.apache.calcite.sql.SqlOperatorBinding;
-import org.apache.calcite.sql.SqlSpecialOperator;
-import org.apache.calcite.sql.SqlUtil;
-import org.apache.calcite.sql.SqlWriter;
-import org.apache.calcite.sql.parser.SqlParserPos;
-import org.apache.calcite.sql.type.OperandTypes;
-import org.apache.calcite.sql.type.SqlOperandCountRanges;
-import org.apache.calcite.sql.type.SqlSingleOperandTypeChecker;
-import org.apache.calcite.sql.type.SqlTypeFamily;
-import org.apache.calcite.sql.type.SqlTypeName;
-import org.apache.calcite.sql.util.SqlBasicVisitor;
-import org.apache.calcite.sql.util.SqlVisitor;
-import org.apache.calcite.sql.validate.SqlValidator;
-import org.apache.calcite.sql.validate.SqlValidatorScope;
-import org.apache.calcite.sql.validate.SqlValidatorUtil;
-import org.apache.calcite.util.Litmus;
-import org.apache.calcite.util.Static;
-
-import java.util.Arrays;
-
-/**
- * The dot operator {@code .}, used to access a field of a record. For
example, {@code a.b}.
- *
- * <p>This class was copied over from Calcite to fix the derived type. If the
ROW is nullable force
- * the accessed field to be nullable as well.
- */
-public class SqlDotOperator extends SqlSpecialOperator {
- SqlDotOperator() {
- super("DOT", SqlKind.DOT, 100, true, null, null, null);
- }
-
- @Override
- public ReduceResult reduceExpr(int ordinal, TokenSequence list) {
- SqlNode left = list.node(ordinal - 1);
- SqlNode right = list.node(ordinal + 1);
- return new ReduceResult(
- ordinal - 1,
- ordinal + 2,
- createCall(
- SqlParserPos.sum(
- Arrays.asList(
- left.getParserPosition(),
- right.getParserPosition(),
- list.pos(ordinal))),
- left,
- right));
- }
-
- @Override
- public void unparse(SqlWriter writer, SqlCall call, int leftPrec, int
rightPrec) {
- final SqlWriter.Frame frame =
writer.startList(SqlWriter.FrameTypeEnum.IDENTIFIER);
- call.operand(0).unparse(writer, leftPrec, 0);
- writer.sep(".");
- call.operand(1).unparse(writer, 0, 0);
- writer.endList(frame);
- }
-
- @Override
- public SqlOperandCountRange getOperandCountRange() {
- return SqlOperandCountRanges.of(2);
- }
-
- @Override
- public <R> void acceptCall(
- SqlVisitor<R> visitor,
- SqlCall call,
- boolean onlyExpressions,
- SqlBasicVisitor.ArgHandler<R> argHandler) {
- if (onlyExpressions) {
- // Do not visit operands[1] -- it is not an expression.
- argHandler.visitChild(visitor, call, 0, call.operand(0));
- } else {
- super.acceptCall(visitor, call, onlyExpressions, argHandler);
- }
- }
-
- @Override
- public RelDataType deriveType(SqlValidator validator, SqlValidatorScope
scope, SqlCall call) {
- final SqlNode operand = call.getOperandList().get(0);
- final RelDataType nodeType = validator.deriveType(scope, operand);
- assert nodeType != null;
- if (!nodeType.isStruct()) {
- throw SqlUtil.newContextException(
- operand.getParserPosition(),
Static.RESOURCE.incompatibleTypes());
- }
-
- final SqlNode fieldId = call.operand(1);
- final String fieldName = fieldId.toString();
- final RelDataTypeField field = nodeType.getField(fieldName, false,
false);
- if (field == null) {
- throw SqlUtil.newContextException(
- fieldId.getParserPosition(),
Static.RESOURCE.unknownField(fieldName));
- }
- RelDataType type = field.getType();
- if (nodeType.isNullable()) {
- type = validator.getTypeFactory().createTypeWithNullability(type,
true);
- }
-
- // Validate and determine coercibility and resulting collation
- // name of binary operator if needed.
- type = adjustType(validator, call, type);
- SqlValidatorUtil.checkCharsetAndCollateConsistentIfCharType(type);
- return type;
- }
-
- public void validateCall(
- SqlCall call,
- SqlValidator validator,
- SqlValidatorScope scope,
- SqlValidatorScope operandScope) {
- assert call.getOperator() == this;
- // Do not visit call.getOperandList().get(1) here.
- // call.getOperandList().get(1) will be validated when deriveType() is
called.
- call.getOperandList().get(0).validateExpr(validator, operandScope);
- }
-
- @Override
- public boolean checkOperandTypes(SqlCallBinding callBinding, boolean
throwOnFailure) {
- final SqlNode left = callBinding.operand(0);
- final SqlNode right = callBinding.operand(1);
- final RelDataType type =
- callBinding.getValidator().deriveType(callBinding.getScope(),
left);
- if (type.getSqlTypeName() != SqlTypeName.ROW) {
- return false;
- } else if (type.getSqlIdentifier().isStar()) {
- return false;
- }
- final RelDataType operandType = callBinding.getOperandType(0);
- final SqlSingleOperandTypeChecker checker = getChecker(operandType);
- // Actually operand0 always comes from parsing the SqlIdentifier, so
there
- // is no need to make implicit type coercion.
- return checker.checkSingleOperandType(callBinding, right, 0,
throwOnFailure);
- }
-
- private SqlSingleOperandTypeChecker getChecker(RelDataType operandType) {
- switch (operandType.getSqlTypeName()) {
- case ROW:
- return OperandTypes.family(SqlTypeFamily.STRING);
- default:
- throw new AssertionError(operandType.getSqlTypeName());
- }
- }
-
- @Override
- public boolean validRexOperands(final int count, final Litmus litmus) {
- return litmus.fail("DOT is valid only for SqlCall not for RexCall");
- }
-
- @Override
- public String getAllowedSignatures(String name) {
- return "<A>.<B>";
- }
-
- @Override
- public RelDataType inferReturnType(SqlOperatorBinding opBinding) {
- final RelDataTypeFactory typeFactory = opBinding.getTypeFactory();
- final RelDataType recordType = opBinding.getOperandType(0);
- switch (recordType.getSqlTypeName()) {
- case ROW:
- final String fieldName = opBinding.getOperandLiteralValue(1,
String.class);
- final RelDataType type =
- opBinding.getOperandType(0).getField(fieldName, false,
false).getType();
- if (recordType.isNullable()) {
- return typeFactory.createTypeWithNullability(type, true);
- } else {
- return type;
- }
- default:
- throw new AssertionError();
- }
- }
-}
diff --git
a/flink-table/flink-table-planner/src/main/java/org/apache/calcite/sql/fun/SqlItemOperator.java
b/flink-table/flink-table-planner/src/main/java/org/apache/calcite/sql/fun/SqlItemOperator.java
deleted file mode 100644
index b5cee249171..00000000000
---
a/flink-table/flink-table-planner/src/main/java/org/apache/calcite/sql/fun/SqlItemOperator.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * 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.calcite.sql.fun;
-
-import org.apache.calcite.rel.type.RelDataType;
-import org.apache.calcite.rel.type.RelDataTypeFactory;
-import org.apache.calcite.rel.type.RelDataTypeField;
-import org.apache.calcite.sql.SqlCall;
-import org.apache.calcite.sql.SqlCallBinding;
-import org.apache.calcite.sql.SqlKind;
-import org.apache.calcite.sql.SqlNode;
-import org.apache.calcite.sql.SqlOperandCountRange;
-import org.apache.calcite.sql.SqlOperatorBinding;
-import org.apache.calcite.sql.SqlSpecialOperator;
-import org.apache.calcite.sql.SqlWriter;
-import org.apache.calcite.sql.parser.SqlParserPos;
-import org.apache.calcite.sql.type.OperandTypes;
-import org.apache.calcite.sql.type.SqlOperandCountRanges;
-import org.apache.calcite.sql.type.SqlSingleOperandTypeChecker;
-import org.apache.calcite.sql.type.SqlTypeFamily;
-import org.apache.calcite.sql.type.SqlTypeName;
-
-import java.util.Arrays;
-
-/**
- * The item operator {@code [ ... ]}, used to access a given element of an
array or map. For
- * example, {@code myArray[3]} or {@code "myMap['foo']"}.
- *
- * <p>This class was copied over from Calcite to fix the infer type for ROW.
If the ROW is nullable
- * force the accessed field to be nullable as well. Additionally in the
checker we verify the
- * argument is a literal in case of a ROW.
- */
-class SqlItemOperator extends SqlSpecialOperator {
-
- private static final SqlSingleOperandTypeChecker ARRAY_OR_MAP =
- OperandTypes.or(
- OperandTypes.family(SqlTypeFamily.ARRAY),
- OperandTypes.family(SqlTypeFamily.MAP),
- OperandTypes.family(SqlTypeFamily.ANY));
-
- SqlItemOperator() {
- super("ITEM", SqlKind.ITEM, 100, true, null, null, null);
- }
-
- @Override
- public ReduceResult reduceExpr(int ordinal, TokenSequence list) {
- SqlNode left = list.node(ordinal - 1);
- SqlNode right = list.node(ordinal + 1);
- return new ReduceResult(
- ordinal - 1,
- ordinal + 2,
- createCall(
- SqlParserPos.sum(
- Arrays.asList(
- left.getParserPosition(),
- right.getParserPosition(),
- list.pos(ordinal))),
- left,
- right));
- }
-
- @Override
- public void unparse(SqlWriter writer, SqlCall call, int leftPrec, int
rightPrec) {
- call.operand(0).unparse(writer, leftPrec, 0);
- final SqlWriter.Frame frame = writer.startList("[", "]");
- call.operand(1).unparse(writer, 0, 0);
- writer.endList(frame);
- }
-
- @Override
- public SqlOperandCountRange getOperandCountRange() {
- return SqlOperandCountRanges.of(2);
- }
-
- @Override
- public boolean checkOperandTypes(SqlCallBinding callBinding, boolean
throwOnFailure) {
- final SqlNode left = callBinding.operand(0);
- final SqlNode right = callBinding.operand(1);
- if (!ARRAY_OR_MAP.checkSingleOperandType(callBinding, left, 0,
throwOnFailure)) {
- return false;
- }
- final SqlSingleOperandTypeChecker checker = getChecker(callBinding);
- return checker.checkSingleOperandType(callBinding, right, 0,
throwOnFailure);
- }
-
- private SqlSingleOperandTypeChecker getChecker(SqlCallBinding callBinding)
{
- final RelDataType operandType = callBinding.getOperandType(0);
- switch (operandType.getSqlTypeName()) {
- case ARRAY:
- return OperandTypes.family(SqlTypeFamily.INTEGER);
- case MAP:
- return
OperandTypes.family(operandType.getKeyType().getSqlTypeName().getFamily());
- case ROW:
- return OperandTypes.and(OperandTypes.LITERAL,
OperandTypes.CHARACTER);
- case ANY:
- case DYNAMIC_STAR:
- return OperandTypes.or(
- OperandTypes.family(SqlTypeFamily.INTEGER),
- OperandTypes.family(SqlTypeFamily.CHARACTER));
- default:
- throw callBinding.newValidationSignatureError();
- }
- }
-
- @Override
- public String getAllowedSignatures(String name) {
- return "<ARRAY>[<INTEGER>]\n" + "<MAP>[<VALUE>]";
- }
-
- @Override
- public RelDataType inferReturnType(SqlOperatorBinding opBinding) {
- final RelDataTypeFactory typeFactory = opBinding.getTypeFactory();
- final RelDataType operandType = opBinding.getOperandType(0);
- switch (operandType.getSqlTypeName()) {
- case ARRAY:
- return
typeFactory.createTypeWithNullability(operandType.getComponentType(), true);
- case MAP:
- return
typeFactory.createTypeWithNullability(operandType.getValueType(), true);
- case ROW:
- String fieldName = opBinding.getOperandLiteralValue(1,
String.class);
- RelDataTypeField field = operandType.getField(fieldName,
false, false);
- if (field == null) {
- throw new AssertionError(
- "Cannot infer type of field '"
- + fieldName
- + "' within ROW type: "
- + operandType);
- } else {
- RelDataType fieldType = field.getType();
- if (operandType.isNullable()) {
- fieldType =
typeFactory.createTypeWithNullability(fieldType, true);
- }
- return fieldType;
- }
- case ANY:
- case DYNAMIC_STAR:
- return typeFactory.createTypeWithNullability(
- typeFactory.createSqlType(SqlTypeName.ANY), true);
- default:
- throw new AssertionError();
- }
- }
-}
diff --git
a/flink-table/flink-table-planner/src/main/java/org/apache/calcite/sql/validate/AliasNamespace.java
b/flink-table/flink-table-planner/src/main/java/org/apache/calcite/sql/validate/AliasNamespace.java
deleted file mode 100644
index 762f348f96d..00000000000
---
a/flink-table/flink-table-planner/src/main/java/org/apache/calcite/sql/validate/AliasNamespace.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * 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.calcite.sql.validate;
-
-import org.apache.calcite.rel.type.RelDataType;
-import org.apache.calcite.rel.type.RelDataTypeField;
-import org.apache.calcite.rel.type.StructKind;
-import org.apache.calcite.sql.SqlCall;
-import org.apache.calcite.sql.SqlIdentifier;
-import org.apache.calcite.sql.SqlNode;
-import org.apache.calcite.sql.SqlNodeList;
-import org.apache.calcite.sql.fun.SqlStdOperatorTable;
-import org.apache.calcite.sql.parser.SqlParserPos;
-import org.apache.calcite.util.Util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.apache.calcite.util.Static.RESOURCE;
-
-/**
- * Namespace for an <code>AS t(c1, c2, ...)</code> clause.
- *
- * <p>A namespace is necessary only if there is a column list, in order to
re-map column names; a
- * <code>relation AS t</code> clause just uses the same namespace as
<code>relation</code>.
- *
- * <p>Compared to Calcite we forward the original {@link StructKind} and
nullability.
- */
-public class AliasNamespace extends AbstractNamespace {
- // ~ Instance fields
--------------------------------------------------------
-
- protected final SqlCall call;
-
- // ~ Constructors
-----------------------------------------------------------
-
- /**
- * Creates an AliasNamespace.
- *
- * @param validator Validator
- * @param call Call to AS operator
- * @param enclosingNode Enclosing node
- */
- protected AliasNamespace(SqlValidatorImpl validator, SqlCall call, SqlNode
enclosingNode) {
- super(validator, enclosingNode);
- this.call = call;
- assert call.getOperator() == SqlStdOperatorTable.AS;
- }
-
- // ~ Methods
----------------------------------------------------------------
-
- protected RelDataType validateImpl(RelDataType targetRowType) {
- final List<String> nameList = new ArrayList<>();
- final List<SqlNode> operands = call.getOperandList();
- final SqlValidatorNamespace childNs =
validator.getNamespace(operands.get(0));
- final RelDataType rowType = childNs.getRowTypeSansSystemColumns();
- final List<SqlNode> columnNames = Util.skip(operands, 2);
- for (final SqlNode operand : columnNames) {
- String name = ((SqlIdentifier) operand).getSimple();
- if (nameList.contains(name)) {
- throw validator.newValidationError(operand,
RESOURCE.aliasListDuplicate(name));
- }
- nameList.add(name);
- }
- if (nameList.size() != rowType.getFieldCount()) {
- // Position error over all column names
- final SqlNode node =
- operands.size() == 3
- ? operands.get(2)
- : new SqlNodeList(columnNames,
SqlParserPos.sum(columnNames));
- throw validator.newValidationError(
- node,
- RESOURCE.aliasListDegree(
- rowType.getFieldCount(), getString(rowType),
nameList.size()));
- }
- final List<RelDataType> typeList = new ArrayList<>();
- for (RelDataTypeField field : rowType.getFieldList()) {
- typeList.add(field.getType());
- }
- RelDataType aliasedType =
- validator
- .getTypeFactory()
- .createStructType(rowType.getStructKind(), typeList,
nameList);
- return validator
- .getTypeFactory()
- .createTypeWithNullability(aliasedType, rowType.isNullable());
- }
-
- private String getString(RelDataType rowType) {
- StringBuilder buf = new StringBuilder();
- buf.append("(");
- for (RelDataTypeField field : rowType.getFieldList()) {
- if (field.getIndex() > 0) {
- buf.append(", ");
- }
- buf.append("'");
- buf.append(field.getName());
- buf.append("'");
- }
- buf.append(")");
- return buf.toString();
- }
-
- public SqlNode getNode() {
- return call;
- }
-
- public String translate(String name) {
- final RelDataType underlyingRowType =
validator.getValidatedNodeType(call.operand(0));
- int i = 0;
- for (RelDataTypeField field : rowType.getFieldList()) {
- if (field.getName().equals(name)) {
- return underlyingRowType.getFieldList().get(i).getName();
- }
- ++i;
- }
- throw new AssertionError("unknown field '" + name + "' in rowtype " +
underlyingRowType);
- }
-}
