tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dkupp...@apache.org
Subject tinkerpop git commit: Merge branch 'TINKERPOP-1736' into TINKERPOP-1736-tp32
Date Tue, 25 Jul 2017 20:17:19 GMT
Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1736-tp32 [created] 131b007fa


Merge branch 'TINKERPOP-1736' into TINKERPOP-1736-tp32


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/131b007f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/131b007f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/131b007f

Branch: refs/heads/TINKERPOP-1736-tp32
Commit: 131b007fabf69ea707d7259bbc46e69ea522210e
Parents: 9a33651 0443211
Author: Daniel Kuppitz <daniel_kuppitz@hotmail.com>
Authored: Tue Jul 25 22:05:58 2017 +0200
Committer: Daniel Kuppitz <daniel_kuppitz@hotmail.com>
Committed: Tue Jul 25 22:05:58 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/131b007f/CHANGELOG.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/131b007f/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/131b007f/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,c69ba09..3207c4f
--- 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();
+         }
      }
--}
++}


Mime
View raw message