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/01/09 13:36:55 UTC

[3/3] tinkerpop git commit: Merge branch 'TINKERPOP-1589' into tp32

Merge branch 'TINKERPOP-1589' into tp32

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/2f68d7e4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2f68d7e4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2f68d7e4

Branch: refs/heads/tp32
Commit: 2f68d7e41d2a94857b84c3e41f26bfe4c8f3ef71
Parents: 63fb5ec 67e0b37
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jan 9 07:36:16 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jan 9 07:36:16 2017 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 .../upgrade/release-3.2.x-incubating.asciidoc   | 18 +++++
 .../gremlin/process/traversal/Traversal.java    |  8 +-
 .../process/traversal/step/TraversalParent.java | 13 ++-
 .../process/traversal/step/map/GraphStep.java   | 18 ++++-
 .../structure/util/CloseableIterator.java       | 49 +++++++++++
 .../util/DefaultCloseableIterator.java          | 45 +++++++++++
 .../process/traversal/TraversalTest.java        | 44 +++++++++-
 .../structure/util/CloseableIteratorTest.java   | 85 ++++++++++++++++++++
 9 files changed, 273 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2f68d7e4/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 35b1320,7316d80..89dcce4
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,7 -26,7 +26,8 @@@ image::https://raw.githubusercontent.co
  TinkerPop 3.2.4 (Release Date: NOT OFFICIALLY RELEASED YET)
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
 +* Added documentation around "terminal steps" in Gremlin: `hasNext()`, `next()`, `toList()`, etc.
+ * Added `CloseableIterator` to allow `Graph` providers who open expensive resources a way to let users release them.
  * Fixed minor bug in `gremlin-driver` where closing a session-based `Client` without initializing it could generate an error.
  * `TinkerGraph` Gryo and GraphSON deserialization is now configured to use multi-properties.
  * Changed behavior of `ElementHelper.areEqual(Property, Property)` to not throw exceptions with `null` arguments.