Merge branch 'TINKERPOP-1428' into tp32

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

Branch: refs/heads/TINKERPOP-1490
Commit: 398e834c4f1a082fc541f87eaf2b90bdfab07b6b
Parents: fbefd8c 525d8ea
Author: Marko A. Rodriguez <[email protected]>
Authored: Thu Nov 10 07:12:33 2016 -0700
Committer: Marko A. Rodriguez <[email protected]>
Committed: Thu Nov 10 07:12:33 2016 -0700

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  2 +
 .../process/traversal/step/map/GroupStep.java   | 35 +++++----
 .../step/sideEffect/GroupSideEffectStep.java    | 19 +++--
 .../traversal/util/DefaultTraversalMetrics.java | 76 ++++++++++----------
 .../traversal/step/map/GroovyProfileTest.groovy |  5 ++
 .../step/sideEffect/GroovyGroupTest.groovy      |  5 ++
 .../process/traversal/step/map/ProfileTest.java | 17 +++++
 .../traversal/step/sideEffect/GroupTest.java    | 23 ++++++
 8 files changed, 125 insertions(+), 57 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/398e834c/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 43e4450,40f3f3a..b7574fa
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,8 -26,8 +26,10 @@@ image::https://raw.githubusercontent.co
  TinkerPop 3.2.4 (Release Date: NOT OFFICIALLY RELEASED YET)
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
 +* Added `TinkerGraphCountStrategy` which translates `g.V().map*.count()` 
patterns into direct `Map.size()` calls in `TinkerGraph`.
 +* Added `Path.head()` and `Path.isEmpty()` with default method 
implementations.
+ * Fixed a `NoSuchElementException` bug with `GroupXXXStep` where if the 
reduced `TraverserSet` is empty, don't add the key/value.
+ * Fixed a `NullPointerException` bug with profiling `GroupSideEffectStep` in 
OLTP.
  * Improved ability to release resources in `GraphProvider` instances in the 
test suite.
  * Added a `force` option for killing sessions without waiting for transaction 
close or timeout of a currently running job or multiple jobs.
  * Deprecated `Session.kill()` and `Session.manualKill()`.

Reply via email to