tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dkupp...@apache.org
Subject tinkerpop git commit: I hate you Travis
Date Thu, 15 Mar 2018 17:00:08 GMT
Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST 8c43a96d8 -> 6bca797e6


I hate you Travis


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

Branch: refs/heads/TRAVIS-TEST
Commit: 6bca797e6f8c4eb9077006bb24badb4011ab98bb
Parents: 8c43a96
Author: Daniel Kuppitz <daniel_kuppitz@hotmail.com>
Authored: Thu Mar 15 09:59:59 2018 -0700
Committer: Daniel Kuppitz <daniel_kuppitz@hotmail.com>
Committed: Thu Mar 15 09:59:59 2018 -0700

----------------------------------------------------------------------
 .../optimization/IncidentToAdjacentStrategy.java        |  7 ++++++-
 .../process/traversal/util/DefaultTraversal.java        | 12 +++---------
 2 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6bca797e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
index 4ca2465..f6c66c8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
@@ -111,12 +111,12 @@ public final class IncidentToAdjacentStrategy extends AbstractTraversalStrategy<
             newStep.addLabel(label);
         }
         TraversalHelper.replaceStep(step1, newStep, traversal);
+        traversal.removeStep(step2);
         if (step2 instanceof EdgeOtherVertexStep) {
             // bothE().otherV() might have been the only step sequence that required path
tracking. Invalidate the
             // requirements to possibly end up with more optimized traversers.
             traversal.invalidateTraverserRequirements();
         }
-        traversal.removeStep(step2);
     }
 
     public static IncidentToAdjacentStrategy instance() {
@@ -153,4 +153,9 @@ public final class IncidentToAdjacentStrategy extends AbstractTraversalStrategy<
     public Set<Class<? extends OptimizationStrategy>> applyPrior() {
         return Collections.singleton(IdentityRemovalStrategy.class);
     }
+
+    @Override
+    public Set<Class<? extends OptimizationStrategy>> applyPost() {
+        return Collections.singleton(PathRetractionStrategy.class);
+    }
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6bca797e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
index faa2819..50368d6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
@@ -167,16 +167,10 @@ public class DefaultTraversal<S, E> implements Traversal.Admin<S,
E> {
 
     @Override
     public void invalidateTraverserRequirements() {
+        this.generator = null;
         this.requirements = null;
-        final TraversalParent parent = this.getParent();
-        if (!(parent instanceof EmptyStep)) {
-            parent.asStep().getTraversal().invalidateTraverserRequirements();
-            for (final Traversal.Admin<?, ?> localChild : parent.getLocalChildren())
{
-                if (localChild != this) localChild.invalidateTraverserRequirements();
-            }
-            for (final Traversal.Admin<?, ?> globalChild : parent.getGlobalChildren())
{
-                if (globalChild != this) globalChild.invalidateTraverserRequirements();
-            }
+        if (!(this.parent instanceof EmptyStep)) {
+            this.parent.asStep().getTraversal().invalidateTraverserRequirements();
         }
     }
 


Mime
View raw message