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/11/04 13:43:36 UTC
[5/9] incubator-tinkerpop git commit: Merge branch 'master' into
TINKERPOP3-909
Merge branch 'master' into TINKERPOP3-909
Resolved Conflicts:
CHANGELOG.asciidoc
docs/src/upgrade-release-3.1.x-incubating.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/e29a9362
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/e29a9362
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/e29a9362
Branch: refs/heads/master
Commit: e29a9362beb2cb2784a547b7f9e1e5d589c83d47
Parents: ccc3bfc 19b7ae0
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Sun Nov 1 22:15:04 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Sun Nov 1 22:15:04 2015 +0100
----------------------------------------------------------------------
CHANGELOG.asciidoc | 4 +-
docs/src/developer-meetings.asciidoc | 64 ++++++++++++++++++++
docs/src/developer-release.asciidoc | 13 ++--
docs/src/developer.asciidoc | 4 +-
docs/src/gremlin-applications.asciidoc | 7 +++
.../upgrade-release-3.1.x-incubating.asciidoc | 5 ++
.../traversal/step/map/AddVertexTest.java | 2 +-
neo4j-gremlin/pom.xml | 28 ++++++++-
.../gremlin/neo4j/structure/Neo4jGraph.java | 2 +-
.../gremlin/neo4j/structure/Neo4jHelper.java | 16 ++---
.../gremlin/neo4j/Neo4jStrategySuite.java | 44 --------------
.../gremlin/neo4j/Neo4jStrategyTest.java | 31 ----------
.../traversal/strategy/Neo4jStrategySuite.java | 44 ++++++++++++++
.../traversal/strategy/Neo4jStrategyTest.java | 32 ++++++++++
.../Neo4jGraphStepStrategyTest.java | 13 ++++
.../tinkergraph/structure/TinkerGraph.java | 2 +-
.../tinkergraph/TinkerGraphStrategySuite.java | 44 --------------
.../tinkergraph/TinkerGraphStrategyTest.java | 31 ----------
.../strategy/TinkerGraphStrategySuite.java | 44 ++++++++++++++
.../strategy/TinkerGraphStrategyTest.java | 32 ++++++++++
.../TinkerGraphStepStrategyTest.java | 13 ++++
21 files changed, 305 insertions(+), 170 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e29a9362/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 6f7c50e,06d0db4..84cb9f5
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -25,10 -25,11 +25,12 @@@ image::https://raw.githubusercontent.co
TinkerPop 3.1.0 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Integrated `NumberHelper` in `SumStep`, `MinStep`, `MaxStep` and `MeanStep` (local and global step variants).
+ * Bumped to Neo4j 2.3.0.
* Renamed the `public static String` configuration variable names of TinkerGraph (deprecated old variables).
* Added `GraphComputer.config(key,value)` to allow engine-specific configurations.
- * Added suppport for mid-traversal `V()`-steps (`GraphStep` semantics updated).
+ * `GraphStep` is no longer in the `sideEffect`-package and is now in `map`-package (breaking change).
+ * Added support for mid-traversal `V()`-steps (`GraphStep` semantics updated).
* Fixed `Number` handling in `Operator` enums. Prior this change a lot of operations on mixed `Number` types returned a wrong result (wrong data type).
* Fixed a bug in Gremlin Server/Driver serializer where empty buffers were getting returned in certain cases.
* Renamed `ConjunctionX` to `ConnectiveX` because "conjunction" is assumed "and" (disjunction "or"), where "connective" is the parent concept.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e29a9362/docs/src/upgrade-release-3.1.x-incubating.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/upgrade-release-3.1.x-incubating.asciidoc
index 7043d74,b50dd7e..00be151
--- a/docs/src/upgrade-release-3.1.x-incubating.asciidoc
+++ b/docs/src/upgrade-release-3.1.x-incubating.asciidoc
@@@ -35,7 -35,7 +35,8 @@@ Additional upgrade information can be f
Important Changes
~~~~~~~~~~~~~~~~~
+* `sum()`, `min()`, `max()` and `mean()` make now use of `NumberHelper`, leading to a more appropriate result type, instead of just `Double`.
+ * `GraphStep` is no longer in `sideEffect`-package, but now in `map`-package as traversals support mid-traversal `V()`.
* Traversals now support mid-traversal `V()`-steps. Graph system providers should ensure that a mid-traversal `V()` can leverage any suitable index.
* The data type of `Operator` enums will now always be the highest common data type of the two given numbers, rather than the data type of the first number, as it's been before.
* The Gephi Plugin has improved integration with Gephi, where manually inserting `store` steps to visualize a running traversal is no longer required.