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 2016/01/04 21:24:17 UTC
[9/9] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/TINKERPOP-1064'
Merge remote-tracking branch 'origin/TINKERPOP-1064'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/46c7189e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/46c7189e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/46c7189e
Branch: refs/heads/master
Commit: 46c7189e29a7ae22195106fca59ce248ae715a58
Parents: f4be739 f8dc1aa
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jan 4 15:23:48 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jan 4 15:23:48 2016 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../src/reference/gremlin-applications.asciidoc | 10 +-
.../upgrade/release-3.1.x-incubating.asciidoc | 15 +++
.../structure/io/gryo/GryoClassResolver.java | 2 +-
.../gremlin/structure/io/gryo/GryoMapper.java | 25 +++-
.../tinkerpop/gremlin/structure/io/IoX.java | 5 +
.../gremlin/structure/io/IoXIoRegistry.java | 57 +++++++++
.../tinkerpop/gremlin/structure/io/IoY.java | 5 +
.../gremlin/structure/io/IoYIoRegistry.java | 39 +++++++
.../structure/io/gryo/GryoMapperTest.java | 113 ++++++++++++++++++
.../AbstractGraphSONMessageSerializerV1d0.java | 5 +-
.../driver/ser/AbstractMessageSerializer.java | 82 +++++++++++++
.../driver/ser/GryoMessageSerializerV1d0.java | 49 +++-----
...raphSONMessageSerializerGremlinV1d0Test.java | 5 +-
.../ser/GraphSONMessageSerializerV1d0Test.java | 60 ++++++++++
.../ser/GryoMessageSerializerV1d0Test.java | 115 ++++++++++++++++++-
16 files changed, 544 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/46c7189e/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index e131b81,5d0feae..43fb4b6
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -27,9 -27,9 +27,10 @@@ TinkerPop 3.1.1 (NOT OFFICIALLY RELEASE
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Execute the `LifeCycle.beforeEval()` in the same thread that `eval()` is executed in for `GremlinExecutor`.
+* Improved error handling of Gremlin Console initialization scripts to better separate errors in initialization script I/O versus execution of the script itself.
* Fixed a bug in `Graph.OptOut` when trying to opt-out of certain test cases with the `method` property set to "*".
* Added another `BulkLoader` implementation (`OneTimeBulkLoader`) that doesn't store temporary properties in the target graph.
+ * Added option to allow for a custom `ClassResolver` to be assigned to a `GryoMapper` instance.
* Fixed a `SparkGraphComputer` sorting bug in MapReduce that occurred when there was more than one partition.
* Added `strictTransactionManagement` to the Gremlin Server settings to indicate that the `aliases` parameter must be passed on requests and that transaction management will be scoped to the graphs provided in that argument.
* Fixed a `NullPointerException` bug in `PeerPressureVertexProgram` that occurred when an adjacency traversal was not provided.