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 2015/10/08 23:51:52 UTC
[6/7] incubator-tinkerpop git commit: Merge branch 'tp30'
Merge branch 'tp30'
Conflicts:
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupTest.groovy
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/268d3778
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/268d3778
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/268d3778
Branch: refs/heads/master
Commit: 268d3778f89683ecfc6778c8b5132b85e423f0f3
Parents: 01594ac e4138e5
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Oct 8 15:45:20 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Oct 8 15:45:20 2015 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
bin/validate-distribution.sh | 55 ++++++++++++++------
.../process/traversal/step/map/GroupStep.java | 4 +-
.../step/sideEffect/GroovyGroupTest.groovy | 5 ++
.../server/GremlinDriverIntegrateTest.java | 33 ++++++++++++
.../traversal/step/sideEffect/GroupTest.java | 21 ++++++++
6 files changed, 100 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/268d3778/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/268d3778/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
index 729747d,c2df4ba..d050387
--- 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
@@@ -156,22 -157,43 +156,22 @@@ public final class GroupStep<S, K, V> e
}
@Override
- public Map<K, Collection<V>> apply(final Map<K, Collection<V>> mutatingSeed, final Traverser.Admin<S> traverser) {
+ public Map<K, Traversal.Admin<S, V>> apply(final Map<K, Traversal.Admin<S, V>> mutatingSeed, final Traverser.Admin<S> traverser) {
final K key = TraversalUtil.applyNullable(traverser, this.groupStep.keyTraversal);
- final V value = TraversalUtil.applyNullable(traverser, this.groupStep.valueTraversal);
- Collection<V> values = mutatingSeed.get(key);
- if (null == values) {
- values = new BulkSet<>();
- mutatingSeed.put(key, values);
+ Traversal.Admin<S, V> traversal = mutatingSeed.get(key);
+ if (null == traversal) {
+ traversal = this.groupStep.valueReduceTraversal.clone();
+ this.counters.put(key, 0);
+ mutatingSeed.put(key, traversal);
}
- TraversalHelper.addToCollectionUnrollIterator(values, value, traverser.bulk());
- return mutatingSeed;
- }
- }
-
- //////////
- private class GroupMap extends HashMap<K, Collection<V>> implements FinalGet<Map<K, R>> {
-
- @Override
- public Map<K, R> getFinal() {
- if (null == GroupStep.this.reduceTraversal)
- return (Map<K, R>) this;
- else {
- final Map<K, R> reduceMap = new HashMap<>();
- this.forEach((k, vv) -> reduceMap.put(k, TraversalUtil.applyNullable(vv, GroupStep.this.reduceTraversal)));
- return reduceMap;
+ traversal.addStart(traverser);
- int count = this.counters.compute(key, (k,i) -> ++i);
++ int count = this.counters.compute(key, (k, i) -> ++i);
+ if (count > 10000) {
- this.counters.put(key,0);
++ this.counters.put(key, 0);
+ TraversalHelper.getFirstStepOfAssignableClass(Barrier.class, traversal).ifPresent(Barrier::processAllStarts);
}
- }
- }
-
- private class GroupMapSupplier implements Supplier<GroupMap>, Serializable {
-
- private GroupMapSupplier() {
- }
-
- @Override
- public GroupMap get() {
- return new GroupMap();
+ return mutatingSeed;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/268d3778/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupTest.groovy
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/268d3778/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/268d3778/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java
index 1e3fa15,6f2716d..2092569
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java
@@@ -57,10 -58,10 +57,13 @@@ public abstract class GroupTest extend
public abstract Traversal<Vertex, Map<Long, Collection<String>>> get_g_V_group_byXoutE_countX_byXnameX();
+ public abstract Traversal<Vertex, Map<String, Double>> get_g_V_groupXaX_byXlabelX_byXoutE_weight_sumX_capXaX();
+
++
public abstract Traversal<Vertex, Map<String, Long>> get_g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byXcountX();
+ public abstract Traversal<Vertex, Map<String, Long>> get_g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byXcountX_capXaX();
+
@Test
@LoadGraphWith(MODERN)
public void g_V_group_byXnameX() {
@@@ -190,6 -161,18 +193,19 @@@
assertFalse(traversal.hasNext());
}
+ @Test
+ @LoadGraphWith(GRATEFUL)
+ public void g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byXcountX_capXaX() {
+ final Traversal<Vertex, Map<String, Long>> traversal = get_g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byXcountX_capXaX();
++
+ checkMap(new HashMap<String, Long>() {{
+ put("original", 771317l);
+ put("", 160968l);
+ put("cover", 368579l);
+ }}, traversal.next());
+ assertFalse(traversal.hasNext());
+ }
+
public static class Traversals extends GroupTest {
@Override