You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2020/05/07 14:54:27 UTC
[tinkerpop] 11/14: TINKERPOP-1682 Rebased on master - fixed
compilation/test issues
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-1682
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 2cebde57677313cd2d9bcbc737fe4e6bbdef5f6f
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue May 5 14:33:18 2020 -0400
TINKERPOP-1682 Rebased on master - fixed compilation/test issues
---
.../traversal/step/sideEffect/GroupSideEffectStep.java | 2 +-
.../optimization/ByModulatorOptimizationStrategy.java | 4 ++--
.../process/traversal/util/TraversalExplanationTest.java | 3 ++-
gremlin-test/features/map/Select.feature | 4 ++--
.../gremlin/process/traversal/step/map/OrderTest.java | 10 +++++-----
.../gremlin/process/traversal/step/map/SelectTest.java | 11 +++++------
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java
index f278349..c9526f8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java
@@ -75,7 +75,7 @@ public final class GroupSideEffectStep<S, K, V> extends SideEffectStep<S> implem
}
private void setValueTraversal(final Traversal.Admin<?, ?> valueTraversal) {
- this.valueTraversal = this.integrateChild(GroupStep.convertValueTraversal(kvTraversal));
+ this.valueTraversal = this.integrateChild(GroupStep.convertValueTraversal(valueTraversal));
this.barrierStep = GroupStep.determineBarrierStep(this.valueTraversal);
this.getTraversal().getSideEffects().register(this.sideEffectKey, null,
new GroupStep.GroupBiOperator<>(null == this.barrierStep ?
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/ByModulatorOptimizationStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/ByModulatorOptimizationStrategy.java
index a4f8544..4a5cef1 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/ByModulatorOptimizationStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/ByModulatorOptimizationStrategy.java
@@ -21,9 +21,9 @@ package org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.ElementValueTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.TokenTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.ValueTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.ByModulating;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.IdStep;
@@ -72,7 +72,7 @@ public final class ByModulatorOptimizationStrategy extends AbstractTraversalStra
if (singleStep instanceof PropertiesStep) {
final PropertiesStep ps = (PropertiesStep) singleStep;
if (ps.getReturnType().equals(PropertyType.VALUE) && ps.getPropertyKeys().length == 1) {
- step.replaceLocalChild(traversal, new ElementValueTraversal<>(ps.getPropertyKeys()[0]));
+ step.replaceLocalChild(traversal, new ValueTraversal<>(ps.getPropertyKeys()[0]));
}
} else if (singleStep instanceof IdStep) {
step.replaceLocalChild(traversal, new TokenTraversal<>(T.id));
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanationTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanationTest.java
index f51b386..89a37d5 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanationTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanationTest.java
@@ -130,8 +130,9 @@ public class TraversalExplanationTest {
}
assertEquals(4, found);
//
+ //System.out.println(traversal.explain().prettyPrint(160));
found = 0;
- for (final String line : traversal.explain().prettyPrint(160).split("]\n")) { // need to split cause of word wrap
+ for (final String line : traversal.explain().prettyPrint(170).split("]\n")) { // need to split cause of word wrap
if (line.contains("IncidentToAdjacentStrategy") && line.contains("[VertexStep(IN,vertex)"))
found++;
if (line.contains("IncidentToAdjacentStrategy") && line.contains("[VertexStep(OUT,vertex)"))
diff --git a/gremlin-test/features/map/Select.feature b/gremlin-test/features/map/Select.feature
index 0d4913a..bdd2233 100644
--- a/gremlin-test/features/map/Select.feature
+++ b/gremlin-test/features/map/Select.feature
@@ -205,14 +205,14 @@ Feature: Step - select()
| v[ripple] |
| v[peter] |
- Scenario: g_VX1X_groupXaX_byXconstantXaXX_byXnameX_selectXaX_selectXaX
+ Scenario: g_VX1X_groupXaX_byXconstantXaXX_byXvaluesXnameXunfoldX_selectXaX_selectXaX
Given the modern graph
And using the parameter v1Id defined as "v[marko].id"
And the traversal of
"""
g.V(v1Id).group("a").
by(__.constant("a")).
- by(__.values("name")).
+ by(__.values("name").unfold()).
barrier().
select("a").select("a")
"""
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 e8f343d..674d1a1 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
@@ -109,7 +109,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Vertex> get_g_V_order_byXlabelX();
- public abstract Traversal<Vertex, Vertex> get_g_V_order_byXlabel_decrX();
+ public abstract Traversal<Vertex, Vertex> get_g_V_order_byXlabel_descX();
@Test
@LoadGraphWith(MODERN)
@@ -449,8 +449,8 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
assertFalse(traversal.hasNext());
}
- public void g_V_order_byXlabel_decrX() {
- final Traversal<Vertex, Vertex> traversal = get_g_V_order_byXlabel_decrX();
+ public void g_V_order_byXlabel_descX() {
+ final Traversal<Vertex, Vertex> traversal = get_g_V_order_byXlabel_descX();
printTraversalForm(traversal);
for (int i = 0; i < 2; i++) {
assertTrue(traversal.hasNext());
@@ -624,8 +624,8 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Vertex> get_g_V_order_byXlabel_decrX() {
- return g.V().order().by(__.label(), Order.decr);
+ public Traversal<Vertex, Vertex> get_g_V_order_byXlabel_descX() {
+ return g.V().order().by(__.label(), Order.desc);
}
}
}
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
index 0f5afbd..a1db3ca 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
@@ -38,7 +38,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.stream.Stream;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.CREW;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
@@ -83,7 +82,7 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Vertex> get_g_V_chooseXoutE_count_isX0X__asXaX__asXbXX_chooseXselectXaX__selectXaX__selectXbXX();
- public abstract Traversal<Vertex, String> get_g_VX1X_groupXaX_byXconstantXaXX_byXnameX_selectXaX_selectXaX(final Object v1Id);
+ public abstract Traversal<Vertex, String> get_g_VX1X_groupXaX_byXconstantXaXX_byXvaluesXnameXunfoldX_selectXaX_selectXaX(final Object v1Id);
public abstract Traversal<Vertex, Long> get_g_V_asXaX_groupXmX_by_byXbothE_countX_barrier_selectXmX_selectXselectXaXX();
@@ -377,8 +376,8 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_VX1X_groupXaX_byXconstantXaXX_byXnameX_selectXaX_selectXaX() {
- final Traversal<Vertex, String> traversal = get_g_VX1X_groupXaX_byXconstantXaXX_byXnameX_selectXaX_selectXaX(convertToVertexId("marko"));
+ public void g_VX1X_groupXaX_byXconstantXaXX_byXvaluesXnameXunfoldX_selectXaX_selectXaX() {
+ final Traversal<Vertex, String> traversal = get_g_VX1X_groupXaX_byXconstantXaXX_byXvaluesXnameXunfoldX_selectXaX_selectXaX(convertToVertexId("marko"));
printTraversalForm(traversal);
assertTrue(traversal.hasNext());
assertEquals("marko", traversal.next());
@@ -889,8 +888,8 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, String> get_g_VX1X_groupXaX_byXconstantXaXX_byXnameX_selectXaX_selectXaX(final Object v1Id) {
- return g.V(v1Id).group("a").by(__.constant("a")).by(__.values("name"))
+ public Traversal<Vertex, String> get_g_VX1X_groupXaX_byXconstantXaXX_byXvaluesXnameXunfoldX_selectXaX_selectXaX(final Object v1Id) {
+ return g.V(v1Id).group("a").by(__.constant("a")).by(__.values("name").unfold())
.barrier() // TODO: this barrier() should not be necessary
.select("a").select("a");
}