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/11/07 15:33:26 UTC
[02/15] incubator-tinkerpop git commit: Merge branch 'master' into
TINKERPOP-886
Merge branch 'master' into TINKERPOP-886
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/5b0dd760
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/5b0dd760
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/5b0dd760
Branch: refs/heads/TINKERPOP3-885
Commit: 5b0dd760a7d1c8609ffda2a415c18d541b2e51ff
Parents: 8ea6aa2 17d4489
Author: Dylan Millikin <dy...@brightzone.fr>
Authored: Wed Oct 21 14:31:16 2015 +0200
Committer: Dylan Millikin <dy...@brightzone.fr>
Committed: Wed Oct 21 14:31:16 2015 +0200
----------------------------------------------------------------------
CHANGELOG.asciidoc | 5 +
docs/src/the-traversal.asciidoc | 4 +-
.../upgrade-release-3.1.x-incubating.asciidoc | 45 +++++
.../gremlin/process/traversal/Traversal.java | 10 +
.../process/traversal/TraversalStrategies.java | 4 +-
.../traversal/dsl/graph/GraphTraversal.java | 4 +-
.../dsl/graph/GraphTraversalSource.java | 49 ++---
.../lambda/AbstractLambdaTraversal.java | 7 +
.../process/traversal/step/filter/AndStep.java | 2 +-
.../traversal/step/filter/ConjunctionStep.java | 81 --------
.../traversal/step/filter/ConnectiveStep.java | 81 ++++++++
.../process/traversal/step/filter/OrStep.java | 2 +-
.../step/filter/WherePredicateStep.java | 10 +-
.../step/filter/WhereTraversalStep.java | 6 +-
.../process/traversal/step/map/MatchStep.java | 40 ++--
.../traversal/step/util/PathIdentityStep.java | 48 -----
.../decoration/ConjunctionStrategy.java | 114 ------------
.../strategy/decoration/ConnectiveStrategy.java | 114 ++++++++++++
.../AdjacentToIncidentStrategy.java | 4 +-
.../optimization/RangeByIsCountStrategy.java | 6 +-
.../B_LP_O_P_S_SE_SL_TraverserGenerator.java | 8 +-
.../B_LP_O_S_SE_SL_TraverserGenerator.java | 8 +-
.../B_O_S_SE_SL_TraverserGenerator.java | 8 +-
.../traverser/B_O_TraverserGenerator.java | 6 +-
.../traverser/LP_O_OB_P_S_SE_SL_Traverser.java | 98 ++++++++++
.../LP_O_OB_P_S_SE_SL_TraverserGenerator.java | 62 +++++++
.../traverser/LP_O_OB_S_SE_SL_Traverser.java | 99 ++++++++++
.../LP_O_OB_S_SE_SL_TraverserGenerator.java | 61 +++++++
.../traverser/O_OB_S_SE_SL_Traverser.java | 137 ++++++++++++++
.../O_OB_S_SE_SL_TraverserGenerator.java | 59 ++++++
.../traverser/O_TraverserGenerator.java | 2 +-
.../traverser/TraverserRequirement.java | 8 +-
.../util/DefaultTraverserGeneratorFactory.java | 34 +++-
.../gremlin/process/traversal/util/AndP.java | 3 +-
.../process/traversal/util/ConjunctionP.java | 117 ------------
.../process/traversal/util/ConnectiveP.java | 115 ++++++++++++
.../traversal/util/DefaultTraversal.java | 27 +++
.../process/traversal/util/EmptyTraversal.java | 5 +
.../gremlin/process/traversal/util/OrP.java | 2 +-
.../process/traversal/util/TraversalHelper.java | 4 +-
.../gremlin/structure/io/gryo/GryoMapper.java | 10 +-
.../traversal/step/map/MatchStepTest.java | 6 +-
.../decoration/ConjunctionStrategyTest.java | 183 -------------------
.../decoration/ConnectiveStrategyTest.java | 183 +++++++++++++++++++
.../DefaultTraverserGeneratorFactoryTest.java | 85 +++++++++
.../step/sideEffect/GroovySackTest.groovy | 5 +
...linGroovyScriptEngineTimedInterruptTest.java | 6 +-
.../traversal/step/sideEffect/SackTest.java | 25 ++-
.../TinkerGraphNoStrategyComputerProvider.java | 4 +-
.../process/TinkerGraphNoStrategyProvider.java | 4 +-
50 files changed, 1352 insertions(+), 658 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/5b0dd760/docs/src/upgrade-release-3.1.x-incubating.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/upgrade-release-3.1.x-incubating.asciidoc
index e3d8115,c2425a3..4dd1673
--- a/docs/src/upgrade-release-3.1.x-incubating.asciidoc
+++ b/docs/src/upgrade-release-3.1.x-incubating.asciidoc
@@@ -55,14 -57,39 +57,50 @@@ to closing where a user must now explic
See link:https://issues.apache.org/jira/browse/TINKERPOP3-805[TINKERPOP3-805] for more information.
++<<<<<<< HEAD
+Transaction.onReadWrite() and Transaction.onClose() are now `ThreadLocal` settings
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+The `Transaction.onReadWrite()` and `Transaction.onClose()` settings now need to be set for each thread (if another behavior than the default is desired).
+For gremlin-server users that may be changing these settings via scripts :
+If the settings are changed from a sessionless request they will now only apply to that one request.
+If the settings are changed from an in-session request they will now only apply to all future requests made in the scope of that session.
+
++=======
+ Gremlin Process
+ ^^^^^^^^^^^^^^^
+
+ Graph Traversal Updates
+ +++++++++++++++++++++++
+
+ * `ConjunctionStrategy` has been renamed to `ConnectiveStrategy` (no other behaviors changed).
+ * `ConjunctionP` has been renamed to `ConnectiveP` (no other behaviors changed).
+ * `DedupBijectionStrategy` has been renamed (and made more effective) as `FilterRankingStrategy`.
+ * The `GraphTraversal` mutation API has change significantly with all previous methods being supported but deprecated.
+ ** The general pattern used now is `addE('knows').from(select('a')).to(select('b')).property('weight',1.0)`.
+ * The `GraphTraversal` sack API has changed with all previous methods being supported but deprecated.
+ ** The old `sack(mult,'weight')` is now `sack(mult).by('weight')`.
+ * `GroupStep` has been redesigned such that there is now only a key- and value-traversal. No more reduce-traversal.
+ ** The previous `group()`-methods have been renamed to `groupV3d0()`. To immediately upgrade, rename all your `group()`-calls to `groupV3d0()`.
+ ** To migrate to the new `group()`-methods, what was `group().by('age').by(outE()).by(sum(local))` is now `group().by('age').by(outE().sum())`.
+ * There was a bug in `fold()`, where if a bulked traverser was provided, the traverser was only represented once.
+ ** This bug fix might cause a breaking change to a user query if the non-bulk behavior was being counted on. If so, used `dedup()` prior to `fold()`.
+ * Both `GraphTraversal().mapKeys()` and `GraphTraversal.mapValues()` has been deprecated.
+ ** Use `select(keys)` and `select(columns)`. However, note that `select()` will not unroll the keys/values. Thus, `mapKeys()` => `select(keys).unfold()`.
+
+ Gremlin-Groovy Updates
+ ++++++++++++++++++++++
+
+ * The closure wrappers classes `GFunction`, `GSupplier`, `GConsumer` have been deprecated.
+ ** In Groovy, a closure can be specified using `as Function` and thus, these wrappers are not needed.
+
+ Hadoop-Gremlin Updates
+ ++++++++++++++++++++++
+
+ * Hadoop1 is no longer supported. Hadoop2 is now the only supported Hadoop version in TinkerPop.
+ * The directory where application jars are stored in HDFS is now `hadoop-gremlin-x.y.z-libs`.
+ ** This versioning is important so that cross-version TinkerPop use does not cause jar conflicts.
++>>>>>>> master
Upgrading for Providers
~~~~~~~~~~~~~~~~~~~~~~~
@@@ -83,12 -110,7 +121,19 @@@ If these tests were referenced in an `O
See link:https://issues.apache.org/jira/browse/TINKERPOP3-805[TINKERPOP3-805] for more information.
++<<<<<<< HEAD
+Driver Implementers
+^^^^^^^^^^^^^^^^^^^
+
+Transaction.onReadWrite() and Transaction.onClose() are now `ThreadLocal` settings
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+If your driver configures the `Transaction.onReadWrite()` or `Transaction.onClose()` settings, note that these no longer apply to all future requests.
+If the settings are changed from a sessionless request they will only apply to that one request.
+If the settings are changed from an in-session request they will only apply to all future requests made in the scope of that session.
++=======
+ Graph Traversal Updates
+ +++++++++++++++++++++++
+
-There were numerous changes to the `GraphTraversal` API. Nearly all changes are backwards compatible with respective "deprecated" annotations. Please review the respective updates specified in the "Graph System Users" section.
++There were numerous changes to the `GraphTraversal` API. Nearly all changes are backwards compatible with respective "deprecated" annotations. Please review the respective updates specified in the "Graph System Users" section.
++>>>>>>> master