You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2015/04/20 16:17:52 UTC

[15/23] incubator-tinkerpop git commit: Modified the Gryo header.

Modified the Gryo header.

Reduced its size from 32 to 16 bytes.  Dropped the version stamp as it really wasn't useful or serving the intended purpose.  Simplified GryoMapper considerably.  Regenerated all data files based on the change.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/19f83de1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/19f83de1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/19f83de1

Branch: refs/heads/io-docs
Commit: 19f83de194e3dc854afb29b057120407dd3705db
Parents: 8122b15
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Apr 17 11:56:52 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Apr 17 11:56:52 2015 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |   2 +
 README.asciidoc                                 |   1 +
 data/grateful-dead-vertices.kryo                | Bin 1028298 -> 975214 bytes
 data/grateful-dead-vertices.ldjson              | 422 +++++++++----------
 data/grateful-dead.kryo                         | Bin 515409 -> 493339 bytes
 data/tinkerpop-classic-typed.json               |   2 +-
 data/tinkerpop-classic-vertices.kryo            | Bin 1323 -> 1179 bytes
 data/tinkerpop-classic-vertices.ldjson          |  12 +-
 data/tinkerpop-classic.json                     |   2 +-
 data/tinkerpop-classic.kryo                     | Bin 817 -> 765 bytes
 data/tinkerpop-crew-vertices.kryo               | Bin 2743 -> 2575 bytes
 data/tinkerpop-crew.kryo                        | Bin 1916 -> 1858 bytes
 data/tinkerpop-modern-vertices.kryo             | Bin 1439 -> 1295 bytes
 data/tinkerpop-modern.kryo                      | Bin 877 -> 825 bytes
 .../gremlin/structure/io/gryo/GryoMapper.java   | 206 +--------
 .../gremlin/structure/io/gryo/GryoReader.java   |  16 +-
 .../gremlin/structure/io/gryo/GryoWriter.java   |  14 +-
 .../driver/ser/GryoMessageSerializerV1d0.java   |  19 +-
 .../structure/io/graphml/grateful-dead.xml      |  18 +-
 .../structure/io/graphml/tinkerpop-classic.xml  |  18 +-
 .../structure/io/graphml/tinkerpop-modern.xml   |  18 +-
 .../graphson/tinkerpop-classic-normalized.json  |   2 +-
 .../io/graphson/tinkerpop-classic-typed.json    |   2 +-
 .../io/graphson/tinkerpop-classic.json          |   2 +-
 .../io/gryo/grateful-dead-vertices.kryo         | Bin 1028298 -> 975214 bytes
 .../structure/io/gryo/grateful-dead.kryo        | Bin 515409 -> 493339 bytes
 .../io/gryo/tinkerpop-classic-vertices.kryo     | Bin 1323 -> 1179 bytes
 .../structure/io/gryo/tinkerpop-classic.kryo    | Bin 817 -> 765 bytes
 .../io/gryo/tinkerpop-crew-vertices.kryo        | Bin 2743 -> 2575 bytes
 .../structure/io/gryo/tinkerpop-crew.kryo       | Bin 1916 -> 1858 bytes
 .../io/gryo/tinkerpop-modern-vertices.kryo      | Bin 1439 -> 1295 bytes
 .../structure/io/gryo/tinkerpop-modern.kryo     | Bin 877 -> 825 bytes
 .../structure/io/gryo/GryoRecordReader.java     |   8 +-
 tinkergraph-gremlin/pom.xml                     |   2 +-
 .../tinkergraph/structure/TinkerGraphTest.java  |   4 +-
 35 files changed, 272 insertions(+), 498 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19f83de1/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 54cf4e8..282f561 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -32,6 +32,8 @@ TinkerPop 3.0.0.M9 (NOT OFFICIALLY RELEASED YET)
 * Changed the `gremlin.tests` environment variable for test filtering to the more standard convention of `GREMLIN_TESTS` and made it work for all test suites.
 * Removed `back()`-step as `select()`-step provides the same behavior with more intelligent optimizations and `by()`-modulation.
 * Removed `Graph.Helper` method annotation and related infrastructure in tests.
+* Modified header of Gryo to be 16 bytes instead of 32 (and removed the version stamp).
+* Removed the concept of handling version in Gryo via the builder as it wasn't really accomplishing the capability of ensuring backward compatibility.
 * Moved `Exceptions.propertyRemovalNotSupported` from `Element` to `Property` for consistency.
 * Provided a method for Gremlin Server to bind `TraversalSource` objects for use in scripts.
 * Modified the reference implementation for dealing with "custom" identifier serialization in GraphSON - See `IoTest.CustomId` for the example.

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19f83de1/README.asciidoc
----------------------------------------------------------------------
diff --git a/README.asciidoc b/README.asciidoc
index d3d81b8..b8ead67 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -39,6 +39,7 @@ mvn -Dmaven.javadoc.skip=true --projects tinkergraph-gremlin test
 ----
 ** Clean the `.groovy/grapes/org.apache.tinkerpop` directory on build: `mvn clean install -DcleanGrapes`
 * Regenerate test data (only necessary given changes to IO classes): `mvn clean install -Dio` from `tinkergraph-gremlin` directory
+** If there are changes to the Gryo format, it may be necessary to generate the Grateful Dead dataset from GraphSON (see `TinkerGraphTest.shouldWriteGratefulDead`)
 * Check license headers are present: `mvn apache-rat:check`
 * Build AsciiDocs: `docs/preprocessor/preprocess.sh && mvn process-resources -Dasciidoc`
 * Build JavaDocs: `mvn process-resources -Djavadoc`

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/19f83de1/data/grateful-dead-vertices.kryo
----------------------------------------------------------------------
diff --git a/data/grateful-dead-vertices.kryo b/data/grateful-dead-vertices.kryo
index 2031c24..f4786ec 100644
Binary files a/data/grateful-dead-vertices.kryo and b/data/grateful-dead-vertices.kryo differ