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 2017/07/13 10:18:34 UTC

[13/13] tinkerpop git commit: Merge branch 'TINKERPOP-1686'

Merge branch 'TINKERPOP-1686'

Conflicts:
	CHANGELOG.asciidoc


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

Branch: refs/heads/master
Commit: 4a8897951a59d4b4ba7434ebfbb26aa1d044f6c1
Parents: 6251966 6465fd9
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jul 13 06:18:08 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jul 13 06:18:08 2017 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |   2 +
 docs/src/dev/io/gryo.asciidoc                   |  25 +-
 docs/src/upgrade/release-3.3.x.asciidoc         |   1 +
 .../process/traversal/step/Profiling.java       |   6 +-
 .../step/sideEffect/ProfileSideEffectStep.java  |  14 +-
 .../traversal/step/util/ProfileStep.java        |   3 +
 .../traversal/util/DefaultTraversalMetrics.java | 246 +++++++++----------
 .../traversal/util/ImmutableMetrics.java        |   8 +-
 .../process/traversal/util/MutableMetrics.java  |  77 ++++--
 .../traversal/util/TraversalMetrics.java        |   8 +-
 .../gremlin/structure/io/gryo/GryoVersion.java  |  16 +-
 .../tinkerpop/gremlin/structure/io/Model.java   |   6 +-
 .../structure/io/gryo/_3_3_0/metrics-v1d0.kryo  | Bin 187 -> 193 bytes
 .../io/gryo/_3_3_0/traversalmetrics-v1d0.kryo   | Bin 306 -> 455 bytes
 14 files changed, 232 insertions(+), 180 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4a889795/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index ca690ab,bee946a..9c39fc1
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,10 -26,8 +26,12 @@@ 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.
  * 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/4a889795/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------