Merge branch '3.8-dev'

Author: spmallette

CHANGELOG.asciidoc

@@ -266,7 +266,10 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 
 [[release-3-7-6]]
 === TinkerPop 3.7.6 (NOT OFFICIALLY RELEASED YET)
+
 * Integrated Python driver examples into automated build process to ensure examples remain functional.
+* Fixed bug in `SubgraphStrategy` where specifying `edges` and `vertices` filters that had `map`-type steps could generate an error.
+* Added `closeSessionPostGraphOp` to the Gremlin Server settings to indicate that the `Session` should be closed on either a successful commit or rollback.
 
 [[release-3-7-5]]
 === TinkerPop 3.7.5 (Release Date: November 12, 2025)

docs/src/reference/the-traversal.asciidoc

@@ -6451,6 +6451,9 @@ g.V().outE().inV().
     by('name')
 ----
 
+WARNING: It is not advisable to provide filtering traversals that do more than just filter (e.g. mutation steps,
+side-effects, etc.) - prefer use of the standard `has()` step variations for best results.
+
 === VertexProgramDenyStrategy
 
 Like the `ReadOnlyStrategy`, the `VertexProgramDenyStrategy` denies the execution of specific traversals. A `Traversal`

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java

@@ -22,6 +22,7 @@
 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.dsl.graph.DefaultGraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
 import org.apache.tinkerpop.gremlin.process.traversal.lambda.ValueTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
@@ -285,7 +286,8 @@ public void apply(final Traversal.Admin<?, ?> traversal) {
             TraversalHelper.applyTraversalRecursively(t -> t.getStartStep().addLabel(MARKER), vertexPredicate);
             return Optional.of(vertexPredicate);
         } else {
-            final Traversal.Admin<Edge, ?> ec = edgeCriterion.clone();
+            final Traversal.Admin<Edge, ?> ec = new DefaultGraphTraversal<>();
+            ec.addStep(new TraversalFilterStep<>(ec, edgeCriterion.clone()));
             ec.addStep(new TraversalFilterStep<>(ec, vertexPredicate));
             TraversalHelper.applyTraversalRecursively(t -> t.getStartStep().addLabel(MARKER), ec);
             return Optional.of(ec);

gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs

@@ -877,6 +877,7 @@ private static IDictionary<string, List<Func<GraphTraversalSource, IDictionary<s
                {"g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX12X_bothV", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: false, vertices: __.Has("name", P.Within("josh", "lop", "ripple")), edges: __.Or(__.Has("weight", 0.4).HasLabel("created"), __.Has("weight", 1.0).HasLabel("created")))).E(p["eid12"]).BothV()}}, 
                {"g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX9X_bothV", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: false, vertices: __.Has("name", P.Within("josh", "lop", "ripple")), edges: __.Or(__.Has("weight", 0.4).HasLabel("created"), __.Has("weight", 1.0).HasLabel("created")))).E(p["eid9"]).BothV()}}, 
                {"g_withStrategiesXSubgraphStrategyXcheckAdjacentVertices_subgraphDXX_EX9X_bothV", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new SubgraphStrategy(checkAdjacentVertices: true, vertices: __.Has("name", P.Within("josh", "lop", "ripple")), edges: __.Or(__.Has("weight", 0.4).HasLabel("created"), __.Has("weight", 1.0).HasLabel("created")))).E(p["eid9"]).BothV()}}, 
+               {"g_withStrategiesXSubgraphStrategyXuseMapStepsInFilterX_E", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new SubgraphStrategy(edges: __.Label().Is(P.Eq("created")), vertices: __.Values<object>("name").Is(P.Within("lop", "josh")), checkAdjacentVertices: true)).E()}}, 
                {"g_withStrategiesXVertexProgramRestrictionStrategyX_withoutStrategiesXVertexProgramStrategyX_V", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new VertexProgramRestrictionStrategy()).WithoutStrategies(typeof(VertexProgramStrategy)).V()}}, 
                {"g_withStrategiesXVertexProgramRestrictionStrategy_VertexProgramStrategyX_V", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithStrategies(new VertexProgramRestrictionStrategy(), new VertexProgramStrategy()).V()}}, 
                {"g_withoutStrategiesXVertexProgramRestrictionStrategyX_V", new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>> {(g,p) =>g.WithoutStrategies(typeof(VertexProgramRestrictionStrategy)).WithStrategies(new VertexProgramStrategy()).V()}}, 

gremlin-go/driver/cucumber/gremlin.go

