You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/06/24 22:50:25 UTC

incubator-tinkerpop git commit: DedupGlobalStep.recommendScope() passes its recommendation through to the next step while remaining global.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master 2268e64e7 -> 4e75615bc


DedupGlobalStep.recommendScope() passes its recommendation through to the next step while remaining global.


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

Branch: refs/heads/master
Commit: 4e75615bcd113fcf15678da58e8d06284b41c098
Parents: 2268e64
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Jun 24 14:50:21 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Jun 24 14:50:21 2015 -0600

----------------------------------------------------------------------
 .../gremlin/process/traversal/step/filter/DedupGlobalStep.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4e75615b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupGlobalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupGlobalStep.java
index d97028f..d3d220c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupGlobalStep.java
@@ -45,6 +45,7 @@ public final class DedupGlobalStep<S> extends FilterStep<S> implements Traversal
     private Set<Object> duplicateSet = new HashSet<>();
     private boolean bypass = false;
     private final Set<String> dedupLabels;
+    private Scope recommendedScope = Scope.global; // pass through
 
     public DedupGlobalStep(final Traversal.Admin traversal, final String... dedupLabels) {
         super(traversal);
@@ -121,12 +122,12 @@ public final class DedupGlobalStep<S> extends FilterStep<S> implements Traversal
 
     @Override
     public Scope recommendNextScope() {
-        return Scope.global;
+        return this.recommendedScope;
     }
 
     @Override
     public void setScope(final Scope scope) {
-
+        this.recommendedScope = scope;
     }
 
     @Override