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/22 16:48:33 UTC

incubator-tinkerpop git commit: EndSteps are 'ignored' in OLAP profiling cause of push-based semantics. No worries, just made the metrics toString() articulate that accordingly. This is an @rjbriody gist hand over.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1199 42ab8bd60 -> 20e9ed1ef


EndSteps are 'ignored' in OLAP profiling cause of push-based semantics. No worries, just made the metrics toString() articulate that accordingly. This is an @rjbriody gist hand over.


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

Branch: refs/heads/TINKERPOP-1199
Commit: 20e9ed1ef28da2c4cc3d190252391b7546369f72
Parents: 42ab8bd
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Mar 22 09:48:29 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Mar 22 09:48:29 2016 -0600

----------------------------------------------------------------------
 .../computer/traversal/TraversalVertexProgram.java      |  2 +-
 .../strategy/finalization/ProfileStrategy.java          |  6 +-----
 .../gremlin/util/function/MutableMetricsSupplier.java   | 12 +++++++++---
 .../tinkergraph/structure/TinkerGraphPlayTest.java      |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/20e9ed1e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
index d26ef59..666a803 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
@@ -161,7 +161,7 @@ public final class TraversalVertexProgram implements VertexProgram<TraverserSet<
         }
         // register profile steps (TODO: try to hide this)
         for (final ProfileStep profileStep : TraversalHelper.getStepsOfAssignableClassRecursively(ProfileStep.class, this.traversal.get())) {
-            this.traversal.get().getSideEffects().register(profileStep.getId(), new MutableMetricsSupplier(profileStep.getPreviousStep().getId(), profileStep.getPreviousStep().toString()), ProfileStep.ProfileBiOperator.instance());
+            this.traversal.get().getSideEffects().register(profileStep.getId(), new MutableMetricsSupplier(profileStep.getPreviousStep()), ProfileStep.ProfileBiOperator.instance());
         }
         // register TraversalVertexProgram specific memory compute keys
         this.memoryComputeKeys.add(MemoryComputeKey.of(HALTED_TRAVERSERS, Operator.addAll, false, this.keepDistributedHaltedTraversers)); // only keep if it will be preserved

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/20e9ed1e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/finalization/ProfileStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/finalization/ProfileStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/finalization/ProfileStrategy.java
index d5e86b8..995ee18 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/finalization/ProfileStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/finalization/ProfileStrategy.java
@@ -54,11 +54,7 @@ public final class ProfileStrategy extends AbstractTraversalStrategy<TraversalSt
         final int numSteps = steps.size();
         for (int ii = 0; ii < numSteps; ii++) {
             // Get the original step
-            Step step = steps.get(ii * 2);
-
-            if (step instanceof ComputerAwareStep.EndStep || step instanceof RepeatStep.RepeatEndStep) {
-                continue;
-            }
+            final Step step = steps.get(ii * 2);
 
             // Do not inject profiling after ProfileSideEffectStep as this will be the last step on the root traversal.
             if (step instanceof ProfileSideEffectStep) {

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/20e9ed1e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/MutableMetricsSupplier.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/MutableMetricsSupplier.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/MutableMetricsSupplier.java
index c83d21e..15e4420 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/MutableMetricsSupplier.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/MutableMetricsSupplier.java
@@ -19,6 +19,9 @@
 
 package org.apache.tinkerpop.gremlin.util.function;
 
+import org.apache.tinkerpop.gremlin.process.traversal.Step;
+import org.apache.tinkerpop.gremlin.process.traversal.step.branch.RepeatStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.ComputerAwareStep;
 import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
 
 import java.io.Serializable;
@@ -32,9 +35,12 @@ public final class MutableMetricsSupplier implements Supplier<MutableMetrics>, S
     private final String stepId;
     private final String stepString;
 
-    public MutableMetricsSupplier(final String stepId, final String stepString) {
-        this.stepId = stepId;
-        this.stepString = stepString;
+    public MutableMetricsSupplier(final Step<?, ?> previousStep) {
+        this.stepId = previousStep.getId();
+        this.stepString =
+                previousStep instanceof RepeatStep.RepeatEndStep || previousStep instanceof ComputerAwareStep.EndStep ?
+                        previousStep.toString() + " (profiling ignored)" :
+                        previousStep.toString();
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/20e9ed1e/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
index f0d77ab..be065c7 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
@@ -59,7 +59,7 @@ public class TinkerGraphPlayTest {
         //System.out.println(g.V().outE("knows").identity().inV().count().is(P.eq(5)).explain());
         //System.out.println(g.V().hasLabel("person").fold().order(Scope.local).by("age").toList());
         //System.out.println(g.V().repeat(out()).times(2).profile("m").explain());
-        final Traversal<?,?> traversal = g.V().both().hasLabel("person").order().by("age", Order.decr).values("name");
+        final Traversal<?,?> traversal = g.V().repeat(__.union(__.<Vertex>identity().as("a"),out())).times(2).profile();
         //System.out.println(g.V().hasLabel("person").pageRank().by("rank").by(bothE()).values("rank").profile("m").explain());
         //System.out.println(traversal.asAdmin().clone().toString());
        // final Traversal<?,?> clone = traversal.asAdmin().clone();