You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2017/07/26 13:11:13 UTC
[1/3] tinkerpop git commit: Fixed a bug in `BigDecimal` divisions in
`NumberHelper` that potentially threw an `ArithmeticException`.
Repository: tinkerpop
Updated Branches:
refs/heads/master fcd623ce3 -> 3a4406a5d
Fixed a bug in `BigDecimal` divisions in `NumberHelper` that potentially threw an `ArithmeticException`.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a612f5f1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a612f5f1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a612f5f1
Branch: refs/heads/master
Commit: a612f5f1f642555615494168c392c7c135bd67bc
Parents: 28ab372
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Jul 25 20:01:21 2017 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Jul 25 22:27:47 2017 +0200
----------------------------------------------------------------------
CHANGELOG.asciidoc | 6 ++++++
.../gremlin/process/traversal/NumberHelper.java | 16 ++++++++++++++-
.../step/sideEffect/GroovySackTest.groovy | 5 +++++
.../traversal/step/sideEffect/SackTest.java | 21 ++++++++++++++++++++
4 files changed, 47 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a612f5f1/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 5436fd9..e2b849c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -27,6 +27,12 @@ TinkerPop 3.1.8 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Fixed a `MessageScope` bug in `TinkerGraphComputer`.
+* Fixed a bug in `BigDecimal` divisions in `NumberHelper` that potentially threw an `ArithmeticException`.
+
+Bugs
+^^^^
+
+* TINKERPOP-1736 Sack step evaluated by Groovy interprets numbers in an unexpected way
[[release-3-1-7]]
TinkerPop 3.1.7 (Release Date: June 12, 2017)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a612f5f1/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/NumberHelper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/NumberHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/NumberHelper.java
index b094f29..eec1d9e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/NumberHelper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/NumberHelper.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.traversal;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.math.MathContext;
import java.util.function.BiFunction;
/**
@@ -129,7 +130,20 @@ public class NumberHelper {
(a, b) -> bigDecimalValue(a).add(bigDecimalValue(b)),
(a, b) -> bigDecimalValue(a).subtract(bigDecimalValue(b)),
(a, b) -> bigDecimalValue(a).multiply(bigDecimalValue(b)),
- (a, b) -> bigDecimalValue(a).divide(bigDecimalValue(b)),
+ (a, b) -> {
+ final BigDecimal ba = bigDecimalValue(a);
+ final BigDecimal bb = bigDecimalValue(b);
+ try {
+ return ba.divide(bb);
+ } catch (ArithmeticException ignored) {
+ // set a default precision
+ final int precision = Math.max(ba.precision(),bb.precision()) + 10;
+ BigDecimal result = ba.divide(bb, new MathContext(precision));
+ final int scale = Math.max(Math.max(ba.scale(), bb.scale()), 10);
+ if (result.scale() > scale) result = result.setScale(scale, BigDecimal.ROUND_HALF_UP);
+ return result;
+ }
+ },
(a, b) -> {
final BigDecimal x = bigDecimalValue(a), y = bigDecimalValue(b);
return x.compareTo(y) <= 0 ? x : y;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a612f5f1/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
index 828f664..d1681cb 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
@@ -74,5 +74,10 @@ public abstract class GroovySackTest {
Traversal<Vertex, BigDecimal> get_g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack() {
TraversalScriptHelper.compute("g.withSack(BigInteger.TEN.pow(1000), assign).V.local(out('knows').barrier(normSack)).in('knows').barrier.sack", g)
}
+
+ @Override
+ Traversal<Vertex, BigDecimal> get_g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack() {
+ TraversalScriptHelper.compute("g.withSack(2).V.sack(div).by(constant(3.0)).sack", g)
+ }
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a612f5f1/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
index 299bee2..63f3649 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
@@ -36,6 +36,7 @@ import java.util.HashMap;
import java.util.Map;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.constant;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.out;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE;
import static org.junit.Assert.assertEquals;
@@ -68,6 +69,8 @@ public abstract class SackTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, BigDecimal> get_g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack();
+ public abstract Traversal<Vertex, BigDecimal> get_g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack();
+
@Test
@LoadGraphWith(MODERN)
public void g_withSackXhellowX_V_outE_sackXassignX_byXlabelX_inV_sack() {
@@ -156,6 +159,19 @@ public abstract class SackTest extends AbstractGremlinProcessTest {
assertFalse(traversal.hasNext());
}
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack() {
+ final Traversal<Vertex, BigDecimal> traversal = get_g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack();
+ printTraversalForm(traversal);
+ final double expected = 2.0 / 3.0;
+ for (int i = 0; i < 6; i++) {
+ assertTrue(traversal.hasNext());
+ assertEquals(expected, traversal.next().doubleValue(), 0.0001);
+ }
+ assertFalse(traversal.hasNext());
+ }
+
public static class Traversals extends SackTest {
@Override
@@ -205,5 +221,10 @@ public abstract class SackTest extends AbstractGremlinProcessTest {
public Traversal<Vertex, BigDecimal> get_g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack() {
return g.withSack(BigInteger.TEN.pow(1000), Operator.assign).V().local(out("knows").barrier(SackFunctions.Barrier.normSack)).in("knows").barrier().sack();
}
+
+ @Override
+ public Traversal<Vertex, BigDecimal> get_g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack() {
+ return g.withSack(2).V().sack(Operator.div).by(constant(BigDecimal.valueOf(3))).sack();
+ }
}
}
\ No newline at end of file
[3/3] tinkerpop git commit: Merge branch 'tp32'
Posted by dk...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3a4406a5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3a4406a5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3a4406a5
Branch: refs/heads/master
Commit: 3a4406a5da4676cd59238eeb9209e48ebe2ed26b
Parents: fcd623c d92dd5d
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Jul 26 15:10:34 2017 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Jul 26 15:10:34 2017 +0200
----------------------------------------------------------------------
CHANGELOG.asciidoc | 6 +++++
.../tinkerpop/gremlin/util/NumberHelper.java | 16 +++++++++++++-
.../traversal/step/sideEffect/SackTest.java | 23 +++++++++++++++++++-
3 files changed, 43 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3a4406a5/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3a4406a5/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/NumberHelper.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/NumberHelper.java
index 95ab189,0000000..b560df3
mode 100644,000000..100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/NumberHelper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/NumberHelper.java
@@@ -1,280 -1,0 +1,294 @@@
+/*
+ * 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.tinkerpop.gremlin.util;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
++import java.math.MathContext;
+import java.util.function.BiFunction;
+
+/**
+ * @author Daniel Kuppitz (http://gremlin.guru)
+ */
+public final class NumberHelper {
+
+ static final NumberHelper BYTE_NUMBER_HELPER = new NumberHelper(
+ (a, b) -> a.byteValue() + b.byteValue(),
+ (a, b) -> a.byteValue() - b.byteValue(),
+ (a, b) -> a.byteValue() * b.byteValue(),
+ (a, b) -> a.byteValue() / b.byteValue(),
+ (a, b) -> {
+ final byte x = a.byteValue(), y = b.byteValue();
+ return x <= y ? x : y;
+ },
+ (a, b) -> {
+ final byte x = a.byteValue(), y = b.byteValue();
+ return x >= y ? x : y;
+ });
+ static final NumberHelper SHORT_NUMBER_HELPER = new NumberHelper(
+ (a, b) -> a.shortValue() + b.shortValue(),
+ (a, b) -> a.shortValue() - b.shortValue(),
+ (a, b) -> a.shortValue() * b.shortValue(),
+ (a, b) -> a.shortValue() / b.shortValue(),
+ (a, b) -> {
+ final short x = a.shortValue(), y = b.shortValue();
+ return x <= y ? x : y;
+ },
+ (a, b) -> {
+ final short x = a.shortValue(), y = b.shortValue();
+ return x >= y ? x : y;
+ });
+ static final NumberHelper INTEGER_NUMBER_HELPER = new NumberHelper(
+ (a, b) -> a.intValue() + b.intValue(),
+ (a, b) -> a.intValue() - b.intValue(),
+ (a, b) -> a.intValue() * b.intValue(),
+ (a, b) -> a.intValue() / b.intValue(),
+ (a, b) -> {
+ final int x = a.intValue(), y = b.intValue();
+ return x <= y ? x : y;
+ },
+ (a, b) -> {
+ final int x = a.intValue(), y = b.intValue();
+ return x >= y ? x : y;
+ });
+ static final NumberHelper LONG_NUMBER_HELPER = new NumberHelper(
+ (a, b) -> a.longValue() + b.longValue(),
+ (a, b) -> a.longValue() - b.longValue(),
+ (a, b) -> a.longValue() * b.longValue(),
+ (a, b) -> a.longValue() / b.longValue(),
+ (a, b) -> {
+ final long x = a.longValue(), y = b.longValue();
+ return x <= y ? x : y;
+ },
+ (a, b) -> {
+ final long x = a.longValue(), y = b.longValue();
+ return x >= y ? x : y;
+ });
+ static final NumberHelper BIG_INTEGER_NUMBER_HELPER = new NumberHelper(
+ (a, b) -> bigIntegerValue(a).add(bigIntegerValue(b)),
+ (a, b) -> bigIntegerValue(a).subtract(bigIntegerValue(b)),
+ (a, b) -> bigIntegerValue(a).multiply(bigIntegerValue(b)),
+ (a, b) -> bigIntegerValue(a).divide(bigIntegerValue(b)),
+ (a, b) -> {
+ final BigInteger x = bigIntegerValue(a), y = bigIntegerValue(b);
+ return x.compareTo(y) <= 0 ? x : y;
+ },
+ (a, b) -> {
+ final BigInteger x = bigIntegerValue(a), y = bigIntegerValue(b);
+ return x.compareTo(y) >= 0 ? x : y;
+ });
+ static final NumberHelper FLOAT_NUMBER_HELPER = new NumberHelper(
+ (a, b) -> a.floatValue() + b.floatValue(),
+ (a, b) -> a.floatValue() - b.floatValue(),
+ (a, b) -> a.floatValue() * b.floatValue(),
+ (a, b) -> a.floatValue() / b.floatValue(),
+ (a, b) -> {
+ final float x = a.floatValue(), y = b.floatValue();
+ return x <= y ? x : y;
+ },
+ (a, b) -> {
+ final float x = a.floatValue(), y = b.floatValue();
+ return x >= y ? x : y;
+ });
+ static final NumberHelper DOUBLE_NUMBER_HELPER = new NumberHelper(
+ (a, b) -> a.doubleValue() + b.doubleValue(),
+ (a, b) -> a.doubleValue() - b.doubleValue(),
+ (a, b) -> a.doubleValue() * b.doubleValue(),
+ (a, b) -> a.doubleValue() / b.doubleValue(),
+ (a, b) -> {
+ final double x = a.doubleValue(), y = b.doubleValue();
+ return x <= y ? x : y;
+ },
+ (a, b) -> {
+ final double x = a.doubleValue(), y = b.doubleValue();
+ return x >= y ? x : y;
+ });
+ static final NumberHelper BIG_DECIMAL_NUMBER_HELPER = new NumberHelper(
+ (a, b) -> bigDecimalValue(a).add(bigDecimalValue(b)),
+ (a, b) -> bigDecimalValue(a).subtract(bigDecimalValue(b)),
+ (a, b) -> bigDecimalValue(a).multiply(bigDecimalValue(b)),
- (a, b) -> bigDecimalValue(a).divide(bigDecimalValue(b)),
++ (a, b) -> {
++ final BigDecimal ba = bigDecimalValue(a);
++ final BigDecimal bb = bigDecimalValue(b);
++ try {
++ return ba.divide(bb);
++ } catch (ArithmeticException ignored) {
++ // set a default precision
++ final int precision = Math.max(ba.precision(),bb.precision()) + 10;
++ BigDecimal result = ba.divide(bb, new MathContext(precision));
++ final int scale = Math.max(Math.max(ba.scale(), bb.scale()), 10);
++ if (result.scale() > scale) result = result.setScale(scale, BigDecimal.ROUND_HALF_UP);
++ return result;
++ }
++ },
+ (a, b) -> {
+ final BigDecimal x = bigDecimalValue(a), y = bigDecimalValue(b);
+ return x.compareTo(y) <= 0 ? x : y;
+ },
+ (a, b) -> {
+ final BigDecimal x = bigDecimalValue(a), y = bigDecimalValue(b);
+ return x.compareTo(y) >= 0 ? x : y;
+ });
+ public final BiFunction<Number, Number, Number> add;
+ public final BiFunction<Number, Number, Number> sub;
+ public final BiFunction<Number, Number, Number> mul;
+ public final BiFunction<Number, Number, Number> div;
+ public final BiFunction<Number, Number, Number> min;
+ public final BiFunction<Number, Number, Number> max;
+
+ private NumberHelper(final BiFunction<Number, Number, Number> add,
+ final BiFunction<Number, Number, Number> sub,
+ final BiFunction<Number, Number, Number> mul,
+ final BiFunction<Number, Number, Number> div,
+ final BiFunction<Number, Number, Number> min,
+ final BiFunction<Number, Number, Number> max
+ ) {
+ this.add = add;
+ this.sub = sub;
+ this.mul = mul;
+ this.div = div;
+ this.min = min;
+ this.max = max;
+ }
+
+ public static Class<? extends Number> getHighestCommonNumberClass(final Number... numbers) {
+ return getHighestCommonNumberClass(false, numbers);
+ }
+
+ public static Class<? extends Number> getHighestCommonNumberClass(final boolean forceFloatingPoint, final Number... numbers) {
+ int bits = 8;
+ boolean fp = forceFloatingPoint;
+ for (final Number number : numbers) {
+ if (number == null) continue;
+ final Class<? extends Number> clazz = number.getClass();
+ if (clazz.equals(Byte.class)) continue;
+ if (clazz.equals(Short.class)) {
+ bits = bits < 16 ? 16 : bits;
+ } else if (clazz.equals(Integer.class)) {
+ bits = bits < 32 ? 32 : bits;
+ } else if (clazz.equals(Long.class)) {
+ bits = bits < 64 ? 64 : bits;
+ } else if (clazz.equals(BigInteger.class)) {
+ bits = bits < 128 ? 128 : bits;
+ } else if (clazz.equals(Float.class)) {
+ bits = bits < 32 ? 32 : bits;
+ fp = true;
+ } else if (clazz.equals(Double.class)) {
+ bits = bits < 64 ? 64 : bits;
+ fp = true;
+ } else /*if (clazz.equals(BigDecimal.class))*/ {
+ bits = bits < 128 ? 128 : bits;
+ fp = true;
+ break; // maxed out, no need to check remaining numbers
+ }
+ }
+ return determineNumberClass(bits, fp);
+ }
+
+ public static Number add(final Number a, final Number b) {
+ final Class<? extends Number> clazz = getHighestCommonNumberClass(a, b);
+ return getHelper(clazz).add.apply(a, b);
+ }
+
+ public static Number sub(final Number a, final Number b) {
+ final Class<? extends Number> clazz = getHighestCommonNumberClass(a, b);
+ return getHelper(clazz).sub.apply(a, b);
+ }
+
+ public static Number mul(final Number a, final Number b) {
+ final Class<? extends Number> clazz = getHighestCommonNumberClass(a, b);
+ return getHelper(clazz).mul.apply(a, b);
+ }
+
+ public static Number div(final Number a, final Number b) {
+ return div(a, b, false);
+ }
+
+ public static Number div(final Number a, final Number b, final boolean forceFloatingPoint) {
+ final Class<? extends Number> clazz = getHighestCommonNumberClass(forceFloatingPoint, a, b);
+ return getHelper(clazz).div.apply(a, b);
+ }
+
+ public static Number min(final Number a, final Number b) {
+ final Class<? extends Number> clazz = getHighestCommonNumberClass(a, b);
+ return getHelper(clazz).min.apply(a, b);
+ }
+
+ public static Number max(final Number a, final Number b) {
+ final Class<? extends Number> clazz = getHighestCommonNumberClass(a, b);
+ return getHelper(clazz).max.apply(a, b);
+ }
+
+ private static NumberHelper getHelper(final Class<? extends Number> clazz) {
+ if (clazz.equals(Byte.class)) {
+ return BYTE_NUMBER_HELPER;
+ }
+ if (clazz.equals(Short.class)) {
+ return SHORT_NUMBER_HELPER;
+ }
+ if (clazz.equals(Integer.class)) {
+ return INTEGER_NUMBER_HELPER;
+ }
+ if (clazz.equals(Long.class)) {
+ return LONG_NUMBER_HELPER;
+ }
+ if (clazz.equals(BigInteger.class)) {
+ return BIG_INTEGER_NUMBER_HELPER;
+ }
+ if (clazz.equals(Float.class)) {
+ return FLOAT_NUMBER_HELPER;
+ }
+ if (clazz.equals(Double.class)) {
+ return DOUBLE_NUMBER_HELPER;
+ }
+ if (clazz.equals(BigDecimal.class)) {
+ return BIG_DECIMAL_NUMBER_HELPER;
+ }
+ throw new IllegalArgumentException("Unsupported numeric type: " + clazz);
+ }
+
+ private static BigInteger bigIntegerValue(final Number number) {
+ if (number == null) return null;
+ if (number instanceof BigInteger) return (BigInteger) number;
+ return BigInteger.valueOf(number.longValue());
+ }
+
+ private static BigDecimal bigDecimalValue(final Number number) {
+ if (number == null) return null;
+ if (number instanceof BigDecimal) return (BigDecimal) number;
+ if (number instanceof BigInteger) return new BigDecimal((BigInteger) number);
+ return (number instanceof Double || number instanceof Float)
+ ? BigDecimal.valueOf(number.doubleValue())
+ : BigDecimal.valueOf(number.longValue());
+ }
+
+ private static Class<? extends Number> determineNumberClass(final int bits, final boolean floatingPoint) {
+ if (floatingPoint) {
+ if (bits <= 32) return Float.class;
+ if (bits <= 64) return Double.class;
+ return BigDecimal.class;
+ } else {
+ if (bits <= 8) return Byte.class;
+ if (bits <= 16) return Short.class;
+ if (bits <= 32) return Integer.class;
+ if (bits <= 64) return Long.class;
+ return BigInteger.class;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3a4406a5/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
----------------------------------------------------------------------
[2/3] tinkerpop git commit: Merge branch 'tp31' into tp32
Posted by dk...@apache.org.
Merge branch 'tp31' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d92dd5d3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d92dd5d3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d92dd5d3
Branch: refs/heads/master
Commit: d92dd5d37626a22eb333cd173eef562be62f1926
Parents: 9a33651 a612f5f
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Jul 26 15:09:34 2017 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Jul 26 15:09:34 2017 +0200
----------------------------------------------------------------------
CHANGELOG.asciidoc | 6 +++++
.../gremlin/process/traversal/NumberHelper.java | 16 +++++++++++++-
.../step/sideEffect/GroovySackTest.groovy | 5 +++++
.../traversal/step/sideEffect/SackTest.java | 23 +++++++++++++++++++-
4 files changed, 48 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d92dd5d3/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d92dd5d3/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
----------------------------------------------------------------------
diff --cc gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
index 9df18ad,d1681cb..a63c224
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
@@@ -78,7 -72,12 +78,12 @@@ public abstract class GroovySackTest
@Override
Traversal<Vertex, BigDecimal> get_g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack() {
- TraversalScriptHelper.compute("g.withSack(BigInteger.TEN.pow(1000), assign).V.local(out('knows').barrier(normSack)).in('knows').barrier.sack", g)
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.withSack(BigInteger.TEN.pow(1000), assign).V.local(out('knows').barrier(normSack)).in('knows').barrier.sack")
}
+
+ @Override
+ Traversal<Vertex, BigDecimal> get_g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack() {
+ TraversalScriptHelper.compute("g.withSack(2).V.sack(div).by(constant(3.0)).sack", g)
+ }
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d92dd5d3/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
index 678cdb3,63f3649..3bde60d
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
@@@ -36,8 -36,7 +36,9 @@@ import java.util.HashMap
import java.util.Map;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
+import static org.apache.tinkerpop.gremlin.process.traversal.Operator.sum;
+import static org.apache.tinkerpop.gremlin.process.traversal.SackFunctions.Barrier.normSack;
+ import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.constant;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.out;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE;
import static org.junit.Assert.assertEquals;
@@@ -68,14 -67,14 +69,16 @@@ public abstract class SackTest extends
public abstract Traversal<Vertex, Integer> get_g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack();
+ public abstract Traversal<Vertex, Double> get_g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack(final Object v1Id);
+
public abstract Traversal<Vertex, BigDecimal> get_g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack();
+ public abstract Traversal<Vertex, BigDecimal> get_g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack();
+
@Test
@LoadGraphWith(MODERN)
- public void g_withSackXhellowX_V_outE_sackXassignX_byXlabelX_inV_sack() {
- final Traversal<Vertex, String> traversal = get_g_withSackXhellowX_V_outE_sackXassignX_byXlabelX_inV_sack();
+ public void g_withSackXhelloX_V_outE_sackXassignX_byXlabelX_inV_sack() {
+ final Traversal<Vertex, String> traversal = get_g_withSackXhelloX_V_outE_sackXassignX_byXlabelX_inV_sack();
checkResults(Arrays.asList("knows", "knows", "created", "created", "created", "created"), traversal);
}
@@@ -220,7 -219,12 +236,12 @@@
@Override
public Traversal<Vertex, BigDecimal> get_g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack() {
- return g.withSack(BigInteger.TEN.pow(1000), Operator.assign).V().local(out("knows").barrier(SackFunctions.Barrier.normSack)).in("knows").barrier().sack();
+ return g.withSack(BigInteger.TEN.pow(1000), Operator.assign).V().local(out("knows").barrier(normSack)).in("knows").barrier().sack();
}
+
+ @Override
+ public Traversal<Vertex, BigDecimal> get_g_withSackX2X_V_sackXdivX_byXconstantXBigDecimal_valueOfX3XXX_sack() {
+ return g.withSack(2).V().sack(Operator.div).by(constant(BigDecimal.valueOf(3))).sack();
+ }
}
--}
++}