This is an automated email from the ASF dual-hosted git repository.
chunwei pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/main by this push:
new 737df397c2 Remove useless explicit type cast when using SqlValidator
737df397c2 is described below
commit 737df397c22e31cc5a47ef56d6468865755743e6
Author: chunwei.lcw <[email protected]>
AuthorDate: Fri Apr 29 10:51:10 2022 +0800
Remove useless explicit type cast when using SqlValidator
---
core/src/main/java/org/apache/calcite/sql/SqlJdbcFunctionCall.java | 3 +--
core/src/main/java/org/apache/calcite/sql/SqlOperator.java | 2 +-
core/src/main/java/org/apache/calcite/sql/SqlOverOperator.java | 5 ++---
core/src/main/java/org/apache/calcite/sql/fun/SqlInOperator.java | 3 +--
.../java/org/apache/calcite/sql/fun/SqlJsonArrayAggAggFunction.java | 3 +--
.../java/org/apache/calcite/sql/fun/SqlJsonObjectAggAggFunction.java | 3 +--
6 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlJdbcFunctionCall.java
b/core/src/main/java/org/apache/calcite/sql/SqlJdbcFunctionCall.java
index 2a79bdc27f..ccb804912d 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlJdbcFunctionCall.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlJdbcFunctionCall.java
@@ -23,7 +23,6 @@ import org.apache.calcite.sql.fun.SqlTrimFunction;
import org.apache.calcite.sql.parser.SqlParserPos;
import org.apache.calcite.sql.type.OperandTypes;
import org.apache.calcite.sql.validate.SqlValidator;
-import org.apache.calcite.sql.validate.SqlValidatorImpl;
import org.apache.calcite.sql.validate.SqlValidatorScope;
import com.google.common.collect.ImmutableMap;
@@ -480,7 +479,7 @@ public class SqlJdbcFunctionCall extends SqlFunction {
for (SqlNode operand : call.getOperandList()) {
RelDataType nodeType = validator.deriveType(scope, operand);
- ((SqlValidatorImpl) validator).setValidatedNodeType(operand, nodeType);
+ validator.setValidatedNodeType(operand, nodeType);
}
return validateOperands(validator, scope, call);
}
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlOperator.java
b/core/src/main/java/org/apache/calcite/sql/SqlOperator.java
index 3dd7105963..466c1e74b8 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlOperator.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlOperator.java
@@ -675,7 +675,7 @@ public abstract class SqlOperator {
if (operand.getKind() == SqlKind.ROW && convertRowArgToColumnList) {
RelDataTypeFactory typeFactory = validator.getTypeFactory();
nodeType = typeFactory.createSqlType(SqlTypeName.COLUMN_LIST);
- ((SqlValidatorImpl) validator).setValidatedNodeType(operand, nodeType);
+ validator.setValidatedNodeType(operand, nodeType);
} else {
nodeType = validator.deriveType(operandScope, operand);
}
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlOverOperator.java
b/core/src/main/java/org/apache/calcite/sql/SqlOverOperator.java
index a5d32ca726..beed7f11b1 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlOverOperator.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlOverOperator.java
@@ -23,7 +23,6 @@ import org.apache.calcite.sql.type.ReturnTypes;
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.SqlValidatorImpl;
import org.apache.calcite.sql.validate.SqlValidatorScope;
import static org.apache.calcite.util.Static.RESOURCE;
@@ -115,8 +114,8 @@ public class SqlOverOperator extends SqlBinaryOperator {
RelDataType ret = aggCall.getOperator().inferReturnType(opBinding);
// Copied from validateOperands
- ((SqlValidatorImpl) validator).setValidatedNodeType(call, ret);
- ((SqlValidatorImpl) validator).setValidatedNodeType(agg, ret);
+ validator.setValidatedNodeType(call, ret);
+ validator.setValidatedNodeType(agg, ret);
return ret;
}
diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlInOperator.java
b/core/src/main/java/org/apache/calcite/sql/fun/SqlInOperator.java
index 8a43e70d12..67fd330211 100644
--- a/core/src/main/java/org/apache/calcite/sql/fun/SqlInOperator.java
+++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlInOperator.java
@@ -34,7 +34,6 @@ import org.apache.calcite.sql.type.ReturnTypes;
import org.apache.calcite.sql.type.SqlTypeName;
import org.apache.calcite.sql.type.SqlTypeUtil;
import org.apache.calcite.sql.validate.SqlValidator;
-import org.apache.calcite.sql.validate.SqlValidatorImpl;
import org.apache.calcite.sql.validate.SqlValidatorScope;
import org.apache.calcite.util.Litmus;
@@ -145,7 +144,7 @@ public class SqlInOperator extends SqlBinaryOperator {
}
// Record the RHS type for use by SqlToRelConverter.
- ((SqlValidatorImpl) validator).setValidatedNodeType(nodeList, rightType);
+ validator.setValidatedNodeType(nodeList, rightType);
} else {
// Handle the 'IN (query)' form.
rightType = validator.deriveType(scope, right);
diff --git
a/core/src/main/java/org/apache/calcite/sql/fun/SqlJsonArrayAggAggFunction.java
b/core/src/main/java/org/apache/calcite/sql/fun/SqlJsonArrayAggAggFunction.java
index 096c737a29..f90e882834 100644
---
a/core/src/main/java/org/apache/calcite/sql/fun/SqlJsonArrayAggAggFunction.java
+++
b/core/src/main/java/org/apache/calcite/sql/fun/SqlJsonArrayAggAggFunction.java
@@ -31,7 +31,6 @@ import org.apache.calcite.sql.type.OperandTypes;
import org.apache.calcite.sql.type.ReturnTypes;
import org.apache.calcite.sql.type.SqlTypeFamily;
import org.apache.calcite.sql.validate.SqlValidator;
-import org.apache.calcite.sql.validate.SqlValidatorImpl;
import org.apache.calcite.sql.validate.SqlValidatorScope;
import org.apache.calcite.util.Optionality;
@@ -67,7 +66,7 @@ public class SqlJsonArrayAggAggFunction extends
SqlAggFunction {
// To prevent operator rewriting by SqlFunction#deriveType.
for (SqlNode operand : call.getOperandList()) {
RelDataType nodeType = validator.deriveType(scope, operand);
- ((SqlValidatorImpl) validator).setValidatedNodeType(operand, nodeType);
+ validator.setValidatedNodeType(operand, nodeType);
}
return validateOperands(validator, scope, call);
}
diff --git
a/core/src/main/java/org/apache/calcite/sql/fun/SqlJsonObjectAggAggFunction.java
b/core/src/main/java/org/apache/calcite/sql/fun/SqlJsonObjectAggAggFunction.java
index dfb3c65df3..88d1617c25 100644
---
a/core/src/main/java/org/apache/calcite/sql/fun/SqlJsonObjectAggAggFunction.java
+++
b/core/src/main/java/org/apache/calcite/sql/fun/SqlJsonObjectAggAggFunction.java
@@ -30,7 +30,6 @@ import org.apache.calcite.sql.type.ReturnTypes;
import org.apache.calcite.sql.type.SqlTypeFamily;
import org.apache.calcite.sql.type.SqlTypeName;
import org.apache.calcite.sql.validate.SqlValidator;
-import org.apache.calcite.sql.validate.SqlValidatorImpl;
import org.apache.calcite.sql.validate.SqlValidatorScope;
import org.apache.calcite.util.Optionality;
@@ -74,7 +73,7 @@ public class SqlJsonObjectAggAggFunction extends
SqlAggFunction {
// To prevent operator rewriting by SqlFunction#deriveType.
for (SqlNode operand : call.getOperandList()) {
RelDataType nodeType = validator.deriveType(scope, operand);
- ((SqlValidatorImpl) validator).setValidatedNodeType(operand, nodeType);
+ validator.setValidatedNodeType(operand, nodeType);
}
return validateOperands(validator, scope, call);
}
