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/07/10 00:23:16 UTC

(tinkerpop) branch GValue-3.8 updated: fix remaining non-GLV tests

This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch GValue-3.8
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


The following commit(s) were added to refs/heads/GValue-3.8 by this push:
     new 6455fa3635 fix remaining non-GLV tests
6455fa3635 is described below

commit 6455fa36354272c719f108a76261a84eca9fc90a
Author: Cole-Greer <Co...@improving.com>
AuthorDate: Wed Jul 9 17:21:36 2025 -0700

    fix remaining non-GLV tests
---
 .../tinkerpop/gremlin/process/traversal/P.java     |  2 +-
 .../traversal/dsl/graph/GraphTraversal.java        |  4 ++--
 .../traversal/dsl/graph/GraphTraversalSource.java  | 23 +++++++++++-----------
 .../process/traversal/step/GValueHolder.java       |  4 +++-
 .../traversal/step/map/AddEdgeStepPlaceholder.java | 18 +++++++++++++++++
 .../step/map/AddVertexStepPlaceholder.java         |  4 ++++
 .../strategy/decoration/PartitionStrategy.java     |  7 ++++---
 .../finalization/GValueReductionStrategy.java      |  1 +
 .../process/traversal/util/DefaultTraversal.java   |  3 +++
 9 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
index 1440d072f6..29fffabbe0 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
@@ -317,7 +317,7 @@ public class P<V> implements Predicate<V>, Serializable, Cloneable {
             for (int i = 0; i < this.gValues.length; i++) {
                 if (name.equals(this.gValues[i].getName())) {
                     this.gValues[i] = GValue.of(name, (V) value);
-                    ((List<V>) value).set(i, (V) value);
+                    ((List<V>) this.value).set(i, (V) value);
                 }
             }
         }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 042433d7b8..ea2d4a0436 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -4500,7 +4500,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         final Step<?, ?> lastStep = this.asAdmin().getEndStep();
 
         // CardinalityValueTraversal doesn't make sense for any prior step other than mergeV()
