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/05/06 22:26:43 UTC
incubator-tinkerpop git commit: barrier steps now have protected
methods like their filter, map, etc. counterparts.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master db1f2fa18 -> 1c069d80d
barrier steps now have protected methods like their filter, map, etc. counterparts.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/1c069d80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/1c069d80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/1c069d80
Branch: refs/heads/master
Commit: 1c069d80d1a3bebab5d117f430646364172a3cea
Parents: db1f2fa
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed May 6 14:26:25 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed May 6 14:26:36 2015 -0600
----------------------------------------------------------------------
.../traversal/step/filter/SampleGlobalStep.java | 2 +-
.../traversal/step/filter/WhereStep.java | 2 -
.../traversal/step/map/OrderGlobalStep.java | 2 +-
.../step/sideEffect/AggregateStep.java | 2 +-
.../step/sideEffect/SideEffectCapStep.java | 2 +-
.../step/util/CollectingBarrierStep.java | 2 +-
.../traversal/step/util/MarkerIdentityStep.java | 39 --------------------
.../traversal/step/util/NoOpBarrierStep.java | 2 +-
.../step/util/SupplyingBarrierStep.java | 2 +-
9 files changed, 7 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1c069d80/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/SampleGlobalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/SampleGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/SampleGlobalStep.java
index 5817f37..41c1092 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/SampleGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/SampleGlobalStep.java
@@ -63,7 +63,7 @@ public final class SampleGlobalStep<S> extends CollectingBarrierStep<S> implemen
}
@Override
- public void barrierConsumer(final TraverserSet<S> traverserSet) {
+ protected void barrierConsumer(final TraverserSet<S> traverserSet) {
// return the entire traverser set if the set is smaller than the amount to sample
if (traverserSet.bulkSize() <= this.amountToSample)
return;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1c069d80/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereStep.java
index 7b80015..633283a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereStep.java
@@ -22,7 +22,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.MarkerIdentityStep;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.P;
@@ -66,7 +65,6 @@ public final class WhereStep<E> extends FilterStep<Map<String, E>> implements Tr
this.firstKey = startStep.getLabels().iterator().next();
/// get the end-step as()
Step<?, ?> endStep = this.traversalConstraint.getEndStep();
- if (endStep instanceof MarkerIdentityStep) endStep = endStep.getPreviousStep(); // DAH
if (endStep.getLabels().size() > 1)
throw new IllegalArgumentException("Where traversal can not have multiple labels on the end step: " + this.traversalConstraint);
this.secondKey = endStep.getLabels().isEmpty() ? null : endStep.getLabels().iterator().next();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1c069d80/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
index 92e2993..464c020 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
@@ -50,7 +50,7 @@ public final class OrderGlobalStep<S> extends CollectingBarrierStep<S> implement
}
@Override
- public void barrierConsumer(final TraverserSet<S> traverserSet) {
+ protected void barrierConsumer(final TraverserSet<S> traverserSet) {
traverserSet.sort(this.comparators.isEmpty() ? new ComparatorTraverser(Order.incr) : new ChainedComparator(ComparatorTraverser.convertComparator((List) this.comparators)));
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1c069d80/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AggregateStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AggregateStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AggregateStep.java
index 996357c..3ce80a5 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AggregateStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AggregateStep.java
@@ -84,7 +84,7 @@ public final class AggregateStep<S> extends CollectingBarrierStep<S> implements
}
@Override
- public void barrierConsumer(final TraverserSet<S> traverserSet) {
+ protected void barrierConsumer(final TraverserSet<S> traverserSet) {
traverserSet.forEach(traverser ->
TraversalHelper.addToCollection(
traverser.getSideEffects().<Collection<Object>>get(this.sideEffectKey).get(),
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1c069d80/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java
index 52d0f87..2b15d67 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java
@@ -61,7 +61,7 @@ public final class SideEffectCapStep<S, E> extends SupplyingBarrierStep<S, E> {
}
@Override
- public E supply() {
+ protected E supply() {
return this.sideEffectKeys.size() == 1 ?
this.getTraversal().asAdmin().getSideEffects().<E>get(this.sideEffectKeys.get(0)).get() :
(E) this.getMapOfSideEffects();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1c069d80/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..6f4fdb2 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
@@ -36,7 +36,7 @@ public abstract class CollectingBarrierStep<S> extends AbstractStep<S, S> {
super(traversal);
}
- public abstract void barrierConsumer(final TraverserSet<S> traverserSet);
+ protected abstract void barrierConsumer(final TraverserSet<S> traverserSet);
@Override
public Set<TraverserRequirement> getRequirements() {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1c069d80/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/MarkerIdentityStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/MarkerIdentityStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/MarkerIdentityStep.java
deleted file mode 100644
index b62370f..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/MarkerIdentityStep.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.process.traversal.step.util;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-
-import java.util.NoSuchElementException;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public final class MarkerIdentityStep<S> extends AbstractStep<S, S> {
-
- public MarkerIdentityStep(final Traversal.Admin traversal) {
- super(traversal);
- }
-
- @Override
- protected Traverser<S> processNextStart() throws NoSuchElementException {
- return this.starts.next();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1c069d80/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..d163851 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
@@ -34,7 +34,7 @@ public final class NoOpBarrierStep<S> extends CollectingBarrierStep<S> {
}
@Override
- public void barrierConsumer(final TraverserSet<S> traverserSet) {
+ protected void barrierConsumer(final TraverserSet<S> traverserSet) {
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1c069d80/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/SupplyingBarrierStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/SupplyingBarrierStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/SupplyingBarrierStep.java
index 7f27813..c1c2d10 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/SupplyingBarrierStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/SupplyingBarrierStep.java
@@ -34,7 +34,7 @@ public abstract class SupplyingBarrierStep<S, E> extends AbstractStep<S, E> {
super(traversal);
}
- public abstract E supply();
+ protected abstract E supply();
@Override
public void reset() {