You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2017/01/19 17:23:35 UTC
[12/13] tinkerpop git commit: Merge branch 'tp32'
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/66f1b235
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/66f1b235
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/66f1b235
Branch: refs/heads/master
Commit: 66f1b235a5a72d1c019deef0e7d27ccb0cb077d5
Parents: d1f0889 6002299
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Jan 19 10:17:59 2017 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Jan 19 10:17:59 2017 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 5 +
.../traversal/step/filter/SampleGlobalStep.java | 19 +-
.../process/traversal/step/map/GroupStep.java | 263 +++----------------
.../traversal/step/map/OrderGlobalStep.java | 68 +++--
.../step/sideEffect/GroupSideEffectStep.java | 50 ++--
.../step/util/CollectingBarrierStep.java | 24 +-
.../ComputerVerificationStrategy.java | 7 -
.../traversal/traverser/ProjectedTraverser.java | 198 ++++++++++++++
.../gremlin/structure/io/gryo/GryoVersion.java | 10 +-
.../gremlin/util/function/MultiComparator.java | 75 ++++++
.../util/function/MultiComparatorTest.java | 69 +++++
.../step/sideEffect/GroovyGroupTest.groovy | 10 +
.../traversal/step/sideEffect/GroupTest.java | 60 ++++-
13 files changed, 549 insertions(+), 309 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/66f1b235/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/66f1b235/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
index 806dbf0,e5c5834..fa705f4
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
@@@ -172,12 -184,12 +184,12 @@@ public final class OrderGlobalStep<S,
@Override
public TraverserSet<S> apply(final TraverserSet<S> setA, final TraverserSet<S> setB) {
setA.addAll(setB);
- if (Long.MAX_VALUE != this.limit && setA.bulkSize() > this.limit) {
+ if (this.limit != -1 && setA.bulkSize() > this.limit) {
- if (this.chainedComparator.isShuffle())
+ if (this.comparator.isShuffle())
setA.shuffle();
else
- setA.sort(this.chainedComparator);
- long counter = 0l;
+ setA.sort(this.comparator);
+ long counter = 0L;
final Iterator<Traverser.Admin<S>> traversers = setA.iterator();
while (traversers.hasNext()) {
final Traverser.Admin<S> traverser = traversers.next();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/66f1b235/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 837095b,7818f6b..0657bc0
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@@ -100,9 -77,9 +99,10 @@@ import org.apache.tinkerpop.gremlin.str
import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphSerializer;
+import org.apache.tinkerpop.gremlin.util.function.FunctionUtils;
import org.apache.tinkerpop.gremlin.util.function.HashSetSupplier;
import org.apache.tinkerpop.gremlin.util.function.Lambda;
+ import org.apache.tinkerpop.gremlin.util.function.MultiComparator;
import org.apache.tinkerpop.shaded.kryo.KryoSerializable;
import org.apache.tinkerpop.shaded.kryo.serializers.JavaSerializer;
import org.javatuples.Pair;
@@@ -454,32 -260,8 +455,33 @@@ public enum GryoVersion
add(GryoTypeReg.of(SackFunctions.Barrier.class, 135));
add(GryoTypeReg.of(TraversalOptionParent.Pick.class, 137));
add(GryoTypeReg.of(HashSetSupplier.class, 136, new UtilSerializers.HashSetSupplierSerializer()));
+ add(GryoTypeReg.of(MultiComparator.class, 165)); // ***LAST ID***
+ add(GryoTypeReg.of(ConnectiveStrategy.class, 138));
+ add(GryoTypeReg.of(HaltedTraverserStrategy.class, 139));
+ add(GryoTypeReg.of(PartitionStrategy.class, 140, new JavaSerializer()));
+ add(GryoTypeReg.of(SubgraphStrategy.class, 141, new JavaSerializer()));
+ add(GryoTypeReg.of(VertexProgramStrategy.class, 142, new JavaSerializer()));
+ add(GryoTypeReg.of(MatchAlgorithmStrategy.class, 143));
+ add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 144));
+ add(GryoTypeReg.of(AdjacentToIncidentStrategy.class, 145));
+ add(GryoTypeReg.of(FilterRankingStrategy.class, 146));
+ add(GryoTypeReg.of(IdentityRemovalStrategy.class, 147));
+ add(GryoTypeReg.of(IncidentToAdjacentStrategy.class, 148));
+ add(GryoTypeReg.of(InlineFilterStrategy.class, 149));
+ add(GryoTypeReg.of(LazyBarrierStrategy.class, 150));
+ add(GryoTypeReg.of(MatchPredicateStrategy.class, 151));
+ add(GryoTypeReg.of(OrderLimitStrategy.class, 152));
+ add(GryoTypeReg.of(PathProcessorStrategy.class, 153));
+ add(GryoTypeReg.of(PathRetractionStrategy.class, 154));
+ add(GryoTypeReg.of(RangeByIsCountStrategy.class, 155));
+ add(GryoTypeReg.of(RepeatUnrollStrategy.class, 156));
+ add(GryoTypeReg.of(GraphFilterStrategy.class, 157));
+ add(GryoTypeReg.of(LambdaRestrictionStrategy.class, 158));
+ add(GryoTypeReg.of(ReadOnlyStrategy.class, 159));
+ add(GryoTypeReg.of(MatchStep.CountMatchAlgorithm.class, 160));
+ add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 164)); // ### LAST_ID
+
add(GryoTypeReg.of(TraverserSet.class, 58));
add(GryoTypeReg.of(Tree.class, 61));
add(GryoTypeReg.of(HashSet.class, 62));