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 2017/07/13 19:18:59 UTC

[3/3] tinkerpop git commit: Merge branch 'TINKERPOP-1720'

Merge branch 'TINKERPOP-1720'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3d2aea49
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3d2aea49
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3d2aea49

Branch: refs/heads/master
Commit: 3d2aea49fc3c5cbe1780f1ac94aaf12b4a838a96
Parents: 55f7c37 f463fc6
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Jul 13 13:18:52 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Jul 13 13:18:52 2017 -0600

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  2 ++
 docs/src/upgrade/release-3.3.x.asciidoc         | 13 ++++++++--
 .../traversal/step/VertexComputing.java         |  8 ------
 .../step/map/TraversalVertexProgramStep.java    |  8 ------
 .../traversal/step/map/VertexProgramStep.java   |  2 +-
 .../tinkerpop/gremlin/hadoop/Constants.java     | 15 -----------
 .../hadoop/structure/HadoopConfiguration.java   | 26 +++-----------------
 .../computer/SparkHadoopGraphProvider.java      |  6 ++---
 8 files changed, 21 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3d2aea49/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 0477f74,4d9b1a5..b546093
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,14 -26,8 +26,16 @@@ 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`).
+ * Removed previously deprecated `Constants` in Hadoop.
+ * Removed previously deprecated `VertexComputing.generateComputer(Graph)`.
  * 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/3d2aea49/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/upgrade/release-3.3.x.asciidoc
index 7d54669,566605d..a3a53cf
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@@ -225,22 -216,7 +225,23 @@@ 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`
 +** `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)`
 +** `org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.LazyBarrierStrategy`
 +** `org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects` (various methods)
+ ** `org.apache.tinkerpop.gremlin.process.computer.traversal.step.VertexComputing#generateComputer(Graph)`
  ** `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`
@@@ -344,9 -318,7 +352,10 @@@ 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-1706[TINKERPOP-1706]
++link:https://issues.apache.org/jira/browse/TINKERPOP-1706[TINKERPOP-1706],
 +link:https://issues.apache.org/jira/browse/TINKERPOP-1721[TINKERPOP-1721],
- link:https://issues.apache.org/jira/browse/TINKERPOP-1719[TINKERPOP-1719]
++link:https://issues.apache.org/jira/browse/TINKERPOP-1719[TINKERPOP-1719],
+ link:https://issues.apache.org/jira/browse/TINKERPOP-1720[TINKERPOP-1720]
  
  Gremlin-server.sh and Init Scripts
  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3d2aea49/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/Constants.java
----------------------------------------------------------------------