You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/05/04 17:48:24 UTC
[3/8] incubator-tinkerpop git commit: fixed a bug in
ProfileStep.MapReduce that occur when there are numerous KeyValues to the
same key -- e.g. Hadoop with numerous reducers.
fixed a bug in ProfileStep.MapReduce that occur when there are numerous KeyValues to the same key -- e.g. Hadoop with numerous reducers.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3a3f4d3a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3a3f4d3a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3a3f4d3a
Branch: refs/heads/gs-protocol
Commit: 3a3f4d3af963f046902e15dc57617a3b95355414
Parents: 1f2a6ad
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon May 4 07:58:33 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon May 4 07:58:33 2015 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../process/traversal/step/Profileable.java | 31 ++++++
.../traversal/step/sideEffect/ProfileStep.java | 8 +-
.../traversal/util/ImmutableMetrics.java | 9 +-
.../gremlin/process/traversal/util/Metrics.java | 4 +-
.../util/StandardTraversalMetrics.java | 37 +++++--
.../traversal/step/sideEffect/ProfileTest.java | 101 ++++++++++++++-----
7 files changed, 148 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3a3f4d3a/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 7af5087..80ccb74 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -69,6 +69,7 @@ TinkerPop 3.0.0.M9 (NOT OFFICIALLY RELEASED YET)
* `Attachable` now has a set of static exception messages in an `Exceptions` inner class.
* Added `StarGraph` which is a heap efficient representation of a vertex and its incident edges (useful for `GraphComputer` implementations).
* `TraverserSet` uses a `FastNoSuchElementException` on `remove()` for increased performance.
+* Add `Profileable` interface to enable vendors to receive a `Step's MutableMetrics`.
TinkerPop 3.0.0.M8 (Release Date: April 6, 2015)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3a3f4d3a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Profileable.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Profileable.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Profileable.java
new file mode 100644
index 0000000..eb7a2f1
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Profileable.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step;
+
+import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
+
+/**
+ * A Step can implement this interface in order to receive a reference to the MutableMetrics object for the Step. The
+ * MutableMetrics is initialized when the ProfileStrategy executes.
+ *
+ * @author Bob Briody (http://bobbriody.com)
+ */
+public interface Profileable {
+ public void setMetrics(final MutableMetrics metrics);
+}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3a3f4d3a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileStep.java
index 29cbfdf..3b94bbf 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileStep.java
@@ -26,6 +26,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.MapReducer;
+import org.apache.tinkerpop.gremlin.process.traversal.step.Profileable;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
@@ -34,6 +35,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
import org.apache.tinkerpop.gremlin.process.traversal.util.StandardTraversalMetrics;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import java.util.Iterator;
import java.util.List;
@@ -145,6 +147,10 @@ public final class ProfileStep<S> extends AbstractStep<S, S> implements MapReduc
prevMetrics = (DependantMutableMetrics) metrics;
}
+ if (step instanceof Profileable) {
+ ((Profileable) step).setMetrics(metrics);
+ }
+
// Initialize counters (necessary because some steps might end up being 0)
metrics.incrementCount(TraversalMetrics.ELEMENT_COUNT_ID, 0);
metrics.incrementCount(TraversalMetrics.TRAVERSER_COUNT_ID, 0);
@@ -209,7 +215,7 @@ public final class ProfileStep<S> extends AbstractStep<S, S> implements MapReduc
@Override
public StandardTraversalMetrics generateFinalResult(final Iterator<KeyValue<NullObject, StandardTraversalMetrics>> keyValues) {
- return keyValues.next().getValue();
+ return StandardTraversalMetrics.merge(IteratorUtils.map(keyValues, KeyValue::getValue));
}
public static ProfileMapReduce instance() {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3a3f4d3a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
index 471fc5f..8fae2b0 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
@@ -44,12 +44,15 @@ public class ImmutableMetrics implements Metrics, Serializable {
}
@Override
- public long getDuration(TimeUnit unit) {
+ public long getDuration(final TimeUnit unit) {
return unit.convert(this.durationNs, SOURCE_UNIT);
}
@Override
- public long getCount(String key) {
+ public Long getCount(final String key) {
+ if (!counts.containsKey(key)) {
+ return null;
+ }
return counts.get(key).get();
}
@@ -77,7 +80,7 @@ public class ImmutableMetrics implements Metrics, Serializable {
}
@Override
- public ImmutableMetrics getNested(String metricsId) {
+ public ImmutableMetrics getNested(final String metricsId) {
return nested.get(metricsId);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3a3f4d3a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/Metrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/Metrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/Metrics.java
index 4492ee7..7492005 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/Metrics.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/Metrics.java
@@ -37,11 +37,11 @@ public interface Metrics {
public long getDuration(TimeUnit units);
/**
- * Get the count for the corresponding countKey.
+ * Get the count for the corresponding countKey. Returns null if countKey does not exist.
*
* @param countKey key for counter to get.
*/
- public long getCount(String countKey);
+ public Long getCount(String countKey);
/**
* Get the map of all counters. This method copies the internal map.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3a3f4d3a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/StandardTraversalMetrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/StandardTraversalMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/StandardTraversalMetrics.java
index 8ea8d6d..6aabea4 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/StandardTraversalMetrics.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/StandardTraversalMetrics.java
@@ -47,9 +47,6 @@ public final class StandardTraversalMetrics implements TraversalMetrics, Seriali
public void start(final String metricsId) {
dirty = true;
- if (allMetrics.get(metricsId) == null) {
- System.out.println();
- }
allMetrics.get(metricsId).start();
}
@@ -116,21 +113,41 @@ public final class StandardTraversalMetrics implements TraversalMetrics, Seriali
// Append each StepMetric's row. indexToLabelMap values are ordered by index.
for (Metrics m : metrics) {
String rowName = m.getName();
+
+ // Handle indentation
for (int ii = 0; ii < indent; ii++) {
rowName = " " + rowName;
}
+ // Abbreviate if necessary
rowName = StringUtils.abbreviate(rowName, 50);
- final long itemCount = m.getCount(ELEMENT_COUNT_ID);
- final long traverserCount = m.getCount(TRAVERSER_COUNT_ID);
+ // Grab the values
+ final Long itemCount = m.getCount(ELEMENT_COUNT_ID);
+ final Long traverserCount = m.getCount(TRAVERSER_COUNT_ID);
Double percentDur = (Double) m.getAnnotation(PERCENT_DURATION_KEY);
- if (percentDur != null) {
- sb.append(String.format("%n%-50s %21d %11d %15.3f %8.2f",
- rowName, itemCount, traverserCount, m.getDuration(TimeUnit.MICROSECONDS) / 1000.0, percentDur));
+
+ // Build the row string
+
+ sb.append(String.format("%n%-50s", rowName));
+
+ if (itemCount != null) {
+ sb.append(String.format(" %21d", itemCount));
+ } else {
+ sb.append(String.format(" %21s", ""));
+ }
+
+ if (traverserCount != null) {
+ sb.append(String.format(" %11d", traverserCount));
} else {
- sb.append(String.format("%n%-50s %21d %11d %15.3f",
- rowName, itemCount, traverserCount, m.getDuration(TimeUnit.MICROSECONDS) / 1000.0));
+ sb.append(String.format(" %11s", ""));
+ }
+
+ sb.append(String.format(" %15.3f", m.getDuration(TimeUnit.MICROSECONDS) / 1000.0));
+
+ if (percentDur!=null){
+ sb.append(String.format(" %8.2f", percentDur ));
}
+
appendMetrics(m.getNested(), sb, indent + 1);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3a3f4d3a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java
index 01abfd5..fc85b0c 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java
@@ -24,12 +24,18 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.Profileable;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.FlatMapStep;
import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
import org.apache.tinkerpop.gremlin.process.traversal.util.StandardTraversalMetrics;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
@@ -63,20 +69,20 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
traversalMetrics.toString(); // ensure no exceptions are thrown
Metrics metrics = traversalMetrics.getMetrics(0);
- assertEquals(6, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
- assertEquals(6, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
+ assertEquals(6, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID).longValue());
+ assertEquals(6, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID).longValue());
assertTrue("Percent duration should be positive.", (Double) metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
assertTrue("Times should be positive.", metrics.getDuration(TimeUnit.MICROSECONDS) > 0);
metrics = traversalMetrics.getMetrics(1);
- assertEquals(6, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
- assertNotEquals(0, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
+ assertEquals(6, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID).longValue());
+ assertNotEquals(0, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID).longValue());
assertTrue("Percent duration should be positive.", (Double) metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
assertTrue("Times should be positive.", metrics.getDuration(TimeUnit.MICROSECONDS) > 0);
metrics = traversalMetrics.getMetrics(2);
- assertEquals(2, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
- assertNotEquals(0, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
+ assertEquals(2, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID).longValue());
+ assertNotEquals(0, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID).longValue());
assertTrue("Percent duration should be positive.", (Double) metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
assertTrue("Times should be positive.", metrics.getDuration(TimeUnit.MICROSECONDS) > 0);
@@ -99,20 +105,20 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
traversalMetrics.toString(); // ensure no exceptions are thrown
Metrics metrics = traversalMetrics.getMetrics(0);
- assertEquals(808, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
- assertEquals(808, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
+ assertEquals(808, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID).longValue());
+ assertEquals(808, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID).longValue());
assertTrue("Percent duration should be positive.", (Double) metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
assertTrue("Times should be positive.", metrics.getDuration(TimeUnit.MICROSECONDS) > 0);
metrics = traversalMetrics.getMetrics(1);
- assertEquals(8049, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
- assertNotEquals(0, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
+ assertEquals(8049, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID).longValue());
+ assertNotEquals(0, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID).longValue());
assertTrue("Percent duration should be positive.", (Double) metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
assertTrue("Times should be positive.", metrics.getDuration(TimeUnit.MICROSECONDS) > 0);
metrics = traversalMetrics.getMetrics(2);
- assertEquals(327370, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
- assertNotEquals(0, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
+ assertEquals(327370, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID).longValue());
+ assertNotEquals(0, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID).longValue());
assertTrue("Percent duration should be positive.", (Double) metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
assertTrue("Times should be positive.", metrics.getDuration(TimeUnit.MICROSECONDS) > 0);
@@ -172,29 +178,29 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
traversalMetrics.toString(); // ensure no exceptions are thrown
Metrics metrics = traversalMetrics.getMetrics(0);
- assertEquals(6, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
- assertEquals(6, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
+ assertEquals(6, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID).longValue());
+ assertEquals(6, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID).longValue());
assertTrue("Percent duration should be positive.", (Double) metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
assertTrue("Times should be positive.", metrics.getDuration(TimeUnit.MICROSECONDS) > 0);
metrics = traversalMetrics.getMetrics(1);
- assertEquals(72, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
- assertNotEquals(0, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
- assertTrue("Count should be greater than traversers.", metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID) > metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
+ assertEquals(72, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID).longValue());
+ assertNotEquals(0, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID).longValue());
+ assertTrue("Count should be greater than traversers.", metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID) > metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID).longValue());
assertTrue("Percent duration should be positive.", (Double) metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
assertTrue("Times should be positive.", metrics.getDuration(TimeUnit.MICROSECONDS) > 0);
// Test the nested global metrics of the repeat step
final Metrics vertexStepNestedInRepeat = (Metrics) metrics.getNested().toArray()[0];
- assertEquals(114, vertexStepNestedInRepeat.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
- assertNotEquals(0, vertexStepNestedInRepeat.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
- assertTrue("Count should be greater than traversers.", vertexStepNestedInRepeat.getCount(TraversalMetrics.ELEMENT_COUNT_ID) > vertexStepNestedInRepeat.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
+ assertEquals(114, vertexStepNestedInRepeat.getCount(TraversalMetrics.ELEMENT_COUNT_ID).longValue());
+ assertNotEquals(0, vertexStepNestedInRepeat.getCount(TraversalMetrics.TRAVERSER_COUNT_ID).longValue());
+ assertTrue("Count should be greater than traversers.", vertexStepNestedInRepeat.getCount(TraversalMetrics.ELEMENT_COUNT_ID) > vertexStepNestedInRepeat.getCount(TraversalMetrics.TRAVERSER_COUNT_ID).longValue());
assertTrue("Times should be positive.", vertexStepNestedInRepeat.getDuration(TimeUnit.MICROSECONDS) > 0);
final Metrics repeatEndStepNestedInRepeat = (Metrics) metrics.getNested().toArray()[1];
- assertEquals(72, repeatEndStepNestedInRepeat.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
- assertNotEquals(0, repeatEndStepNestedInRepeat.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
- assertTrue("Count should be greater than traversers.", repeatEndStepNestedInRepeat.getCount(TraversalMetrics.ELEMENT_COUNT_ID) > repeatEndStepNestedInRepeat.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
+ assertEquals(72, repeatEndStepNestedInRepeat.getCount(TraversalMetrics.ELEMENT_COUNT_ID).longValue());
+ assertNotEquals(0, repeatEndStepNestedInRepeat.getCount(TraversalMetrics.TRAVERSER_COUNT_ID).longValue());
+ assertTrue("Count should be greater than traversers.", repeatEndStepNestedInRepeat.getCount(TraversalMetrics.ELEMENT_COUNT_ID) > repeatEndStepNestedInRepeat.getCount(TraversalMetrics.TRAVERSER_COUNT_ID).longValue());
assertTrue("Times should be positive.", repeatEndStepNestedInRepeat.getDuration(TimeUnit.MICROSECONDS) > 0);
@@ -219,16 +225,57 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
assertEquals("There should be 3 top-level metrics.", 3, traversalMetrics.getMetrics().size());
Metrics metrics = traversalMetrics.getMetrics(0);
- assertEquals(6, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
- assertEquals(6, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
+ assertEquals(6, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID).longValue());
+ assertEquals(6, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID).longValue());
metrics = traversalMetrics.getMetrics(1);
- assertEquals(1, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
- assertEquals(1, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
+ assertEquals(1, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID).longValue());
+ assertEquals(1, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID).longValue());
assertEquals("Metrics 1 should have 3 nested metrics.", 3, metrics.getNested().size());
}
+ /**
+ * ProfileStrategy callback test. Goal: ensure that a step that implements Profileable gets a callback to setMetrics
+ */
+
+ // Setup a "mock" step to test the strategy
+ static public class MockStep extends FlatMapStep<Vertex, Vertex> implements Profileable {
+ public static boolean callbackCalled = false;
+
+ public MockStep(final Traversal.Admin traversal) {
+ super(traversal);
+ }
+
+ @Override
+ protected Iterator<Vertex> flatMap(final Traverser.Admin<Vertex> traverser) {
+ List<Vertex> l = new ArrayList<>();
+ l.add(traverser.get());
+ return l.iterator();
+ }
+
+ @Override
+ public void setMetrics(final MutableMetrics parentMetrics) {
+ if (parentMetrics != null) {
+ callbackCalled = true;
+ }
+ }
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
+ public void testProfileStrategyCallback() {
+ final Traversal<Vertex, StandardTraversalMetrics> t = get_g_V_out_out_profile();
+ MockStep mockStep = new MockStep(t.asAdmin());
+ t.asAdmin().addStep(3, mockStep);
+ t.iterate();
+ assertTrue(mockStep.callbackCalled);
+ }
+
+ /**
+ * Traversals
+ */
@UseEngine(TraversalEngine.Type.STANDARD)
@UseEngine(TraversalEngine.Type.COMPUTER)
public static class Traversals extends ProfileTest {