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:34 UTC
[3/4] incubator-tinkerpop git commit: random nothings.
random nothings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/e0086f3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/e0086f3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/e0086f3d
Branch: refs/heads/master
Commit: e0086f3d389ea37755ef09d1cc8966dd3ad25d96
Parents: a636c17
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Sat Feb 14 08:58:18 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Sat Feb 14 08:58:18 2015 -0700
----------------------------------------------------------------------
.../process/graph/traversal/GraphTraversal.java | 38 ++++++++++++++++++--
.../tinkergraph/structure/TinkerGraphTest.java | 2 +-
2 files changed, 36 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e0086f3d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversal.java
index 189e300..ad33389 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversal.java
@@ -48,7 +48,39 @@ import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.SampleGl
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.SimplePathStep;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.TimeLimitStep;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.WhereStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.*;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.BackStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.CoalesceStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.CountGlobalStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.CountLocalStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.DedupLocalStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.EdgeOtherVertexStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.EdgeVertexStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.FoldStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.IdStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.KeyStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.LabelStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.LambdaFlatMapStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.LambdaMapStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.MaxGlobalStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.MaxLocalStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.MeanGlobalStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.MeanLocalStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.MinGlobalStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.MinLocalStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.OrderGlobalStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.OrderLocalStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.PathStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.PropertiesStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.PropertyMapStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.PropertyValueStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.SackStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.SampleLocalStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.SelectOneStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.SelectStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.SumGlobalStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.SumLocalStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.UnfoldStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.VertexStep;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.match.MatchStep;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.AddEdgeStep;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.AggregateStep;
@@ -344,7 +376,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
}
public default GraphTraversal<S, E> dedup() {
- return this.asAdmin().addStep(new DedupGlobalStep<>(this.asAdmin()));
+ return this.dedup(Scope.global);
}
public default GraphTraversal<S, E> dedup(final Scope scope) {
@@ -468,7 +500,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
}
public default GraphTraversal<S, E> sample(final int amountToSample) {
- return this.asAdmin().addStep(new SampleGlobalStep<>(this.asAdmin(), amountToSample));
+ return this.sample(Scope.global, amountToSample);
}
public default GraphTraversal<S, E> sample(final Scope scope, final int amountToSample) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e0086f3d/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 ada9914..22e264e 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
@@ -97,7 +97,7 @@ public class TinkerGraphTest {
v7.addEdge("link", v9, "weight", 1f);
v8.addEdge("link", v9, "weight", 7f);
- v1.withSack(() -> Float.MIN_VALUE).repeat(outE().sack(Operator.max, "weight").inV()).times(5).sack().forEachRemaining(System.out::println);
+ v1.withSack(Float.MIN_VALUE).repeat(outE().sack(Operator.max, "weight").inV()).times(5).sack().forEachRemaining(System.out::println);
}
@Test