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/16 15:38:56 UTC
[1/2] incubator-tinkerpop git commit: added `.hasNot(traversal)`
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 2b918f75c -> 6640db010
added `.hasNot(traversal)`
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/06aa2476
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/06aa2476
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/06aa2476
Branch: refs/heads/master
Commit: 06aa24762da70fe3232198d0b8c6cb46bde6f344
Parents: 2b918f7
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon Feb 16 14:59:52 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Feb 16 14:59:52 2015 +0100
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../graph/traversal/ElementTraversal.java | 4 +
.../process/graph/traversal/GraphTraversal.java | 123 +++----------------
.../gremlin/process/graph/traversal/__.java | 4 +
.../traversal/step/filter/HasTraversalStep.java | 8 +-
.../step/filter/GroovyHasNotTest.groovy | 14 ++-
.../graph/traversal/step/filter/HasNotTest.java | 30 +++--
7 files changed, 58 insertions(+), 126 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/06aa2476/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 4bb8e40..eab30ce 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,7 @@ image::http://www.tinkerpop.com/docs/current/images/gremlin-hindu.png[width=225]
TinkerPop 3.0.0.M8 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Added `hasNot(traversal)` which is a faster way of doing `has(traversal.count().is(0L))`.
* `TraversalStrategy.apply(traversal)` is the new method signature as the `TraversalEngine` can be retrieved from the `Traversal`.
* `TraversalEngine` is now an interface and provided to the traversal by the graph. `Graph` methods added to set the desired traversal engine to use.
* Added `count(local)`, `sum(local)`, `max(local)`, `min(local)`, `mean(local)`, `dedup(local)`, `sample(local)` and `range(local)` for operating on the local object (e.g. collection, map, etc.).
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/06aa2476/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/ElementTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/ElementTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/ElementTraversal.java
index 79ca0d7..a346c1c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/ElementTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/ElementTraversal.java
@@ -238,6 +238,10 @@ public abstract interface ElementTraversal<A extends Element> {
return this.start().has(hasNextTraversal);
}
+ public default GraphTraversal<A, A> hasNot(final Traversal<?, ?> hasNotNextTraversal) {
+ return this.start().hasNot(hasNotNextTraversal);
+ }
+
public default GraphTraversal<A, A> has(final String key) {
return this.start().has(key);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/06aa2476/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 f86e8e2..190bac0 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
@@ -18,128 +18,29 @@
*/
package org.apache.tinkerpop.gremlin.process.graph.traversal;
-import org.apache.tinkerpop.gremlin.process.Path;
-import org.apache.tinkerpop.gremlin.process.Scope;
-import org.apache.tinkerpop.gremlin.process.Step;
-import org.apache.tinkerpop.gremlin.process.T;
-import org.apache.tinkerpop.gremlin.process.Traversal;
-import org.apache.tinkerpop.gremlin.process.Traverser;
+import org.apache.tinkerpop.gremlin.process.*;
import org.apache.tinkerpop.gremlin.process.graph.traversal.lambda.LoopTraversal;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.ComparatorHolder;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.TraversalOptionParent;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.BranchStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.ChooseStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.LocalStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.RepeatStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.UnionStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.AndStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.CoinStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.CyclicPathStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.DedupGlobalStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.ExceptStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.HasStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.HasTraversalStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.IsStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.LambdaFilterStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.OrStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.RangeGlobalStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.RetainStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.SampleGlobalStep;
-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.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.RangeLocalStep;
-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.branch.*;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.*;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.*;
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;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroupCountStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroupStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.IdentityStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.InjectStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.LambdaSideEffectStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.ProfileStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SackElementValueStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SackObjectStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SideEffectCapStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StartStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StoreStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SubgraphStep;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.TreeStep;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.*;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.CollectingBarrierStep;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.PathIdentityStep;
import org.apache.tinkerpop.gremlin.process.graph.util.HasContainer;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.ElementValueTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.FilterTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.FilterTraverserTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.MapTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.MapTraverserTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.TrueTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.*;
import org.apache.tinkerpop.gremlin.process.traversal.step.ElementFunctionComparator;
import org.apache.tinkerpop.gremlin.process.traversal.step.ElementValueComparator;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalComparator;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.util.TraverserSet;
-import org.apache.tinkerpop.gremlin.structure.Compare;
-import org.apache.tinkerpop.gremlin.structure.Contains;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Order;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.PropertyType;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.*;
import org.apache.tinkerpop.gremlin.util.function.ConstantSupplier;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Optional;
-import java.util.function.BiFunction;
-import java.util.function.BiPredicate;
-import java.util.function.BinaryOperator;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.function.UnaryOperator;
+import java.util.*;
+import java.util.function.*;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -409,7 +310,11 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
}
public default GraphTraversal<S, E> has(final Traversal<?, ?> hasNextTraversal) {
- return this.asAdmin().addStep(new HasTraversalStep<>(this.asAdmin(), (Traversal.Admin<E, ?>) hasNextTraversal));
+ return this.asAdmin().addStep(new HasTraversalStep<>(this.asAdmin(), (Traversal.Admin<E, ?>) hasNextTraversal, false));
+ }
+
+ public default GraphTraversal<S, E> hasNot(final Traversal<?, ?> hasNotNextTraversal) {
+ return this.asAdmin().addStep(new HasTraversalStep<>(this.asAdmin(), (Traversal.Admin<E, ?>) hasNotNextTraversal, true));
}
public default GraphTraversal<S, E> has(final String key) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/06aa2476/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/__.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/__.java
index c55b49e..97f6d69 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/__.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/__.java
@@ -273,6 +273,10 @@ public class __ {
return __.<A>start().has(hasNextTraversal);
}
+ public static <A> GraphTraversal<A, A> hasNot(final Traversal<?, ?> hasNotNextTraversal) {
+ return __.<A>start().hasNot(hasNotNextTraversal);
+ }
+
public static <A> GraphTraversal<A, A> has(final String key) {
return __.<A>start().has(key);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/06aa2476/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTraversalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTraversalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTraversalStep.java
index e69569f..4b5c9da 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTraversalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTraversalStep.java
@@ -20,8 +20,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter;
import org.apache.tinkerpop.gremlin.process.Traversal;
import org.apache.tinkerpop.gremlin.process.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement;
@@ -37,9 +37,11 @@ import java.util.Set;
public final class HasTraversalStep<S> extends AbstractStep<S, S> implements TraversalParent {
private Traversal.Admin<S, ?> hasTraversal;
+ private final boolean negate;
- public HasTraversalStep(final Traversal.Admin traversal, final Traversal.Admin<S, ?> hasTraversal) {
+ public HasTraversalStep(final Traversal.Admin traversal, final Traversal.Admin<S, ?> hasTraversal, final boolean negate) {
super(traversal);
+ this.negate = negate;
this.integrateChild(this.hasTraversal = hasTraversal, TYPICAL_LOCAL_OPERATIONS);
}
@@ -47,7 +49,7 @@ public final class HasTraversalStep<S> extends AbstractStep<S, S> implements Tra
protected Traverser<S> processNextStart() throws NoSuchElementException {
while (true) {
final Traverser.Admin<S> start = this.starts.next();
- if (TraversalUtil.test(start, this.hasTraversal))
+ if (TraversalUtil.test(start, this.hasTraversal) != negate)
return start;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/06aa2476/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasNotTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasNotTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasNotTest.groovy
index b1d43e1..95af73f 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasNotTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasNotTest.groovy
@@ -18,9 +18,9 @@
*/
package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter
-import org.apache.tinkerpop.gremlin.process.Traversal
import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.HasNotTest
+import org.apache.tinkerpop.gremlin.process.Traversal
+import org.apache.tinkerpop.gremlin.process.graph.traversal.__
import org.apache.tinkerpop.gremlin.structure.Vertex
/**
@@ -38,6 +38,11 @@ public abstract class GroovyHasNotTest {
public Traversal<Vertex, Vertex> get_g_V_hasNotXprop(final String propertyKey) {
g.V.hasNot(propertyKey)
}
+
+ @Override
+ public Traversal<Vertex, String> get_g_V_hasNotXoutXcreatedXX() {
+ return g.V().hasNot(__.out('created')).values('name');
+ }
}
public static class ComputerTest extends HasNotTest {
@@ -50,5 +55,10 @@ public abstract class GroovyHasNotTest {
public Traversal<Vertex, Vertex> get_g_V_hasNotXprop(final String propertyKey) {
ComputerTestHelper.compute("g.V.hasNot('${propertyKey}')", g);
}
+
+ @Override
+ public Traversal<Vertex, String> get_g_V_hasNotXoutXcreatedXX() {
+ ComputerTestHelper.compute("return g.V().hasNot(__.out('created')).values('name')", g);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/06aa2476/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasNotTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasNotTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasNotTest.java
index 275aec3..a15c9e0 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasNotTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasNotTest.java
@@ -21,11 +21,13 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.Traversal;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.__;
import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.util.StreamFactory;
import org.junit.Test;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -42,6 +44,8 @@ public abstract class HasNotTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Vertex> get_g_V_hasNotXprop(final String propertyKey);
+ public abstract Traversal<Vertex, String> get_g_V_hasNotXoutXcreatedXX();
+
@Test
@LoadGraphWith(MODERN)
public void g_VX1X_hasNotXprop() {
@@ -56,13 +60,20 @@ public abstract class HasNotTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void get_g_V_hasNotXprop() {
+ public void g_V_hasNotXprop() {
Traversal<Vertex, Vertex> traversal = get_g_V_hasNotXprop("circumference");
printTraversalForm(traversal);
final List<Element> list = StreamFactory.stream(traversal).collect(Collectors.toList());
assertEquals(6, list.size());
}
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_hasNotXoutXcreatedXX() {
+ Traversal<Vertex, String> traversal = get_g_V_hasNotXoutXcreatedXX();
+ checkResults(Arrays.asList("vadas", "lop", "ripple"), traversal);
+ }
+
public static class StandardTest extends HasNotTest {
public StandardTest() {
requiresGraphComputer = false;
@@ -77,21 +88,16 @@ public abstract class HasNotTest extends AbstractGremlinProcessTest {
public Traversal<Vertex, Vertex> get_g_V_hasNotXprop(final String propertyKey) {
return g.V().hasNot(propertyKey);
}
- }
-
- public static class ComputerTest extends HasNotTest {
- public ComputerTest() {
- requiresGraphComputer = true;
- }
@Override
- public Traversal<Vertex, Vertex> get_g_VX1X_hasNotXprop(final Object v1Id, final String propertyKey) {
- return g.V(v1Id).hasNot(propertyKey);
+ public Traversal<Vertex, String> get_g_V_hasNotXoutXcreatedXX() {
+ return g.V().hasNot(__.out("created")).values("name");
}
+ }
- @Override
- public Traversal<Vertex, Vertex> get_g_V_hasNotXprop(final String propertyKey) {
- return g.V().hasNot(propertyKey);
+ public static class ComputerTest extends StandardTest {
+ public ComputerTest() {
+ requiresGraphComputer = true;
}
}
}
\ No newline at end of file
[2/2] incubator-tinkerpop git commit: modified step string for
HasTraversalStep in case it's hasNot.
Posted by ok...@apache.org.
modified step string for HasTraversalStep in case it's hasNot.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/6640db01
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/6640db01
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/6640db01
Branch: refs/heads/master
Commit: 6640db0108be6cf52f69c78a12f788066c60fbc2
Parents: 06aa247
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon Feb 16 15:29:10 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Feb 16 15:29:10 2015 +0100
----------------------------------------------------------------------
.../process/graph/traversal/step/filter/HasTraversalStep.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6640db01/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTraversalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTraversalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTraversalStep.java
index 4b5c9da..e8c7fd2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTraversalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/HasTraversalStep.java
@@ -56,7 +56,8 @@ public final class HasTraversalStep<S> extends AbstractStep<S, S> implements Tra
@Override
public String toString() {
- return TraversalHelper.makeStepString(this, this.hasTraversal);
+ final String stepString = TraversalHelper.makeStepString(this, this.hasTraversal);
+ return this.negate ? stepString.replaceFirst("\\(", "(!") : stepString;
}
@Override