Merge branch 'TINKERPOP-1547' into tp32

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

Branch: refs/heads/TINKERPOP-1490
Commit: f23a47b345c49204b2c07fd7593b15c3933a3b9e
Parents: 398e834 56e113d
Author: Marko A. Rodriguez <[email protected]>
Authored: Thu Nov 10 17:26:07 2016 -0700
Committer: Marko A. Rodriguez <[email protected]>
Committed: Thu Nov 10 17:26:07 2016 -0700

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |   3 +
 .../process/traversal/step/map/MatchStep.java   |  22 +--
 .../optimization/RangeByIsCountStrategy.java    | 137 ++++++++++---------
 .../RangeByIsCountStrategyTest.java             |   2 +
 .../traversal/step/map/GroovyMatchTest.groovy   |  15 +-
 .../process/traversal/step/map/MatchTest.java   |  46 ++++---
 .../neo4j/process/NativeNeo4jCypherCheck.java   |  16 +--
 7 files changed, 140 insertions(+), 101 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f23a47b3/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index b7574fa,3c44f0f..229bcef
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,10 -26,11 +26,13 @@@ image::https://raw.githubusercontent.co
  TinkerPop 3.2.4 (Release Date: NOT OFFICIALLY RELEASED YET)
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
+ * Fixed a OLAP `MatchStep.clone()`-bug that occurs when the `match()` is in a 
local child.
+ * Fixed a bug in `RangeByIsCountStrategy` where labeled parents shouldn't 
have the strategy applied to their children.
+ * Fixed a bug in `PathRetractionStrategy` where `MatchEndStep` labels were 
being dropped when they shouldn't be.
  * 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