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/df914d02 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/df914d02 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/df914d02 Branch: refs/heads/TINKERPOP-1686 Commit: df914d02f1c8c22b9972a35ae6c17e83db7269ec Parents: 7c5294b Author: Stephen Mallette <[email protected]> Authored: Wed Jun 28 08:27:19 2017 -0400 Committer: Stephen Mallette <[email protected]> Committed: Wed Jun 28 08:31:47 2017 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 2 +- .../gremlin/structure/io/gryo/GryoVersion.java | 9 +++++++-- gremlin-tools/gremlin-io-test/pom.xml | 2 +- .../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 7 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/df914d02/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 4edce2c..a00c1ba 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. * Graphite and Ganglia are no longer packaged with the Gremlin Server distribution. * `TransactionException` is no longer a class of `AbstractTransaction` and it extends `RuntimeException`. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/df914d02/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 b524cbc..5ba7a76 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 @@ -146,6 +146,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; /** @@ -231,6 +232,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)); @@ -358,7 +361,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); }}; } @@ -405,6 +408,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)); @@ -523,7 +528,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/df914d02/gremlin-tools/gremlin-io-test/pom.xml ---------------------------------------------------------------------- diff --git a/gremlin-tools/gremlin-io-test/pom.xml b/gremlin-tools/gremlin-io-test/pom.xml index 60a56dc..afdc79b 100644 --- a/gremlin-tools/gremlin-io-test/pom.xml +++ b/gremlin-tools/gremlin-io-test/pom.xml @@ -168,7 +168,7 @@ writeSupportedV1Objects = { writer, mapper -> } mapper = GraphSONMapper.build(). - addRegistry(TinkerIoRegistry.instance()). + addRegistry(TinkerIoRegistryV1d0.instance()). addCustomModule(new AbstractGraphSONMessageSerializerV1d0.GremlinServerModule()). version(GraphSONVersion.V1_0).create().createMapper() http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/df914d02/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/df914d02/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/df914d02/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/df914d02/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
