Fixed a bug in `OrderGlobalStep` and added the previously removed `RangeTest` test back.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/41f12880 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/41f12880 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/41f12880 Branch: refs/heads/TINKERPOP-1565 Commit: 41f1288072bb06837c1c663143c33fbcbbfa9a91 Parents: ba6186a Author: Daniel Kuppitz <daniel_kupp...@hotmail.com> Authored: Tue Jan 10 16:48:09 2017 +0100 Committer: Daniel Kuppitz <daniel_kupp...@hotmail.com> Committed: Tue Jan 10 16:48:09 2017 +0100 ---------------------------------------------------------------------- .../process/traversal/step/map/OrderGlobalStep.java | 2 +- .../traversal/step/filter/GroovyRangeTest.groovy | 5 +++++ .../process/traversal/step/filter/RangeTest.java | 16 ++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/41f12880/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java index a7d21b2..806dbf0 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java @@ -172,7 +172,7 @@ public final class OrderGlobalStep<S, C extends Comparable> extends CollectingBa @Override public TraverserSet<S> apply(final TraverserSet<S> setA, final TraverserSet<S> setB) { setA.addAll(setB); - if (Long.MAX_VALUE != this.limit && setA.bulkSize() > this.limit) { + if (this.limit != -1 && setA.bulkSize() > this.limit) { if (this.chainedComparator.isShuffle()) setA.shuffle(); else http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/41f12880/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy ---------------------------------------------------------------------- diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy index 4f7b0d4..14d7282 100644 --- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy @@ -115,6 +115,11 @@ public abstract class GroovyRangeTest { } @Override + public Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXageX_skipX1X_valuesXnameX() { + new ScriptTraversal<>(g, "gremlin-groovy", "g.V.hasLabel('person').order.by('age').skip(1).values('name')") + } + + @Override public Traversal<Vertex, List<Double>> get_g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X() { new ScriptTraversal<>(g, "gremlin-groovy", "g.V.outE.values('weight').fold.order(local).skip(local, 2)") } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/41f12880/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java index 0abaf70..3a565be 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java @@ -83,6 +83,8 @@ public abstract class RangeTest extends AbstractGremlinProcessTest { public abstract Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXageX_valuesXnameX_skipX1X(); + public abstract Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXageX_skipX1X_valuesXnameX(); + public abstract Traversal<Vertex, List<Double>> get_g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X(); @Test @@ -330,6 +332,15 @@ public abstract class RangeTest extends AbstractGremlinProcessTest { @Test @LoadGraphWith(MODERN) + public void g_V_hasLabelXpersonX_order_byXageX_skipX1X_valuesXnameX() { + final Traversal<Vertex, String> traversal = get_g_V_hasLabelXpersonX_order_byXageX_skipX1X_valuesXnameX(); + printTraversalForm(traversal); + assertTrue(traversal.hasNext()); + assertEquals(Arrays.asList("marko", "josh", "peter"), traversal.toList()); + } + + @Test + @LoadGraphWith(MODERN) public void g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X() { final Traversal<Vertex, List<Double>> traversal = get_g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X(); printTraversalForm(traversal); @@ -425,6 +436,11 @@ public abstract class RangeTest extends AbstractGremlinProcessTest { } @Override + public Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXageX_skipX1X_valuesXnameX() { + return g.V().hasLabel("person").order().by("age").skip(1).values("name"); + } + + @Override public Traversal<Vertex, List<Double>> get_g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X() { return g.V().outE().values("weight").fold().order(local).skip(local, 2); }