You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by ch...@apache.org on 2022/05/11 01:48:58 UTC
[calcite] branch main updated: [CALCITE-5131] Remove redundant type cast
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 f58a6aa8d0 [CALCITE-5131] Remove redundant type cast
f58a6aa8d0 is described below
commit f58a6aa8d04accbca3d1237eddfd82dbd3553cf8
Author: chunwei.lcw <ch...@gmail.com>
AuthorDate: Sat May 7 09:46:42 2022 +0800
[CALCITE-5131] Remove redundant type cast
---
.../AggregateExpandDistinctAggregatesRule.java | 2 +-
.../java/org/apache/calcite/rex/RexInputRef.java | 3 +--
.../calcite/schema/impl/AggregateFunctionImpl.java | 2 +-
.../calcite/sql/validate/IdentifierNamespace.java | 2 +-
.../org/apache/calcite/rex/RexBuilderTest.java | 2 +-
.../org/apache/calcite/test/SqlFunctionsTest.java | 28 +++++++++++-----------
.../calcite/test/concurrent/SamplePlugin.java | 3 +--
.../apache/calcite/adapter/druid/DruidQuery.java | 4 ++--
.../org/apache/calcite/piglet/PigRelExVisitor.java | 2 +-
.../calcite/adapter/splunk/SplunkSchema.java | 2 +-
10 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateExpandDistinctAggregatesRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateExpandDistinctAggregatesRule.java
index 819065378f..ae2ce09efb 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateExpandDistinctAggregatesRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateExpandDistinctAggregatesRule.java
@@ -196,7 +196,7 @@ public final class AggregateExpandDistinctAggregatesRule
return;
}
- if (((Config) config).isUsingGroupingSets()) {
+ if (config.isUsingGroupingSets()) {
rewriteUsingGroupingSets(call, aggregate);
return;
}
diff --git a/core/src/main/java/org/apache/calcite/rex/RexInputRef.java b/core/src/main/java/org/apache/calcite/rex/RexInputRef.java
index c67e82ee5a..788b44dc06 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexInputRef.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexInputRef.java
@@ -101,8 +101,7 @@ public class RexInputRef extends RexSlot {
int index,
List<RelDataTypeField> fields) {
final RelDataTypeField field = fields.get(index);
- return Pair.of(
- (RexNode) new RexInputRef(index, field.getType()),
+ return Pair.of(new RexInputRef(index, field.getType()),
field.getName());
}
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/AggregateFunctionImpl.java b/core/src/main/java/org/apache/calcite/schema/impl/AggregateFunctionImpl.java
index bdf03e995f..72626fa0af 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/AggregateFunctionImpl.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/AggregateFunctionImpl.java
@@ -98,7 +98,7 @@ public class AggregateFunctionImpl implements AggregateFunction,
// V is remaining args of add by definition
final List<Class> addParamTypes =
- ImmutableList.copyOf((Class[]) addMethod.getParameterTypes());
+ ImmutableList.copyOf(addMethod.getParameterTypes());
if (addParamTypes.isEmpty() || addParamTypes.get(0) != accumulatorType) {
throw RESOURCE.firstParameterOfAdd(clazz.getName()).ex();
}
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/IdentifierNamespace.java b/core/src/main/java/org/apache/calcite/sql/validate/IdentifierNamespace.java
index f029e82e1d..62b1926d95 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/IdentifierNamespace.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/IdentifierNamespace.java
@@ -234,7 +234,7 @@ public class IdentifierNamespace extends AbstractNamespace {
resolvedNamespace.getMonotonicity(fieldName);
if (monotonicity != null && monotonicity != SqlMonotonicity.NOT_MONOTONIC) {
builder.add(
- Pair.of((SqlNode) new SqlIdentifier(fieldName, SqlParserPos.ZERO),
+ Pair.of(new SqlIdentifier(fieldName, SqlParserPos.ZERO),
monotonicity));
}
}
diff --git a/core/src/test/java/org/apache/calcite/rex/RexBuilderTest.java b/core/src/test/java/org/apache/calcite/rex/RexBuilderTest.java
index e51f3a7dc5..5b0ee198c9 100644
--- a/core/src/test/java/org/apache/calcite/rex/RexBuilderTest.java
+++ b/core/src/test/java/org/apache/calcite/rex/RexBuilderTest.java
@@ -566,7 +566,7 @@ class RexBuilderTest {
SqlCollation.IMPLICIT);
assertEquals("_UTF8'foobar'", literal.toString());
assertEquals("_UTF8'foobar':CHAR(6) CHARACTER SET \"UTF-8\"",
- ((RexLiteral) literal).computeDigest(RexDigestIncludeType.ALWAYS));
+ literal.computeDigest(RexDigestIncludeType.ALWAYS));
literal = builder.makePreciseStringLiteral(
new ByteString("\u82f1\u56fd".getBytes(StandardCharsets.UTF_8)),
"UTF8",
diff --git a/core/src/test/java/org/apache/calcite/test/SqlFunctionsTest.java b/core/src/test/java/org/apache/calcite/test/SqlFunctionsTest.java
index bb494d42db..ce60ca8d56 100644
--- a/core/src/test/java/org/apache/calcite/test/SqlFunctionsTest.java
+++ b/core/src/test/java/org/apache/calcite/test/SqlFunctionsTest.java
@@ -836,19 +836,19 @@ class SqlFunctionsTest {
assertThat(SqlFunctions.multiplyAny(1, null), nullValue());
// Numeric types
- assertThat(SqlFunctions.multiplyAny(2, 1L), is((Object) new BigDecimal(2)));
+ assertThat(SqlFunctions.multiplyAny(2, 1L), is(new BigDecimal(2)));
assertThat(SqlFunctions.multiplyAny(2, 1.0D),
- is((Object) new BigDecimal(2)));
+ is(new BigDecimal(2)));
assertThat(SqlFunctions.multiplyAny(2L, 1.0D),
- is((Object) new BigDecimal(2)));
+ is(new BigDecimal(2)));
assertThat(SqlFunctions.multiplyAny(new BigDecimal(2L), 1),
- is((Object) new BigDecimal(2)));
+ is(new BigDecimal(2)));
assertThat(SqlFunctions.multiplyAny(new BigDecimal(2L), 1L),
- is((Object) new BigDecimal(2)));
+ is(new BigDecimal(2)));
assertThat(SqlFunctions.multiplyAny(new BigDecimal(2L), 1.0D),
- is((Object) new BigDecimal(2)));
+ is(new BigDecimal(2)));
assertThat(SqlFunctions.multiplyAny(new BigDecimal(2L), new BigDecimal(1.0D)),
- is((Object) new BigDecimal(2)));
+ is(new BigDecimal(2)));
// Non-numeric type
try {
@@ -869,19 +869,19 @@ class SqlFunctionsTest {
// Numeric types
assertThat(SqlFunctions.divideAny(5, 2L),
- is((Object) new BigDecimal("2.5")));
+ is(new BigDecimal("2.5")));
assertThat(SqlFunctions.divideAny(5, 2.0D),
- is((Object) new BigDecimal("2.5")));
+ is(new BigDecimal("2.5")));
assertThat(SqlFunctions.divideAny(5L, 2.0D),
- is((Object) new BigDecimal("2.5")));
+ is(new BigDecimal("2.5")));
assertThat(SqlFunctions.divideAny(new BigDecimal(5L), 2),
- is((Object) new BigDecimal(2.5)));
+ is(new BigDecimal(2.5)));
assertThat(SqlFunctions.divideAny(new BigDecimal(5L), 2L),
- is((Object) new BigDecimal(2.5)));
+ is(new BigDecimal(2.5)));
assertThat(SqlFunctions.divideAny(new BigDecimal(5L), 2.0D),
- is((Object) new BigDecimal(2.5)));
+ is(new BigDecimal(2.5)));
assertThat(SqlFunctions.divideAny(new BigDecimal(5L), new BigDecimal(2.0D)),
- is((Object) new BigDecimal(2.5)));
+ is(new BigDecimal(2.5)));
// Non-numeric type
try {
diff --git a/core/src/test/java/org/apache/calcite/test/concurrent/SamplePlugin.java b/core/src/test/java/org/apache/calcite/test/concurrent/SamplePlugin.java
index 495d080d84..86265cd543 100644
--- a/core/src/test/java/org/apache/calcite/test/concurrent/SamplePlugin.java
+++ b/core/src/test/java/org/apache/calcite/test/concurrent/SamplePlugin.java
@@ -48,8 +48,7 @@ public class SamplePlugin extends ConcurrentTestPlugin {
/** Command that describes a result set. */
static class DescribeResultSet implements ConcurrentTestPluginCommand {
public void execute(TestContext testContext) throws IOException {
- Statement stmt =
- (PreparedStatement) testContext.getCurrentStatement();
+ Statement stmt = testContext.getCurrentStatement();
if (stmt == null) {
testContext.storeMessage("No current statement");
} else if (stmt instanceof PreparedStatement) {
diff --git a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidQuery.java b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidQuery.java
index 7ab7881bcd..b4d13a50ce 100644
--- a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidQuery.java
+++ b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidQuery.java
@@ -280,7 +280,7 @@ public class DruidQuery extends AbstractRelNode implements BindableRel {
// unknown Granularity
return Pair.of(null, null);
}
- if (!TimeExtractionFunction.isValidTimeExtract((RexCall) rexNode)) {
+ if (!TimeExtractionFunction.isValidTimeExtract(rexNode)) {
return Pair.of(null, null);
}
RexNode extractValueNode = ((RexCall) rexNode).getOperands().get(1);
@@ -309,7 +309,7 @@ public class DruidQuery extends AbstractRelNode implements BindableRel {
// unknown Granularity
return Pair.of(null, null);
}
- if (!TimeExtractionFunction.isValidTimeFloor((RexCall) rexNode)) {
+ if (!TimeExtractionFunction.isValidTimeFloor(rexNode)) {
return Pair.of(null, null);
}
RexNode floorValueNode = ((RexCall) rexNode).getOperands().get(0);
diff --git a/piglet/src/main/java/org/apache/calcite/piglet/PigRelExVisitor.java b/piglet/src/main/java/org/apache/calcite/piglet/PigRelExVisitor.java
index 1436649c20..f3ac770678 100644
--- a/piglet/src/main/java/org/apache/calcite/piglet/PigRelExVisitor.java
+++ b/piglet/src/main/java/org/apache/calcite/piglet/PigRelExVisitor.java
@@ -442,7 +442,7 @@ class PigRelExVisitor extends LogicalExpressionVisitor {
RelNode referencedRel = builder.getRel(
((LogicalRelationalOperator) op.getImplicitReferencedOperator()).getAlias());
builder.push(referencedRel);
- List<RexNode> projectCol = Lists.newArrayList((RexNode) builder.field(index));
+ List<RexNode> projectCol = Lists.newArrayList(builder.field(index));
builder.project(projectCol);
stack.push(RexSubQuery.scalar(builder.build()));
diff --git a/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkSchema.java b/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkSchema.java
index c7989dc244..2478d108cd 100644
--- a/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkSchema.java
+++ b/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkSchema.java
@@ -32,7 +32,7 @@ public class SplunkSchema extends AbstractSchema {
public static final String SPLUNK_TABLE_NAME = "splunk";
public static final ImmutableMap<String, Table> TABLE_MAP =
- ImmutableMap.of(SPLUNK_TABLE_NAME, (Table) SplunkTable.INSTANCE);
+ ImmutableMap.of(SPLUNK_TABLE_NAME, SplunkTable.INSTANCE);
public final SplunkConnection splunkConnection;