You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2015/05/05 20:57:40 UTC
[2/9] incubator-tinkerpop git commit: don't optimize .select() in
HalfStepTraversalStrategy
don't optimize .select() in HalfStepTraversalStrategy
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/f16fa5f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/f16fa5f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/f16fa5f1
Branch: refs/heads/master
Commit: f16fa5f154a483867ce9b867a678506cfb99e5fc
Parents: a98b2db
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon May 4 19:10:43 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon May 4 19:10:43 2015 +0200
----------------------------------------------------------------------
.../strategy/optimization/HalfStepTraversalStrategy.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f16fa5f1/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/HalfStepTraversalStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/HalfStepTraversalStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/HalfStepTraversalStrategy.java
index 13aa824..dd4aa0b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/HalfStepTraversalStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/HalfStepTraversalStrategy.java
@@ -25,8 +25,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTraversalStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.CountGlobalStep;
-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.VertexStep;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
@@ -56,8 +54,7 @@ public class HalfStepTraversalStrategy extends AbstractTraversalStrategy impleme
stepToReplace = (VertexStep) curr;
}
} else if (prev instanceof VertexStep && Vertex.class.equals(((VertexStep) prev).getReturnClass())) {
- if (curr instanceof CountGlobalStep ||
- ((curr instanceof SelectStep || curr instanceof SelectOneStep) && prev.getLabels().isEmpty())) {
+ if (curr instanceof CountGlobalStep) {
stepToReplace = (VertexStep) prev;
}
}