You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/04/28 12:47:37 UTC
incubator-tinkerpop git commit: Drop the nextId from the gryo
serialization.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master e7e3cceae -> 3fb1c852c
Drop the nextId from the gryo serialization.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3fb1c852
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3fb1c852
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3fb1c852
Branch: refs/heads/master
Commit: 3fb1c852c2a6d17cc406a9c4782eaa9a34591f94
Parents: e7e3cce
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Apr 28 06:46:06 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 28 06:46:06 2015 -0400
----------------------------------------------------------------------
data/grateful-dead-vertices.kryo | Bin 332385 -> 331418 bytes
data/grateful-dead.kryo | Bin 332385 -> 331418 bytes
data/tinkerpop-classic-vertices.kryo | Bin 729 -> 723 bytes
data/tinkerpop-classic.kryo | Bin 729 -> 723 bytes
data/tinkerpop-crew-vertices.kryo | Bin 1386 -> 1380 bytes
data/tinkerpop-crew.kryo | Bin 1386 -> 1380 bytes
data/tinkerpop-modern-vertices.kryo | Bin 781 -> 775 bytes
data/tinkerpop-modern.kryo | Bin 781 -> 775 bytes
.../util/star/StarGraphSerializer.java | 2 --
gremlin-server/data/sample.kryo | Bin 2416891 -> 2406053 bytes
.../io/gryo/grateful-dead-vertices.kryo | Bin 332385 -> 331418 bytes
.../structure/io/gryo/grateful-dead.kryo | Bin 332385 -> 331418 bytes
.../io/gryo/tinkerpop-classic-vertices.kryo | Bin 729 -> 723 bytes
.../structure/io/gryo/tinkerpop-classic.kryo | Bin 729 -> 723 bytes
.../io/gryo/tinkerpop-crew-vertices.kryo | Bin 1386 -> 1380 bytes
.../structure/io/gryo/tinkerpop-crew.kryo | Bin 1386 -> 1380 bytes
.../io/gryo/tinkerpop-modern-vertices.kryo | Bin 781 -> 775 bytes
.../structure/io/gryo/tinkerpop-modern.kryo | Bin 781 -> 775 bytes
18 files changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fb1c852/data/grateful-dead-vertices.kryo
----------------------------------------------------------------------
diff --git a/data/grateful-dead-vertices.kryo b/data/grateful-dead-vertices.kryo
index 105f6f5..05a9522 100644
Binary files a/data/grateful-dead-vertices.kryo and b/data/grateful-dead-vertices.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fb1c852/data/grateful-dead.kryo
----------------------------------------------------------------------
diff --git a/data/grateful-dead.kryo b/data/grateful-dead.kryo
index 7432c85..ba4fce2 100644
Binary files a/data/grateful-dead.kryo and b/data/grateful-dead.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fb1c852/data/tinkerpop-classic-vertices.kryo
----------------------------------------------------------------------
diff --git a/data/tinkerpop-classic-vertices.kryo b/data/tinkerpop-classic-vertices.kryo
index 4374c77..cf150a1 100644
Binary files a/data/tinkerpop-classic-vertices.kryo and b/data/tinkerpop-classic-vertices.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fb1c852/data/tinkerpop-classic.kryo
----------------------------------------------------------------------
diff --git a/data/tinkerpop-classic.kryo b/data/tinkerpop-classic.kryo
index 4374c77..cf150a1 100644
Binary files a/data/tinkerpop-classic.kryo and b/data/tinkerpop-classic.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fb1c852/data/tinkerpop-crew-vertices.kryo
----------------------------------------------------------------------
diff --git a/data/tinkerpop-crew-vertices.kryo b/data/tinkerpop-crew-vertices.kryo
index b59a890..b26d8b6 100644
Binary files a/data/tinkerpop-crew-vertices.kryo and b/data/tinkerpop-crew-vertices.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fb1c852/data/tinkerpop-crew.kryo
----------------------------------------------------------------------
diff --git a/data/tinkerpop-crew.kryo b/data/tinkerpop-crew.kryo
index b59a890..b26d8b6 100644
Binary files a/data/tinkerpop-crew.kryo and b/data/tinkerpop-crew.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fb1c852/data/tinkerpop-modern-vertices.kryo
----------------------------------------------------------------------
diff --git a/data/tinkerpop-modern-vertices.kryo b/data/tinkerpop-modern-vertices.kryo
index f6ef7c6..5829803 100644
Binary files a/data/tinkerpop-modern-vertices.kryo and b/data/tinkerpop-modern-vertices.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fb1c852/data/tinkerpop-modern.kryo
----------------------------------------------------------------------
diff --git a/data/tinkerpop-modern.kryo b/data/tinkerpop-modern.kryo
index f6ef7c6..5829803 100644
Binary files a/data/tinkerpop-modern.kryo and b/data/tinkerpop-modern.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fb1c852/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphSerializer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphSerializer.java
index 8ab1d4b..6075a58 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphSerializer.java
@@ -65,7 +65,6 @@ public final class StarGraphSerializer extends Serializer<StarGraph> {
@Override
public void write(final Kryo kryo, final Output output, final StarGraph starGraph) {
- kryo.writeObject(output, starGraph.nextId);
kryo.writeObjectOrNull(output, starGraph.edgeProperties, HashMap.class);
kryo.writeObjectOrNull(output, starGraph.metaProperties, HashMap.class);
kryo.writeClassAndObject(output, starGraph.starVertex.id);
@@ -89,7 +88,6 @@ public final class StarGraphSerializer extends Serializer<StarGraph> {
@Override
public StarGraph read(final Kryo kryo, final Input input, final Class<StarGraph> aClass) {
final StarGraph starGraph = StarGraph.open();
- starGraph.nextId = kryo.readObject(input, Long.class);
starGraph.edgeProperties = kryo.readObjectOrNull(input, HashMap.class);
starGraph.metaProperties = kryo.readObjectOrNull(input, HashMap.class);
starGraph.addVertex(T.id, kryo.readClassAndObject(input), T.label, kryo.readObject(input, String.class));
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fb1c852/gremlin-server/data/sample.kryo
----------------------------------------------------------------------
diff --git a/gremlin-server/data/sample.kryo b/gremlin-server/data/sample.kryo
index a18e336..659b003 100644
Binary files a/gremlin-server/data/sample.kryo and b/gremlin-server/data/sample.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fb1c852/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-vertices.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-vertices.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-vertices.kryo
index 105f6f5..05a9522 100644
Binary files a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-vertices.kryo and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead-vertices.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fb1c852/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead.kryo
index 7432c85..ba4fce2 100644
Binary files a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead.kryo and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fb1c852/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-vertices.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-vertices.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-vertices.kryo
index 4374c77..cf150a1 100644
Binary files a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-vertices.kryo and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic-vertices.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fb1c852/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic.kryo
index 4374c77..cf150a1 100644
Binary files a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic.kryo and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-classic.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fb1c852/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-vertices.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-vertices.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-vertices.kryo
index b59a890..b26d8b6 100644
Binary files a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-vertices.kryo and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew-vertices.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fb1c852/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew.kryo
index b59a890..b26d8b6 100644
Binary files a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew.kryo and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-crew.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fb1c852/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-vertices.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-vertices.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-vertices.kryo
index f6ef7c6..5829803 100644
Binary files a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-vertices.kryo and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern-vertices.kryo differ
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fb1c852/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern.kryo
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern.kryo b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern.kryo
index f6ef7c6..5829803 100644
Binary files a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern.kryo and b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-modern.kryo differ