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 2016/03/25 21:05:23 UTC

incubator-tinkerpop git commit: commented out the where(as(a)...) support as this will only work (correctly) when we can drop path labels. Left it commented out cause, once path labels can be dropped, then this can be uncommented and path.dropLabels() ca

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1236 69d8ce69c -> 930ab25d5


commented out the where(as(a)...) support as this will only work (correctly) when we can drop path labels. Left it commented out cause, once path labels can be dropped, then this can be uncommented and path.dropLabels() can be inserted and done.


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

Branch: refs/heads/TINKERPOP-1236
Commit: 930ab25d55457099ffb6b181b6699d867d8e8973
Parents: 69d8ce6
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Mar 25 14:05:17 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Mar 25 14:05:17 2016 -0600

----------------------------------------------------------------------
 .../strategy/optimization/PathProcessorStrategy.java          | 7 +++----
 .../strategy/optimization/PathProcessorStrategyTest.java      | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/930ab25d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathProcessorStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathProcessorStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathProcessorStrategy.java
index dd73b46..c0286f2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathProcessorStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathProcessorStrategy.java
@@ -25,8 +25,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.step.PathProcessor;
 import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTraversalStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectOneStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalMapStep;
@@ -62,7 +60,8 @@ public final class PathProcessorStrategy extends AbstractTraversalStrategy<Trave
             return;
 
         // process where(as("a").out()...)
-        final List<WhereTraversalStep> whereTraversalSteps = TraversalHelper.getStepsOfClass(WhereTraversalStep.class, traversal);
+        // todo: need to be able to drop path labels for this to work
+        /*final List<WhereTraversalStep> whereTraversalSteps = TraversalHelper.getStepsOfClass(WhereTraversalStep.class, traversal);
         for (final WhereTraversalStep<?> whereTraversalStep : whereTraversalSteps) {
             final Traversal.Admin<?, ?> localChild = whereTraversalStep.getLocalChildren().get(0);
             if ((localChild.getStartStep() instanceof WhereTraversalStep.WhereStartStep) &&
@@ -88,7 +87,7 @@ public final class PathProcessorStrategy extends AbstractTraversalStrategy<Trave
                     traversal.removeStep(whereTraversalStep);
                 }
             }
-        }
+        }*/
 
         // process select("a","b").by(...).by(...)
         final List<SelectStep> selectSteps = TraversalHelper.getStepsOfClass(SelectStep.class, traversal);

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/930ab25d/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathProcessorStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathProcessorStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathProcessorStrategyTest.java
index 0fa8f27..a24f68a 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathProcessorStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathProcessorStrategyTest.java
@@ -81,8 +81,8 @@ public class PathProcessorStrategyTest {
                 {__.select(Pop.all, "a", "b").by("name").by("age"), __.select(Pop.all, "a", "b").by("name").by("age")},
                 // where(as("a")...)
                 {__.where(__.out("knows")), __.where(__.out("knows"))},
-                {__.where(__.as("a").out("knows")), __.select(Pop.last, "a").where(__.out("knows"))},
-                {__.where(__.as("a").out("knows").as("b")), __.select(Pop.last, "a").where(__.out("knows").as("b"))},
+                //{__.where(__.as("a").out("knows")), __.select(Pop.last, "a").where(__.out("knows"))},
+                //{__.where(__.as("a").out("knows").as("b")), __.select(Pop.last, "a").where(__.out("knows").as("b"))},    // todo: need to be able to drop path labels for this to work
                 {__.where("a", P.eq("b")), __.where("a", P.eq("b"))}
         });
     }