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/11 16:14:41 UTC
[1/3] incubator-tinkerpop git commit: fixed minor bug in
RangeByIsCountStrategy
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master f6d1444b0 -> e9cf11c3b
fixed minor bug in RangeByIsCountStrategy
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/f9f157ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/f9f157ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/f9f157ca
Branch: refs/heads/master
Commit: f9f157ca7ad263efae3b4435a5e126543fcb0597
Parents: 5617c2b
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Feb 11 15:20:07 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Feb 11 15:20:07 2015 +0100
----------------------------------------------------------------------
.../gremlin/process/graph/traversal/strategy/ProfileStrategy.java | 1 +
.../process/graph/traversal/strategy/RangeByIsCountStrategy.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f9f157ca/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/ProfileStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/ProfileStrategy.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/ProfileStrategy.java
index d0ae454..7cb6fe7 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/ProfileStrategy.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/ProfileStrategy.java
@@ -48,6 +48,7 @@ public final class ProfileStrategy extends AbstractTraversalStrategy {
PRIORS.add(ReducingStrategy.class);
PRIORS.add(SideEffectCapStrategy.class);
PRIORS.add(SideEffectRegistrationStrategy.class);
+ PRIORS.add(RangeByIsCountStrategy.class);
}
private ProfileStrategy() {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f9f157ca/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/RangeByIsCountStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/RangeByIsCountStrategy.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/RangeByIsCountStrategy.java
index f820d78..7a4af41 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/RangeByIsCountStrategy.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/strategy/RangeByIsCountStrategy.java
@@ -67,6 +67,7 @@ public final class RangeByIsCountStrategy extends AbstractTraversalStrategy impl
final long highRangeOffset = INCREASED_OFFSET_SCALAR_PREDICATES.contains(predicate) ? 1L : 0L;
final long highRange = ((Number) value).longValue() + highRangeOffset;
TraversalHelper.insertBeforeStep(new RangeStep<>(traversal, 0L, highRange), curr, traversal);
+ i++;
} else {
final Long highRangeOffset = RANGE_PREDICATES.get(predicate);
if (value instanceof Collection && highRangeOffset != null) {
@@ -74,6 +75,7 @@ public final class RangeByIsCountStrategy extends AbstractTraversalStrategy impl
if (high instanceof Number) {
final long highRange = ((Number) high).longValue() + highRangeOffset;
TraversalHelper.insertBeforeStep(new RangeStep<>(traversal, 0L, highRange), curr, traversal);
+ i++;
}
}
}
[2/3] incubator-tinkerpop git commit: clone global strategies for
each traversal instance
Posted by ok...@apache.org.
clone global strategies for each traversal instance
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/41aa686d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/41aa686d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/41aa686d
Branch: refs/heads/master
Commit: 41aa686dcf881fa025f521f987633a2b4bdfa64a
Parents: f9f157c
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Feb 11 16:10:46 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Feb 11 16:10:46 2015 +0100
----------------------------------------------------------------------
.../process/traversal/DefaultTraversal.java | 21 +++++------
.../tinkergraph/structure/TinkerGraphTest.java | 37 +++++++-------------
2 files changed, 21 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/41aa686d/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversal.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversal.java
index eef59db..5ab3d64 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversal.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversal.java
@@ -18,21 +18,12 @@
*/
package com.tinkerpop.gremlin.process.traversal;
-import com.tinkerpop.gremlin.process.Step;
-import com.tinkerpop.gremlin.process.Traversal;
-import com.tinkerpop.gremlin.process.TraversalEngine;
-import com.tinkerpop.gremlin.process.TraversalSideEffects;
-import com.tinkerpop.gremlin.process.TraversalStrategies;
-import com.tinkerpop.gremlin.process.Traverser;
+import com.tinkerpop.gremlin.process.*;
import com.tinkerpop.gremlin.process.traversal.step.EmptyStep;
import com.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -53,7 +44,7 @@ public class DefaultTraversal<S, E> implements Traversal.Admin<S, E> {
protected TraversalParent traversalParent = (TraversalParent) EmptyStep.instance();
public DefaultTraversal(final Class emanatingClass) {
- this.strategies = TraversalStrategies.GlobalCache.getStrategies(emanatingClass);
+ this.setStrategies(TraversalStrategies.GlobalCache.getStrategies(emanatingClass));
}
@Override
@@ -186,7 +177,11 @@ public class DefaultTraversal<S, E> implements Traversal.Admin<S, E> {
@Override
public void setStrategies(final TraversalStrategies strategies) {
- this.strategies = strategies;
+ try {
+ this.strategies = strategies.clone();
+ } catch (CloneNotSupportedException e) {
+ throw new IllegalStateException(e.getMessage(), e);
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/41aa686d/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java b/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index 719660e..bbc756e 100644
--- a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@ -21,6 +21,9 @@ package com.tinkerpop.gremlin.tinkergraph.structure;
import com.tinkerpop.gremlin.AbstractGremlinTest;
import com.tinkerpop.gremlin.process.T;
import com.tinkerpop.gremlin.process.Traversal;
+import com.tinkerpop.gremlin.process.graph.traversal.strategy.RangeByIsCountStrategy;
+import com.tinkerpop.gremlin.process.traversal.DefaultTraversal;
+import com.tinkerpop.gremlin.process.util.metric.TraversalMetrics;
import com.tinkerpop.gremlin.structure.*;
import com.tinkerpop.gremlin.structure.io.GraphReader;
import com.tinkerpop.gremlin.structure.io.graphml.GraphMLWriter;
@@ -174,37 +177,23 @@ public class TinkerGraphTest {
public void testPlayDK() throws Exception {
Graph g = TinkerFactory.createModern();
- Traversal t;
-
- System.out.println("g.V().has(out(\"created\").count().is(0l))");
- t = g.V().has(out("created").count().is(0l));
+ Traversal t = g.V().count().is(0l).profile().cap(TraversalMetrics.METRICS_KEY);
System.out.println(t.toString());
- t.forEachRemaining(System.out::println);
- System.out.println(t.toString() + "\n");
-
- System.out.println("g.V().has(out(\"created\").count().is(lt, 2l))");
- t = g.V().has(out("created").count().is(Compare.lt, 2l));
+ t.iterate();
System.out.println(t.toString());
- t.forEachRemaining(System.out::println);
- System.out.println(t.toString() + "\n");
+ System.out.println("--");
- System.out.println("g.V().has(out(\"created\").count().is(gt, 1l))");
- t = g.V().has(out("created").count().is(Compare.gt, 1l));
+ t = g.V().count().is(0l).profile().cap(TraversalMetrics.METRICS_KEY);
+ ((DefaultTraversal) t).getStrategies().removeStrategies(RangeByIsCountStrategy.class);
System.out.println(t.toString());
- t.forEachRemaining(System.out::println);
- System.out.println(t.toString() + "\n");
-
- System.out.println("g.V().has(out(\"created\").count().is(inside, [1l,4l]))");
- t = g.V().has(out("created").count().is(Compare.inside, Arrays.asList(1l, 4l)));
+ t.iterate();
System.out.println(t.toString());
- t.forEachRemaining(System.out::println);
- System.out.println(t.toString() + "\n");
+ System.out.println("--");
- System.out.println("g.V().has(out(\"created\").count().is(outside, [1l,4l]))");
- t = g.V().has(out("created").count().is(Compare.outside, Arrays.asList(1l, 4l)));
+ t = g.V().count().is(0l).profile().cap(TraversalMetrics.METRICS_KEY);
+ System.out.println(t.toString());
+ t.iterate();
System.out.println(t.toString());
- t.forEachRemaining(System.out::println);
- System.out.println(t.toString() + "\n");
}
/**
[3/3] incubator-tinkerpop git commit: Merge branch 'master' into
optimize-count-filter
Posted by ok...@apache.org.
Merge branch 'master' into optimize-count-filter
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/e9cf11c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/e9cf11c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/e9cf11c3
Branch: refs/heads/master
Commit: e9cf11c3b58a4982ca8dd715e0c3474a2324d2ee
Parents: 41aa686 f6d1444
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Feb 11 16:11:49 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Feb 11 16:11:49 2015 +0100
----------------------------------------------------------------------
.../plugin/UtilitiesGremlinPluginScript.groovy | 2 +-
.../tinkerpop/gremlin/process/Traversal.java | 2 +
.../traversal/step/sideEffect/StartStep.java | 4 +-
.../process/traversal/DefaultTraversal.java | 23 +++---
.../traversal/DefaultTraversalSideEffects.java | 12 +--
.../process/traversal/step/AbstractStep.java | 11 ++-
.../com/tinkerpop/gremlin/structure/Graph.java | 1 +
.../GroovyEnvironmentPerformanceSuite.java | 87 ++++++++++++++++++++
.../engine/GremlinExecutorPerformanceTest.java | 57 +++++++++++++
.../tinkerpop/gremlin/AbstractGremlinTest.java | 4 +-
.../graph/traversal/step/filter/RetainTest.java | 2 +-
.../tinkergraph/structure/TinkerGraph.java | 1 +
.../tinkergraph/structure/TinkerGraphTest.java | 3 +-
...erGraphGroovyEnvironmentPerformanceTest.java | 37 +++++++++
14 files changed, 214 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e9cf11c3/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e9cf11c3/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------