You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2015/06/24 21:43:31 UTC
[1/3] incubator-tinkerpop git commit: almost fixed a Neo4j Cypher
query
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 80f3119bc -> 2b3b96c6e
almost fixed a Neo4j Cypher query
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/99cc8240
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/99cc8240
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/99cc8240
Branch: refs/heads/master
Commit: 99cc8240169da55e3a42e7878202d465a21e181a
Parents: cf063b3
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Jun 24 21:39:39 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Jun 24 21:39:39 2015 +0200
----------------------------------------------------------------------
.../tinkerpop/gremlin/neo4j/process/NativeNeo4jCypherTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/99cc8240/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/NativeNeo4jCypherTest.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/NativeNeo4jCypherTest.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/NativeNeo4jCypherTest.java
index 5c4ff46..d462336 100644
--- a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/NativeNeo4jCypherTest.java
+++ b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/NativeNeo4jCypherTest.java
@@ -153,7 +153,7 @@ public class NativeNeo4jCypherTest extends AbstractNeo4jGremlinTest {
as("d").out("sungBy").as("e"),
as("e").in("sungBy").count().as("b"),
where("a", P.neq("e"))).select("a", "e").by("name"),
- () -> n.cypher("MATCH (a)<-[:sungBy]-(b) WITH a, COUNT(b) as bc MATCH (a)<-[:sungBy]-(c), (c)-[:followedBy]->(d), (d)-[:sungBy]->(e), (e)<-[:sungBy]-(f) WITH a, e, bc, COUNT(f) as fc WHERE a <> e AND bc = fc RETURN a, e").select("a", "e").by("name"),
+ () -> n.cypher("MATCH (a)<-[:sungBy]-()-[:followedBy]->()-[:sungBy]->(e) WHERE a <> e WITH a, e MATCH (a)<-[:sungBy]-(b) WITH a, e, COUNT(DISTINCT b) as bc MATCH (e)<-[:sungBy]-(f) WITH a, e, bc, COUNT(DISTINCT f) as fc WHERE bc = fc RETURN a, e").select("a", "e").by("name"),
///
() -> g.V().match("a",
as("a").in("followedBy").as("b"),
[3/3] incubator-tinkerpop git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop
Posted by dk...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop
Resolved Conflicts:
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/2b3b96c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/2b3b96c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/2b3b96c6
Branch: refs/heads/master
Commit: 2b3b96c6e4a9dca572b16b33ec74fcb26e0bc488
Parents: 664d530 80f3119
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Jun 24 21:42:40 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Jun 24 21:42:40 2015 +0200
----------------------------------------------------------------------
.../console/commands/PluginCommand.groovy | 6 +-
.../console/commands/PluginCommand.properties | 2 +-
.../traversal/dsl/graph/GraphTraversal.java | 5 +
.../gremlin/process/traversal/dsl/graph/__.java | 4 +
.../step/filter/WhereTraversalStep.java | 2 +-
.../process/traversal/step/map/MatchStep.java | 121 +++++++++++++------
.../traversal/step/sideEffect/StartStep.java | 6 +-
.../decoration/ConjunctionStrategy.java | 2 +-
.../process/traversal/util/TraversalHelper.java | 2 +-
.../traversal/step/map/GroovyMatchTest.groovy | 17 ++-
.../process/traversal/step/map/MatchTest.java | 18 +++
11 files changed, 132 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2b3b96c6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
index c2d92aa,cb6b36d..48ae008
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
@@@ -61,7 -60,7 +61,7 @@@ public final class ConjunctionStrategy
}
private static boolean legalCurrentStep(final Step<?, ?> step) {
- return !(step instanceof EmptyStep || step instanceof ProfileStep || step instanceof ComputerAwareStep.EndStep || (step instanceof StartStep && !((StartStep) step).isVariableStartStep()));
- return !(step instanceof EmptyStep || step instanceof ComputerAwareStep.EndStep || (step instanceof StartStep && !StartStep.isVariableStartStep(step)));
++ return !(step instanceof EmptyStep || step instanceof ProfileStep || step instanceof ComputerAwareStep.EndStep || (step instanceof StartStep && !StartStep.isVariableStartStep(step)));
}
private static void processConjunctionMarkers(final Traversal.Admin<?, ?> traversal) {
[2/3] incubator-tinkerpop git commit: fixed TINKERPOP3-747
Posted by dk...@apache.org.
fixed TINKERPOP3-747
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/664d5303
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/664d5303
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/664d5303
Branch: refs/heads/master
Commit: 664d53035e156be75aa8159482241c8528a4824c
Parents: 99cc824
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Jun 24 21:41:08 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Jun 24 21:41:08 2015 +0200
----------------------------------------------------------------------
.../strategy/decoration/ConjunctionStrategy.java | 3 ++-
.../traversal/strategy/finalization/ProfileStrategy.java | 10 ++--------
.../gremlin/tinkergraph/structure/TinkerGraphTest.java | 10 +++++++++-
3 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/664d5303/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
index 1fb6051..c2d92aa 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
@@ -25,6 +25,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AndStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConjunctionStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.OrStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.ProfileStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.StartStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.ComputerAwareStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
@@ -60,7 +61,7 @@ public final class ConjunctionStrategy extends AbstractTraversalStrategy<Travers
}
private static boolean legalCurrentStep(final Step<?, ?> step) {
- return !(step instanceof EmptyStep || step instanceof ComputerAwareStep.EndStep || (step instanceof StartStep && !((StartStep) step).isVariableStartStep()));
+ return !(step instanceof EmptyStep || step instanceof ProfileStep || step instanceof ComputerAwareStep.EndStep || (step instanceof StartStep && !((StartStep) step).isVariableStartStep()));
}
private static void processConjunctionMarkers(final Traversal.Admin<?, ?> traversal) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/664d5303/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/finalization/ProfileStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/finalization/ProfileStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/finalization/ProfileStrategy.java
index da2ef6a..656fd92 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/finalization/ProfileStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/finalization/ProfileStrategy.java
@@ -23,7 +23,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.ProfileStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
@@ -41,11 +40,6 @@ public final class ProfileStrategy extends AbstractTraversalStrategy<TraversalSt
@Override
public void apply(final Traversal.Admin<?, ?> traversal) {
- if (!(traversal.getParent() instanceof EmptyStep)) {
- // This strategy is applied to the top-level traversal only
- return;
- }
-
if (!TraversalHelper.hasStepOfClass(ProfileStep.class, traversal)) {
// No ProfileStep present
return;
@@ -76,10 +70,10 @@ public final class ProfileStrategy extends AbstractTraversalStrategy<TraversalSt
// Handle nested traversal
if (step instanceof TraversalParent) {
for (Traversal.Admin<?, ?> t : ((TraversalParent) step).getLocalChildren()) {
- prepTraversalForProfiling(t);
+ t.addStep(new ProfileStep(t));
}
for (Traversal.Admin<?, ?> t : ((TraversalParent) step).getGlobalChildren()) {
- prepTraversalForProfiling(t);
+ t.addStep(new ProfileStep(t));
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/664d5303/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index 1e50d2d..224ff0c 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@ -24,6 +24,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.T;
@@ -149,11 +150,18 @@ public class TinkerGraphTest {
public void testPlayDK() throws Exception {
final Graph graph = TinkerFactory.createModern();
final GraphTraversalSource g = graph.traversal();
- Traversal traversal = g.V().both().both().count();
+ Traversal traversal = g.V().where(out().and().in()).profile().cap(TraversalMetrics.METRICS_KEY);
//traversal.forEachRemaining(System.out::println);
+ System.out.println(traversal.toString());
traversal.asAdmin().applyStrategies();
System.out.println(traversal.toString());
+ traversal.forEachRemaining(System.out::println);
+ traversal = g.V().where(and(out(), in())).profile().cap(TraversalMetrics.METRICS_KEY);
+ //traversal.forEachRemaining(System.out::println);
+ System.out.println(traversal.toString());
+ traversal.asAdmin().applyStrategies();
System.out.println(traversal.toString());
+ //System.out.println(traversal.toString());
}
@Test