Merge branch '3.8-dev'

Author: xiazcy

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/NumberHelper.java

@@ -23,6 +23,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.MathContext;
+import java.math.RoundingMode;
 import java.util.function.Function;
 import java.util.function.BiFunction;
 
@@ -793,7 +794,12 @@ private static Long longValue(final Number num, final Class<? extends Number> ta
         }
 
         try {
-            if (num.getClass().equals(BigDecimal.class)) return ((BigDecimal) num).longValueExact();
+            if (num.getClass().equals(BigDecimal.class)) {
+                // need to truncate the decimal places or else longValueExact() will throw
+                BigDecimal truncated = ((BigDecimal) num).setScale(0, RoundingMode.DOWN);
+                return truncated.longValueExact();
+            }
+
             return num.getClass().equals(BigInteger.class) ? ((BigInteger) num).longValueExact() : num.longValue();
         } catch (ArithmeticException ae) {
             throw new ArithmeticException(msgOverflow);

gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AsNumberStepTest.java

@@ -51,6 +51,10 @@ public void testReturnTypes() {
         assertEquals(3.14f, __.__(3.14).asNumber(GType.FLOAT).next());
         assertEquals(3.14, __.__(3.14f).asNumber(GType.DOUBLE).next());
         assertEquals(3.14, __.__(3.14f).asNumber(GType.DOUBLE).next());
+        assertEquals(3, __.__(new BigDecimal("3.14")).asNumber(GType.INT).next());
+        assertEquals(3L, __.__(new BigDecimal("3.14")).asNumber(GType.LONG).next());
+        assertEquals(-3, __.__(new BigDecimal("-3.14")).asNumber(GType.INT).next());
+        assertEquals(-3L, __.__(new BigDecimal("-3.14")).asNumber(GType.LONG).next());
         assertEquals(1, __.__("1").asNumber(GType.INT).next());
         assertEquals(1, __.__("1").asNumber().next());
         assertEquals((byte) 1, __.__("1").asNumber(GType.BYTE).next());
@@ -273,6 +277,11 @@ public void shouldThrowOverflowExceptionWhenBigDecimalToShortOverflows() {
         __.__(new BigDecimal(Long.MAX_VALUE+"1")).asNumber(GType.SHORT).next();
     }
 
+    @Test(expected = ArithmeticException.class)
+    public void shouldThrowOverflowExceptionWhenBigDecimalToLongOverflows() {
+        __.__(new BigDecimal(Long.MAX_VALUE+"1")).asNumber(GType.LONG).next();
+    }
+
     @Test(expected = ArithmeticException.class)
     public void shouldThrowOverflowExceptionWhenFloatToLongOverflows() {
         __.__(new Float(Long.MAX_VALUE+"1")).asNumber(GType.LONG).next();

gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs

@@ -969,6 +969,7 @@ private static IDictionary<string, List<Func<GraphTraversalSource, IDictionary<s
                {"g_injectXnullX_asNumberXGType_INTX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(null).AsNumber(GType.Int)}}, 
                {"g_V_asXaX_outXknowsX_asXbX_mathXa_plus_bX_byXageX_asNumberXGType_INTX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().As("a").Out("knows").As("b").Math("a + b").By("age").AsNumber(GType.Int)}}, 
                {"g_withSideEffectXx_100X_V_age_mathX__plus_xX_asNumberXGType_LONGX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithSideEffect("x", 100).V().Values<object>("age").Math("_ + x").AsNumber(GType.Long)}}, 
+               {"g_V_valuesXageX_asString_asNumberXGType_DOUBLEX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.V().Values<object>("age").AsString().AsNumber(GType.Double)}}, 
                {"g_injectX1_2X_asString", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(1, 2).AsString()}}, 
                {"g_injectX1_2X_asStringXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(1, 2).AsString<object>(Scope.Local)}}, 
                {"g_injectXlist_1_2X_asStringXlocalX", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.Inject<object>(new List<object> { 1, 2 }).AsString<object>(Scope.Local)}}, 

gremlin-go/driver/cucumber/gremlin.go

@@ -940,6 +940,7 @@ var translationMap = map[string][]func(g *gremlingo.GraphTraversalSource, p map[
     "g_injectXnullX_asNumberXGType_INTX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(nil).AsNumber(gremlingo.GType.Int)}}, 
     "g_V_asXaX_outXknowsX_asXbX_mathXa_plus_bX_byXageX_asNumberXGType_INTX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().As("a").Out("knows").As("b").Math("a + b").By("age").AsNumber(gremlingo.GType.Int)}}, 
     "g_withSideEffectXx_100X_V_age_mathX__plus_xX_asNumberXGType_LONGX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithSideEffect("x", 100).V().Values("age").Math("_ + x").AsNumber(gremlingo.GType.Long)}}, 
+    "g_V_valuesXageX_asString_asNumberXGType_DOUBLEX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.V().Values("age").AsString().AsNumber(gremlingo.GType.Double)}}, 
     "g_injectX1_2X_asString": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(1, 2).AsString()}}, 
     "g_injectX1_2X_asStringXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject(1, 2).AsString(gremlingo.Scope.Local)}}, 
     "g_injectXlist_1_2X_asStringXlocalX": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.Inject([]interface{}{1, 2}).AsString(gremlingo.Scope.Local)}}, 

gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js

@@ -943,6 +943,7 @@
     'g_injectXnullX_asNumberXGType_INTX': [(lambda g:g.inject(None).as_number(GType.INT))], 
     'g_V_asXaX_outXknowsX_asXbX_mathXa_plus_bX_byXageX_asNumberXGType_INTX': [(lambda g:g.V().as_('a').out('knows').as_('b').math('a + b').by('age').as_number(GType.INT))], 
     'g_withSideEffectXx_100X_V_age_mathX__plus_xX_asNumberXGType_LONGX': [(lambda g:g.with_side_effect('x', 100).V().values('age').math('_ + x').as_number(GType.LONG))], 
+    'g_V_valuesXageX_asString_asNumberXGType_DOUBLEX': [(lambda g:g.V().values('age').as_string().as_number(GType.DOUBLE))], 
     'g_injectX1_2X_asString': [(lambda g:g.inject(1, 2).as_string())], 
     'g_injectX1_2X_asStringXlocalX': [(lambda g:g.inject(1, 2).as_string(Scope.local))], 
     'g_injectXlist_1_2X_asStringXlocalX': [(lambda g:g.inject([1, 2]).as_string(Scope.local))], 

gremlin-python/src/main/python/radish/gremlin.py

@@ -311,3 +311,17 @@ Feature: Step - asNumber()
       | d[127].l |
       | d[132].l |
       | d[135].l |
+
+  Scenario: g_V_valuesXageX_asString_asNumberXGType_DOUBLEX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().values("age").asString().asNumber(GType.DOUBLE)
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | d[29.0].d |
+      | d[27.0].d |
+      | d[32.0].d |
+      | d[35.0].d |