You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/02/11 03:50:11 UTC
[4/5] incubator-tinkerpop git commit: Merge branch 'master' into
optimize-count-filter
Merge branch 'master' into optimize-count-filter
Resolved Conflicts:
CHANGELOG.asciidoc
gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraversalStrategies.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/6086a596
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/6086a596
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/6086a596
Branch: refs/heads/master
Commit: 6086a5968d458ed0a27845b306cd497b6ce4d581
Parents: f8bfafc a348e6b
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Feb 11 03:40:35 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Feb 11 03:40:35 2015 +0100
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
CLA.txt | 138 -------------------
CONTRIBUTING.asciidoc | 5 +-
.../tinkerpop/gremlin/process/Traversal.java | 2 +-
.../process/computer/ComputerResult.java | 32 ++---
.../gremlin/process/computer/GraphComputer.java | 2 +-
.../gremlin/process/computer/MapReduce.java | 2 +-
.../peerpressure/PeerPressureVertexProgram.java | 18 ++-
.../ranking/pagerank/PageRankVertexProgram.java | 7 +-
.../traversal/step/map/ComputerResultStep.java | 2 +-
.../computer/util/DefaultComputerResult.java | 60 ++++++++
.../computer/util/GraphComputerHelper.java | 5 +-
.../process/computer/util/MemoryHelper.java | 5 +-
.../computer/util/VertexProgramHelper.java | 7 +-
.../traversal/step/filter/ConjunctionStep.java | 84 +++++++++++
.../FilterByCountOptimizerStrategy.java | 101 ++++++++++++++
.../process/traversal/DefaultTraversal.java | 7 +-
.../com/tinkerpop/gremlin/structure/Vertex.java | 22 ++-
.../gremlin/structure/VertexProperty.java | 4 +
.../gremlin/structure/util/ElementHelper.java | 7 +-
.../gremlin/structure/util/StringFactory.java | 10 +-
.../structure/util/batch/BatchGraph.java | 5 -
.../groovy/loaders/SugarLoaderTest.groovy | 2 +-
.../computer/GroovyGraphComputerTest.groovy | 10 +-
.../jsr223/GremlinGroovyScriptEngineTest.java | 4 +-
.../gremlin/groovy/loaders/SugarLoader.groovy | 2 +-
.../AbstractImportCustomizerProvider.java | 4 +-
.../groovy/engine/GroovyTraversalScript.java | 2 +-
.../process/computer/GraphComputerTest.java | 5 +-
.../ranking/PageRankVertexProgramTest.java | 1 +
.../structure/StructureStandardSuite.java | 4 +-
.../gremlin/structure/TransactionTest.java | 8 +-
.../gremlin/structure/VertexPropertyTest.java | 72 +++++++++-
.../tinkerpop/gremlin/structure/VertexTest.java | 4 +-
.../process/graph/step/util/TreeTest.java | 97 -------------
.../step/filter/ConjunctionStepTest.java | 68 +++++++++
.../gremlin/process/graph/util/TreeTest.java | 96 +++++++++++++
.../groovy/plugin/HadoopRemoteAcceptor.java | 2 +-
.../computer/giraph/GiraphComputeVertex.java | 3 +-
.../computer/giraph/GiraphGraphComputer.java | 3 +-
.../process/computer/util/MapReduceHelper.java | 5 +-
.../hadoop/structure/util/HadoopHelper.java | 5 +-
.../gremlin/neo4j/structure/Neo4jGraph.java | 27 ++--
.../gremlin/neo4j/structure/Neo4jHelper.java | 5 +-
.../gremlin/neo4j/structure/Neo4jVertex.java | 32 -----
.../gremlin/neo4j/structure/Neo4jGraphTest.java | 8 +-
.../process/computer/TinkerComputerResult.java | 39 ++++++
.../process/computer/TinkerGraphComputer.java | 2 +-
.../tinkergraph/structure/TinkerGraph.java | 21 ++-
.../tinkergraph/structure/TinkerHelper.java | 9 +-
.../tinkergraph/structure/TinkerGraphTest.java | 2 +-
51 files changed, 686 insertions(+), 382 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6086a596/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 5ef1b4b,fd2138d..4c7fccd
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -9,7 -9,8 +9,8 @@@ image::http://www.tinkerpop.com/docs/cu
TinkerPop 3.0.0.M8 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * Added `VertexProperty.Cardinality` with `list`, `set`, and `single`. No more `Vertex.singleProperty()` method.
-* Added `FilterByCountOptimizerStrategy` that adds a `RangeStep` in front of `.count().is(<predicate>, <value>)` to minimize the amount of fetched elements.
+* Added `RangeByIsCountStrategy` that adds a `RangeStep` in front of `.count().is(<predicate>, <value>)` to minimize the amount of fetched elements.
* Added `CoalesceStep` / `.coalesce()` that emits the first traversal which emits at least one element.
* Added more syntactic sugar tricks to the Gremlin sugar plugin -- `&`, `|`, `select from`, `gt`, etc.
* `Traversal.Admin` is consistent internal to steps, traversals, strategies, etc. For the user, `Traversal` is all they see.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6086a596/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6086a596/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------