-        if (!(lastStep instanceof MergeVertexStep) && m != null) {
+        if (!(lastStep instanceof MergeVertexStep || lastStep instanceof MergeVertexStepPlaceholder) && m != null) {
             for (Object k : m.keySet()) {
                 final Object o = m.get(k);
                 if (o instanceof CardinalityValueTraversal)
@@ -4528,7 +4528,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         final Step<?, ?> lastStep = this.asAdmin().getEndStep();
 
         // CardinalityValueTraversal doesn't make sense for any prior step other than mergeV()
-        if (!(lastStep instanceof MergeVertexStep)) {
+        if (!(lastStep instanceof MergeVertexStep || lastStep instanceof MergeVertexStepPlaceholder)) {
             throw new IllegalStateException("option() with the Cardinality argument can only be used following mergeV()");
         }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index 8aebf80103..b65624aafe 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@ -35,7 +35,9 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.map.CallStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStepPlaceholder;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeEdgeStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeEdgeStepPlaceholder;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeVertexStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeVertexStepPlaceholder;
 import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.IoStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.stepContract.GraphStepInterface;
@@ -411,7 +413,7 @@ public class GraphTraversalSource implements TraversalSource {
         final GraphTraversalSource clone = this.clone();
         clone.bytecode.addStep(GraphTraversal.Symbols.mergeV, searchCreate);
         final GraphTraversal.Admin<Vertex, Vertex> traversal = new DefaultGraphTraversal<>(clone);
-        return traversal.addStep(new MergeVertexStep(traversal, true, searchCreate));
+        return traversal.addStep(new MergeVertexStepPlaceholder<>(traversal, true, searchCreate));
     }
 
     /**
@@ -429,8 +431,8 @@ public class GraphTraversalSource implements TraversalSource {
         clone.bytecode.addStep(GraphTraversal.Symbols.mergeV, searchCreate);
         final GraphTraversal.Admin<S, Vertex> traversal = new DefaultGraphTraversal<>(clone);
 
-        final MergeVertexStep<S> step = null == searchCreate ? new MergeVertexStep(traversal, true, (Map) null) :
-                new MergeVertexStep(traversal, true, searchCreate.asAdmin());
+        final MergeVertexStepPlaceholder<S> step = null == searchCreate ? new MergeVertexStepPlaceholder(traversal, true, (Map) null) :
+                new MergeVertexStepPlaceholder(traversal, true, searchCreate.asAdmin());
 
         return traversal.addStep(step);
     }
@@ -448,7 +450,7 @@ public class GraphTraversalSource implements TraversalSource {
         final GraphTraversalSource clone = GraphTraversalSource.this.clone();
         clone.bytecode.addStep(GraphTraversal.Symbols.mergeV, searchCreate);
         final GraphTraversal.Admin<Vertex, Vertex> traversal = new DefaultGraphTraversal<>(clone);
-        return traversal.addStep(new MergeVertexStep(traversal, true, searchCreate == null ? (Map) null : searchCreate.get())); //TODO
+        return traversal.addStep(new MergeVertexStepPlaceholder(traversal, true, searchCreate));
     }
 
     /**
@@ -458,11 +460,11 @@ public class GraphTraversalSource implements TraversalSource {
      * @param searchCreate This {@code Map} can have a key of {@link T} {@link Direction} or a {@code String}.
      * @since 3.6.0
      */
-    public GraphTraversal<Edge, Edge> mergeE(final Map<?, Object> searchCreate) {
+    public GraphTraversal<Edge, Edge> mergeE(final Map<Object, Object> searchCreate) {
         final GraphTraversalSource clone = this.clone();
         clone.bytecode.addStep(GraphTraversal.Symbols.mergeE, searchCreate);
         final GraphTraversal.Admin<Edge, Edge> traversal = new DefaultGraphTraversal<>(clone);
-        return traversal.addStep(new MergeEdgeStep(traversal, true, searchCreate));
+        return traversal.addStep(new MergeEdgeStepPlaceholder<>(traversal, true, searchCreate));
     }
 
     /**
@@ -477,8 +479,8 @@ public class GraphTraversalSource implements TraversalSource {
         clone.bytecode.addStep(GraphTraversal.Symbols.mergeE, searchCreate);
         final GraphTraversal.Admin<Edge, Edge> traversal = new DefaultGraphTraversal<>(clone);
 
-        final MergeEdgeStep step = null == searchCreate ? new MergeEdgeStep(traversal, true,  (Map) null) :
-                new MergeEdgeStep(traversal, true, searchCreate.asAdmin());
+        final MergeEdgeStepPlaceholder step = null == searchCreate ? new MergeEdgeStepPlaceholder(traversal, true,  (Map) null) :
+                new MergeEdgeStepPlaceholder(traversal, true, searchCreate.asAdmin());
 
         return traversal.addStep(step);
     }
@@ -490,12 +492,11 @@ public class GraphTraversalSource implements TraversalSource {
      * @param searchCreate This {@code Map} can have a key of {@link T} {@link Direction} or a {@code String}.
      * @since 4.0.0
      */
-    public GraphTraversal<Edge, Edge> mergeE(final GValue<Map<?, ?>> searchCreate) {
+    public GraphTraversal<Edge, Edge> mergeE(final GValue<Map<Object, Object>> searchCreate) {
         final GraphTraversalSource clone = GraphTraversalSource.this.clone();
         clone.bytecode.addStep(GraphTraversal.Symbols.mergeE, searchCreate);
         final GraphTraversal.Admin<Edge, Edge> traversal = new DefaultGraphTraversal<>(clone);
-        final MergeEdgeStep<Edge> step = new MergeEdgeStep(traversal, true, searchCreate == null ? (Map) null : searchCreate.get());
-        return traversal.addStep(new MergeEdgeStep(traversal, true, searchCreate == null ? (Map) null : searchCreate.get())); //TODO
+        return traversal.addStep(new MergeEdgeStepPlaceholder(traversal, true, searchCreate));
     }
 
     /**
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueHolder.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueHolder.java
index 5e1b77ea39..4f2973ce93 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueHolder.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValueHolder.java
@@ -32,7 +32,9 @@ public interface GValueHolder<S, E> extends Step<S, E> {
         manger.getGValues().forEach(gValue -> {
             updateVariable(gValue.getName(), gValue.get());
         });
-        TraversalHelper.replaceStep(this, this.asConcreteStep(), this.getTraversal());
+        Step<S, E> concreteStep = this.asConcreteStep();
+        concreteStep.setId(this.getId());
+        TraversalHelper.replaceStep(this, concreteStep, this.getTraversal());
     }
 
     public Step<S, E> asConcreteStep();
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStepPlaceholder.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStepPlaceholder.java
index 5f91ecda4f..9e5bbac99e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStepPlaceholder.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStepPlaceholder.java
@@ -327,4 +327,22 @@ public class AddEdgeStepPlaceholder<S> extends AbstractStep<S, Edge>
     public CallbackRegistry<Event.EdgeAddedEvent> getMutatingCallbackRegistry() {
         throw new IllegalStateException("Cannot get mutating CallbackRegistry on GValue placeholder step");
     }
+
+    @Override
+    public AddEdgeStepPlaceholder<S> clone() { //TODO for equivalent steps
+        final AddEdgeStepPlaceholder<S> clone = (AddEdgeStepPlaceholder) super.clone();
+        if (label != null) {
+            clone.label = label.clone();
+        }
+        if (from != null){
+            clone.from = from.clone();
+        }
+        if (to != null){
+            clone.to = to.clone();
+        }
+        clone.properties.putAll(properties);
+        clone.elementId = elementId;
+        clone.scopeKeys.addAll(scopeKeys);
+        return clone;
+    }
 }
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexStepPlaceholder.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexStepPlaceholder.java
index 6da9e11881..f52e884c13 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexStepPlaceholder.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexStepPlaceholder.java
@@ -185,6 +185,10 @@ public class AddVertexStepPlaceholder<S> extends AbstractStep<S, Vertex>
     public Step asConcreteStep() {
         AddVertexStep<S> step = new AddVertexStep<>(traversal, label instanceof GValueConstantTraversal ? ((GValueConstantTraversal<S, String>) label).getConstantTraversal() : label);
 
+        if (elementId != null) {
+            step.setElementId(elementId.get()); //TODO copy to similar steps
+        }
+
         for (final Map.Entry<Object, List<Object>> entry : properties.entrySet()) {
             for (Object value : entry.getValue()) {
                 step.addProperty(entry.getKey(), value instanceof GValue ? ((GValue<?>) value).get() : value);
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategy.java
index e32b969ffd..cf4329480a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategy.java
@@ -246,8 +246,9 @@ public final class PartitionStrategy extends AbstractTraversalStrategy<Traversal
                         step instanceof AddVertexStartStepPlaceholder || step instanceof AddEdgeStartStepPlaceholder) {
                     final Map<Object, List<Object>> params = ((PropertyAdding) step).getProperties();
 
-                    params.forEach((k, v) -> {
-
+                    // we get accused of ConcurrentModification if we rely on either the entry set or key set iterators in HashMap here
+                    for (Object k : params.keySet().toArray()) {
+                        final List<Object> v = params.get(k);
                         // need to filter out T based keys
                         if (k instanceof String) {
                             final List<Step> addPropertyStepsToAppend = new ArrayList<>(v.size());
@@ -266,7 +267,7 @@ public final class PartitionStrategy extends AbstractTraversalStrategy<Traversal
                                 TraversalHelper.insertAfterStep(addPropertyStep, step, traversal);
                             });
                         }
-                    });
+                    }
                 }
             }
         });
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/finalization/GValueReductionStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/finalization/GValueReductionStrategy.java
index a00d40349a..9388a13218 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/finalization/GValueReductionStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/finalization/GValueReductionStrategy.java
@@ -23,6 +23,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.step.GValueHolder;
 import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.util.StepPosition;
 import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
 
 import java.util.List;
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
index 57ef87cac7..8bfacc700f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
@@ -94,6 +94,9 @@ public class DefaultTraversal<S, E> implements Traversal.Admin<S, E> {
         this(traversalSource.getGraph(), traversalSource.getStrategies(), traversal.getBytecode());
         this.g = traversalSource;
         steps.addAll(traversal.getSteps());
+        for (Step step : traversal.getSteps()) {
+            step.setTraversal(this);
+        }
     }
 
     public DefaultTraversal() {