You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/12/07 20:02:30 UTC

[07/50] tinkerpop git commit: moved where().by() a bit further down in the FilterRankStrategy ranking as OrStep and AndStep can have has(xxx) analyses.

moved where().by() a bit further down in the FilterRankStrategy ranking as OrStep and AndStep can have has(xxx) analyses.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/09eb0c33
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/09eb0c33
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/09eb0c33

Branch: refs/heads/TINKERPOP-1490
Commit: 09eb0c33136b34da52500d4989dc0075c8fc1179
Parents: 248ccc6
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Nov 15 12:13:45 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Nov 16 05:44:18 2016 -0700

----------------------------------------------------------------------
 .../traversal/strategy/optimization/FilterRankingStrategy.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/09eb0c33/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategy.java
index 4ff485a..15040f7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategy.java
@@ -134,11 +134,11 @@ public final class FilterRankingStrategy extends AbstractTraversalStrategy<Trave
             return 5;
         else if (step instanceof WhereTraversalStep)
             return 6;
-        else if (step instanceof WherePredicateStep) // has by()-modulation
-            return 7;
         else if (step instanceof OrStep)
-            return 8;
+            return 7;
         else if (step instanceof AndStep)
+            return 8;
+        else if (step instanceof WherePredicateStep) // has by()-modulation
             return 9;
         else if (step instanceof DedupGlobalStep)
             return 10;