You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by la...@apache.org on 2019/07/31 22:30:23 UTC
[calcite] branch master updated: Fix compiler warnings
This is an automated email from the ASF dual-hosted git repository.
laurent pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/master by this push:
new fef2133 Fix compiler warnings
fef2133 is described below
commit fef2133ee6652688de7c6cd7ecb755cf5459cba1
Author: Laurent Goujon <la...@apache.org>
AuthorDate: Wed Jul 31 14:45:08 2019 -0700
Fix compiler warnings
Fix compiler warnings introduced by patches for issues CALCITE-3031 and
CALCITE-3187.
Also force compiler to stop if such warnings are detected.
---
.../main/java/org/apache/calcite/rel/rules/ReduceDecimalsRule.java | 3 ++-
.../main/java/org/apache/calcite/rel/rules/SubQueryRemoveRule.java | 5 ++---
.../java/org/apache/calcite/rel/type/RelDataTypeFactoryImpl.java | 3 +++
pom.xml | 5 ++++-
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ReduceDecimalsRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ReduceDecimalsRule.java
index c8dd509..b425227 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ReduceDecimalsRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ReduceDecimalsRule.java
@@ -939,7 +939,8 @@ public class ReduceDecimalsRule extends RelOptRule {
// a lower scale, then the number should be scaled down.
int divisor = scaleA + scaleB - call.getType().getScale();
- if (builder.getTypeFactory().useDoubleMultiplication(
+ if (builder.getTypeFactory().getTypeSystem().shouldUseDoubleMultiplication(
+ builder.getTypeFactory(),
typeA,
typeB)) {
// Approximate implementation:
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/SubQueryRemoveRule.java b/core/src/main/java/org/apache/calcite/rel/rules/SubQueryRemoveRule.java
index 9a0f32d..3763d19 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/SubQueryRemoveRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/SubQueryRemoveRule.java
@@ -39,7 +39,6 @@ import org.apache.calcite.rex.RexUtil;
import org.apache.calcite.sql.SqlKind;
import org.apache.calcite.sql.fun.SqlQuantifyOperator;
import org.apache.calcite.sql.fun.SqlStdOperatorTable;
-import org.apache.calcite.sql.type.SqlTypeName;
import org.apache.calcite.sql2rel.RelDecorrelator;
import org.apache.calcite.tools.RelBuilder;
import org.apache.calcite.tools.RelBuilderFactory;
@@ -198,7 +197,7 @@ public abstract class SubQueryRemoveRule extends RelOptRule {
builder.field("q", "m"))), builder.literal(true), builder
.call(SqlStdOperatorTable.GREATER_THAN, builder.field("q", "c"),
builder.field("q", "d")),
- e.rel.getCluster().getRexBuilder().makeNullLiteral(SqlTypeName.BOOLEAN), builder
+ builder.getRexBuilder().constantNull(), builder
.call(RelOptUtil.op(op.comparisonKind, null), e.operands.get(0),
builder.field("q", "m")));
} else {
@@ -241,7 +240,7 @@ public abstract class SubQueryRemoveRule extends RelOptRule {
builder.field("q", "m"))), builder.literal(true), builder
.call(SqlStdOperatorTable.GREATER_THAN, builder.field("q", "c"),
builder.field("q", "d")),
- e.rel.getCluster().getRexBuilder().makeNullLiteral(SqlTypeName.BOOLEAN), builder
+ builder.getRexBuilder().constantNull(), builder
.call(RelOptUtil.op(op.comparisonKind, null), e.operands.get(0),
builder.field("q", "m")));
}
diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFactoryImpl.java b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFactoryImpl.java
index b8af869..a559b8d 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFactoryImpl.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeFactoryImpl.java
@@ -460,6 +460,7 @@ public abstract class RelDataTypeFactoryImpl implements RelDataTypeFactory {
* {@link RelDataTypeSystem#deriveDecimalMultiplyType(RelDataTypeFactory, RelDataType, RelDataType)}
* to get the return type for the operation.
*/
+ @Deprecated
public RelDataType createDecimalProduct(
RelDataType type1,
RelDataType type2) {
@@ -471,6 +472,7 @@ public abstract class RelDataTypeFactoryImpl implements RelDataTypeFactory {
* {@link RelDataTypeSystem#shouldUseDoubleMultiplication(RelDataTypeFactory, RelDataType, RelDataType)}
* to get if double should be used for multiplication.
*/
+ @Deprecated
public boolean useDoubleMultiplication(
RelDataType type1,
RelDataType type2) {
@@ -482,6 +484,7 @@ public abstract class RelDataTypeFactoryImpl implements RelDataTypeFactory {
* {@link RelDataTypeSystem#deriveDecimalDivideType(RelDataTypeFactory, RelDataType, RelDataType)}
* to get the return type for the operation.
*/
+ @Deprecated
public RelDataType createDecimalQuotient(
RelDataType type1,
RelDataType type2) {
diff --git a/pom.xml b/pom.xml
index b18109b..f6791d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -745,7 +745,10 @@ limitations under the License.
<!-- If you are looking to change source/target,
change the maven.compiler.{source,target} property -->
<configuration>
- <compilerArgument>-Xlint:deprecation</compilerArgument>
+ <compilerArgs>
+ <arg>-Xlint:deprecation</arg>
+ <arg>-Werror</arg>
+ </compilerArgs>
</configuration>
</plugin>
<plugin>