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/03/28 15:35:09 UTC
(tinkerpop) branch master updated (0fc776dbf2 -> 4317779308)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from 0fc776dbf2 Merge branch '3.8-dev'
add a43618155b TINKERPOP-2971 Fixed bug in value traversal to group()
new 4317779308 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:
CHANGELOG.asciidoc | 3 +
docs/src/upgrade/release-3.8.x.asciidoc | 32 +++++
.../process/computer/util/ComputerGraph.java | 2 +-
.../gremlin/process/traversal/step/Barrier.java | 7 +
.../{MapReducer.java => FilteringBarrier.java} | 8 +-
.../gremlin/process/traversal/step/Grouping.java | 7 +
.../process/traversal/step/LocalBarrier.java | 4 +
.../process/traversal/step/ProfilingAware.java | 12 +-
.../traversal/step/filter/DedupGlobalStep.java | 11 +-
.../traversal/step/filter/RangeGlobalStep.java | 10 +-
.../traversal/step/filter/TailGlobalStep.java | 9 +-
.../process/traversal/step/map/GroupStep.java | 48 +++----
.../step/sideEffect/GroupSideEffectStep.java | 52 ++++----
.../step/sideEffect/SideEffectCapStep.java | 6 +
.../traversal/step/util/CollectingBarrierStep.java | 9 +-
.../traversal/step/util/ReducingBarrierStep.java | 6 +-
.../strategy/finalization/ProfileStrategy.java | 5 -
.../process/traversal/util/DefaultTraversal.java | 6 +
.../gremlin/structure/io/gryo/GryoVersion.java | 11 ++
.../structure/util/detached/DetachedFactory.java | 6 +-
.../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 18 +++
gremlin-go/driver/cucumber/gremlin.go | 18 +++
.../gremlin-javascript/test/cucumber/gremlin.js | 18 +++
gremlin-python/src/main/python/radish/gremlin.py | 18 +++
.../gremlin/test/features/sideEffect/Group.feature | 145 ++++++++++++++++++++-
.../test/features/sideEffect/SideEffectCap.feature | 121 ++++++++++++++++-
26 files changed, 519 insertions(+), 73 deletions(-)
copy gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/{MapReducer.java => FilteringBarrier.java} (78%)
(tinkerpop) 01/01: Merge branch '3.8-dev'
Posted by sp...@apache.org.
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 431777930868a7d7d7d40dc87e4d1752fbdcd0ca
Merge: 0fc776dbf2 a43618155b
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Fri Mar 28 11:34:59 2025 -0400
Merge branch '3.8-dev'
CHANGELOG.asciidoc | 3 +
docs/src/upgrade/release-3.8.x.asciidoc | 32 +++++
.../process/computer/util/ComputerGraph.java | 2 +-
.../gremlin/process/traversal/step/Barrier.java | 7 +
.../{LocalBarrier.java => FilteringBarrier.java} | 15 +--
.../gremlin/process/traversal/step/Grouping.java | 7 +
.../process/traversal/step/LocalBarrier.java | 4 +
.../process/traversal/step/ProfilingAware.java | 12 +-
.../traversal/step/filter/DedupGlobalStep.java | 11 +-
.../traversal/step/filter/RangeGlobalStep.java | 10 +-
.../traversal/step/filter/TailGlobalStep.java | 9 +-
.../process/traversal/step/map/GroupStep.java | 48 +++----
.../step/sideEffect/GroupSideEffectStep.java | 52 ++++----
.../step/sideEffect/SideEffectCapStep.java | 6 +
.../traversal/step/util/CollectingBarrierStep.java | 9 +-
.../traversal/step/util/ReducingBarrierStep.java | 6 +-
.../strategy/finalization/ProfileStrategy.java | 5 -
.../process/traversal/util/DefaultTraversal.java | 6 +
.../gremlin/structure/io/gryo/GryoVersion.java | 11 ++
.../structure/util/detached/DetachedFactory.java | 6 +-
.../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 18 +++
gremlin-go/driver/cucumber/gremlin.go | 18 +++
.../gremlin-javascript/test/cucumber/gremlin.js | 18 +++
gremlin-python/src/main/python/radish/gremlin.py | 18 +++
.../gremlin/test/features/sideEffect/Group.feature | 145 ++++++++++++++++++++-
.../test/features/sideEffect/SideEffectCap.feature | 121 ++++++++++++++++-
26 files changed, 519 insertions(+), 80 deletions(-)
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeGlobalStep.java
index 7b6fc721ab,a0bf19489d..da1c7769e6
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeGlobalStep.java
@@@ -21,9 -21,8 +21,9 @@@ package org.apache.tinkerpop.gremlin.pr
import org.apache.tinkerpop.gremlin.process.computer.MemoryComputeKey;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
- import org.apache.tinkerpop.gremlin.process.traversal.step.Barrier;
import org.apache.tinkerpop.gremlin.process.traversal.step.Bypassing;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.FilteringBarrier;
import org.apache.tinkerpop.gremlin.process.traversal.step.Ranging;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSet;
@@@ -43,10 -41,10 +42,10 @@@ import java.util.function.BinaryOperato
* @author Bob Briody (http://bobbriody.com)
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
- public final class RangeGlobalStep<S> extends FilterStep<S> implements Ranging, Bypassing, Barrier<TraverserSet<S>> {
+ public final class RangeGlobalStep<S> extends FilterStep<S> implements Ranging, Bypassing, FilteringBarrier<TraverserSet<S>> {
- private long low;
- private final long high;
+ private GValue<Long> low;
+ private final GValue<Long> high;
private AtomicLong counter = new AtomicLong(0l);
private boolean bypass;
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TailGlobalStep.java
index 293eba24de,c6493ed80e..fde75ea3ad
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TailGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TailGlobalStep.java
@@@ -21,9 -21,8 +21,9 @@@ package org.apache.tinkerpop.gremlin.pr
import org.apache.tinkerpop.gremlin.process.computer.MemoryComputeKey;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
- import org.apache.tinkerpop.gremlin.process.traversal.step.Barrier;
import org.apache.tinkerpop.gremlin.process.traversal.step.Bypassing;
+import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.FilteringBarrier;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSet;
@@@ -40,9 -39,9 +40,9 @@@ import java.util.Set
/**
* @author Matt Frantz (http://github.com/mhfrantz)
*/
- public final class TailGlobalStep<S> extends AbstractStep<S, S> implements Bypassing, Barrier<TraverserSet<S>> {
+ public final class TailGlobalStep<S> extends AbstractStep<S, S> implements Bypassing, FilteringBarrier<TraverserSet<S>> {
- private final long limit;
+ private final GValue<Long> limit;
private Deque<Traverser.Admin<S>> tail;
private long tailBulk = 0L;
private boolean bypass = false;
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 7fa37b5acb,f4eb044b0b..723f469fa9
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@@ -23,8 -22,10 +23,9 @@@ import org.apache.tinkerpop.gremlin.pro
import org.apache.tinkerpop.gremlin.process.computer.MapReduce;
import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.optimization.GraphFilterStrategy;
+ import org.apache.tinkerpop.gremlin.process.computer.util.ComputerGraph;
import org.apache.tinkerpop.gremlin.process.computer.util.MapMemory;
import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.Contains;
import org.apache.tinkerpop.gremlin.process.traversal.DT;
import org.apache.tinkerpop.gremlin.process.traversal.Merge;