You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2015/06/05 20:46:53 UTC

[23/26] incubator-tinkerpop git commit: CollectingBarrierStep now supports a maxBarrierSize. The default is Integer.MAX_VALUE. If other, then when the traverser set barrier is filled to maxBarrierSize, it is Consumer and then drained fully

CollectingBarrierStep now supports a maxBarrierSize. The default is Integer.MAX_VALUE. If other, then when the traverser set barrier is filled to maxBarrierSize, it is Consumer<TravesrserSet> and then drained fully.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3858e379
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3858e379
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3858e379

Branch: refs/heads/preprocessor
Commit: 3858e37919951e1601fbea27fd04dcd1ff4239a0
Parents: b37e8ee
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Jun 5 12:16:39 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Jun 5 12:16:39 2015 -0600

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 .../traversal/dsl/graph/GraphTraversal.java     |  4 ++++
 .../gremlin/process/traversal/dsl/graph/__.java |  4 ++++
 .../step/util/CollectingBarrierStep.java        | 22 +++++++++++++++++---
 .../traversal/step/util/NoOpBarrierStep.java    |  4 ++++
 5 files changed, 32 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3858e379/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 96abe2b..44a4b84 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,7 @@ image::http://www.tinkerpop.com/docs/current/images/gremlin-hindu.png[width=225]
 TinkerPop 3.0.0.GA (NOT OFFICIALLY RELEASED YET)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+* `CollectingBarrierStep` supports `maxBarrierSize` for "lazy barrier," memory conservation.
 * `Scoping` now has `getScope()`, `setScope()`, and `getScopeKeys()`.
 * `ScopingStrategy` is smart about `Scope.global` settings based on traversal labels.
 * `Scope.global` and `Scope.local` both account for traversal side-effects. The distinction is between path and map.

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3858e379/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
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 c41c44c..2dc03c7 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
@@ -708,6 +708,10 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
         return this.asAdmin().addStep(new NoOpBarrierStep<>(this.asAdmin()));
     }
 
+    public default GraphTraversal<S, E> barrier(final int maxBarrierSize) {
+        return this.asAdmin().addStep(new NoOpBarrierStep<>(this.asAdmin(), maxBarrierSize));
+    }
+
     ////
 
     public default GraphTraversal<S, E> by(final Traversal<?, ?> byTraversal) {

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3858e379/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
index b290051..f2d3dce 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
@@ -580,4 +580,8 @@ public class __ {
         return __.<A>start().barrier();
     }
 
+    public static <A> GraphTraversal<A, A> barrier(final int maxBarrierSize) {
+        return __.<A>start().barrier(maxBarrierSize);
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3858e379/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/CollectingBarrierStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/CollectingBarrierStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/CollectingBarrierStep.java
index 83907fa..e8227d6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/CollectingBarrierStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/CollectingBarrierStep.java
@@ -32,8 +32,15 @@ import java.util.Set;
 public abstract class CollectingBarrierStep<S> extends AbstractStep<S, S> {
     private TraverserSet<S> traverserSet = new TraverserSet<>();
 
+    private int maxBarrierSize;
+
     public CollectingBarrierStep(final Traversal.Admin traversal) {
+        this(traversal, Integer.MAX_VALUE);
+    }
+
+    public CollectingBarrierStep(final Traversal.Admin traversal, final int maxBarrierSize) {
         super(traversal);
+        this.maxBarrierSize = maxBarrierSize;
     }
 
     public abstract void barrierConsumer(final TraverserSet<S> traverserSet);
@@ -45,9 +52,18 @@ public abstract class CollectingBarrierStep<S> extends AbstractStep<S, S> {
 
     @Override
     public Traverser<S> processNextStart() {
-        if (this.starts.hasNext()) {
-            this.starts.forEachRemaining(this.traverserSet::add);
-            this.barrierConsumer(this.traverserSet);
+        if (!this.traverserSet.isEmpty()) {
+            return this.traverserSet.remove();
+        } else if (this.starts.hasNext()) {
+            if (Integer.MAX_VALUE == this.maxBarrierSize) {
+                this.starts.forEachRemaining(this.traverserSet::add);
+                this.barrierConsumer(this.traverserSet);
+            } else {
+                while (this.starts.hasNext() && this.traverserSet.size() < this.maxBarrierSize) {
+                    this.traverserSet.add(this.starts.next());
+                }
+                this.barrierConsumer(this.traverserSet);
+            }
         }
         return this.traverserSet.remove();
     }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3858e379/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/NoOpBarrierStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/NoOpBarrierStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/NoOpBarrierStep.java
index 0bf7023..647cc84 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/NoOpBarrierStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/NoOpBarrierStep.java
@@ -33,6 +33,10 @@ public final class NoOpBarrierStep<S> extends CollectingBarrierStep<S> {
         super(traversal);
     }
 
+    public NoOpBarrierStep(final Traversal.Admin traversal, final int maxBarrierSize) {
+        super(traversal, maxBarrierSize);
+    }
+
     @Override
     public void barrierConsumer(final TraverserSet<S> traverserSet) {