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/04/08 16:45:42 UTC
[1/2] incubator-tinkerpop git commit: TINKERPOP3-615 cap(String,
String...) to require at least one side effect key
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 22f17527c -> a05e8e558
TINKERPOP3-615 cap(String, String...) to require at least one side effect key
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/116cdaf2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/116cdaf2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/116cdaf2
Branch: refs/heads/master
Commit: 116cdaf27c9bd04a6df26a818ff92c4e85b2c6ba
Parents: 7163400
Author: mfrantz <mf...@redsealnetworks.com>
Authored: Tue Apr 7 16:37:50 2015 -0700
Committer: mfrantz <mf...@redsealnetworks.com>
Committed: Tue Apr 7 16:40:13 2015 -0700
----------------------------------------------------------------------
.../gremlin/process/traversal/dsl/graph/GraphTraversal.java | 4 ++--
.../tinkerpop/gremlin/process/traversal/dsl/graph/__.java | 4 ++--
.../traversal/step/sideEffect/SideEffectCapStep.java | 9 +++++----
.../tinkerpop/gremlin/process/TraversalPerformanceTest.java | 4 ++--
.../gremlin/tinkergraph/structure/TinkerGraphTest.java | 2 +-
5 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/116cdaf2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 6208468..acfd01a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -594,8 +594,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
return this.asAdmin().addStep(new LambdaSideEffectStep<>(this.asAdmin(), consumer));
}
- public default <E2> GraphTraversal<S, E2> cap(final String... sideEffectKeys) {
- return this.asAdmin().addStep(new SideEffectCapStep<>(this.asAdmin(), sideEffectKeys));
+ public default <E2> GraphTraversal<S, E2> cap(final String sideEffectKey, final String... sideEffectKeys) {
+ return this.asAdmin().addStep(new SideEffectCapStep<>(this.asAdmin(), sideEffectKey, sideEffectKeys));
}
public default GraphTraversal<S, Edge> subgraph(final String sideEffectKey) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/116cdaf2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
index 926968e..f34ba71 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
@@ -449,8 +449,8 @@ public class __ {
return __.<A>start().sideEffect(consumer);
}
- public static <A, E2> GraphTraversal<A, E2> cap(final String... sideEffectKeys) {
- return __.<A>start().cap(sideEffectKeys);
+ public static <A, E2> GraphTraversal<A, E2> cap(final String sideEffectKey, String... sideEffectKeys) {
+ return __.<A>start().cap(sideEffectKey, sideEffectKeys);
}
public static <A> GraphTraversal<A, Edge> subgraph(final String sideEffectKey) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/116cdaf2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java
index 28f1cf0..32e7d86 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java
@@ -23,6 +23,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.util.SupplyingBarrier
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashMap;
@@ -42,11 +43,11 @@ public final class SideEffectCapStep<S, E> extends SupplyingBarrierStep<S, E> {
private List<String> sideEffectKeys;
- public SideEffectCapStep(final Traversal.Admin traversal, final String... sideEffectKeys) {
+ public SideEffectCapStep(final Traversal.Admin traversal, final String sideEffectKey, final String... sideEffectKeys) {
super(traversal);
- if (0 == sideEffectKeys.length)
- throw new IllegalArgumentException("At least one sideEffect key must be provided to " + this.getClass().getSimpleName());
- this.sideEffectKeys = Arrays.asList(sideEffectKeys);
+ this.sideEffectKeys = new ArrayList(1 + sideEffectKeys.length);
+ this.sideEffectKeys.add(sideEffectKey);
+ this.sideEffectKeys.addAll(Arrays.asList(sideEffectKeys));
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/116cdaf2/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalPerformanceTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalPerformanceTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalPerformanceTest.java
index 5bf7542..2953464 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalPerformanceTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalPerformanceTest.java
@@ -108,7 +108,7 @@ public class TraversalPerformanceTest extends AbstractGremlinTest {
@LoadGraphWith(LoadGraphWith.GraphData.GRATEFUL)
@Test
public void g_V_label_groupCount_cap() throws Exception {
- g.V().label().groupCount().cap().iterate();
+ g.V().label().groupCount("x").cap("x").iterate();
}
@BenchmarkOptions(benchmarkRounds = DEFAULT_BENCHMARK_ROUNDS, warmupRounds = DEFAULT_WARMUP_ROUNDS, concurrency = BenchmarkOptions.CONCURRENCY_SEQUENTIAL)
@@ -127,4 +127,4 @@ public class TraversalPerformanceTest extends AbstractGremlinTest {
public void g_E_hasLabelXwrittenByX_hasNotXinV_inEXsungByXX_subgraphXsgX() throws Exception {
g.E().hasLabel("writtenBy").hasNot(__.inV().inE("sungBy")).subgraph("sg").iterate();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/116cdaf2/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 51d1b51..4e0cc00 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
@@ -187,7 +187,7 @@ public class TinkerGraphTest {
@Ignore
public void testPlayDK() throws Exception {
GraphTraversalSource g = TinkerFactory.createModern().traversal();
- Traversal t = g.V().hasLabel("person").as("person").local(bothE().label().groupCount().cap()).as("relations").select().by("name").by();
+ Traversal t = g.V().hasLabel("person").as("person").local(bothE().label().groupCount("x").cap("x")).as("relations").select().by("name").by();
t.forEachRemaining(System.out::println);
System.out.println("--");
[2/2] incubator-tinkerpop git commit: Merge branch 'TINKERPOP3-615'
of https://github.com/RedSeal-co/incubator-tinkerpop
Posted by ok...@apache.org.
Merge branch 'TINKERPOP3-615' of https://github.com/RedSeal-co/incubator-tinkerpop
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/a05e8e55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a05e8e55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a05e8e55
Branch: refs/heads/master
Commit: a05e8e5589d449fea001f6cfacdb85918e5d6d1f
Parents: 22f1752 116cdaf
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Apr 8 08:41:16 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Apr 8 08:41:16 2015 -0600
----------------------------------------------------------------------
.../gremlin/process/traversal/dsl/graph/GraphTraversal.java | 4 ++--
.../tinkerpop/gremlin/process/traversal/dsl/graph/__.java | 4 ++--
.../traversal/step/sideEffect/SideEffectCapStep.java | 9 +++++----
.../tinkerpop/gremlin/process/TraversalPerformanceTest.java | 4 ++--
.../gremlin/tinkergraph/structure/TinkerGraphTest.java | 2 +-
5 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------