Merge branch 'TINKERPOP-1719'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/add211a6 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/add211a6 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/add211a6 Branch: refs/heads/master Commit: add211a69b355061ca6fcef8754e97ea3c16c292 Parents: 4a88979 ef2ca2a Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Thu Jul 13 09:17:02 2017 -0600 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Thu Jul 13 09:17:02 2017 -0600 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 2 + docs/src/upgrade/release-3.3.x.asciidoc | 8 +- .../traversal/MemoryTraversalSideEffects.java | 12 -- .../AbstractRemoteTraversalSideEffects.java | 10 -- .../process/traversal/TraversalSideEffects.java | 72 ------------ .../traversal/step/sideEffect/SubgraphStep.java | 16 ++- .../finalization/LazyBarrierStrategy.java | 111 ------------------- .../util/DefaultTraversalSideEffects.java | 46 -------- .../util/EmptyTraversalSideEffects.java | 11 -- 9 files changed, 19 insertions(+), 269 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/add211a6/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --cc CHANGELOG.asciidoc index 9c39fc1,37afd9c..45ed003 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -26,12 -26,8 +26,14 @@@ image::https://raw.githubusercontent.co TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* Removed previously deprecated `DetachedEdge(Object,String,Map,Pair,Pair)` constructor. +* Removed previously deprecated `Bindings` constructor. It is now a private constructor. +* Removed previously deprecated `TraversalSource.withBindings()`. +* Removed previously deprecated `GraphTraversal.sack(BiFunction,String)`. +* `TraversalMetrics` and `Metrics` Gryo 1.0 formats changed given internal changes to their implementations. +* Made `TraversalMetrics` safe to write to from multiple threads. + * Removed previously deprecated `TraversalSideEffects` methods. + * Removed previously deprecated `finalization.LazyBarrierStrategy` (moved to `optimization.LazyBarrierStrategy`). * Established the Gryo 3.0 format. * `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`. * `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/add211a6/docs/src/upgrade/release-3.3.x.asciidoc ---------------------------------------------------------------------- diff --cc docs/src/upgrade/release-3.3.x.asciidoc index 81c618e,f039793..e6b9b26 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@@ -217,23 -216,8 +217,22 @@@ The following deprecated classes, metho ** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper` - <<<<<<< 849563fe3773d504d6ba2f61ee640547277760de +** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyDecr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.GraphTraversal.mapKeys()` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.GraphTraversal.mapValues()` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addV(Object...)` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addE(Direction, String, String, Object...)` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addOutE(String, String, Object...)` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addInV(String, String, Object...)` +** `org.apache.tinkerpop.gremlin.process.traversal.Bindings()` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource#withBindings(Bindings)` +** `org.apache.tinkerpop.gremlin.structure.Transaction.submit(Function)` - ======= +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#sack(BiFunction,String)` - >>>>>>> removed deprecated sack() function. + ** `org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.LazyBarrierStrategy` + ** `org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects` (various methods) ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY` ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD` @@@ -328,11 -312,7 +327,12 @@@ link:https://issues.apache.org/jira/bro link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651], link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694], link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700], +link:https://issues.apache.org/jira/browse/TINKERPOP-1142[TINKERPOP-1142], +link:https://issues.apache.org/jira/browse/TINKERPOP-1291[TINKERPOP-1291], +link:https://issues.apache.org/jira/browse/TINKERPOP-832[TINKERPOP-832], +link:https://issues.apache.org/jira/browse/TINKERPOP-1721[TINKERPOP-1721], - link:https://issues.apache.org/jira/browse/TINKERPOP-834[TINKERPOP-834] ++link:https://issues.apache.org/jira/browse/TINKERPOP-834[TINKERPOP-834], + link:https://issues.apache.org/jira/browse/TINKERPOP-1719[TINKERPOP-1719] Gremlin-server.sh and Init Scripts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^