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/03/21 20:02:29 UTC
[26/27] tinkerpop git commit: Fixed rebase conflicts and added
missing Gherkin tests
Fixed rebase conflicts and added missing Gherkin tests
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/595a064e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/595a064e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/595a064e
Branch: refs/heads/TINKERPOP-1682
Commit: 595a064eabc0cb1561f5927e681cd400b334ee77
Parents: 42b0f83
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Mar 20 08:41:40 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Mar 21 13:01:46 2018 -0700
----------------------------------------------------------------------
.../gremlin/structure/io/gryo/GryoVersion.java | 8 +++----
gremlin-test/features/sideEffect/Group.feature | 22 ++++++++++++++++++++
.../process/traversal/step/map/OrderTest.java | 3 +++
3 files changed, 29 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/595a064e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
----------------------------------------------------------------------
diff --git 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
index 65ae4b1..bc017d5 100644
--- 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
@@ -320,7 +320,7 @@ public enum GryoVersion {
add(GryoTypeReg.of(MatchAlgorithmStrategy.class, 143));
add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 144));
add(GryoTypeReg.of(AdjacentToIncidentStrategy.class, 145));
- add(GryoTypeReg.of(ByModulatorOptimizationStrategy.class, 170)); // ***LAST ID***
+ add(GryoTypeReg.of(ByModulatorOptimizationStrategy.class, 174)); // ***LAST ID***
add(GryoTypeReg.of(CountStrategy.class, 155));
add(GryoTypeReg.of(FilterRankingStrategy.class, 146));
add(GryoTypeReg.of(IdentityRemovalStrategy.class, 147));
@@ -375,7 +375,7 @@ public enum GryoVersion {
add(GryoTypeReg.of(RangeGlobalStep.RangeBiOperator.class, 114));
add(GryoTypeReg.of(OrderGlobalStep.OrderBiOperator.class, 118));
add(GryoTypeReg.of(ProfileStep.ProfileBiOperator.class, 119));
- add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173)); // ***LAST ID***
+ add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
// placeholder serializers for classes that don't live here in core. this will allow them to be used if
// present or ignored if the class isn't available. either way the registration numbers are held as
@@ -537,7 +537,7 @@ public enum GryoVersion {
add(GryoTypeReg.of(MatchAlgorithmStrategy.class, 143));
add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 144));
add(GryoTypeReg.of(AdjacentToIncidentStrategy.class, 145));
- add(GryoTypeReg.of(ByModulatorOptimizationStrategy.class, 170)); // ***LAST ID***
+ add(GryoTypeReg.of(ByModulatorOptimizationStrategy.class, 174)); // ***LAST ID***
add(GryoTypeReg.of(CountStrategy.class, 155));
add(GryoTypeReg.of(FilterRankingStrategy.class, 146));
add(GryoTypeReg.of(IdentityRemovalStrategy.class, 147));
@@ -555,7 +555,7 @@ public enum GryoVersion {
add(GryoTypeReg.of(MatchStep.CountMatchAlgorithm.class, 160));
add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 167));
// skip 171, 172 to sync with tp33
- add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173)); // ***LAST ID***
+ add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
}};
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/595a064e/gremlin-test/features/sideEffect/Group.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/sideEffect/Group.feature b/gremlin-test/features/sideEffect/Group.feature
index 94d2191..47d7903 100644
--- a/gremlin-test/features/sideEffect/Group.feature
+++ b/gremlin-test/features/sideEffect/Group.feature
@@ -242,3 +242,25 @@ Feature: Step - group()
Then the result should be unordered
| result |
| m[{"ripple":[], "peter":["created"], "noone":["blah"], "vadas":[], "josh":["created", "created"], "lop":[], "marko":[666, "created", "knows", "knows"]}] |
+
+ Scenario: g_V_group_byXlabelX_byXlabel_countX
+ Given the modern graph
+ And the traversal of
+ """
+ g.V().group().by(__.label()).by(__.label().count())
+ """
+ When iterated to list
+ Then the result should be unordered
+ | result |
+ | m[{"software":"d[2].l", "person":"d[4].l"}] |
+
+ Scenario: g_V_groupXmX_byXlabelX_byXlabel_countX_capXmX
+ Given the modern graph
+ And the traversal of
+ """
+ g.V().group("m").by(__.label()).by(__.label().count()).cap("m")
+ """
+ When iterated to list
+ Then the result should be unordered
+ | result |
+ | m[{"software":"d[2].l", "person":"d[4].l"}] |
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/595a064e/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 a44ac5a..5cd12ff 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
@@ -405,6 +405,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
entry = iterator.next();
assertEquals("marko", entry.getKey());
assertEquals(1.9, entry.getValue().doubleValue(), 0.0001);
+ }
public void g_V_order_byXlabelX() {
final Traversal<Vertex, Vertex> traversal = get_g_V_order_byXlabelX();
@@ -440,6 +441,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
entry = traversal.next();
assertEquals("vadas", entry.getKey());
assertEquals(0.0, entry.getValue().doubleValue(), 0.0001);
+ }
public void g_V_order_byXlabel_decrX() {
final Traversal<Vertex, Vertex> traversal = get_g_V_order_byXlabel_decrX();
@@ -576,6 +578,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Override
public Traversal<Vertex, Map.Entry<String, Number>> get_g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX() {
return g.V().hasLabel("person").group().by("name").by(outE().values("weight").sum()).<Map.Entry<String, Number>>unfold().order().by(Column.values, Order.decr);
+ }
public Traversal<Vertex, Vertex> get_g_V_order_byXlabelX() {
return g.V().order().by(__.label());