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 2016/02/26 18:11:49 UTC
incubator-tinkerpop git commit: renamed Operator.add() to
Operator.addAll() as its more clear especially since Operator.sum() exists.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1166 efc1739f1 -> 958791792
renamed Operator.add() to Operator.addAll() as its more clear especially since Operator.sum() exists.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/95879179
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/95879179
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/95879179
Branch: refs/heads/TINKERPOP-1166
Commit: 958791792b3e48b7c983fb5a54ae21671e1154f6
Parents: efc1739
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Feb 26 10:11:38 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Feb 26 10:11:38 2016 -0700
----------------------------------------------------------------------
.../computer/traversal/TraversalVertexProgram.java | 6 +++---
.../tinkerpop/gremlin/process/traversal/Operator.java | 2 +-
.../process/traversal/step/filter/DedupGlobalStep.java | 2 +-
.../gremlin/process/traversal/step/map/FoldStep.java | 4 ++--
.../process/traversal/step/map/GroupCountStep.java | 2 --
.../gremlin/process/traversal/step/map/GroupStep.java | 4 +---
.../process/traversal/step/map/OrderGlobalStep.java | 2 +-
.../process/traversal/step/sideEffect/StoreStep.java | 2 +-
.../process/traversal/step/sideEffect/GroupTestV3d0.java | 10 ++++++++--
9 files changed, 18 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/95879179/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
index 26790ed..1b1988a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
@@ -153,9 +153,9 @@ public final class TraversalVertexProgram implements VertexProgram<TraverserSet<
graphComputing.getMemoryComputeKey().ifPresent(x -> this.neverTouchedMemoryKeys.add(x.getKey()));
}
- this.memoryComputeKeys.add(MemoryComputeKey.of(HALTED_TRAVERSERS, Operator.add, false, false));
- this.memoryComputeKeys.add(MemoryComputeKey.of(ALIVE_TRAVERSERS, Operator.add, true, true));
- this.memoryComputeKeys.add(MemoryComputeKey.of(MUTATED_MEMORY_KEYS, Operator.add, false, true));
+ this.memoryComputeKeys.add(MemoryComputeKey.of(HALTED_TRAVERSERS, Operator.addAll, false, false));
+ this.memoryComputeKeys.add(MemoryComputeKey.of(ALIVE_TRAVERSERS, Operator.addAll, true, true));
+ this.memoryComputeKeys.add(MemoryComputeKey.of(MUTATED_MEMORY_KEYS, Operator.addAll, false, true));
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/95879179/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java
index 5965bb7..13406ad 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java
@@ -71,7 +71,7 @@ public enum Operator implements BinaryOperator<Object> {
return ((boolean) a) || ((boolean) b);
}
},
- add {
+ addAll {
public Object apply(final Object a, final Object b) {
((Collection) a).addAll((Collection) b);
return a;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/95879179/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupGlobalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupGlobalStep.java
index 04e9c4f..72f0d26 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupGlobalStep.java
@@ -137,7 +137,7 @@ public final class DedupGlobalStep<S> extends FilterStep<S> implements Traversal
@Override
public Optional<MemoryComputeKey> getMemoryComputeKey() {
- return Optional.of(MemoryComputeKey.of(this.getId(), Operator.add, false, true));
+ return Optional.of(MemoryComputeKey.of(this.getId(), Operator.addAll, false, true));
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/95879179/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FoldStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FoldStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FoldStep.java
index 6bc230c..934d965 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FoldStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FoldStep.java
@@ -43,12 +43,12 @@ public final class FoldStep<S, E> extends ReducingBarrierStep<S, E> {
private final boolean listFold;
public FoldStep(final Traversal.Admin traversal) {
- this(traversal, (Supplier) ArrayListSupplier.instance(), (BiFunction) Operator.add);
+ this(traversal, (Supplier) ArrayListSupplier.instance(), (BiFunction) Operator.addAll);
}
public FoldStep(final Traversal.Admin traversal, final Supplier<E> seed, final BiFunction<E, S, E> foldFunction) {
super(traversal);
- this.listFold = Operator.add.equals(foldFunction);
+ this.listFold = Operator.addAll.equals(foldFunction);
this.setSeedSupplier(seed);
this.setReducingBiOperator(new FoldBiOperator<>(foldFunction));
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/95879179/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupCountStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupCountStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupCountStep.java
index 31912fe..2b8b3a8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupCountStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupCountStep.java
@@ -19,7 +19,6 @@
package org.apache.tinkerpop.gremlin.process.traversal.step.map;
-import org.apache.tinkerpop.gremlin.process.computer.MemoryComputeKey;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.ByModulating;
@@ -35,7 +34,6 @@ import java.io.Serializable;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.Set;
import java.util.function.BinaryOperator;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/95879179/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
index 3a13bd5..203e475 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
@@ -19,7 +19,6 @@
package org.apache.tinkerpop.gremlin.process.traversal.step.map;
-import org.apache.tinkerpop.gremlin.process.computer.MemoryComputeKey;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
@@ -46,7 +45,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.Set;
import java.util.function.BinaryOperator;
@@ -249,6 +247,6 @@ public final class GroupStep<S, K, V> extends ReducingBarrierStep<S, Map<K, V>>
valueTraversal.getEndStep().forEachRemaining(t -> traverserSet.add(t.asAdmin()));
return Collections.singletonMap(key, traverserSet);
} else
- return Collections.singletonMap(key,traverser);
+ return Collections.singletonMap(key, traverser);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/95879179/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
----------------------------------------------------------------------
diff --git 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
index 5802c1e..f1cc6e6 100644
--- 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
@@ -142,7 +142,7 @@ public final class OrderGlobalStep<S> extends CollectingBarrierStep<S> implement
@Override
public Optional<MemoryComputeKey> getMemoryComputeKey() {
- return Optional.of(MemoryComputeKey.of(this.getId(), Operator.add, false, true));
+ return Optional.of(MemoryComputeKey.of(this.getId(), Operator.addAll, false, true));
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/95879179/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StoreStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StoreStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StoreStep.java
index 64c1478..e347d39 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StoreStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StoreStep.java
@@ -108,6 +108,6 @@ public final class StoreStep<S> extends SideEffectStep<S> implements SideEffectC
@Override
public Optional<MemoryComputeKey> getMemoryComputeKey() {
- return Optional.of(MemoryComputeKey.of(this.sideEffectKey, Operator.add, false, false));
+ return Optional.of(MemoryComputeKey.of(this.sideEffectKey, Operator.addAll, false, false));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/95879179/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTestV3d0.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTestV3d0.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTestV3d0.java
index d48ba0c..5cc2a9c 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTestV3d0.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTestV3d0.java
@@ -34,8 +34,14 @@ import java.util.Map;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.GRATEFUL;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.*;
-import static org.junit.Assert.*;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.both;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.count;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.inject;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.out;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)