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 2025/09/12 18:27:05 UTC
(tinkerpop) 04/04: Merge branch '3.8-dev'
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit a1bda3eaecffed2dabfba0f627ff2c0917a2a655
Merge: ca91e9c195 5ee753a6aa
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Fri Sep 12 13:50:14 2025 -0400
Merge branch '3.8-dev'
docs/src/upgrade/release-3.8.x.asciidoc | 2 +-
.../process/traversal/TraversalStrategies.java | 5 +-
.../process/traversal/TraversalStrategy.java | 14 ++
.../process/traversal/step/HasContainerHolder.java | 4 +-
.../map/AbstractAddElementStepPlaceholder.java | 28 ++-
.../traversal/step/map/AddEdgeStepContract.java | 10 +
.../traversal/step/map/AddEdgeStepPlaceholder.java | 13 +
.../traversal/step/map/GraphStepContract.java | 11 +
.../finalization/GValueReductionStrategy.java | 54 -----
.../optimization/GValueReductionStrategy.java | 74 ++++++
.../optimization/IncidentToAdjacentStrategy.java | 4 +-
.../optimization/InlineFilterStrategy.java | 4 +-
.../optimization/MatchPredicateStrategy.java | 4 +-
.../optimization/PathProcessorStrategy.java | 22 +-
.../provider/ProviderGValueReductionStrategy.java | 61 +++++
.../process/traversal/util/ConnectiveP.java | 5 +-
.../process/traversal/util/PureTraversal.java | 2 +-
.../process/traversal/util/TraversalHelper.java | 257 +++++++++++++++++++-
.../gremlin/process/traversal/ConnectiveTest.java | 63 +++++
.../optimization/EarlyLimitStrategyTest.java | 1 -
.../optimization/GValueReductionStrategyTest.java | 269 +++++++++++++++++++++
.../ProviderGValueReductionStrategyTest.java | 254 +++++++++++++++++++
.../traversal/util/TraversalHelperTest.java | 118 +++++----
.../TinkerGraphGremlinLangScriptEngineTest.java | 10 +-
.../process/TinkerGraphNoStrategyProvider.java | 2 +-
25 files changed, 1148 insertions(+), 143 deletions(-)
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
index f572604fbb,cb70213eba..21e5c675ab
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
@@@ -39,10 -37,11 +37,11 @@@ import org.apache.tinkerpop.gremlin.pro
import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ProfileStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ReferenceElementStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.AdjacentToIncidentStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ByModulatorOptimizationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.CountStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.EarlyLimitStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ByModulatorOptimizationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.FilterRankingStrategy;
+ import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.GValueReductionStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IdentityRemovalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IncidentToAdjacentStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.InlineFilterStrategy;
diff --cc gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/EarlyLimitStrategyTest.java
index d9d6734d3b,a33dc1dcc4..2d6f139ca3
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/EarlyLimitStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/EarlyLimitStrategyTest.java
@@@ -29,8 -30,8 +29,7 @@@ import org.apache.tinkerpop.gremlin.pro
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStepContract;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.GValueManagerVerifier;
- import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.GValueReductionStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ProfileStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.translator.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.util.CollectionUtil;