[
https://issues.apache.org/jira/browse/BEAM-2281?focusedWorklogId=80733&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-80733
]
ASF GitHub Bot logged work on BEAM-2281:
----------------------------------------
Author: ASF GitHub Bot
Created on: 15/Mar/18 06:09
Start Date: 15/Mar/18 06:09
Worklog Time Spent: 10m
Work Description: XuMingmin closed pull request #4865: [BEAM-2281][Sql]
Use SqlFunctions.toBigDecimal not toString
URL: https://github.com/apache/beam/pull/4865
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java
index 1d56be9189d..63acdc41eb0 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/arithmetic/BeamSqlArithmeticExpression.java
@@ -25,6 +25,7 @@
import
org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive;
import org.apache.beam.sdk.transforms.windowing.BoundedWindow;
import org.apache.beam.sdk.values.Row;
+import org.apache.calcite.runtime.SqlFunctions;
import org.apache.calcite.sql.type.SqlTypeName;
/**
@@ -53,10 +54,8 @@ protected
BeamSqlArithmeticExpression(List<BeamSqlExpression> operands, SqlTypeN
@Override public BeamSqlPrimitive<? extends Number> evaluate(Row inputRow,
BoundedWindow window) {
- BigDecimal left = BigDecimal.valueOf(
- Double.valueOf(opValueEvaluated(0, inputRow, window).toString()));
- BigDecimal right = BigDecimal.valueOf(
- Double.valueOf(opValueEvaluated(1, inputRow, window).toString()));
+ BigDecimal left = SqlFunctions.toBigDecimal((Object) opValueEvaluated(0,
inputRow, window));
+ BigDecimal right = SqlFunctions.toBigDecimal((Object) opValueEvaluated(1,
inputRow, window));
BigDecimal result = calc(left, right);
return getCorrectlyTypedResult(result);
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlAbsExpression.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlAbsExpression.java
index 01b4cc7a2e3..20155b0803e 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlAbsExpression.java
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/math/BeamSqlAbsExpression.java
@@ -18,7 +18,6 @@
package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.math;
-import java.math.BigDecimal;
import java.util.List;
import
org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlExpression;
import
org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.BeamSqlPrimitive;
@@ -60,7 +59,7 @@ public BeamSqlAbsExpression(List<BeamSqlExpression> operands)
{
break;
case DECIMAL:
result = BeamSqlPrimitive
- .of(SqlTypeName.DECIMAL, SqlFunctions.abs(new
BigDecimal(op.getValue().toString())));
+ .of(SqlTypeName.DECIMAL, SqlFunctions.abs(op.getDecimal()));
break;
case DOUBLE:
result = BeamSqlPrimitive
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/agg/CovarianceFn.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/agg/CovarianceFn.java
index 6959aaca0c8..9cf386a1cdd 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/agg/CovarianceFn.java
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/agg/CovarianceFn.java
@@ -29,6 +29,7 @@
import org.apache.beam.sdk.transforms.Combine;
import org.apache.beam.sdk.transforms.SerializableFunction;
import org.apache.beam.sdk.values.KV;
+import org.apache.calcite.runtime.SqlFunctions;
/**
* {@link Combine.CombineFn} for <em>Covariance</em> on {@link Number} types.
@@ -83,7 +84,8 @@ public CovarianceAccumulator addInput(
}
return
currentVariance.combineWith(CovarianceAccumulator.ofSingleElement(
- toBigDecimal(rawInput.getKey()),
toBigDecimal(rawInput.getValue())));
+ SqlFunctions.toBigDecimal(rawInput.getKey()),
+ SqlFunctions.toBigDecimal(rawInput.getValue())));
}
@Override
@@ -113,8 +115,4 @@ private BigDecimal getCovariance(CovarianceAccumulator
covariance) {
return covariance.covariance().divide(adjustedCount, MATH_CTX);
}
-
- private BigDecimal toBigDecimal(T rawInput) {
- return new BigDecimal(rawInput.toString());
- }
}
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/agg/VarianceFn.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/agg/VarianceFn.java
index 0ac14707493..f124dd6e277 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/agg/VarianceFn.java
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/agg/VarianceFn.java
@@ -28,6 +28,7 @@
import org.apache.beam.sdk.coders.SerializableCoder;
import org.apache.beam.sdk.transforms.Combine;
import org.apache.beam.sdk.transforms.SerializableFunction;
+import org.apache.calcite.runtime.SqlFunctions;
/**
* {@link Combine.CombineFn} for <em>Variance</em> on {@link Number} types.
@@ -102,7 +103,8 @@ public VarianceAccumulator addInput(VarianceAccumulator
currentVariance, T rawIn
return currentVariance;
}
- return
currentVariance.combineWith(VarianceAccumulator.ofSingleElement(toBigDecimal(rawInput)));
+ return currentVariance.combineWith(VarianceAccumulator.ofSingleElement(
+ SqlFunctions.toBigDecimal(rawInput)));
}
@Override
@@ -131,8 +133,4 @@ private BigDecimal getVariance(VarianceAccumulator
variance) {
return variance.variance().divide(adjustedCount, MATH_CTX);
}
-
- private BigDecimal toBigDecimal(T rawInput) {
- return new BigDecimal(rawInput.toString());
- }
}
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlArithmeticOperatorsIntegrationTest.java
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlArithmeticOperatorsIntegrationTest.java
index e5409814d14..39565b374ab 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlArithmeticOperatorsIntegrationTest.java
+++
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/integrationtest/BeamSqlArithmeticOperatorsIntegrationTest.java
@@ -34,6 +34,7 @@
private static final BigDecimal ONE10 = BigDecimal.ONE.divide(
BigDecimal.ONE, 10, RoundingMode.HALF_EVEN);
private static final BigDecimal TWO = BigDecimal.valueOf(2.0);
+ private static final BigDecimal TWO0 = BigDecimal.ONE.add(BigDecimal.ONE);
@Test
public void testPlus() throws Exception {
@@ -45,8 +46,8 @@ public void testPlus() throws Exception {
.addExpr("c_tinyint + c_tinyint", (byte) 2)
.addExpr("c_smallint + c_smallint", (short) 2)
.addExpr("c_bigint + c_bigint", 2L)
- .addExpr("c_decimal + c_decimal", TWO)
- .addExpr("c_tinyint + c_decimal", TWO)
+ .addExpr("c_decimal + c_decimal", TWO0)
+ .addExpr("c_tinyint + c_decimal", TWO0)
.addExpr("c_float + c_decimal", 2.0)
.addExpr("c_double + c_decimal", 2.0)
.addExpr("c_float + c_float", 2.0f)
@@ -65,9 +66,7 @@ public void testPlus_overflow() throws Exception {
.addExpr("c_tinyint_max + c_tinyint_max", (byte) -2)
.addExpr("c_smallint_max + c_smallint_max", (short) -2)
.addExpr("c_integer_max + c_integer_max", -2)
- // yeah, I know 384L is strange, but since it is already overflowed
- // what the actualy result is not so important, it is wrong any way.
- .addExpr("c_bigint_max + c_bigint_max", 384L)
+ .addExpr("c_bigint_max + c_bigint_max", -2L)
;
checker.buildRunAndCheck();
@@ -83,8 +82,8 @@ public void testMinus() throws Exception {
.addExpr("c_tinyint - c_tinyint", (byte) 0)
.addExpr("c_smallint - c_smallint", (short) 0)
.addExpr("c_bigint - c_bigint", 0L)
- .addExpr("c_decimal - c_decimal", ZERO)
- .addExpr("c_tinyint - c_decimal", ZERO)
+ .addExpr("c_decimal - c_decimal", BigDecimal.ZERO)
+ .addExpr("c_tinyint - c_decimal", BigDecimal.ZERO)
.addExpr("c_float - c_decimal", 0.0)
.addExpr("c_double - c_decimal", 0.0)
.addExpr("c_float - c_float", 0.0f)
@@ -101,14 +100,14 @@ public void testMinus() throws Exception {
public void testMultiply() throws Exception {
ExpressionChecker checker = new ExpressionChecker()
.addExpr("1 * 1", 1)
- .addExpr("1.0 * 1", ONE2)
- .addExpr("1 * 1.0", ONE2)
+ .addExpr("1.0 * 1", ONE)
+ .addExpr("1 * 1.0", ONE)
.addExpr("1.0 * 1.0", ONE2)
.addExpr("c_tinyint * c_tinyint", (byte) 1)
.addExpr("c_smallint * c_smallint", (short) 1)
.addExpr("c_bigint * c_bigint", 1L)
- .addExpr("c_decimal * c_decimal", ONE2)
- .addExpr("c_tinyint * c_decimal", ONE2)
+ .addExpr("c_decimal * c_decimal", BigDecimal.ONE)
+ .addExpr("c_tinyint * c_decimal", BigDecimal.ONE)
.addExpr("c_float * c_decimal", 1.0)
.addExpr("c_double * c_decimal", 1.0)
.addExpr("c_float * c_float", 1.0f)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Issue Time Tracking
-------------------
Worklog Id: (was: 80733)
Time Spent: 1h 40m (was: 1.5h)
> call SqlFunctions in operator implementation
> --------------------------------------------
>
> Key: BEAM-2281
> URL: https://issues.apache.org/jira/browse/BEAM-2281
> Project: Beam
> Issue Type: Improvement
> Components: dsl-sql
> Reporter: Xu Mingmin
> Priority: Major
> Time Spent: 1h 40m
> Remaining Estimate: 0h
>
> Calcite has a collections of functions in
> {{org.apache.calcite.runtime.SqlFunctions}}. It sounds a good source to
> leverage when adding operators as {{BeamSqlExpression}}.
> [~xumingming] [~app-tarush], any comments?
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
