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 2017/07/13 10:18:22 UTC
[01/13] tinkerpop git commit: TINKERPOP-1686 Minor tweaks to finalize
MutableMetrics
Repository: tinkerpop
Updated Branches:
refs/heads/master 625196624 -> 4a8897951
TINKERPOP-1686 Minor tweaks to finalize MutableMetrics
MutableMetrics attached to DefaultTraversalMetrics should not keep getting stuff written to them after the DefaultTraversalMetrics have been finalized.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f5ffa0d8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f5ffa0d8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f5ffa0d8
Branch: refs/heads/master
Commit: f5ffa0d8237668613dade85c19b51bf285e6d72e
Parents: a8ce816
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 7 13:42:56 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jul 11 08:00:57 2017 -0400
----------------------------------------------------------------------
.../traversal/util/DefaultTraversalMetrics.java | 7 +++-
.../process/traversal/util/MutableMetrics.java | 41 ++++++++++++++++----
2 files changed, 38 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f5ffa0d8/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
index df24932..291c7ea 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
@@ -103,6 +103,9 @@ public final class DefaultTraversalMetrics implements TraversalMetrics, Serializ
return this.computedMetrics.values();
}
+ /**
+ * The metrics have been computed and can no longer be modified.
+ */
public boolean isFinalized() {
return finalized;
}
@@ -131,7 +134,7 @@ public final class DefaultTraversalMetrics implements TraversalMetrics, Serializ
* metrics such that their values can no longer be modified.
*/
public synchronized void setMetrics(final Traversal.Admin traversal, final boolean onGraphComputer) {
- if (finalized) throw new IllegalStateException("Metrics have been finalized");
+ if (finalized) throw new IllegalStateException("Metrics have been finalized and cannot be modified");
finalized = true;
addTopLevelMetrics(traversal, onGraphComputer);
handleNestedTraversals(traversal, null, onGraphComputer);
@@ -280,7 +283,7 @@ public final class DefaultTraversalMetrics implements TraversalMetrics, Serializ
if (null != metrics) { // this happens when a particular branch never received a .next() call (the metrics were never initialized)
if (!onGraphComputer) {
// subtract upstream duration.
- long durBeforeAdjustment = metrics.getDuration(TimeUnit.NANOSECONDS);
+ final long durBeforeAdjustment = metrics.getDuration(TimeUnit.NANOSECONDS);
// adjust duration
metrics.setDuration(metrics.getDuration(TimeUnit.NANOSECONDS) - prevDur, TimeUnit.NANOSECONDS);
prevDur = durBeforeAdjustment;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f5ffa0d8/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
index 47decf1..34fa370 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
@@ -18,6 +18,8 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.util;
+import org.apache.tinkerpop.gremlin.process.traversal.step.Profiling;
+
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -33,6 +35,11 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
private long tempTime = -1L;
+ /**
+ * Determines if metrics have been finalized, meaning that no more may be collected.
+ */
+ private volatile boolean finalized = false;
+
protected MutableMetrics() {
// necessary for gryo serialization
}
@@ -55,10 +62,12 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
}
public void addNested(final MutableMetrics metrics) {
+ if (finalized) throw new IllegalStateException("Metrics have been finalized and cannot be modified");
this.nested.put(metrics.getId(), metrics);
}
public void start() {
+ if (finalized) throw new IllegalStateException("Metrics have been finalized and cannot be modified");
if (-1 != this.tempTime) {
throw new IllegalStateException("Internal Error: Concurrent Metrics start. Stop timer before starting timer.");
}
@@ -66,6 +75,7 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
}
public void stop() {
+ if (finalized) throw new IllegalStateException("Metrics have been finalized and cannot be modified");
if (-1 == this.tempTime)
throw new IllegalStateException("Internal Error: Metrics has not been started. Start timer before stopping timer");
this.durationNs = this.durationNs + (System.nanoTime() - this.tempTime);
@@ -73,6 +83,7 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
}
public void incrementCount(final String key, final long incr) {
+ if (finalized) throw new IllegalStateException("Metrics have been finalized and cannot be modified");
AtomicLong count = this.counts.get(key);
if (count == null) {
count = new AtomicLong();
@@ -82,14 +93,17 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
}
public void setDuration(final long dur, final TimeUnit unit) {
+ if (finalized) throw new IllegalStateException("Metrics have been finalized and cannot be modified");
this.durationNs = TimeUnit.NANOSECONDS.convert(dur, unit);
}
public void setCount(final String key, final long val) {
+ if (finalized) throw new IllegalStateException("Metrics have been finalized and cannot be modified");
this.counts.put(key, new AtomicLong(val));
}
public void aggregate(final MutableMetrics other) {
+ if (finalized) throw new IllegalStateException("Metrics have been finalized and cannot be modified");
this.durationNs += other.durationNs;
for (Map.Entry<String, AtomicLong> otherCount : other.counts.entrySet()) {
AtomicLong thisCount = this.counts.get(otherCount.getKey());
@@ -114,12 +128,11 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
}
} else {
// Numbers are summed
- Number existingNum = (Number) existingVal;
- Number otherNum = (Number) p.getValue();
+ final Number existingNum = (Number) existingVal;
+ final Number otherNum = (Number) p.getValue();
Number newVal;
if (existingNum instanceof Double || existingNum instanceof Float) {
- newVal =
- existingNum.doubleValue() + otherNum.doubleValue();
+ newVal = existingNum.doubleValue() + otherNum.doubleValue();
} else {
newVal = existingNum.longValue() + otherNum.longValue();
}
@@ -145,11 +158,9 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
/**
* Set an annotation value. Support exists for Strings and Numbers only. During a merge, Strings are concatenated
* into a "," (comma) separated list of distinct values (duplicates are ignored), and Numbers are summed.
- *
- * @param key
- * @param value
*/
public void setAnnotation(final String key, final Object value) {
+ if (finalized) throw new IllegalStateException("Metrics have been finalized and cannot be modified");
if (!(value instanceof String) && !(value instanceof Number)) {
throw new IllegalArgumentException("Metrics annotations only support String and Number values.");
}
@@ -161,7 +172,21 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
return (MutableMetrics) nested.get(metricsId);
}
- public ImmutableMetrics getImmutableClone() {
+ /**
+ * Once these metrics are used in computing the final metrics to report through {@link TraversalMetrics} they
+ * should no longer be modified and are thus finalized.
+ */
+ public boolean isFinalized() {
+ return finalized;
+ }
+
+ /**
+ * Gets a copy of the metrics that is immutable. Once this clone is made, the {@link MutableMetrics} can no
+ * longer be modified themselves. This prevents custom steps that implement {@link Profiling} from adding to
+ * the metrics after the traversal is complete.
+ */
+ public synchronized ImmutableMetrics getImmutableClone() {
+ finalized = true;
final ImmutableMetrics clone = new ImmutableMetrics();
copyMembers(clone);
this.nested.values().forEach(nested -> clone.nested.put(nested.id, ((MutableMetrics) nested).getImmutableClone()));
[10/13] tinkerpop git commit: TINKERPOP-1686 Cleaned up registrations
a bit for Gryo 3.0
Posted by sp...@apache.org.
TINKERPOP-1686 Cleaned up registrations a bit for Gryo 3.0
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/580af332
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/580af332
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/580af332
Branch: refs/heads/master
Commit: 580af332833e5dcf6b0e29459ff9a706b69947f8
Parents: 773267f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jul 11 09:51:14 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jul 11 09:51:14 2017 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/structure/io/gryo/GryoVersion.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/580af332/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 54ea131..d55da1e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@ -256,8 +256,8 @@ public enum GryoVersion {
add(GryoTypeReg.of(LinkedList.class, 116));
add(GryoTypeReg.of(Types.LINKED_HASH_MAP_ENTRY_CLASS, 15));
add(GryoTypeReg.of(Locale.class, 22));
-// add(GryoTypeReg.of(StringBuffer.class, 43));
-// add(GryoTypeReg.of(StringBuilder.class, 44));
+ add(GryoTypeReg.of(StringBuffer.class, 43));
+ add(GryoTypeReg.of(StringBuilder.class, 44));
add(GryoTypeReg.of(T.class, 48));
add(GryoTypeReg.of(TimeZone.class, 42));
add(GryoTypeReg.of(TreeMap.class, 45));
@@ -341,9 +341,6 @@ public enum GryoVersion {
add(GryoTypeReg.of(BulkSet.class, 64));
add(GryoTypeReg.of(Metrics.class, 69, new GryoSerializersV3d0.MetricsSerializer()));
add(GryoTypeReg.of(TraversalMetrics.class, 70, new GryoSerializersV3d0.TraversalMetricsSerializer()));
- //add(GryoTypeReg.of(MutableMetrics.class, 69, ));
- //add(GryoTypeReg.of(ImmutableMetrics.class, 115));
- //add(GryoTypeReg.of(DefaultTraversalMetrics.class, 70, new GryoSerializersV3d0.TraversalSerializer()));
add(GryoTypeReg.of(MapMemory.class, 73));
add(GryoTypeReg.of(MapReduce.NullObject.class, 74));
add(GryoTypeReg.of(AtomicLong.class, 79));
[12/13] tinkerpop git commit: TINKERPOP-1686 Minor refactoring -
changed looping structure
Posted by sp...@apache.org.
TINKERPOP-1686 Minor refactoring - changed looping structure
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6465fd97
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6465fd97
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6465fd97
Branch: refs/heads/master
Commit: 6465fd97c617d438cf3ba8338144e4808fba4534
Parents: 85dc8a9
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 12 19:36:13 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 12 19:36:13 2017 -0400
----------------------------------------------------------------------
.../process/traversal/util/DefaultTraversalMetrics.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6465fd97/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
index 6053c9c..ae0bd8e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
@@ -77,9 +77,10 @@ public final class DefaultTraversalMetrics implements TraversalMetrics, Serializ
*/
public DefaultTraversalMetrics(final long totalStepDurationNs, final List<MutableMetrics> orderedMetrics) {
totalStepDuration = totalStepDurationNs;
- for (int ix = 0; ix < orderedMetrics.size(); ix++) {
- stepIndexedMetrics.put(orderedMetrics.get(ix).getId(), orderedMetrics.get(ix).getImmutableClone());
- positionIndexedMetrics.put(ix, orderedMetrics.get(ix).getImmutableClone());
+ int ix = 0;
+ for (final MutableMetrics metric : orderedMetrics) {
+ stepIndexedMetrics.put(metric.getId(), metric.getImmutableClone());
+ positionIndexedMetrics.put(ix++, metric.getImmutableClone());
}
}
[11/13] tinkerpop git commit: TINKERPOP-1686 Add some javadoc and
synchronize some methods for thread safety
Posted by sp...@apache.org.
TINKERPOP-1686 Add some javadoc and synchronize some methods for thread safety
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/85dc8a98
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/85dc8a98
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/85dc8a98
Branch: refs/heads/master
Commit: 85dc8a98444017f7a45b13b4460595725684badc
Parents: 580af33
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jul 11 12:24:45 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jul 11 12:24:45 2017 -0400
----------------------------------------------------------------------
.../process/traversal/util/MutableMetrics.java | 31 +++++++++++++++-----
1 file changed, 24 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/85dc8a98/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
index b3ee5f0..335481f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
@@ -69,23 +69,31 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
this.nested.put(metrics.getId(), metrics);
}
+ /**
+ * Starts the timer for this metric. Should not be called again without first calling {@link #stop()}.
+ */
public void start() {
if (finalized) throw new IllegalStateException("Metrics have been finalized and cannot be modified");
- if (-1 != this.tempTime) {
- throw new IllegalStateException("Internal Error: Concurrent Metrics start. Stop timer before starting timer.");
- }
+ if (-1 != this.tempTime) throw new IllegalStateException("Internal Error: Concurrent Metrics start. Stop timer before starting timer.");
+
this.tempTime = System.nanoTime();
}
+ /**
+ * Stops the timer for this metric and increments the overall duration. Should not be called without first calling
+ * {@link #start()}.
+ */
public void stop() {
if (finalized) throw new IllegalStateException("Metrics have been finalized and cannot be modified");
- if (-1 == this.tempTime)
- throw new IllegalStateException("Internal Error: Metrics has not been started. Start timer before stopping timer");
+ if (-1 == this.tempTime) throw new IllegalStateException("Internal Error: Metrics has not been started. Start timer before stopping timer");
this.durationNs = this.durationNs + (System.nanoTime() - this.tempTime);
this.tempTime = -1;
}
- public void incrementCount(final String key, final long incr) {
+ /**
+ * Increments a count metric.
+ */
+ public synchronized void incrementCount(final String key, final long incr) {
if (finalized) throw new IllegalStateException("Metrics have been finalized and cannot be modified");
AtomicLong count = this.counts.get(key);
if (count == null) {
@@ -95,17 +103,26 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
count.addAndGet(incr);
}
+ /**
+ * Directly set the duration for the metric.
+ */
public void setDuration(final long dur, final TimeUnit unit) {
if (finalized) throw new IllegalStateException("Metrics have been finalized and cannot be modified");
this.durationNs = TimeUnit.NANOSECONDS.convert(dur, unit);
}
+ /**
+ * Directly set the count for the metric.
+ */
public void setCount(final String key, final long val) {
if (finalized) throw new IllegalStateException("Metrics have been finalized and cannot be modified");
this.counts.put(key, new AtomicLong(val));
}
- public void aggregate(final MutableMetrics other) {
+ /**
+ * Aggregate one set of metrics into the current body of metrics.
+ */
+ public synchronized void aggregate(final MutableMetrics other) {
if (finalized) throw new IllegalStateException("Metrics have been finalized and cannot be modified");
this.durationNs += other.durationNs;
for (Map.Entry<String, AtomicLong> otherCount : other.counts.entrySet()) {
[07/13] tinkerpop git commit: TINKERPOP-1686 Update changelog
Posted by sp...@apache.org.
TINKERPOP-1686 Update changelog
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c5364356
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c5364356
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c5364356
Branch: refs/heads/master
Commit: c5364356bd40e14dfba93f5b32b04628aa5b9234
Parents: 4ec6921
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 28 07:38:40 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jul 11 08:04:55 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 ++
docs/src/upgrade/release-3.3.x.asciidoc | 1 +
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c5364356/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8c08d5d..07d85fc 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,8 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* `TraversalMetrics` and `Metrics` Gryo formats changed given internal changes to the implementations.
+* Made `TraversalMetrics` safe to write to from multiple threads.
* Established the Gryo 3.0 format.
* `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`.
* `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c5364356/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index e02bc6e..3f201e5 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -109,6 +109,7 @@ Changes to IO
* Gryo incompatibilities with 3.2.x:
** `RequestMessage`
** `ResponseMessage`
+** `TraversalMetrics`
* GraphSON
** embedTypes is gone, use typeInfo setting. will default to no types for GraphSON 1.0 and partial types for graphson 2.0 TINKERPOP-1700
[05/13] tinkerpop git commit: TINKERPOP-1686 Updated Gryo
serialization tests for metrics
Posted by sp...@apache.org.
TINKERPOP-1686 Updated Gryo serialization tests for metrics
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/19a573c3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/19a573c3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/19a573c3
Branch: refs/heads/master
Commit: 19a573c3c5dcf53bd51b539800a3bc923fda73c9
Parents: d136455
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 28 08:27:19 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jul 11 08:04:55 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
.../gremlin/structure/io/gryo/GryoVersion.java | 9 +++++++--
.../structure/io/gryo/_3_3_0/metrics-v1d0.kryo | Bin 189 -> 193 bytes
.../structure/io/gryo/_3_3_0/metrics-v3d0.kryo | Bin 189 -> 193 bytes
.../io/gryo/_3_3_0/traversalmetrics-v1d0.kryo | Bin 439 -> 455 bytes
.../io/gryo/_3_3_0/traversalmetrics-v3d0.kryo | Bin 439 -> 455 bytes
6 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/19a573c3/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 07d85fc..bee946a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,7 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* `TraversalMetrics` and `Metrics` Gryo formats changed given internal changes to the implementations.
+* `TraversalMetrics` and `Metrics` Gryo 1.0 formats changed given internal changes to their implementations.
* Made `TraversalMetrics` safe to write to from multiple threads.
* Established the Gryo 3.0 format.
* `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/19a573c3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index aca1638..54ea131 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@ -149,6 +149,7 @@ import java.util.TimeZone;
import java.util.TreeMap;
import java.util.TreeSet;
import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Supplier;
@@ -250,6 +251,8 @@ public enum GryoVersion {
add(GryoTypeReg.of(KryoSerializable.class, 36));
add(GryoTypeReg.of(LinkedHashMap.class, 47));
add(GryoTypeReg.of(LinkedHashSet.class, 71));
+ add(GryoTypeReg.of(ConcurrentHashMap.class, 170));
+ add(GryoTypeReg.of(ConcurrentHashMap.Entry.class, 171)); // ***LAST ID***
add(GryoTypeReg.of(LinkedList.class, 116));
add(GryoTypeReg.of(Types.LINKED_HASH_MAP_ENTRY_CLASS, 15));
add(GryoTypeReg.of(Locale.class, 22));
@@ -379,7 +382,7 @@ public enum GryoVersion {
tryAddDynamicType(this, "org.apache.tinkerpop.gremlin.driver.message.RequestMessage",
"org.apache.tinkerpop.gremlin.driver.ser.RequestMessageGryoSerializer", 167);
tryAddDynamicType(this, "org.apache.tinkerpop.gremlin.driver.message.ResponseMessage",
- "org.apache.tinkerpop.gremlin.driver.ser.ResponseMessageGryoSerializer", 169); // ***LAST ID***
+ "org.apache.tinkerpop.gremlin.driver.ser.ResponseMessageGryoSerializer", 169);
}};
}
@@ -426,6 +429,8 @@ public enum GryoVersion {
add(GryoTypeReg.of(LinkedHashMap.class, 47));
add(GryoTypeReg.of(LinkedHashSet.class, 71));
add(GryoTypeReg.of(LinkedList.class, 116));
+ add(GryoTypeReg.of(ConcurrentHashMap.class, 168));
+ add(GryoTypeReg.of(ConcurrentHashMap.Entry.class, 169)); // ***LAST ID***
add(GryoTypeReg.of(Types.LINKED_HASH_MAP_ENTRY_CLASS, 15));
add(GryoTypeReg.of(Locale.class, 22));
add(GryoTypeReg.of(StringBuffer.class, 43));
@@ -544,7 +549,7 @@ public enum GryoVersion {
add(GryoTypeReg.of(LambdaRestrictionStrategy.class, 158));
add(GryoTypeReg.of(ReadOnlyStrategy.class, 159));
add(GryoTypeReg.of(MatchStep.CountMatchAlgorithm.class, 160));
- add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 167)); // ***LAST ID***
+ add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 167));
}};
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/19a573c3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo
index 79629c9..f660f85 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/19a573c3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v3d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v3d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v3d0.kryo
index 79629c9..39aa210 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v3d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v3d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/19a573c3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo
index 4065705..5eeb07d 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/19a573c3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v3d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v3d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v3d0.kryo
index 4065705..b9d8ae8 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v3d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v3d0.kryo differ
[13/13] tinkerpop git commit: Merge branch 'TINKERPOP-1686'
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1686'
Conflicts:
CHANGELOG.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4a889795
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4a889795
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4a889795
Branch: refs/heads/master
Commit: 4a8897951a59d4b4ba7434ebfbb26aa1d044f6c1
Parents: 6251966 6465fd9
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jul 13 06:18:08 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jul 13 06:18:08 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +
docs/src/dev/io/gryo.asciidoc | 25 +-
docs/src/upgrade/release-3.3.x.asciidoc | 1 +
.../process/traversal/step/Profiling.java | 6 +-
.../step/sideEffect/ProfileSideEffectStep.java | 14 +-
.../traversal/step/util/ProfileStep.java | 3 +
.../traversal/util/DefaultTraversalMetrics.java | 246 +++++++++----------
.../traversal/util/ImmutableMetrics.java | 8 +-
.../process/traversal/util/MutableMetrics.java | 77 ++++--
.../traversal/util/TraversalMetrics.java | 8 +-
.../gremlin/structure/io/gryo/GryoVersion.java | 16 +-
.../tinkerpop/gremlin/structure/io/Model.java | 6 +-
.../structure/io/gryo/_3_3_0/metrics-v1d0.kryo | Bin 187 -> 193 bytes
.../io/gryo/_3_3_0/traversalmetrics-v1d0.kryo | Bin 306 -> 455 bytes
14 files changed, 232 insertions(+), 180 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4a889795/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index ca690ab,bee946a..9c39fc1
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,10 -26,8 +26,12 @@@ image::https://raw.githubusercontent.co
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Removed previously deprecated `DetachedEdge(Object,String,Map,Pair,Pair)` constructor.
+* Removed previously deprecated `Bindings` constructor. It is now a private constructor.
+* Removed previously deprecated `TraversalSource.withBindings()`.
+* Removed previously deprecated `GraphTraversal.sack(BiFunction,String)`.
+ * `TraversalMetrics` and `Metrics` Gryo 1.0 formats changed given internal changes to their implementations.
+ * Made `TraversalMetrics` safe to write to from multiple threads.
* Established the Gryo 3.0 format.
* `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`.
* `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4a889795/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
[06/13] tinkerpop git commit: TINKERPOP-1686 Made MutableMetrics
thread-safe for nested results and counts
Posted by sp...@apache.org.
TINKERPOP-1686 Made MutableMetrics thread-safe for nested results and counts
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d136455b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d136455b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d136455b
Branch: refs/heads/master
Commit: d136455b83955a81440d97b5fa26bd5d60f23f4b
Parents: c536435
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 28 07:55:51 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jul 11 08:04:55 2017 -0400
----------------------------------------------------------------------
.../gremlin/process/traversal/util/ImmutableMetrics.java | 8 ++++++--
.../gremlin/process/traversal/util/MutableMetrics.java | 5 ++++-
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d136455b/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 a563bbd..d2b1430 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
@@ -23,11 +23,15 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
/**
+ * A {@link Metrics} implementation that cannot be modified.
+ *
* @author Bob Briody (http://bobbriody.com)
+ * @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class ImmutableMetrics implements Metrics, Serializable {
@@ -35,9 +39,9 @@ public class ImmutableMetrics implements Metrics, Serializable {
protected String id;
protected String name;
- protected Map<String, AtomicLong> counts = new HashMap<>();
+ protected Map<String, AtomicLong> counts = new ConcurrentHashMap<>();
protected long durationNs = 0l;
- protected final Map<String, Object> annotations = new HashMap<>();
+ protected final Map<String, Object> annotations = new ConcurrentHashMap<>();
protected final Map<String, ImmutableMetrics> nested = new LinkedHashMap<>();
protected ImmutableMetrics() {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d136455b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
index 34fa370..b3ee5f0 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
@@ -27,7 +27,10 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
/**
+ * A {@link Metrics} implementation that can be modified.
+ *
* @author Bob Briody (http://bobbriody.com)
+ * @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class MutableMetrics extends ImmutableMetrics implements Cloneable {
@@ -61,7 +64,7 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
other.getNested().forEach(nested -> this.addNested(new MutableMetrics(nested)));
}
- public void addNested(final MutableMetrics metrics) {
+ public synchronized void addNested(final MutableMetrics metrics) {
if (finalized) throw new IllegalStateException("Metrics have been finalized and cannot be modified");
this.nested.put(metrics.getId(), metrics);
}
[04/13] tinkerpop git commit: TINKERPOP-1686 No need for LinkedHashMap
Posted by sp...@apache.org.
TINKERPOP-1686 No need for LinkedHashMap
Order can be determined by the key which is the step number essentially. Had to regenerate the model for IO tests, but this ends up being a breaking change in gryo.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4ec69216
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4ec69216
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4ec69216
Branch: refs/heads/master
Commit: 4ec69216c9ab23bf09eb9434d96ab6fb3ca14726
Parents: 4a5efab
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 19 16:33:03 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jul 11 08:04:15 2017 -0400
----------------------------------------------------------------------
.../traversal/util/DefaultTraversalMetrics.java | 8 +++++---
.../tinkerpop/gremlin/structure/io/Model.java | 6 +++---
.../structure/io/gryo/_3_3_0/metrics-v1d0.kryo | Bin 187 -> 189 bytes
.../structure/io/gryo/_3_3_0/metrics-v3d0.kryo | Bin 184 -> 189 bytes
.../io/gryo/_3_3_0/traversalmetrics-v1d0.kryo | Bin 306 -> 439 bytes
.../io/gryo/_3_3_0/traversalmetrics-v3d0.kryo | Bin 308 -> 439 bytes
6 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4ec69216/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
index 9d4adaf..6053c9c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
@@ -33,7 +33,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
/**
* Default implementation for {@link TraversalMetrics} that aggregates {@link ImmutableMetrics} instances from a
@@ -62,7 +62,7 @@ public final class DefaultTraversalMetrics implements TraversalMetrics, Serializ
/**
* {@link ImmutableMetrics} indexed by their step position.
*/
- private Map<Integer, ImmutableMetrics> positionIndexedMetrics = new LinkedHashMap<>();
+ private Map<Integer, ImmutableMetrics> positionIndexedMetrics = new HashMap<>();
/**
* Determines if final metrics have been computed
@@ -100,7 +100,9 @@ public final class DefaultTraversalMetrics implements TraversalMetrics, Serializ
@Override
public Collection<ImmutableMetrics> getMetrics() {
- return this.positionIndexedMetrics.values();
+ return positionIndexedMetrics.entrySet().stream().sorted(Map.Entry.comparingByKey()).
+ collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,
+ (oldValue, newValue) -> oldValue, LinkedHashMap::new)).values();
}
/**
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4ec69216/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
index 9b144fe..e10dc11 100644
--- a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
+++ b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
@@ -36,7 +36,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
import org.apache.tinkerpop.gremlin.structure.Column;
import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONCompatibility;
@@ -104,6 +103,7 @@ public class Model {
final GraphTraversalSource g = graph.traversal();
final Compatibility[] noTypeGraphSONPlusGryo3_2_3 = Compatibilities.with(GryoCompatibility.class).beforeRelease("3.2.4").join(Compatibilities.UNTYPED_GRAPHSON).matchToArray();
+ final Compatibility[] noTypeGraphSONPlusGryo3_3_0 = Compatibilities.with(GryoCompatibility.class).beforeRelease("3.3.0").join(Compatibilities.UNTYPED_GRAPHSON).matchToArray();
// IMPORTANT - the "title" or name of the Entry needs to be unique
@@ -143,7 +143,7 @@ public class Model {
final TraversalMetrics tm = createStaticTraversalMetrics();
final MutableMetrics metrics = new MutableMetrics(tm.getMetrics("7.0.0()"));
metrics.addNested(new MutableMetrics(tm.getMetrics("3.0.0()")));
- addGraphProcessEntry(metrics, "Metrics", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
+ addGraphProcessEntry(metrics, "Metrics", "", noTypeGraphSONPlusGryo3_3_0);
addGraphProcessEntry(P.gt(0), "P", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
// A bug in the the Gryo serialization of ConjunctiveP prevented its proper serialization in versions prior to 3.3.0 and 3.2.4.
addGraphProcessEntry(P.gt(0).and(P.lt(10)), "P and", "", noTypeGraphSONPlusGryo3_2_3);
@@ -151,7 +151,7 @@ public class Model {
addGraphProcessEntry(P.gt(0).or(P.within(-1, -10, -100)), "P or", "", noTypeGraphSONPlusGryo3_2_3);
addGraphProcessEntry(Scope.local, "Scope", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
addGraphProcessEntry(T.label, "T", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
- addGraphProcessEntry(createStaticTraversalMetrics(), "TraversalMetrics", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
+ addGraphProcessEntry(createStaticTraversalMetrics(), "TraversalMetrics", "", noTypeGraphSONPlusGryo3_3_0);
addGraphProcessEntry(g.V().hasLabel("person").asAdmin().nextTraverser(), "Traverser", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
final Map<String,Object> requestBindings = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4ec69216/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo
index c098e38..79629c9 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4ec69216/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v3d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v3d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v3d0.kryo
index f65dd63..79629c9 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v3d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v3d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4ec69216/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo
index 2d02c43..4065705 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4ec69216/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v3d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v3d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v3d0.kryo
index 5ec44fd..4065705 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v3d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v3d0.kryo differ
[02/13] tinkerpop git commit: TINKERPOP-1686 WIP toward thread-safety
in metrics
Posted by sp...@apache.org.
TINKERPOP-1686 WIP toward thread-safety in metrics
Cleaned up javadocs a bit. Added synchronization around setMetrics().
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a8ce816b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a8ce816b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a8ce816b
Branch: refs/heads/master
Commit: a8ce816b04ae3543d4799e4272cc22d0e2b3d61a
Parents: 4062898
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 7 09:39:07 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jul 11 08:00:57 2017 -0400
----------------------------------------------------------------------
.../process/traversal/step/Profiling.java | 6 +-
.../step/sideEffect/ProfileSideEffectStep.java | 14 ++-
.../traversal/step/util/ProfileStep.java | 3 +
.../traversal/util/DefaultTraversalMetrics.java | 112 ++++++++++++-------
.../traversal/util/TraversalMetrics.java | 8 +-
5 files changed, 95 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a8ce816b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Profiling.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Profiling.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Profiling.java
index 3e4ff19..5fa53ee 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Profiling.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Profiling.java
@@ -18,11 +18,13 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step;
+import org.apache.tinkerpop.gremlin.process.traversal.Step;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ProfileStrategy;
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.
+ * A {@link Step} can implement this interface in order to receive a reference to the {@link MutableMetrics} object
+ * for the {@link Step}. The {@link MutableMetrics} is initialized when the {@link ProfileStrategy} executes.
*
* @author Bob Briody (http://bobbriody.com)
*/
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a8ce816b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileSideEffectStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileSideEffectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileSideEffectStep.java
index be60808..5a60d02 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileSideEffectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileSideEffectStep.java
@@ -45,7 +45,7 @@ public final class ProfileSideEffectStep<S> extends SideEffectStep<S> implements
}
@Override
- protected void sideEffect(Traverser.Admin<S> traverser) {
+ protected void sideEffect(final Traverser.Admin<S> traverser) {
}
@Override
@@ -61,7 +61,8 @@ public final class ProfileSideEffectStep<S> extends SideEffectStep<S> implements
return start;
} finally {
if (!this.onGraphComputer && start == null) {
- ((DefaultTraversalMetrics) this.getTraversal().getSideEffects().get(this.sideEffectKey)).setMetrics(this.getTraversal(), false);
+ final DefaultTraversalMetrics m = getTraversalMetricsFromSideEffects();
+ if (!m.isFinalized()) m.setMetrics(this.getTraversal(), false);
}
}
}
@@ -70,14 +71,19 @@ public final class ProfileSideEffectStep<S> extends SideEffectStep<S> implements
public boolean hasNext() {
boolean start = super.hasNext();
if (!this.onGraphComputer && !start) {
- ((DefaultTraversalMetrics) this.getTraversal().getSideEffects().get(this.sideEffectKey)).setMetrics(this.getTraversal(), false);
+ final DefaultTraversalMetrics m = getTraversalMetricsFromSideEffects();
+ if (!m.isFinalized()) m.setMetrics(this.getTraversal(), false);
}
return start;
}
+ private DefaultTraversalMetrics getTraversalMetricsFromSideEffects() {
+ return (DefaultTraversalMetrics) this.getTraversal().getSideEffects().get(this.sideEffectKey);
+ }
+
@Override
public DefaultTraversalMetrics generateFinalResult(final DefaultTraversalMetrics tm) {
- if (this.onGraphComputer)
+ if (this.onGraphComputer && !tm.isFinalized())
tm.setMetrics(this.getTraversal(), true);
return tm;
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a8ce816b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ProfileStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ProfileStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ProfileStep.java
index 9b2276b..0bc5f4f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ProfileStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ProfileStep.java
@@ -90,6 +90,9 @@ public final class ProfileStep<S> extends AbstractStep<S, S> implements MemoryCo
this.onGraphComputer = TraversalHelper.onGraphComputer(this.getTraversal());
this.metrics = new MutableMetrics(this.getPreviousStep().getId(), this.getPreviousStep().toString());
final Step<?, S> previousStep = this.getPreviousStep();
+
+ // give metrics to the step being profiled so that it can add additional data to the metrics like
+ // annotations
if (previousStep instanceof Profiling)
((Profiling) previousStep).setMetrics(this.metrics);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a8ce816b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
index 3c543f6..df24932 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
@@ -28,7 +28,6 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -37,6 +36,9 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
/**
+ * Default implementation for {@link TraversalMetrics} that aggregates {@link ImmutableMetrics} instances from a
+ * {@link Traversal}.
+ *
* @author Bob Briody (http://bobbriody.com)
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
@@ -49,12 +51,21 @@ public final class DefaultTraversalMetrics implements TraversalMetrics, Serializ
private final Map<String, MutableMetrics> metrics = new HashMap<>();
private final TreeMap<Integer, String> indexToLabelMap = new TreeMap<>();
- /*
- The following are computed values upon the completion of profiling in order to report the results back to the user
+ /**
+ * A computed value representing the total time spent on all steps.
*/
private long totalStepDuration;
+
+ /**
+ * The metrics that are reported to the caller of profile() which are computed once all metrics have been gathered.
+ */
private Map<String, ImmutableMetrics> computedMetrics = new LinkedHashMap<>();
+ /**
+ * Determines if final metrics have been computed
+ */
+ private volatile boolean finalized = false;
+
public DefaultTraversalMetrics() {
}
@@ -92,6 +103,10 @@ public final class DefaultTraversalMetrics implements TraversalMetrics, Serializ
return this.computedMetrics.values();
}
+ public boolean isFinalized() {
+ return finalized;
+ }
+
@Override
public String toString() {
// Build a pretty table of metrics data.
@@ -111,6 +126,18 @@ public final class DefaultTraversalMetrics implements TraversalMetrics, Serializ
return sb.toString();
}
+ /**
+ * Extracts metrics from the provided {@code traversal} and computes metrics. Calling this method finalizes the
+ * metrics such that their values can no longer be modified.
+ */
+ public synchronized void setMetrics(final Traversal.Admin traversal, final boolean onGraphComputer) {
+ if (finalized) throw new IllegalStateException("Metrics have been finalized");
+ finalized = true;
+ addTopLevelMetrics(traversal, onGraphComputer);
+ handleNestedTraversals(traversal, null, onGraphComputer);
+ computeTotals();
+ }
+
private void appendMetrics(final Collection<? extends Metrics> metrics, final StringBuilder sb, final int indent) {
// Append each StepMetric's row. indexToLabelMap values are ordered by index.
for (Metrics m : metrics) {
@@ -222,41 +249,7 @@ public final class DefaultTraversalMetrics implements TraversalMetrics, Serializ
tempMetrics.forEach(it -> this.computedMetrics.put(it.getId(), it.getImmutableClone()));
}
- public static DefaultTraversalMetrics merge(final Iterator<DefaultTraversalMetrics> toMerge) {
- final DefaultTraversalMetrics newTraversalMetrics = new DefaultTraversalMetrics();
-
- // iterate the incoming TraversalMetrics
- toMerge.forEachRemaining(inTraversalMetrics -> {
- // aggregate the internal Metrics
- inTraversalMetrics.metrics.forEach((metricsId, toAggregate) -> {
-
- MutableMetrics aggregateMetrics = newTraversalMetrics.metrics.get(metricsId);
- if (null == aggregateMetrics) {
- // need to create a Metrics to aggregate into
- aggregateMetrics = new MutableMetrics(toAggregate.getId(), toAggregate.getName());
-
- newTraversalMetrics.metrics.put(metricsId, aggregateMetrics);
- // Set the index of the Metrics
- for (final Map.Entry<Integer, String> entry : inTraversalMetrics.indexToLabelMap.entrySet()) {
- if (metricsId.equals(entry.getValue())) {
- newTraversalMetrics.indexToLabelMap.put(entry.getKey(), metricsId);
- break;
- }
- }
- }
- aggregateMetrics.aggregate(toAggregate);
- });
- });
- return newTraversalMetrics;
- }
-
- public void setMetrics(final Traversal.Admin traversal, final boolean onGraphComputer) {
- addTopLevelMetrics(traversal, onGraphComputer);
- handleNestedTraversals(traversal, null, onGraphComputer);
- computeTotals();
- }
-
- private void addTopLevelMetrics(Traversal.Admin traversal, final boolean onGraphComputer) {
+ private void addTopLevelMetrics(final Traversal.Admin traversal, final boolean onGraphComputer) {
final List<ProfileStep> profileSteps = TraversalHelper.getStepsOfClass(ProfileStep.class, traversal);
for (int ii = 0; ii < profileSteps.size(); ii++) {
// The index is necessary to ensure that step order is preserved after a merge.
@@ -308,4 +301,47 @@ public final class DefaultTraversalMetrics implements TraversalMetrics, Serializ
}
}
}
+
+ private void appendMetrics(final Collection<? extends Metrics> metrics, final StringBuilder sb, final int indent) {
+ // 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);
+
+ // 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);
+
+ // 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(" %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/tinkerpop/blob/a8ce816b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalMetrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalMetrics.java
index 6a54680..0dbb2f6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalMetrics.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalMetrics.java
@@ -46,15 +46,13 @@ public interface TraversalMetrics {
/**
* Get the total duration taken by the Traversal.
*
- * @param unit
* @return total duration taken by the Traversal.
*/
- public long getDuration(TimeUnit unit);
+ public long getDuration(final TimeUnit unit);
/**
* Get an individual Metrics object by the index of the profiled Step.
*
- * @param stepIndex
* @return an individual Metrics object.
*/
public Metrics getMetrics(final int stepIndex);
@@ -62,10 +60,12 @@ public interface TraversalMetrics {
/**
* Get an individual Metrics object by the id of the profiled Step.
*
- * @param id
* @return an individual Metrics object.
*/
public Metrics getMetrics(final String id);
+ /**
+ * Gets all the metrics.
+ */
public Collection<? extends Metrics> getMetrics();
}
[03/13] tinkerpop git commit: TINKERPOP-1686 Refactored
DefaultTraversalMetrics
Posted by sp...@apache.org.
TINKERPOP-1686 Refactored DefaultTraversalMetrics
There seems to be some weird problem in gryo serialization for this class that is difficult to reproduce. It seemed to have something to do with nested maps or perhaps TreeMap, but I wasn't able to easily isolate it to create a bug report to Kryo. All I know is that these changes made the serialization failure (a buffer underflow) go away. It also fixed a problem where deserialization with GraphSON did not allow the getMetrics(int) method to work.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4a5efabc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4a5efabc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4a5efabc
Branch: refs/heads/master
Commit: 4a5efabc07700f5c497f0e8e2e57c13dc8826359
Parents: f5ffa0d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 7 15:06:10 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jul 11 08:02:47 2017 -0400
----------------------------------------------------------------------
.../traversal/util/DefaultTraversalMetrics.java | 220 +++++++------------
1 file changed, 81 insertions(+), 139 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4a5efabc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
index 291c7ea..9d4adaf 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
@@ -23,6 +23,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.ProfileStep;
+import org.javatuples.Pair;
import java.io.Serializable;
import java.util.ArrayList;
@@ -31,7 +32,6 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.TreeMap;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -41,6 +41,7 @@ import java.util.concurrent.atomic.AtomicInteger;
*
* @author Bob Briody (http://bobbriody.com)
* @author Marko A. Rodriguez (http://markorodriguez.com)
+ * @author Stephen Mallette (http://stephen.genoprime.com)
*/
public final class DefaultTraversalMetrics implements TraversalMetrics, Serializable {
/**
@@ -48,8 +49,10 @@ public final class DefaultTraversalMetrics implements TraversalMetrics, Serializ
*/
private static final String[] HEADERS = {"Step", "Count", "Traversers", "Time (ms)", "% Dur"};
- private final Map<String, MutableMetrics> metrics = new HashMap<>();
- private final TreeMap<Integer, String> indexToLabelMap = new TreeMap<>();
+ /**
+ * {@link ImmutableMetrics} indexed by their step identifier.
+ */
+ private final Map<String, ImmutableMetrics> stepIndexedMetrics = new HashMap<>();
/**
* A computed value representing the total time spent on all steps.
@@ -57,9 +60,9 @@ public final class DefaultTraversalMetrics implements TraversalMetrics, Serializ
private long totalStepDuration;
/**
- * The metrics that are reported to the caller of profile() which are computed once all metrics have been gathered.
+ * {@link ImmutableMetrics} indexed by their step position.
*/
- private Map<String, ImmutableMetrics> computedMetrics = new LinkedHashMap<>();
+ private Map<Integer, ImmutableMetrics> positionIndexedMetrics = new LinkedHashMap<>();
/**
* Determines if final metrics have been computed
@@ -72,14 +75,12 @@ public final class DefaultTraversalMetrics implements TraversalMetrics, Serializ
/**
* This is only a convenient constructor needed for GraphSON deserialization.
*/
- public DefaultTraversalMetrics(final long totalStepDurationNs, final List<MutableMetrics> metricsMap) {
- this.totalStepDuration = totalStepDurationNs;
- this.computedMetrics = new LinkedHashMap<>(this.metrics.size());
- final AtomicInteger counter = new AtomicInteger(0);
- metricsMap.forEach(metric -> {
- this.computedMetrics.put(metric.getId(), metric.getImmutableClone());
- this.indexToLabelMap.put(counter.getAndIncrement(), metric.getId());
- });
+ public DefaultTraversalMetrics(final long totalStepDurationNs, final List<MutableMetrics> orderedMetrics) {
+ totalStepDuration = totalStepDurationNs;
+ for (int ix = 0; ix < orderedMetrics.size(); ix++) {
+ stepIndexedMetrics.put(orderedMetrics.get(ix).getId(), orderedMetrics.get(ix).getImmutableClone());
+ positionIndexedMetrics.put(ix, orderedMetrics.get(ix).getImmutableClone());
+ }
}
@Override
@@ -89,18 +90,17 @@ public final class DefaultTraversalMetrics implements TraversalMetrics, Serializ
@Override
public Metrics getMetrics(final int index) {
- // adjust index to account for the injected profile steps
- return this.computedMetrics.get(this.indexToLabelMap.get(index));
+ return this.positionIndexedMetrics.get(index);
}
@Override
public Metrics getMetrics(final String id) {
- return this.computedMetrics.get(id);
+ return this.stepIndexedMetrics.get(id);
}
@Override
public Collection<ImmutableMetrics> getMetrics() {
- return this.computedMetrics.values();
+ return this.positionIndexedMetrics.values();
}
/**
@@ -120,7 +120,7 @@ public final class DefaultTraversalMetrics implements TraversalMetrics, Serializ
sb.append("\n=============================================================================================================");
- appendMetrics(this.computedMetrics.values(), sb, 0);
+ appendMetrics(this.positionIndexedMetrics.values(), sb, 0);
// Append total duration
sb.append(String.format("%n%50s %21s %11s %15.3f %8s",
@@ -136,137 +136,34 @@ public final class DefaultTraversalMetrics implements TraversalMetrics, Serializ
public synchronized void setMetrics(final Traversal.Admin traversal, final boolean onGraphComputer) {
if (finalized) throw new IllegalStateException("Metrics have been finalized and cannot be modified");
finalized = true;
- addTopLevelMetrics(traversal, onGraphComputer);
handleNestedTraversals(traversal, null, onGraphComputer);
- computeTotals();
- }
-
- private void appendMetrics(final Collection<? extends Metrics> metrics, final StringBuilder sb, final int indent) {
- // 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);
-
- // Grab the values
- final Long itemCount = m.getCount(ELEMENT_COUNT_ID);
- final Long traverserCount = m.getCount(TRAVERSER_COUNT_ID);
- final Double percentDur = (Double) m.getAnnotation(PERCENT_DURATION_KEY);
-
- // 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(" %11s", ""));
- }
-
- sb.append(String.format(" %15.3f", m.getDuration(TimeUnit.MICROSECONDS) / 1000.0));
-
- if (percentDur != null) {
- sb.append(String.format(" %8.2f", percentDur));
- }
-
- // process any annotations
- final Map<String,Object> annotations = m.getAnnotations();
- if (!annotations.isEmpty()) {
- // ignore the PERCENT_DURATION_KEY as that is a TinkerPop annotation that is displayed by default
- annotations.entrySet().stream().filter(kv -> !kv.getKey().equals(PERCENT_DURATION_KEY)).forEach(kv -> {
- final String prefix = " \\_";
- final String separator = "=";
- final String k = prefix + StringUtils.abbreviate(kv.getKey(), 30);
- final int valueIndentLen = separator.length() + k.length() + indent;
- final int leftover = 110 - valueIndentLen;
-
- final String[] splitValues = splitOnSize(kv.getValue().toString(), leftover);
- for (int ix = 0; ix < splitValues.length; ix++) {
- // the first lines gets the annotation prefix. the rest are indented to the separator
- if (ix == 0) {
- sb.append(String.format("%n%s", k + separator + splitValues[ix]));
- } else {
- sb.append(String.format("%n%s", padLeft(splitValues[ix], valueIndentLen - 1)));
- }
- }
- });
- }
-
- appendMetrics(m.getNested(), sb, indent + 1);
- }
+ addTopLevelMetrics(traversal, onGraphComputer);
}
- private static String[] splitOnSize(final String text, final int size) {
- final String[] ret = new String[(text.length() + size - 1) / size];
-
- int counter = 0;
- for (int start = 0; start < text.length(); start += size) {
- ret[counter] = text.substring(start, Math.min(text.length(), start + size));
- counter++;
- }
+ private void addTopLevelMetrics(final Traversal.Admin traversal, final boolean onGraphComputer) {
+ this.totalStepDuration = 0;
- return ret;
- }
+ final List<ProfileStep> profileSteps = TraversalHelper.getStepsOfClass(ProfileStep.class, traversal);
+ final List<Pair<Integer, MutableMetrics>> tempMetrics = new ArrayList<>(profileSteps.size());
- private static String padLeft(final String text, final int amountToPad) {
- // not sure why this method needed to exist. stupid string format stuff and commons utilities wouldn't
- // work for some reason in the context this method was used above.
- String newText = text;
- for (int ix = 0; ix < amountToPad; ix++) {
- newText = " " + newText;
- }
- return newText;
- }
+ for (int ii = 0; ii < profileSteps.size(); ii++) {
+ // The index is necessary to ensure that step order is preserved after a merge.
+ final ProfileStep step = profileSteps.get(ii);
+ final MutableMetrics stepMetrics = onGraphComputer ? traversal.getSideEffects().get(step.getId()) : step.getMetrics();
- private void computeTotals() {
- // Create temp list of ordered metrics
- final List<MutableMetrics> tempMetrics = new ArrayList<>(this.metrics.size());
- for (final String label : this.indexToLabelMap.values()) {
- // The indexToLabelMap is sorted by index (key)
- tempMetrics.add(this.metrics.get(label).clone());
+ this.totalStepDuration += stepMetrics.getDuration(MutableMetrics.SOURCE_UNIT);
+ tempMetrics.add(Pair.with(ii, stepMetrics.clone()));
}
- // Calculate total duration
- this.totalStepDuration = 0;
- tempMetrics.forEach(metric -> this.totalStepDuration += metric.getDuration(MutableMetrics.SOURCE_UNIT));
-
- // Assign %'s
tempMetrics.forEach(m -> {
- final double dur = m.getDuration(TimeUnit.NANOSECONDS) * 100.d / this.totalStepDuration;
- m.setAnnotation(PERCENT_DURATION_KEY, dur);
+ final double dur = m.getValue1().getDuration(TimeUnit.NANOSECONDS) * 100.d / this.totalStepDuration;
+ m.getValue1().setAnnotation(PERCENT_DURATION_KEY, dur);
});
- // Store immutable instances of the calculated metrics
- this.computedMetrics = new LinkedHashMap<>(this.metrics.size());
- tempMetrics.forEach(it -> this.computedMetrics.put(it.getId(), it.getImmutableClone()));
- }
-
- private void addTopLevelMetrics(final Traversal.Admin traversal, final boolean onGraphComputer) {
- final List<ProfileStep> profileSteps = TraversalHelper.getStepsOfClass(ProfileStep.class, traversal);
- for (int ii = 0; ii < profileSteps.size(); ii++) {
- // The index is necessary to ensure that step order is preserved after a merge.
- final ProfileStep step = profileSteps.get(ii);
- if (onGraphComputer) {
- final MutableMetrics stepMetrics = traversal.getSideEffects().get(step.getId());
- this.indexToLabelMap.put(ii, stepMetrics.getId());
- this.metrics.put(stepMetrics.getId(), stepMetrics);
- } else {
- final MutableMetrics stepMetrics = step.getMetrics();
- this.indexToLabelMap.put(ii, stepMetrics.getId());
- this.metrics.put(stepMetrics.getId(), stepMetrics);
- }
- }
+ tempMetrics.forEach(p -> {
+ this.stepIndexedMetrics.put(p.getValue1().getId(), p.getValue1().getImmutableClone());
+ this.positionIndexedMetrics.put(p.getValue0(), p.getValue1().getImmutableClone());
+ });
}
private void handleNestedTraversals(final Traversal.Admin traversal, final MutableMetrics parentMetrics, final boolean onGraphComputer) {
@@ -320,7 +217,7 @@ public final class DefaultTraversalMetrics implements TraversalMetrics, Serializ
// 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);
+ final Double percentDur = (Double) m.getAnnotation(PERCENT_DURATION_KEY);
// Build the row string
@@ -344,7 +241,52 @@ public final class DefaultTraversalMetrics implements TraversalMetrics, Serializ
sb.append(String.format(" %8.2f", percentDur));
}
+ // process any annotations
+ final Map<String,Object> annotations = m.getAnnotations();
+ if (!annotations.isEmpty()) {
+ // ignore the PERCENT_DURATION_KEY as that is a TinkerPop annotation that is displayed by default
+ annotations.entrySet().stream().filter(kv -> !kv.getKey().equals(PERCENT_DURATION_KEY)).forEach(kv -> {
+ final String prefix = " \\_";
+ final String separator = "=";
+ final String k = prefix + StringUtils.abbreviate(kv.getKey(), 30);
+ final int valueIndentLen = separator.length() + k.length() + indent;
+ final int leftover = 110 - valueIndentLen;
+
+ final String[] splitValues = splitOnSize(kv.getValue().toString(), leftover);
+ for (int ix = 0; ix < splitValues.length; ix++) {
+ // the first lines gets the annotation prefix. the rest are indented to the separator
+ if (ix == 0) {
+ sb.append(String.format("%n%s", k + separator + splitValues[ix]));
+ } else {
+ sb.append(String.format("%n%s", padLeft(splitValues[ix], valueIndentLen - 1)));
+ }
+ }
+ });
+ }
+
appendMetrics(m.getNested(), sb, indent + 1);
}
}
+
+ private static String[] splitOnSize(final String text, final int size) {
+ final String[] ret = new String[(text.length() + size - 1) / size];
+
+ int counter = 0;
+ for (int start = 0; start < text.length(); start += size) {
+ ret[counter] = text.substring(start, Math.min(text.length(), start + size));
+ counter++;
+ }
+
+ return ret;
+ }
+
+ private static String padLeft(final String text, final int amountToPad) {
+ // not sure why this method needed to exist. stupid string format stuff and commons utilities wouldn't
+ // work for some reason in the context this method was used above.
+ String newText = text;
+ for (int ix = 0; ix < amountToPad; ix++) {
+ newText = " " + newText;
+ }
+ return newText;
+ }
}
[08/13] tinkerpop git commit: TINKERPOP-1686 Regenerated gryo files
for metrics after gryo 3.0 work
Posted by sp...@apache.org.
TINKERPOP-1686 Regenerated gryo files for metrics after gryo 3.0 work
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/dee27e33
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/dee27e33
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/dee27e33
Branch: refs/heads/master
Commit: dee27e33725337c9cddad33f6c3f8cd310203a3c
Parents: 19a573c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jul 11 08:44:26 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jul 11 08:44:26 2017 -0400
----------------------------------------------------------------------
.../structure/io/gryo/_3_3_0/metrics-v3d0.kryo | Bin 193 -> 184 bytes
.../io/gryo/_3_3_0/traversalmetrics-v3d0.kryo | Bin 455 -> 308 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/dee27e33/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v3d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v3d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v3d0.kryo
index 39aa210..f65dd63 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v3d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v3d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/dee27e33/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v3d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v3d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v3d0.kryo
index b9d8ae8..5ec44fd 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v3d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v3d0.kryo differ
[09/13] tinkerpop git commit: TINKERPOP-1686 Fixed up gryo io docs
for 3.0
Posted by sp...@apache.org.
TINKERPOP-1686 Fixed up gryo io docs for 3.0
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/773267f1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/773267f1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/773267f1
Branch: refs/heads/master
Commit: 773267f19a37f86e8a19ef68a390a846d76b5d02
Parents: dee27e3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jul 11 09:50:43 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jul 11 09:50:43 2017 -0400
----------------------------------------------------------------------
docs/src/dev/io/gryo.asciidoc | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/773267f1/docs/src/dev/io/gryo.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/io/gryo.asciidoc b/docs/src/dev/io/gryo.asciidoc
index 61afdb0..d4a2b0b 100644
--- a/docs/src/dev/io/gryo.asciidoc
+++ b/docs/src/dev/io/gryo.asciidoc
@@ -35,16 +35,6 @@ what the Gryo format looks like in a byte-by-byte perspective will not be discus
TinkerPop has Kryo-based serializers for certain classes that it supports and that the bytes written or read must be
Kryo compliant.
-While there is only one version of Gryo at the moment, 1.0, the format has generally expanded as new releases of
-TinkerPop have been produced. "Expansion" has generally meant that new types have come to be supported over time. The
-addition of new types means that while Gryo has remained at 1.0, older releases that produced Gryo files will not
-be compatible with newer TinkerPop releases if the newer types are utilized. On the flip side, newer release of
-TinkerPop are fully backward compatible with Gryo produced on older versions of TinkerPop.
-
-The full list of Gryo 1.0 types can be found in the `GryoMapper` source code. Looking at the source code for a specific
-release tag would show what types were compatible for a specific release. For example, the type listing for 3.2.2
-can be found link:https://github.com/apache/tinkerpop/blob/3.2.2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java#L249[here].
-
One of the key aspects of Gryo is that, by default, it requires that all types expected to be used to be registered
with the `GryoMapper`. There are two ways to do that:
@@ -60,4 +50,17 @@ to be compatible. Calls to `addCustom` will be applied first, prior to calls to
`addCustom`).
It is possible to disable registration by setting `registrationRequired` on the `GryoMapper.Builder` to `false`, but
-Gryo is less efficient with this feature is turned off.
\ No newline at end of file
+Gryo is less efficient with this feature is turned off.
+
+Until TinkerPop 3.3.0 there has only been one version of Gryo in 1.0 and the format for that version has generally
+expanded as new releases of TinkerPop have been produced. "Expansion" has generally meant that new types have come to
+be supported over time. The addition of new types means that while Gryo has remained at 1.0, older releases that
+produced Gryo files will not be compatible with newer TinkerPop releases if the newer types are utilized. On the flip
+side, newer release of TinkerPop are fully backward compatible with Gryo produced on older versions of TinkerPop.
+
+As of TinkerPop 3.3.0, there is now a new version of Gryo in 3.0 that is only partially compatible with 1.0. Attempts
+to use 3.0 serializers with 1.0 serializers will likely lead to failure.
+
+Both versions of Gryo support all the types defined by GraphSON as well as others that are bound more specifically
+to the JVM. The link:https://github.com/apache/tinkerpop/blob/x.y.z/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java[GryoVersion]
+class contains a listing of all the default registered classes.
\ No newline at end of file