[08/13] tinkerpop git commit: Merge branch 'TINKERPOP-1248' into tp32

2017-01-20 Thread dkuppitz
Merge branch 'TINKERPOP-1248' into tp32


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

Branch: refs/heads/centrality-recipes
Commit: 379a6e5e9e19b1de72fba3c7c401e4424028a88a
Parents: 3496402 973484d
Author: Marko A. Rodriguez 
Authored: Thu Jan 19 05:33:22 2017 -0700
Committer: Marko A. Rodriguez 
Committed: Thu Jan 19 05:33:22 2017 -0700

--
 CHANGELOG.asciidoc  |   3 +
 .../traversal/step/filter/SampleGlobalStep.java |  19 +-
 .../traversal/step/map/OrderGlobalStep.java |  68 ---
 .../step/util/CollectingBarrierStep.java|  24 ++-
 .../ComputerVerificationStrategy.java   |   7 -
 .../traversal/traverser/ProjectedTraverser.java | 198 +++
 .../gremlin/structure/io/gryo/GryoVersion.java  |   8 +-
 .../gremlin/util/function/MultiComparator.java  |  72 +++
 8 files changed, 349 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/379a6e5e/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 74751fa,25ff3e9..88cbf32
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,7 -26,8 +26,10 @@@ image::https://raw.githubusercontent.co
  TinkerPop 3.2.4 (Release Date: NOT OFFICIALLY RELEASED YET)
  ~~~
  
 +* `GroupBiOperator` no longer maintains state and thus, no more side-effect 
related OLAP inconsistencies.
+ * Added `ProjectedTraverser` which wraps a traverser with a `List` of 
projected data.
++* Fixed an optimization bug in `CollectionBarrierSteps` where the barrier was 
being consumed on each `addBarrier()`.
+ * `OrderGlobalStep` and `SampleGlobalStep` use `ProjectedTraverser` and now 
can work up to the local star graph in OLAP.
  * SASL negotiation supports both a byte array and Base64 encoded bytes as a 
string for authentication to Gremlin Server.
  * Deprecated `TinkerIoRegistry` replacing it with the more consistently named 
`TinkerIoRegistryV1d0`.
  * Made error messaging more consistent during result iteration timeouts in 
Gremlin Server.



[08/13] tinkerpop git commit: Merge branch 'TINKERPOP-1248' into tp32

2017-01-19 Thread okram
Merge branch 'TINKERPOP-1248' into tp32


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

Branch: refs/heads/master
Commit: 379a6e5e9e19b1de72fba3c7c401e4424028a88a
Parents: 3496402 973484d
Author: Marko A. Rodriguez 
Authored: Thu Jan 19 05:33:22 2017 -0700
Committer: Marko A. Rodriguez 
Committed: Thu Jan 19 05:33:22 2017 -0700

--
 CHANGELOG.asciidoc  |   3 +
 .../traversal/step/filter/SampleGlobalStep.java |  19 +-
 .../traversal/step/map/OrderGlobalStep.java |  68 ---
 .../step/util/CollectingBarrierStep.java|  24 ++-
 .../ComputerVerificationStrategy.java   |   7 -
 .../traversal/traverser/ProjectedTraverser.java | 198 +++
 .../gremlin/structure/io/gryo/GryoVersion.java  |   8 +-
 .../gremlin/util/function/MultiComparator.java  |  72 +++
 8 files changed, 349 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/379a6e5e/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 74751fa,25ff3e9..88cbf32
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,7 -26,8 +26,10 @@@ image::https://raw.githubusercontent.co
  TinkerPop 3.2.4 (Release Date: NOT OFFICIALLY RELEASED YET)
  ~~~
  
 +* `GroupBiOperator` no longer maintains state and thus, no more side-effect 
related OLAP inconsistencies.
+ * Added `ProjectedTraverser` which wraps a traverser with a `List` of 
projected data.
++* Fixed an optimization bug in `CollectionBarrierSteps` where the barrier was 
being consumed on each `addBarrier()`.
+ * `OrderGlobalStep` and `SampleGlobalStep` use `ProjectedTraverser` and now 
can work up to the local star graph in OLAP.
  * SASL negotiation supports both a byte array and Base64 encoded bytes as a 
string for authentication to Gremlin Server.
  * Deprecated `TinkerIoRegistry` replacing it with the more consistently named 
`TinkerIoRegistryV1d0`.
  * Made error messaging more consistent during result iteration timeouts in 
Gremlin Server.