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/05/19 00:35:16 UTC
incubator-tinkerpop git commit: HasContainer does not care about OrP
anymore.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 17843c207 -> c0064b6e6
HasContainer does not care about OrP anymore.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c0064b6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c0064b6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c0064b6e
Branch: refs/heads/master
Commit: c0064b6e6189f6b2f11fd38ef5fcfe965fed7eb4
Parents: 17843c2
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon May 18 16:35:27 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon May 18 16:35:27 2015 -0600
----------------------------------------------------------------------
.../gremlin/process/traversal/step/util/HasContainer.java | 7 ++-----
.../gremlin/tinkergraph/structure/TinkerGraphTest.java | 2 +-
2 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c0064b6e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java
index fe338bc..8dca058 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java
@@ -18,14 +18,13 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.util;
-import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
+import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
-import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import java.io.Serializable;
@@ -133,8 +132,6 @@ public final class HasContainer implements Serializable, Cloneable, Predicate<El
hasContainers[i] = new HasContainer(key, predicate);
}
return hasContainers;
- } else if (predicate instanceof OrP) {
- throw new IllegalArgumentException("The or'ing of HasContainers is currently not supported");
} else {
return new HasContainer[]{new HasContainer(key, predicate)};
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c0064b6e/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 8866a2c..e1ba016 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
@@ -163,7 +163,7 @@ public class TinkerGraphTest {
//g.V().label().groupCount().as("x").select().forEachRemaining(System.out::println);
//g.V().choose(__.outE().count().is(0L), __.as("x"), __.as("y")).select("x", "y").forEachRemaining(System.out::println);
// g.V().hasLabel("person").values("age").is(P.lt(27).or(P.gt(29))).forEachRemaining(System.out::println);
- System.out.println(g.V().has("name","marko").where(out("knows").has(T.id,P.within(32,34,56))).out("created"));
+ g.V().has("age",P.eq(27).or(P.eq(32))).values("name").forEachRemaining(System.out::println);
}
@Test