tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dkupp...@apache.org
Subject tinkerpop git commit: foo
Date Mon, 12 Mar 2018 21:21:23 GMT
Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST 0aa7aebe8 -> f90ae732e


foo


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

Branch: refs/heads/TRAVIS-TEST
Commit: f90ae732e42bb14eaada277cd5abdbfd931128ad
Parents: 0aa7aeb
Author: Daniel Kuppitz <daniel_kuppitz@hotmail.com>
Authored: Mon Mar 12 14:21:20 2018 -0700
Committer: Daniel Kuppitz <daniel_kuppitz@hotmail.com>
Committed: Mon Mar 12 14:21:20 2018 -0700

----------------------------------------------------------------------
 .../tinkerpop/gremlin/process/traversal/TraversalStrategies.java | 4 ++--
 .../traversal/strategy/decoration/RequirementsStrategy.java      | 4 ++--
 .../process/traversal/strategy/decoration/SubgraphStrategy.java  | 2 +-
 .../strategy/decoration/SubgraphStrategyProcessTest.java         | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f90ae732/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
index 7ace019..c89e7b0 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
@@ -178,8 +178,8 @@ public interface TraversalStrategies extends Serializable, Cloneable {
             }
         }
 
-        if (sortedStrategies.stream().anyMatch(s -> s instanceof SubgraphStrategy) &&
sortedStrategies.stream().anyMatch(s -> s instanceof RequirementsStrategy))
-            logger.error("Sorted strategies: " + sortedStrategies.stream().map(TraversalStrategy::toString).collect(Collectors.toList()));
+        //if (sortedStrategies.stream().anyMatch(s -> s instanceof SubgraphStrategy) &&
sortedStrategies.stream().anyMatch(s -> s instanceof RequirementsStrategy))
+        //    logger.error("Sorted strategies: " + sortedStrategies.stream().map(TraversalStrategy::toString).collect(Collectors.toList()));
 
         return sortedStrategies;
     }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f90ae732/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java
index efea348..247835c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java
@@ -57,12 +57,12 @@ public final class RequirementsStrategy extends AbstractTraversalStrategy<Traver
         RequirementsStrategy strategy = (RequirementsStrategy) traversalStrategies.toList().stream().filter(s
-> s instanceof RequirementsStrategy).findAny().orElse(null);
         if (null == strategy) {
             strategy = new RequirementsStrategy();
-            logger.error("Applying requirements: " + strategy.requirements.stream().map(TraverserRequirement::toString).collect(Collectors.toList()));
+            //logger.error("Applying requirements: " + strategy.requirements.stream().map(TraverserRequirement::toString).collect(Collectors.toList()));
             traversalStrategies.addStrategies(strategy);
         } else {
             final RequirementsStrategy cloneStrategy = new RequirementsStrategy();
             cloneStrategy.requirements.addAll(strategy.requirements);
-            logger.error("Applying requirements: " + cloneStrategy.requirements.stream().map(TraverserRequirement::toString).collect(Collectors.toList()));
+            //logger.error("Applying requirements: " + cloneStrategy.requirements.stream().map(TraverserRequirement::toString).collect(Collectors.toList()));
             strategy = cloneStrategy;
             traversalStrategies.addStrategies(strategy);
         }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f90ae732/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 85e9020..d7b5557 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
@@ -152,7 +152,7 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
             traversal.getStartStep().removeLabel(MARKER);
             return;
         }
-        logger.error("Applying SubgraphStrategy.");
+        //logger.error("Applying SubgraphStrategy.");
         //
         final List<GraphStep> graphSteps = TraversalHelper.getStepsOfAssignableClass(GraphStep.class,
traversal);
         final List<VertexStep> vertexSteps = TraversalHelper.getStepsOfAssignableClass(VertexStep.class,
traversal);

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f90ae732/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index 927a54e..6dac9b0 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -287,7 +287,7 @@ public class SubgraphStrategyProcessTest extends AbstractGremlinProcessTest
{
         assertEquals(0, sg.V(convertToVertexId("josh")).in().count().next().longValue());
 
         assertEquals(3, g.V(convertToVertexId("josh")).bothE().count().next().longValue());
-        assertEquals(2, sg.V(convertToVertexId("josh")).bothE().count().next().longValue());
+        assertEquals(2, sg.withPath().V(convertToVertexId("josh")).bothE().count().next().longValue());
         assertEquals(3, g.V(convertToVertexId("josh")).both().count().next().longValue());
 
 final Traversal<Vertex, Long> t = sg.withPath().V(convertToVertexId("josh")).both().count();
@@ -317,7 +317,7 @@ try {
         assertEquals(2, g.V(convertToVertexId("josh")).bothE("created").count().next().longValue());
         assertEquals(2, sg.V(convertToVertexId("josh")).bothE("created").count().next().longValue());
         assertEquals(2, g.V(convertToVertexId("josh")).both("created").count().next().longValue());
-        assertEquals(2, sg.V(convertToVertexId("josh")).both("created").count().next().longValue());
+        assertEquals(2, sg.withPath().V(convertToVertexId("josh")).both("created").count().next().longValue());
 /*
         assertEquals(1, g.V(convertToVertexId("josh")).inE("knows").count().next().longValue());
         assertEquals(0, sg.V(convertToVertexId("josh")).inE("knows").count().next().longValue());


Mime
View raw message