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/11 12:45:58 UTC
[49/50] [abbrv] tinkerpop git commit: TINKERPOP-1686 Updated Gryo
serialization tests for metrics
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/TINKERPOP-1686
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