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 2015/09/03 19:51:37 UTC
[10/50] [abbrv] incubator-tinkerpop git commit: TINKERPOP3-797 #close
A typecast to List should have been a typecast to Collection. Fixed. Added an
OrderTest to that validates the fix over Modern.
TINKERPOP3-797 #close A typecast to List should have been a typecast to Collection. Fixed. Added an OrderTest to that validates the fix over Modern.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/52ba134a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/52ba134a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/52ba134a
Branch: refs/heads/blvp
Commit: 52ba134a4dcbb334fd5aae5fa197511bcfde224e
Parents: 5efd404
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Aug 24 08:26:22 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Aug 24 08:26:22 2015 -0600
----------------------------------------------------------------------
.../traversal/step/map/OrderLocalStep.java | 11 +++++-
.../traversal/step/map/GroovyOrderTest.groovy | 7 +++-
.../process/traversal/step/map/OrderTest.java | 39 ++++++++++++++++++--
3 files changed, 51 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/52ba134a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderLocalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderLocalStep.java
index 49c64d1..0ea9af2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderLocalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderLocalStep.java
@@ -26,7 +26,14 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.util.TraversalCompara
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -45,7 +52,7 @@ public final class OrderLocalStep<S, M> extends MapStep<S, S> implements Compara
protected S map(final Traverser.Admin<S> traverser) {
final S start = traverser.get();
if (start instanceof Collection)
- return (S) OrderLocalStep.sortCollection((List) start, this.chainedComparator);
+ return (S) OrderLocalStep.sortCollection((Collection) start, this.chainedComparator);
else if (start instanceof Map)
return (S) OrderLocalStep.sortMap((Map) start, this.chainedComparator);
else
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/52ba134a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
index 5a082e7..69e354d 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
@@ -18,8 +18,8 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper
import org.apache.tinkerpop.gremlin.structure.Vertex
/**
@@ -81,5 +81,10 @@ public abstract class GroovyOrderTest {
public Traversal<Vertex, Vertex> get_g_V_order_byXoutE_count__decrX() {
TraversalScriptHelper.compute("g.V.order.by(__.outE.count, decr)", g)
}
+
+ @Override
+ public Traversal<Vertex, Map<String, List<Vertex>>> get_g_V_group_byXlabelX_by_byXorderXlocalX_byXname_decrXX() {
+ TraversalScriptHelper.compute("g.V.group.by(label).by.by(order(local).by('name', decr))", g)
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/52ba134a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
index 0310ac5..cd893fc 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
@@ -22,15 +22,21 @@ 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.IgnoreEngine;
+import org.apache.tinkerpop.gremlin.process.traversal.Order;
import org.apache.tinkerpop.gremlin.process.traversal.Scope;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.traversal.Order;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
import org.junit.runner.RunWith;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE;
@@ -62,6 +68,8 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Vertex> get_g_V_order_byXoutE_count__decrX();
+ public abstract Traversal<Vertex, Map<String, List<Vertex>>> get_g_V_group_byXlabelX_by_byXorderXlocalX_byXname_decrXX();
+
@Test
@LoadGraphWith(MODERN)
public void g_V_name_order() {
@@ -214,6 +222,26 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
});
}
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_group_byXlabelX_by_byXorderXlocalX_byXname_decrXX() {
+ final Traversal<Vertex, Map<String, List<Vertex>>> traversal = get_g_V_group_byXlabelX_by_byXorderXlocalX_byXname_decrXX();
+ printTraversalForm(traversal);
+ final Map<String, List<Vertex>> map = traversal.next();
+ assertFalse(traversal.hasNext());
+ assertEquals(2, map.size());
+ List list = map.get("software");
+ assertEquals(2, list.size());
+ assertEquals(convertToVertex(graph, "lop"), list.get(1));
+ assertEquals(convertToVertex(graph, "ripple"), list.get(0));
+ list = map.get("person");
+ assertEquals(4, list.size());
+ assertEquals(convertToVertex(graph, "josh"), list.get(3));
+ assertEquals(convertToVertex(graph, "marko"), list.get(2));
+ assertEquals(convertToVertex(graph, "peter"), list.get(1));
+ assertEquals(convertToVertex(graph, "vadas"), list.get(0));
+ }
+
public static class Traversals extends OrderTest {
@Override
@@ -250,7 +278,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Override
public Traversal<Vertex, Map<String, Vertex>> get_g_V_asXaX_outXcreatedX_asXbX_order_byXshuffleX_selectXa_bX() {
- return g.V().as("a").out("created").as("b").order().by(Order.shuffle).select("a","b");
+ return g.V().as("a").out("created").as("b").order().by(Order.shuffle).select("a", "b");
}
@Override
@@ -270,5 +298,10 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
return g.V().order().by(outE().count(), Order.decr);
}
+ @Override
+ public Traversal<Vertex, Map<String, List<Vertex>>> get_g_V_group_byXlabelX_by_byXorderXlocalX_byXname_decrXX() {
+ return g.V().<String, List<Vertex>>group().by(T.label).by().by(__.order(Scope.local).by("name", Order.decr));
+ }
+
}
}