You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/02/14 16:58:33 UTC
[2/4] incubator-tinkerpop git commit: minor logic fix in
minor logic fix in
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/ab6091c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ab6091c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ab6091c3
Branch: refs/heads/master
Commit: ab6091c31cfe6f6f9b6eba54d296499e9b70b51c
Parents: 4ccd504
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Sat Feb 14 16:23:22 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Sat Feb 14 16:23:22 2015 +0100
----------------------------------------------------------------------
.../graph/traversal/step/map/RangeLocalStep.java | 2 +-
.../traversal/step/filter/GroovyRangeTest.groovy | 10 +++++-----
.../graph/traversal/step/filter/RangeTest.java | 14 +++++++-------
3 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ab6091c3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/RangeLocalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/RangeLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/RangeLocalStep.java
index 22c3c74..8baee42 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/RangeLocalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/RangeLocalStep.java
@@ -47,7 +47,7 @@ public final class RangeLocalStep<S> extends LocalBarrierStep<S, S> {
protected S map(final Traverser.Admin<S> traverser) {
Stream stream = this.collect(traverser).stream().skip(this.low);
if (this.high != -1) {
- stream = stream.limit(this.high);
+ stream = stream.limit(this.high - this.low);
}
return (S) stream.collect(Collectors.toList());
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ab6091c3/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRangeTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRangeTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRangeTest.groovy
index 5e8a024..4067f06 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRangeTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRangeTest.groovy
@@ -72,8 +72,8 @@ public abstract class GroovyRangeTest {
}
@Override
- Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_2XX_asXwX_select_byXnameX_by() {
- g.V().hasLabel('software').as('s').local(__.inE('created').values('weight').fold().range(Scope.local, 1, 2)).as('w').select().by('name').by()
+ Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_3XX_asXwX_select_byXnameX_by() {
+ g.V().hasLabel('software').as('s').local(__.inE('created').values('weight').fold().range(Scope.local, 1, 3)).as('w').select().by('name').by()
}
}
@@ -137,11 +137,11 @@ public abstract class GroovyRangeTest {
}
@Override
- Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_2XX_asXwX_select_byXnameX_by() {
+ Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_3XX_asXwX_select_byXnameX_by() {
g.engine(StandardTraversalEngine.instance())
// TODO: the traversal should work in computer mode, but throws a ClassCastException
- g.V().hasLabel('software').as('s').local(__.inE('created').values('weight').fold().range(Scope.local, 1, 2)).as('w').select().by('name').by()
- //ComputerTestHelper.compute("g.V().hasLabel('software').as('s').local(__.inE('created').values('weight').fold().range(Scope.local, 1, 2)).as('p').select().by('name').by()", g)
+ g.V().hasLabel('software').as('s').local(__.inE('created').values('weight').fold().range(Scope.local, 1, 3)).as('w').select().by('name').by()
+ //ComputerTestHelper.compute("g.V().hasLabel('software').as('s').local(__.inE('created').values('weight').fold().range(Scope.local, 1, 3)).as('p').select().by('name').by()", g)
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ab6091c3/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeTest.java
index 6fbabea..f28a47d 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeTest.java
@@ -56,7 +56,7 @@ public abstract class RangeTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_limitXlocal_1XX_asXwX_select_byXnameX_by();
- public abstract Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_2XX_asXwX_select_byXnameX_by();
+ public abstract Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_3XX_asXwX_select_byXnameX_by();
@Test
@LoadGraphWith(MODERN)
@@ -178,8 +178,8 @@ public abstract class RangeTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_2XX_asXwX_select_byXnameX_by() {
- final Traversal<Vertex, Map<String, Object>> traversal = get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_2XX_asXwX_select_byXnameX_by();
+ public void g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_3XX_asXwX_select_byXnameX_by() {
+ final Traversal<Vertex, Map<String, Object>> traversal = get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_3XX_asXwX_select_byXnameX_by();
printTraversalForm(traversal);
int counter = 0;
while (traversal.hasNext()) {
@@ -247,8 +247,8 @@ public abstract class RangeTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_2XX_asXwX_select_byXnameX_by() {
- return g.V().hasLabel("software").as("s").local(inE("created").values("weight").fold().range(Scope.local, 1, 2)).as("w").select().by("name").by();
+ public Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_3XX_asXwX_select_byXnameX_by() {
+ return g.V().hasLabel("software").as("s").local(inE("created").values("weight").fold().range(Scope.local, 1, 3)).as("w").select().by("name").by();
}
}
@@ -307,9 +307,9 @@ public abstract class RangeTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_2XX_asXwX_select_byXnameX_by() {
+ public Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_3XX_asXwX_select_byXnameX_by() {
g.engine(StandardTraversalEngine.instance()); // TODO: the traversal should work in computer mode, but throws a ClassCastException
- return super.get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_2XX_asXwX_select_byXnameX_by();
+ return super.get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_3XX_asXwX_select_byXnameX_by();
}
}
}
\ No newline at end of file