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/09/03 17:33:40 UTC
[20/31] incubator-tinkerpop git commit: Merge branch 'blvp' into tp30
Merge branch 'blvp' into tp30
Resolved Conflicts:
CHANGELOG.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/f0992f22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/f0992f22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/f0992f22
Branch: refs/heads/master
Commit: f0992f2257ec356eac3135197f1bb3ed81db8da1
Parents: 0c826bb f9ac298
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Sep 1 16:25:10 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Sep 1 16:25:10 2015 +0200
----------------------------------------------------------------------
CHANGELOG.asciidoc | 4 +-
.../gremlin/process/computer/VertexProgram.java | 4 +
.../computer/bulkloading/BulkLoader.java | 115 ++++++
.../bulkloading/BulkLoaderVertexProgram.java | 407 +++++++++++++++++++
.../bulkloading/IncrementalBulkLoader.java | 150 +++++++
.../util/AbstractVertexProgramBuilder.java | 5 +-
.../tinkerpop/gremlin/structure/Graph.java | 13 +
.../gremlin/structure/io/gryo/GryoMapper.java | 19 +-
.../structure/io/gryo/PairSerializer.java | 42 ++
.../process/GroovyProcessComputerSuite.java | 23 +-
.../AbstractImportCustomizerProvider.java | 2 +
.../gremlin/process/ProcessComputerSuite.java | 2 +
.../BulkLoaderVertexProgramTest.java | 81 ++++
.../gremlin/neo4j/structure/Neo4jGraph.java | 5 +
.../tinkergraph/structure/TinkerGraph.java | 5 +
15 files changed, 865 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f0992f22/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index d20c2fc,234d431..e7da592
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -25,9 -25,7 +25,11 @@@ image::http://www.tinkerpop.com/docs/cu
TinkerPop 3.0.1 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++* Added `BulkLoaderVertexProgram` and a default bulk loader implementation: `IncrementalBulkLoader`
+* `Compare` now uses `BigDecimal` internally to ensure that precision is not lost on standard number comparisons.
+* Renamed `ComputerVerificationStrategy` to `VerificationStrategy` so all the verification strategies can use it.
+* Added `StandardVerificationStrategy` that throws exceptions for illegal traversal patterns on the standard engine (which extends to `GraphComputer`).
+ * Added `GraphFeatures.supportsConcurrentAccess()` to allows `Graph` implementations to signify if multiple instances can access the same data.
* Clarified semantics of `Transaction.close()` in unit tests - now refers only to closing the current transaction in the current thread.
* `Neo4jGraph` no longer uses `OptOut` on `TransactionTest.shouldRollbackOnCloseWhenConfigured` (formerly `shouldRollbackOnShutdownWhenConfigured`)
* Gremlin Server initialization scripts can now return a `Map` of values that will become global bindings for the server.
@@@ -722,4 -720,4 +724,4 @@@ TinkerPop 3.0.0.M2 (Release Date: Septe
TinkerPop 3.0.0.M1 (Release Date: August 12, 2014)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--* First official release of TinkerPop3 and thus, no changes.
++* First official release of TinkerPop3 and thus, no changes.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f0992f22/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
----------------------------------------------------------------------