tinkerpop git commit: I hate you Travis

2018-03-15 Thread dkuppitz 
Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST 6bca797e6 -> b7ed64d61


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/b7ed64d6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b7ed64d6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b7ed64d6

Branch: refs/heads/TRAVIS-TEST
Commit: b7ed64d6198844838e3f18720ca9295b7a63417a
Parents: 6bca797
Author: Daniel Kuppitz 
Authored: Thu Mar 15 17:31:35 2018 -0700
Committer: Daniel Kuppitz 
Committed: Thu Mar 15 17:31:35 2018 -0700

--
 .../step/map/TraversalVertexProgramStep.java  |  3 +++
 .../strategy/decoration/SubgraphStrategy.java | 14 +-
 .../optimization/IncidentToAdjacentStrategy.java  |  7 ++-
 3 files changed, 22 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b7ed64d6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
index a591a25..642ad00 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
@@ -24,11 +24,14 @@ import 
org.apache.tinkerpop.gremlin.process.computer.GraphFilter;
 import org.apache.tinkerpop.gremlin.process.computer.Memory;
 import 
org.apache.tinkerpop.gremlin.process.computer.traversal.MemoryTraversalSideEffects;
 import 
org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram;
+import 
org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
+import 
org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.finalization.ComputerFinalizationStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
 import 
org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import 
org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
 import org.apache.tinkerpop.gremlin.process.traversal.util.PureTraversal;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b7ed64d6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index ab9ceb8..ae50126 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -149,6 +149,18 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy graphSteps = 
TraversalHelper.getStepsOfAssignableClass(GraphStep.class, traversal);
 final List vertexSteps = 
TraversalHelper.getStepsOfAssignableClass(VertexStep.class, traversal);
@@ -201,7 +213,7 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategyhttp://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b7ed64d6/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 f6c66c8..9ec0fef 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/

tinkerpop git commit: I hate you Travis

2018-03-15 Thread dkuppitz 
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 
Authored: Thu Mar 15 09:59:59 2018 -0700
Committer: Daniel Kuppitz 
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> applyPrior() {
 return Collections.singleton(IdentityRemovalStrategy.class);
 }
+
+@Override
+public Set> 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 implements 
Traversal.Admin {
 
 @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();
 }
 }

tinkerpop git commit: I hate you Travis

2018-03-15 Thread dkuppitz 
Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST [created] 8c43a96d8


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/8c43a96d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8c43a96d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8c43a96d

Branch: refs/heads/TRAVIS-TEST
Commit: 8c43a96d8dd1f78787a5d3902ce164507583c7ab
Parents: f2f0cbd
Author: Daniel Kuppitz 
Authored: Thu Mar 15 09:08:02 2018 -0700
Committer: Daniel Kuppitz 
Committed: Thu Mar 15 09:08:02 2018 -0700

--
 .../gremlin/process/traversal/util/DefaultTraversal.java   | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c43a96d/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 3f5b366..faa2819 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
@@ -171,6 +171,12 @@ public class DefaultTraversal implements 
Traversal.Admin {
 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();
+}
 }
 }