@@ -848,6 +848,7 @@ var translationMap = map[string][]func(g *gremlingo.GraphTraversalSource, p map[
     "g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX12X_bothV": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.SubgraphStrategy(gremlingo.SubgraphStrategyConfig{CheckAdjacentVertices: false, Vertices: gremlingo.T__.Has("name", gremlingo.P.Within("josh", "lop", "ripple")), Edges: gremlingo.T__.Or(gremlingo.T__.Has("weight", 0.4).HasLabel("created"), gremlingo.T__.Has("weight", 1.0).HasLabel("created"))})).E(p["eid12"]).BothV()}}, 
     "g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX9X_bothV": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.SubgraphStrategy(gremlingo.SubgraphStrategyConfig{CheckAdjacentVertices: false, Vertices: gremlingo.T__.Has("name", gremlingo.P.Within("josh", "lop", "ripple")), Edges: gremlingo.T__.Or(gremlingo.T__.Has("weight", 0.4).HasLabel("created"), gremlingo.T__.Has("weight", 1.0).HasLabel("created"))})).E(p["eid9"]).BothV()}}, 
     "g_withStrategiesXSubgraphStrategyXcheckAdjacentVertices_subgraphDXX_EX9X_bothV": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.SubgraphStrategy(gremlingo.SubgraphStrategyConfig{CheckAdjacentVertices: true, Vertices: gremlingo.T__.Has("name", gremlingo.P.Within("josh", "lop", "ripple")), Edges: gremlingo.T__.Or(gremlingo.T__.Has("weight", 0.4).HasLabel("created"), gremlingo.T__.Has("weight", 1.0).HasLabel("created"))})).E(p["eid9"]).BothV()}}, 
+    "g_withStrategiesXSubgraphStrategyXuseMapStepsInFilterX_E": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.SubgraphStrategy(gremlingo.SubgraphStrategyConfig{Edges: gremlingo.T__.Label().Is(gremlingo.P.Eq("created")), Vertices: gremlingo.T__.Values("name").Is(gremlingo.P.Within("lop", "josh")), CheckAdjacentVertices: true})).E()}}, 
     "g_withStrategiesXVertexProgramRestrictionStrategyX_withoutStrategiesXVertexProgramStrategyX_V": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.VertexProgramRestrictionStrategy()).WithoutStrategies(gremlingo.VertexProgramStrategy()).V()}}, 
     "g_withStrategiesXVertexProgramRestrictionStrategy_VertexProgramStrategyX_V": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithStrategies(gremlingo.VertexProgramRestrictionStrategy(), gremlingo.VertexProgramStrategy()).V()}}, 
     "g_withoutStrategiesXVertexProgramRestrictionStrategyX_V": {func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal {return g.WithoutStrategies(gremlingo.VertexProgramRestrictionStrategy()).WithStrategies(gremlingo.VertexProgramStrategy()).V()}}, 

gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js

@@ -851,6 +851,7 @@
     'g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX12X_bothV': [(lambda g, eid12=None:g.with_strategies(SubgraphStrategy(check_adjacent_vertices=False, vertices=__.has('name', P.within('josh', 'lop', 'ripple')), edges=__.or_(__.has('weight', 0.4).has_label('created'), __.has('weight', 1.0).has_label('created')))).E(eid12).both_v())], 
     'g_withStrategiesXSubgraphStrategyXsubgraphDXX_EX9X_bothV': [(lambda g, eid9=None:g.with_strategies(SubgraphStrategy(check_adjacent_vertices=False, vertices=__.has('name', P.within('josh', 'lop', 'ripple')), edges=__.or_(__.has('weight', 0.4).has_label('created'), __.has('weight', 1.0).has_label('created')))).E(eid9).both_v())], 
     'g_withStrategiesXSubgraphStrategyXcheckAdjacentVertices_subgraphDXX_EX9X_bothV': [(lambda g, eid9=None:g.with_strategies(SubgraphStrategy(check_adjacent_vertices=True, vertices=__.has('name', P.within('josh', 'lop', 'ripple')), edges=__.or_(__.has('weight', 0.4).has_label('created'), __.has('weight', 1.0).has_label('created')))).E(eid9).both_v())], 
+    'g_withStrategiesXSubgraphStrategyXuseMapStepsInFilterX_E': [(lambda g:g.with_strategies(SubgraphStrategy(edges=__.label().is_(P.eq('created')), vertices=__.values('name').is_(P.within('lop', 'josh')), check_adjacent_vertices=True)).E())], 
     'g_withStrategiesXVertexProgramRestrictionStrategyX_withoutStrategiesXVertexProgramStrategyX_V': [(lambda g:g.with_strategies(VertexProgramRestrictionStrategy()).without_strategies(VertexProgramStrategy).V())], 
     'g_withStrategiesXVertexProgramRestrictionStrategy_VertexProgramStrategyX_V': [(lambda g:g.with_strategies(VertexProgramRestrictionStrategy(), VertexProgramStrategy()).V())], 
     'g_withoutStrategiesXVertexProgramRestrictionStrategyX_V': [(lambda g:g.without_strategies(VertexProgramRestrictionStrategy).with_strategies(VertexProgramStrategy()).V())], 

gremlin-python/src/main/python/radish/gremlin.py

@@ -943,4 +943,19 @@ Feature: Step - SubgraphStrategy
                                                          __.has("weight", 1.0).hasLabel("created")))).E(eid9).bothV()
       """
     When iterated to list
-    Then the result should be empty
+    Then the result should be empty
+
+  @WithSubgraphStrategy @GraphComputerVerificationStarGraphExceeded
+  Scenario: g_withStrategiesXSubgraphStrategyXuseMapStepsInFilterX_E
+    Given the modern graph
+    And the traversal of
+      """
+      g.withStrategies(new SubgraphStrategy(edges: __.label().is(P.eq("created")),
+                                            vertices: __.values("name").is(P.within("lop","josh")),
+                                            checkAdjacentVertices: true)).
+        E()
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | e[josh-created->lop] |