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/15 22:59:15 UTC
incubator-tinkerpop git commit: the oring of has containers is
currently not supported.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 9e423d8f1 -> 440e83396
the oring of has containers is currently not supported.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/440e8339
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/440e8339
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/440e8339
Branch: refs/heads/master
Commit: 440e83396dfa8e7b3966e614e9edf31e67f2d5b7
Parents: 9e423d8
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri May 15 14:59:11 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri May 15 14:59:11 2015 -0600
----------------------------------------------------------------------
.../gremlin/process/traversal/step/util/HasContainer.java | 7 +++++--
.../org/apache/tinkerpop/gremlin/structure/util/AndP.java | 5 +++++
.../java/org/apache/tinkerpop/gremlin/structure/util/OrP.java | 5 +++++
.../gremlin/tinkergraph/structure/TinkerGraphTest.java | 3 ++-
4 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/440e8339/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 0b47001..b41e280 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
@@ -26,6 +26,7 @@ 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.structure.util.AndP;
+import org.apache.tinkerpop.gremlin.structure.util.OrP;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import java.io.Serializable;
@@ -56,9 +57,9 @@ public final class HasContainer implements Serializable {
if (this.key.equals(T.id.getAccessor()) && value instanceof Collection)
valuesToStringed = IteratorUtils.set(IteratorUtils.map(((Collection<Object>) value).iterator(), Object::toString));
- if (null == this.value && !(this.predicate instanceof Contains)) {
+ /*if (null == this.value && !(this.predicate instanceof Contains)) {
throw new IllegalArgumentException("For determining the existence of a property, use the Contains predicate with null-value");
- }
+ }*/
}
public boolean test(final Element element) {
@@ -127,6 +128,8 @@ public final class HasContainer implements Serializable {
hasContainers[i] = new HasContainer(key, predicates.get(i).getBiPredicate(), predicates.get(i).getValue());
}
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.getBiPredicate(), predicate.getValue())};
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/440e8339/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/AndP.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/AndP.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/AndP.java
index e9e14d7..132e2d0 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/AndP.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/AndP.java
@@ -51,4 +51,9 @@ public final class AndP<V> extends ConjunctionP<V> {
this.predicates.add((P<V>) predicate); // TODO: clone and add?
return this;
}
+
+ @Override
+ public String toString() {
+ return "and(" + this.predicates + ")";
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/440e8339/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/OrP.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/OrP.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/OrP.java
index ff74a53..ad9c626 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/OrP.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/OrP.java
@@ -50,4 +50,9 @@ public final class OrP<V> extends ConjunctionP<V> {
this.predicates.add((P<V>) predicate); // TODO: clone and add?
return this;
}
+
+ @Override
+ public String toString() {
+ return "or(" + this.predicates + ")";
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/440e8339/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 d6dbddc..57a660d 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
@@ -155,7 +155,8 @@ public class TinkerGraphTest {
//g.V().has("name", "gremlin").inE("uses").order().by("skill", Order.incr).as("a").outV().as("b").path().forEachRemaining(System.out::println);
//g.V().has("name", "gremlin").inE("uses").order().by("skill", Order.incr).as("a").outV().as("b").select().by("skill").by("name").forEachRemaining(System.out::println);
//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().choose(__.outE().count().is(0L), __.as("x"), __.as("y")).select("x", "y").forEachRemaining(System.out::println);
+ g.V().hasLabel("person").has("age", P.lt(27).or(P.gt(29))).valueMap().forEachRemaining(System.out::println);
}
@Test