tweaked up CHANGELOG and this. TraversalVertexProgram variables.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f8c13076 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f8c13076 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f8c13076 Branch: refs/heads/TINKERPOP-1489 Commit: f8c130767689c09179bc7d37fbf204e37e24e0c6 Parents: 4e44953 Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Tue Oct 31 09:05:01 2017 -0600 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Tue Oct 31 09:05:01 2017 -0600 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 2 +- .../computer/traversal/TraversalVertexProgram.java | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f8c13076/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index e8505ad..1d41ab9 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -23,7 +23,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima [[release-3-2-7]] === TinkerPop 3.2.7 (Release Date: NOT OFFICIALLY RELEASED YET) -* profile() timing is fixed for OLAP by adding worker iteration timings to step metrics +* `TraversalVertexProgram` ``profile()` now accounts for worker iteration in `GraphComputer` OLAP. * Better respected permissions on the `plugins.txt` file and prevented writing if marked as read-only. * Added getters for the lambdas held by `LambdaCollectingBarrierStep`, `LambdaFlatMapStep` and `LambdaSideEffectStep`. * Fixed an old hack in `GroovyTranslator` and `PythonTranslator` where `Elements` were being mapped to their id only. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f8c13076/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 f9a1e34..6f36306 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 @@ -358,9 +358,8 @@ public final class TraversalVertexProgram implements VertexProgram<TraverserSet< public void workerIterationStart(final Memory memory) { // start collecting profile metrics if (this.profile) { - iterationMetrics = new MutableMetrics("iteration" + memory.getIteration(), - "Worker Iteration " + memory.getIteration()); - iterationMetrics.start(); + this.iterationMetrics = new MutableMetrics("iteration" + memory.getIteration(), "Worker Iteration " + memory.getIteration()); + this.iterationMetrics.start(); } } @@ -373,13 +372,13 @@ public final class TraversalVertexProgram implements VertexProgram<TraverserSet< int profileStepIndex = memory.getIteration(); // if we guess wrongly write timing into last step profileStepIndex = profileStepIndex >= profileSteps.size() ? profileSteps.size() - 1 : profileStepIndex; - iterationMetrics.finish(0); + this.iterationMetrics.finish(0); // reset counts - iterationMetrics.setCount(TraversalMetrics.TRAVERSER_COUNT_ID,0); + this.iterationMetrics.setCount(TraversalMetrics.TRAVERSER_COUNT_ID,0); if (null != MemoryTraversalSideEffects.getMemorySideEffectsPhase(this.traversal.get())) { - this.traversal.get().getSideEffects().add(profileSteps.get(profileStepIndex).getId(), iterationMetrics); + this.traversal.get().getSideEffects().add(profileSteps.get(profileStepIndex).getId(), this.iterationMetrics); } - iterationMetrics = null; + this.iterationMetrics = null; } }