You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by co...@apache.org on 2025/09/25 18:10:36 UTC
(tinkerpop) branch master updated (33ad6d1d2b -> 9744310b2f)
This is an automated email from the ASF dual-hosted git repository.
colegreer pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from 33ad6d1d2b Merge branch '3.8-dev'
add ca14991983 Consolidate interfaces into step contracts (#3214)
new 9744310b2f Merge branch '3.8-dev'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../traversal/dsl/graph/GraphTraversal.java | 4 +-
.../traversal/step/filter/IsStepPlaceholder.java | 6 +-
.../traversal/step/filter/RangeGlobalStep.java | 30 +-----
.../step/filter/RangeGlobalStepContract.java | 32 +++++-
...holder.java => RangeGlobalStepPlaceholder.java} | 116 +++++++--------------
.../step/filter/RangeLocalStepContract.java | 3 +-
...eholder.java => RangeLocalStepPlaceholder.java} | 104 +++++-------------
.../traversal/step/filter/TailGlobalStep.java | 36 +------
.../step/filter/TailGlobalStepContract.java | 37 ++++++-
.../step/filter/TailGlobalStepPlaceholder.java | 25 +++++
.../step/filter/TailLocalStepPlaceholder.java | 8 +-
.../map/AbstractAddElementStepPlaceholder.java | 5 +-
.../map/AbstractMergeElementStepPlaceholder.java | 7 +-
.../traversal/step/map/AddEdgeStepContract.java | 4 +-
.../traversal/step/map/AddVertexStartStep.java | 3 +-
.../process/traversal/step/map/AddVertexStep.java | 6 +-
.../process/traversal/step/map/CallStep.java | 2 +-
.../traversal/step/map/CallStepPlaceholder.java | 1 +
.../process/traversal/step/map/GraphStep.java | 3 +-
.../traversal/step/map/GraphStepContract.java | 2 +-
.../traversal/step/map/GraphStepPlaceholder.java | 4 +
.../process/traversal/step/map/RangeLocalStep.java | 1 -
.../process/traversal/step/map/VertexStep.java | 2 +-
.../traversal/step/map/VertexStepContract.java | 2 +-
.../traversal/step/map/VertexStepPlaceholder.java | 5 +
.../traversal/step/sideEffect/AddPropertyStep.java | 4 +-
.../sideEffect/AddPropertyStepPlaceholder.java | 4 +-
.../traversal/step/filter/RangeGlobalStepTest.java | 12 +--
.../traversal/step/map/RangeLocalStepTest.java | 100 +++++++++---------
.../traversal/strategy/GValueManagerVerifier.java | 2 +-
30 files changed, 251 insertions(+), 319 deletions(-)
copy gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/{RangeStepPlaceholder.java => RangeGlobalStepPlaceholder.java} (58%)
rename gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/{RangeStepPlaceholder.java => RangeLocalStepPlaceholder.java} (56%)
(tinkerpop) 01/01: Merge branch '3.8-dev'
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 9744310b2f4ab6353967132b5d0be51d90593535
Merge: 33ad6d1d2b ca14991983
Author: Cole-Greer <Co...@improving.com>
AuthorDate: Thu Sep 25 10:51:21 2025 -0700
Merge branch '3.8-dev'
.../traversal/dsl/graph/GraphTraversal.java | 4 +-
.../traversal/step/filter/IsStepPlaceholder.java | 6 +-
.../traversal/step/filter/RangeGlobalStep.java | 30 +-----
.../step/filter/RangeGlobalStepContract.java | 32 +++++-
...holder.java => RangeGlobalStepPlaceholder.java} | 116 +++++++--------------
.../step/filter/RangeLocalStepContract.java | 3 +-
...eholder.java => RangeLocalStepPlaceholder.java} | 104 +++++-------------
.../traversal/step/filter/TailGlobalStep.java | 36 +------
.../step/filter/TailGlobalStepContract.java | 37 ++++++-
.../step/filter/TailGlobalStepPlaceholder.java | 25 +++++
.../step/filter/TailLocalStepPlaceholder.java | 8 +-
.../map/AbstractAddElementStepPlaceholder.java | 5 +-
.../map/AbstractMergeElementStepPlaceholder.java | 7 +-
.../traversal/step/map/AddEdgeStepContract.java | 4 +-
.../traversal/step/map/AddVertexStartStep.java | 3 +-
.../process/traversal/step/map/AddVertexStep.java | 6 +-
.../process/traversal/step/map/CallStep.java | 2 +-
.../traversal/step/map/CallStepPlaceholder.java | 1 +
.../process/traversal/step/map/GraphStep.java | 3 +-
.../traversal/step/map/GraphStepContract.java | 2 +-
.../traversal/step/map/GraphStepPlaceholder.java | 4 +
.../process/traversal/step/map/RangeLocalStep.java | 1 -
.../process/traversal/step/map/VertexStep.java | 2 +-
.../traversal/step/map/VertexStepContract.java | 2 +-
.../traversal/step/map/VertexStepPlaceholder.java | 5 +
.../traversal/step/sideEffect/AddPropertyStep.java | 4 +-
.../sideEffect/AddPropertyStepPlaceholder.java | 4 +-
.../traversal/step/filter/RangeGlobalStepTest.java | 12 +--
.../traversal/step/map/RangeLocalStepTest.java | 100 +++++++++---------
.../traversal/strategy/GValueManagerVerifier.java | 2 +-
30 files changed, 251 insertions(+), 319 deletions(-)
diff --cc gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RangeLocalStepTest.java
index c0b8466b6a,ffe3e804b7..4dd3f4e975
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RangeLocalStepTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/RangeLocalStepTest.java
@@@ -24,21 -24,20 +24,20 @@@ import java.util.LinkedHashSet
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.lang3.tuple.Pair;
import org.apache.tinkerpop.gremlin.process.traversal.Scope;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-
+ import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.GValueStepTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeLocalStepPlaceholder;
import org.junit.Test;
import static org.apache.tinkerpop.gremlin.process.traversal.step.map.RangeLocalStep.applyRange;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
- import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
- import org.apache.tinkerpop.gremlin.process.traversal.step.GValueStepTest;
- import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeStepPlaceholder;
/**
* @author Daniel Kuppitz (http://gremlin.guru)
@@@ -62,6 -61,52 +61,53 @@@ public class RangeLocalStepTest extend
);
}
+ @Override
+ protected List<Pair<Traversal, Set<String>>> getGValueTraversals() {
+ return List.of(
+ Pair.of(__.limit(Scope.local, GValue.of("limit", HIGH_VALUE)), Set.of("limit")),
+ Pair.of(__.skip(Scope.local, GValue.of("skip", HIGH_VALUE)), Set.of("skip")),
+ Pair.of(__.range(Scope.local, GValue.of(LOW_NAME, LOW_VALUE), GValue.of(HIGH_NAME, HIGH_VALUE)), Set.of(LOW_NAME, HIGH_NAME))
+ );
+ }
+
+ @Test
+ public void getLowHighRangeNonGValue() {
+ GraphTraversal.Admin<Object, Object> traversal = __.range(Scope.local, LOW_VALUE, HIGH_VALUE).asAdmin();
+ assertEquals((Long) LOW_VALUE, ((RangeLocalStep) traversal.getSteps().get(0)).getLowRange());
+ assertEquals((Long) HIGH_VALUE, ((RangeLocalStep) traversal.getSteps().get(0)).getHighRange());
+ verifyNoVariables(traversal);
+ }
+
+ @Test
+ public void getLowHighRangeAsGValueShouldNotPinVariables() {
+ GraphTraversal.Admin<Object, Object> traversal = __.range(Scope.local, GValue.of(LOW_NAME, LOW_VALUE), GValue.of(HIGH_NAME, HIGH_VALUE)).asAdmin();
+ assertEquals(GValue.of(LOW_NAME, LOW_VALUE), ((RangeLocalStepPlaceholder) traversal.getSteps().get(0)).getLowRangeAsGValue());
+ assertEquals(GValue.of(HIGH_NAME, HIGH_VALUE), ((RangeLocalStepPlaceholder) traversal.getSteps().get(0)).getHighRangeAsGValue());
+ verifyVariables(traversal, Set.of(), Set.of(LOW_NAME, HIGH_NAME));
+ }
+
++
+ @Test
+ public void getLowShouldPinVariable() {
+ GraphTraversal.Admin<Object, Object> traversal = __.range(Scope.local, GValue.of(LOW_NAME, LOW_VALUE), GValue.of(HIGH_NAME, HIGH_VALUE)).asAdmin();
+ assertEquals((Long) LOW_VALUE, ((RangeLocalStepPlaceholder) traversal.getSteps().get(0)).getLowRange());
+ verifyVariables(traversal, Set.of(LOW_NAME), Set.of(HIGH_NAME));
+ }
+
+ @Test
+ public void getHighShouldPinVariable() {
+ GraphTraversal.Admin<Object, Object> traversal = __.range(Scope.local, GValue.of(LOW_NAME, LOW_VALUE), GValue.of(HIGH_NAME, HIGH_VALUE)).asAdmin();
+ assertEquals((Long) HIGH_VALUE, ((RangeLocalStepPlaceholder) traversal.getSteps().get(0)).getHighRange());
+ verifyVariables(traversal, Set.of(HIGH_NAME), Set.of(LOW_NAME));
+ }
+
+ @Test
+ public void getLowHighRangeGValueFromConcreteStep() {
+ GraphTraversal.Admin<Object, Object> traversal = __.range(Scope.local, GValue.of(LOW_NAME, LOW_VALUE), GValue.of(HIGH_NAME, HIGH_VALUE)).asAdmin();
+ assertEquals((Long) LOW_VALUE, ((RangeLocalStepPlaceholder) traversal.getSteps().get(0)).asConcreteStep().getLowRange());
+ assertEquals((Long) HIGH_VALUE, ((RangeLocalStepPlaceholder) traversal.getSteps().get(0)).asConcreteStep().getHighRange());
+ }
+
@Test
public void applyRangeShouldReturnCollectionForSingleElementFromList() {
// Test that range(local) returns a collection even for single element results