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/06 00:22:26 UTC
incubator-tinkerpop git commit: made ConjunctionStrategy a bit faster.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 4e09c7c5a -> 0605e6432
made ConjunctionStrategy a bit faster.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/0605e643
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/0605e643
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/0605e643
Branch: refs/heads/master
Commit: 0605e6432837c12296938a16b959aef3daf23618
Parents: 4e09c7c
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue May 5 16:22:21 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue May 5 16:22:21 2015 -0600
----------------------------------------------------------------------
.../traversal/strategy/decoration/ConjunctionStrategy.java | 3 +++
.../process/traversal/strategy/verification/ReadOnlyStrategy.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0605e643/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
index 6cbdfad..10164d4 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
@@ -42,6 +42,9 @@ public final class ConjunctionStrategy extends AbstractTraversalStrategy<Travers
@Override
public void apply(final Traversal.Admin<?, ?> traversal) {
+ if (!TraversalHelper.hasStepOfAssignableClass(ConjunctionStep.ConjunctionMarker.class, traversal))
+ return;
+
processConjunctionMarker(AndStep.AndMarker.class, traversal);
processConjunctionMarker(OrStep.OrMarker.class, traversal);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0605e643/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReadOnlyStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReadOnlyStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReadOnlyStrategy.java
index c8d7a17..715e234 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReadOnlyStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReadOnlyStrategy.java
@@ -25,7 +25,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversal
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
/**
- * Detects steps marked with {@link Mutating} and throw an {@link IllegalStateException} if one is found.
+ * Detects steps marked with {@link Mutating} and throws an {@link IllegalStateException} if one is found.
*
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/