You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2018/02/17 05:22:31 UTC
[2/4] tinkerpop git commit: Added SumStep into the mix
Added SumStep into the mix
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e09203e2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e09203e2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e09203e2
Branch: refs/heads/TINKERPOP-1777-master
Commit: e09203e2ebe3d62c4f271f6c9b92891849f1e440
Parents: f69c715
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Feb 13 11:11:44 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Feb 14 18:33:21 2018 -0700
----------------------------------------------------------------------
.../traversal/step/map/SumGlobalStep.java | 8 ++-
.../traversal/step/map/SumLocalStep.java | 9 ++-
.../process/traversal/step/map/SumTest.java | 60 ++++++++++++++++++--
3 files changed, 65 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e09203e2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumGlobalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumGlobalStep.java
index 7942d9b..3711cfe 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumGlobalStep.java
@@ -48,6 +48,12 @@ public final class SumGlobalStep<S extends Number> extends ReducingBarrierStep<S
}
@Override
+ public void processAllStarts() {
+ if (this.starts.hasNext())
+ super.processAllStarts();
+ }
+
+ @Override
public S projectTraverser(final Traverser.Admin<S> traverser) {
return (S) mul(traverser.get(), traverser.bulk());
}
@@ -57,4 +63,4 @@ public final class SumGlobalStep<S extends Number> extends ReducingBarrierStep<S
public Set<TraverserRequirement> getRequirements() {
return REQUIREMENTS;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e09203e2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumLocalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumLocalStep.java
index b062a7e..72e6539 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumLocalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumLocalStep.java
@@ -22,6 +22,7 @@ import org.apache.tinkerpop.gremlin.util.NumberHelper;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.util.FastNoSuchElementException;
import java.util.Collections;
import java.util.Iterator;
@@ -39,17 +40,15 @@ public final class SumLocalStep<E extends Number, S extends Iterable<E>> extends
@Override
protected E map(final Traverser.Admin<S> traverser) {
- Number result;
final Iterator<E> iterator = traverser.get().iterator();
if (iterator.hasNext()) {
- result = iterator.next();
+ Number result = iterator.next();
while (iterator.hasNext()) {
result = NumberHelper.add(result, iterator.next());
}
- } else {
- result = 0;
+ return (E) result;
}
- return (E) result;
+ throw FastNoSuchElementException.instance();
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e09203e2/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumTest.java
index 1183863..e1bbd0b 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumTest.java
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
@@ -39,17 +40,49 @@ import static org.junit.Assert.*;
@RunWith(GremlinProcessRunner.class)
public abstract class SumTest extends AbstractGremlinProcessTest {
- public abstract Traversal<Vertex, Double> get_g_V_valuesXageX_sum();
+ public abstract Traversal<Vertex, Integer> get_g_V_valuesXageX_sum();
+
+ public abstract Traversal<Vertex, Integer> get_g_V_age_fold_sumXlocalX();
+
+ public abstract Traversal<Vertex, Number> get_g_V_foo_sum();
+
+ public abstract Traversal<Vertex, Number> get_g_V_foo_fold_sumXlocalX();
public abstract Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_weight_sumX();
@Test
@LoadGraphWith(MODERN)
public void g_V_valuesXageX_sum() {
- final Traversal<Vertex, Double> traversal = get_g_V_valuesXageX_sum();
+ final Traversal<Vertex, Integer> traversal = get_g_V_valuesXageX_sum();
+ printTraversalForm(traversal);
+ final Integer sum = traversal.next();
+ assertEquals(123, sum.intValue());
+ assertFalse(traversal.hasNext());
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_age_fold_sumXlocalX() {
+ final Traversal<Vertex, Integer> traversal = get_g_V_age_fold_sumXlocalX();
+ printTraversalForm(traversal);
+ final Integer sum = traversal.next();
+ assertEquals(123, sum.intValue());
+ assertFalse(traversal.hasNext());
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_foo_sum() {
+ final Traversal<Vertex, Number> traversal = get_g_V_foo_sum();
+ printTraversalForm(traversal);
+ assertFalse(traversal.hasNext());
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_foo_fold_sumXlocalX() {
+ final Traversal<Vertex, Number> traversal = get_g_V_foo_fold_sumXlocalX();
printTraversalForm(traversal);
- final Number sum = traversal.next();
- assertEquals(123L, sum);
assertFalse(traversal.hasNext());
}
@@ -69,13 +102,28 @@ public abstract class SumTest extends AbstractGremlinProcessTest {
public static class Traversals extends SumTest {
@Override
- public Traversal<Vertex, Double> get_g_V_valuesXageX_sum() {
+ public Traversal<Vertex, Integer> get_g_V_valuesXageX_sum() {
return g.V().values("age").sum();
}
@Override
+ public Traversal<Vertex, Integer> get_g_V_age_fold_sumXlocalX() {
+ return g.V().values("age").fold().sum(Scope.local);
+ }
+
+ @Override
+ public Traversal<Vertex, Number> get_g_V_foo_sum() {
+ return g.V().values("foo").sum();
+ }
+
+ @Override
+ public Traversal<Vertex, Number> get_g_V_foo_fold_sumXlocalX() {
+ return g.V().values("foo").fold().sum(Scope.local);
+ }
+
+ @Override
public Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_weight_sumX() {
return g.V().hasLabel("software").<String, Number>group().by("name").by(bothE().values("weight").sum());
}
}
-}
\ No newline at end of file
+}