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/10/20 23:34:20 UTC
[2/6] incubator-tinkerpop git commit: Renamed ConjunctionXXX to
ConnectiveXXX as that is more resonent with the terminology used in logic,
where conjunction assumes and and dijunction or.
Renamed ConjunctionXXX to ConnectiveXXX as that is more resonent with the terminology used in logic, where conjunction assumes and and dijunction or.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/45fc9f26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/45fc9f26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/45fc9f26
Branch: refs/heads/TINKERPOP3-762
Commit: 45fc9f261cd0baf1e7ecf817d4dd9d8f14c1e39e
Parents: 49f09ec
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Oct 20 11:55:52 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Oct 20 11:55:52 2015 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../process/traversal/TraversalStrategies.java | 4 +-
.../traversal/dsl/graph/GraphTraversal.java | 4 +-
.../process/traversal/step/filter/AndStep.java | 2 +-
.../traversal/step/filter/ConjunctionStep.java | 81 --------
.../traversal/step/filter/ConnectiveStep.java | 81 ++++++++
.../process/traversal/step/filter/OrStep.java | 2 +-
.../step/filter/WherePredicateStep.java | 10 +-
.../step/filter/WhereTraversalStep.java | 6 +-
.../process/traversal/step/map/MatchStep.java | 40 ++--
.../decoration/ConjunctionStrategy.java | 114 ------------
.../strategy/decoration/ConnectiveStrategy.java | 114 ++++++++++++
.../AdjacentToIncidentStrategy.java | 4 +-
.../optimization/RangeByIsCountStrategy.java | 6 +-
.../gremlin/process/traversal/util/AndP.java | 3 +-
.../process/traversal/util/ConjunctionP.java | 117 ------------
.../process/traversal/util/ConnectiveP.java | 115 ++++++++++++
.../gremlin/process/traversal/util/OrP.java | 2 +-
.../process/traversal/util/TraversalHelper.java | 4 +-
.../traversal/step/map/MatchStepTest.java | 6 +-
.../decoration/ConjunctionStrategyTest.java | 183 -------------------
.../decoration/ConnectiveStrategyTest.java | 183 +++++++++++++++++++
.../TinkerGraphNoStrategyComputerProvider.java | 4 +-
.../process/TinkerGraphNoStrategyProvider.java | 4 +-
24 files changed, 543 insertions(+), 547 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 3559aa0..80e658c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
TinkerPop 3.1.0 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Renamed `ConjunctionX` to `ConnectiveX` because "conjunction" is assumed "and" (disjunction "or"), where "connective" is the parent concept.
* Removed `PathIdentityStep` as it was a hack that is now solved by `Traversal.Admin.addTraverserRequirement()`.
* Added `Traversal.Admin.addTraverserRequirement()` to allow a traversal strategy or source to add requirements (not only step determined anymore).
* Added `TraverserRequirement.ONE_BULK` to state the traverser does not handle bulk.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
----------------------------------------------------------------------
diff --git 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
index da4d839..cdd2f9a 100644
--- 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
@@ -18,7 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ConjunctionStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ConnectiveStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.EngineDependentStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ProfileStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.AdjacentToIncidentStrategy;
@@ -196,7 +196,7 @@ public interface TraversalStrategies extends Serializable, Cloneable {
static {
final TraversalStrategies coreStrategies = new DefaultTraversalStrategies();
coreStrategies.addStrategies(
- ConjunctionStrategy.instance(),
+ ConnectiveStrategy.instance(),
EngineDependentStrategy.instance(),
ProfileStrategy.instance(),
IncidentToAdjacentStrategy.instance(),
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/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 d264860..ccefeaa 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
@@ -45,7 +45,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.branch.RepeatStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.branch.UnionStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AndStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.CoinStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConjunctionStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConnectiveStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.CyclicPathStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupGlobalStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DropStep;
@@ -521,7 +521,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
* @return the traversal with an appended {@link MatchStep}.
*/
public default <E2> GraphTraversal<S, Map<String, E2>> match(final Traversal<?, ?>... matchTraversals) {
- return this.asAdmin().addStep(new MatchStep<>(this.asAdmin(), ConjunctionStep.Conjunction.AND, matchTraversals));
+ return this.asAdmin().addStep(new MatchStep<>(this.asAdmin(), ConnectiveStep.Connective.AND, matchTraversals));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java
index 43a40be..d611d30 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java
@@ -27,7 +27,7 @@ import java.util.NoSuchElementException;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public final class AndStep<S> extends ConjunctionStep<S> {
+public final class AndStep<S> extends ConnectiveStep<S> {
public AndStep(final Traversal.Admin traversal, final Traversal<S, ?>... traversals) {
super(traversal, traversals);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ConjunctionStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ConjunctionStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ConjunctionStep.java
deleted file mode 100644
index 25d35ce..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ConjunctionStep.java
+++ /dev/null
@@ -1,81 +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.filter;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep;
-import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
-import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public abstract class ConjunctionStep<S> extends AbstractStep<S, S> implements TraversalParent {
-
- public enum Conjunction {AND, OR}
-
- protected List<Traversal.Admin<S, ?>> traversals;
-
- public ConjunctionStep(final Traversal.Admin traversal, final Traversal<S, ?>... traversals) {
- super(traversal);
- this.traversals = Stream.of(traversals).map(Traversal::asAdmin).collect(Collectors.toList());
- this.traversals.forEach(this::integrateChild);
- }
-
- @Override
- public List<Traversal.Admin<S, ?>> getLocalChildren() {
- return this.traversals;
- }
-
- @Override
- public Set<TraverserRequirement> getRequirements() {
- return this.getSelfAndChildRequirements();
- }
-
- public void addLocalChild(final Traversal.Admin<?, ?> localChildTraversal) {
- this.traversals.add(this.integrateChild((Traversal.Admin) localChildTraversal));
- }
-
- @Override
- public ConjunctionStep<S> clone() {
- final ConjunctionStep<S> clone = (ConjunctionStep<S>) super.clone();
- clone.traversals = new ArrayList<>();
- for (final Traversal.Admin<S, ?> traversal : this.traversals) {
- clone.traversals.add(clone.integrateChild(traversal.clone()));
- }
- return clone;
- }
-
- @Override
- public String toString() {
- return StringFactory.stepString(this, this.traversals);
- }
-
- @Override
- public int hashCode() {
- return super.hashCode() ^ this.traversals.hashCode();
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ConnectiveStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ConnectiveStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ConnectiveStep.java
new file mode 100644
index 0000000..cfa4071
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ConnectiveStep.java
@@ -0,0 +1,81 @@
+/*
+ * 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.filter;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+public abstract class ConnectiveStep<S> extends AbstractStep<S, S> implements TraversalParent {
+
+ public enum Connective {AND, OR}
+
+ protected List<Traversal.Admin<S, ?>> traversals;
+
+ public ConnectiveStep(final Traversal.Admin traversal, final Traversal<S, ?>... traversals) {
+ super(traversal);
+ this.traversals = Stream.of(traversals).map(Traversal::asAdmin).collect(Collectors.toList());
+ this.traversals.forEach(this::integrateChild);
+ }
+
+ @Override
+ public List<Traversal.Admin<S, ?>> getLocalChildren() {
+ return this.traversals;
+ }
+
+ @Override
+ public Set<TraverserRequirement> getRequirements() {
+ return this.getSelfAndChildRequirements();
+ }
+
+ public void addLocalChild(final Traversal.Admin<?, ?> localChildTraversal) {
+ this.traversals.add(this.integrateChild((Traversal.Admin) localChildTraversal));
+ }
+
+ @Override
+ public ConnectiveStep<S> clone() {
+ final ConnectiveStep<S> clone = (ConnectiveStep<S>) super.clone();
+ clone.traversals = new ArrayList<>();
+ for (final Traversal.Admin<S, ?> traversal : this.traversals) {
+ clone.traversals.add(clone.integrateChild(traversal.clone()));
+ }
+ return clone;
+ }
+
+ @Override
+ public String toString() {
+ return StringFactory.stepString(this, this.traversals);
+ }
+
+ @Override
+ public int hashCode() {
+ return super.hashCode() ^ this.traversals.hashCode();
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/OrStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/OrStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/OrStep.java
index ee496cf..ba49402 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/OrStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/OrStep.java
@@ -27,7 +27,7 @@ import java.util.NoSuchElementException;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public final class OrStep<S> extends ConjunctionStep<S> {
+public final class OrStep<S> extends ConnectiveStep<S> {
public OrStep(final Traversal.Admin traversal, final Traversal<S, ?>... traversals) {
super(traversal, traversals);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WherePredicateStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WherePredicateStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WherePredicateStep.java
index 04aa3ef..6fea7d6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WherePredicateStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WherePredicateStep.java
@@ -24,7 +24,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.Scoping;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
-import org.apache.tinkerpop.gremlin.process.traversal.util.ConjunctionP;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
@@ -51,8 +51,8 @@ public final class WherePredicateStep<S> extends FilterStep<S> implements Scopin
}
private void configurePredicates(final P<Object> predicate) {
- if (predicate instanceof ConjunctionP)
- ((ConjunctionP<Object>) predicate).getPredicates().forEach(this::configurePredicates);
+ if (predicate instanceof ConnectiveP)
+ ((ConnectiveP<Object>) predicate).getPredicates().forEach(this::configurePredicates);
else {
final String selectKey = (String) (predicate.getValue() instanceof Collection ? ((Collection) predicate.getValue()).iterator().next() : predicate.getValue()); // hack for within("x"))
this.selectKeys.add(selectKey);
@@ -61,8 +61,8 @@ public final class WherePredicateStep<S> extends FilterStep<S> implements Scopin
}
private void setPredicateValues(final P<Object> predicate, final Traverser.Admin<S> traverser, final Iterator<String> selectKeysIterator) {
- if (predicate instanceof ConjunctionP)
- ((ConjunctionP<Object>) predicate).getPredicates().forEach(p -> this.setPredicateValues(p, traverser, selectKeysIterator));
+ if (predicate instanceof ConnectiveP)
+ ((ConnectiveP<Object>) predicate).getPredicates().forEach(p -> this.setPredicateValues(p, traverser, selectKeysIterator));
else
predicate.setValue(this.getScopeValue(Pop.last, selectKeysIterator.next(), traverser));
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTraversalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTraversalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTraversalStep.java
index b0d00f1..78f3756 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTraversalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTraversalStep.java
@@ -27,7 +27,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.MapStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.ProfileStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.StartStep;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ConjunctionStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ConnectiveStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
@@ -56,10 +56,10 @@ public final class WhereTraversalStep<S> extends FilterStep<S> implements Traver
}
private void configureStartAndEndSteps(final Traversal.Admin<?, ?> whereTraversal) {
- ConjunctionStrategy.instance().apply(whereTraversal);
+ ConnectiveStrategy.instance().apply(whereTraversal);
//// START STEP to WhereStartStep
final Step<?, ?> startStep = whereTraversal.getStartStep();
- if (startStep instanceof ConjunctionStep || startStep instanceof NotStep) { // for conjunction- and not-steps
+ if (startStep instanceof ConnectiveStep || startStep instanceof NotStep) { // for conjunction- and not-steps
((TraversalParent) startStep).getLocalChildren().forEach(this::configureStartAndEndSteps);
} else if (StartStep.isVariableStartStep(startStep)) { // as("a").out()... traversals
final String label = startStep.getLabels().iterator().next();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStep.java
index 9518cb9..724ab8a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStep.java
@@ -26,7 +26,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.Scoping;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AndStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConjunctionStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConnectiveStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.NotStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.WherePredicateStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTraversalStep;
@@ -35,7 +35,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.StartStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.ComputerAwareStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.ReducingBarrierStep;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ConjunctionStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ConnectiveStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
@@ -71,7 +71,7 @@ public final class MatchStep<S, E> extends ComputerAwareStep<S, Map<String, E>>
private Set<String> matchStartLabels = new HashSet<>();
private Set<String> matchEndLabels = new HashSet<>();
private Set<String> scopeKeys = null;
- private final ConjunctionStep.Conjunction conjunction;
+ private final ConnectiveStep.Connective connective;
private final String computedStartLabel;
private MatchAlgorithm matchAlgorithm;
private Class<? extends MatchAlgorithm> matchAlgorithmClass = CountMatchAlgorithm.class; // default is CountMatchAlgorithm (use MatchAlgorithmStrategy to change)
@@ -79,9 +79,9 @@ public final class MatchStep<S, E> extends ComputerAwareStep<S, Map<String, E>>
private Set<List<Object>> dedups = null;
private Set<String> dedupLabels = null;
- public MatchStep(final Traversal.Admin traversal, final ConjunctionStep.Conjunction conjunction, final Traversal... matchTraversals) {
+ public MatchStep(final Traversal.Admin traversal, final ConnectiveStep.Connective connective, final Traversal... matchTraversals) {
super(traversal);
- this.conjunction = conjunction;
+ this.connective = connective;
this.matchTraversals = (List) Stream.of(matchTraversals).map(Traversal::asAdmin).collect(Collectors.toList());
this.matchTraversals.forEach(this::configureStartAndEndSteps); // recursively convert to MatchStep, MatchStartStep, or MatchEndStep
this.matchTraversals.forEach(this::integrateChild);
@@ -98,7 +98,7 @@ public final class MatchStep<S, E> extends ComputerAwareStep<S, Map<String, E>>
if (startStep instanceof WhereTraversalStep.WhereStartStep && !((WhereTraversalStep.WhereStartStep) startStep).getScopeKeys().isEmpty()) {
selectKeys.addAll(((WhereTraversalStep.WhereStartStep<?>) startStep).getScopeKeys());
if (!testRun) ((WhereTraversalStep.WhereStartStep) startStep).removeScopeKey();
- } else if (startStep instanceof ConjunctionStep || startStep instanceof NotStep) {
+ } else if (startStep instanceof ConnectiveStep || startStep instanceof NotStep) {
((TraversalParent) startStep).getLocalChildren().forEach(child -> this.pullOutVariableStartStepToParent(selectKeys, child, testRun));
}
return selectKeys;
@@ -106,13 +106,13 @@ public final class MatchStep<S, E> extends ComputerAwareStep<S, Map<String, E>>
//////////////////
private void configureStartAndEndSteps(final Traversal.Admin<?, ?> matchTraversal) {
- ConjunctionStrategy.instance().apply(matchTraversal);
+ ConnectiveStrategy.instance().apply(matchTraversal);
// START STEP to MatchStep OR MatchStartStep
final Step<?, ?> startStep = matchTraversal.getStartStep();
- if (startStep instanceof ConjunctionStep) {
+ if (startStep instanceof ConnectiveStep) {
final MatchStep matchStep = new MatchStep(matchTraversal,
- startStep instanceof AndStep ? ConjunctionStep.Conjunction.AND : ConjunctionStep.Conjunction.OR,
- ((ConjunctionStep<?>) startStep).getLocalChildren().toArray(new Traversal[((ConjunctionStep<?>) startStep).getLocalChildren().size()]));
+ startStep instanceof AndStep ? ConnectiveStep.Connective.AND : ConnectiveStep.Connective.OR,
+ ((ConnectiveStep<?>) startStep).getLocalChildren().toArray(new Traversal[((ConnectiveStep<?>) startStep).getLocalChildren().size()]));
TraversalHelper.replaceStep(startStep, matchStep, matchTraversal);
this.matchStartLabels.addAll(matchStep.matchStartLabels);
this.matchEndLabels.addAll(matchStep.matchEndLabels);
@@ -153,8 +153,8 @@ public final class MatchStep<S, E> extends ComputerAwareStep<S, Map<String, E>>
}
}
- public ConjunctionStep.Conjunction getConjunction() {
- return this.conjunction;
+ public ConnectiveStep.Connective getConnective() {
+ return this.connective;
}
public void addGlobalChild(final Traversal.Admin<?, ?> globalChildTraversal) {
@@ -191,7 +191,7 @@ public final class MatchStep<S, E> extends ComputerAwareStep<S, Map<String, E>>
@Override
public String toString() {
- return StringFactory.stepString(this, this.dedupLabels, this.conjunction, this.matchTraversals);
+ return StringFactory.stepString(this, this.dedupLabels, this.connective, this.matchTraversals);
}
@Override
@@ -245,13 +245,13 @@ public final class MatchStep<S, E> extends ComputerAwareStep<S, Map<String, E>>
return this.dedups.contains(objects);
}
- private boolean hasMatched(final ConjunctionStep.Conjunction conjunction, final Traverser<S> traverser) {
+ private boolean hasMatched(final ConnectiveStep.Connective connective, final Traverser<S> traverser) {
final Path path = traverser.path();
int counter = 0;
boolean matched = false;
for (final Traversal.Admin<Object, Object> matchTraversal : this.matchTraversals) {
if (path.hasLabel(matchTraversal.getStartStep().getId())) {
- if (conjunction == ConjunctionStep.Conjunction.OR) {
+ if (connective == ConnectiveStep.Connective.OR) {
matched = true;
break;
}
@@ -314,10 +314,10 @@ public final class MatchStep<S, E> extends ComputerAwareStep<S, Map<String, E>>
}
///
if (!this.isDuplicate(traverser)) {
- if (hasMatched(this.conjunction, traverser))
+ if (hasMatched(this.connective, traverser))
return IteratorUtils.of(traverser.split(this.getBindings(traverser), this));
- if (this.conjunction == ConjunctionStep.Conjunction.AND) {
+ if (this.connective == ConnectiveStep.Connective.AND) {
this.getMatchAlgorithm().apply(traverser).addStart(traverser); // determine which sub-pattern the traverser should try next
} else { // OR
for (final Traversal.Admin<?, ?> matchTraversal : this.matchTraversals) {
@@ -339,12 +339,12 @@ public final class MatchStep<S, E> extends ComputerAwareStep<S, Map<String, E>>
traverser.addLabels(Collections.singleton(this.getId())); // so the traverser never returns to this branch ever again
///
if (!this.isDuplicate(traverser)) {
- if (hasMatched(this.conjunction, traverser)) {
+ if (hasMatched(this.connective, traverser)) {
traverser.setStepId(this.getNextStep().getId());
traverser.addLabels(this.labels);
return IteratorUtils.of(traverser.split(this.getBindings(traverser), this));
}
- if (this.conjunction == ConjunctionStep.Conjunction.AND) {
+ if (this.connective == ConnectiveStep.Connective.AND) {
final Traversal.Admin<Object, Object> matchTraversal = this.getMatchAlgorithm().apply(traverser); // determine which sub-pattern the traverser should try next
traverser.setStepId(matchTraversal.getStartStep().getId()); // go down the traversal match sub-pattern
return IteratorUtils.of(traverser);
@@ -363,7 +363,7 @@ public final class MatchStep<S, E> extends ComputerAwareStep<S, Map<String, E>>
@Override
public int hashCode() {
- int result = super.hashCode() ^ this.conjunction.hashCode();
+ int result = super.hashCode() ^ this.connective.hashCode();
for (final Traversal t : this.matchTraversals) {
result ^= t.hashCode();
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
deleted file mode 100644
index 7bf7177..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategy.java
+++ /dev/null
@@ -1,114 +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.strategy.decoration;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Step;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AndStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConjunctionStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.OrStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.ProfileStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.StartStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.ComputerAwareStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
-
-import java.util.Set;
-
-/**
- * ConjunctionStrategy rewrites the binary conjunction form of {@code a.and().b} into a {@link AndStep} of
- * {@code and(a,b)} (likewise for {@link OrStep}).
- * <p/>
- *
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Daniel Kuppitz (http://gremlin.guru)
- * @example <pre>
- * __.has("name","stephen").or().where(__.out("knows").has("name","stephen")) // is replaced by __.or(__.has("name","stephen"), __.where(__.out("knows").has("name","stephen")))
- * __.out("a").out("b").and().out("c").or().out("d") // is replaced by __.or(__.and(__.out("a").out("b"), __.out("c")), __.out("d"))
- * __.as("a").out().as("b").and().as("c").in().as("d") // is replaced by __.and(__.as("a").out().as("b"), __.as("c").in().as("d"))
- * </pre>
- */
-public final class ConjunctionStrategy extends AbstractTraversalStrategy<TraversalStrategy.DecorationStrategy> implements TraversalStrategy.DecorationStrategy {
-
- private static final ConjunctionStrategy INSTANCE = new ConjunctionStrategy();
-
- private ConjunctionStrategy() {
- }
-
- @Override
- public void apply(final Traversal.Admin<?, ?> traversal) {
- if (TraversalHelper.hasStepOfAssignableClass(ConjunctionStep.class, traversal)) {
- processConjunctionMarkers(traversal);
- }
- }
-
- private static boolean legalCurrentStep(final Step<?, ?> step) {
- return !(step instanceof EmptyStep || step instanceof ProfileStep || step instanceof ComputerAwareStep.EndStep || (step instanceof StartStep && !StartStep.isVariableStartStep(step)));
- }
-
- private static void processConjunctionMarkers(final Traversal.Admin<?, ?> traversal) {
- processConjunctionMarker(OrStep.class, traversal);
- processConjunctionMarker(AndStep.class, traversal);
- }
-
- private static void processConjunctionMarker(final Class<? extends ConjunctionStep> markerClass, final Traversal.Admin<?, ?> traversal) {
-
- TraversalHelper.getStepsOfClass(markerClass, traversal).stream()
- .filter(conjunctionStep -> conjunctionStep.getLocalChildren().isEmpty())
- .findFirst().ifPresent(conjunctionStep -> {
-
- Step<?, ?> currentStep = conjunctionStep.getNextStep();
- final Traversal.Admin<?, ?> rightTraversal = __.start().asAdmin();
- if (!conjunctionStep.getLabels().isEmpty()) {
- final StartStep<?> startStep = new StartStep<>(rightTraversal);
- final Set<String> conjunctionLabels = ((Step<?, ?>) conjunctionStep).getLabels();
- conjunctionLabels.forEach(startStep::addLabel);
- conjunctionLabels.forEach(label -> conjunctionStep.removeLabel(label));
- rightTraversal.addStep(startStep);
- }
- while (legalCurrentStep(currentStep)) {
- final Step<?, ?> nextStep = currentStep.getNextStep();
- rightTraversal.addStep(currentStep);
- traversal.removeStep(currentStep);
- currentStep = nextStep;
- }
- processConjunctionMarkers(rightTraversal);
-
- currentStep = conjunctionStep.getPreviousStep();
- final Traversal.Admin<?, ?> leftTraversal = __.start().asAdmin();
- while (legalCurrentStep(currentStep)) {
- final Step<?, ?> previousStep = currentStep.getPreviousStep();
- leftTraversal.addStep(0, currentStep);
- traversal.removeStep(currentStep);
- currentStep = previousStep;
- }
- processConjunctionMarkers(leftTraversal);
-
- conjunctionStep.addLocalChild(leftTraversal);
- conjunctionStep.addLocalChild(rightTraversal);
- });
- }
-
- public static ConjunctionStrategy instance() {
- return INSTANCE;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConnectiveStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConnectiveStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConnectiveStrategy.java
new file mode 100644
index 0000000..ffde90a
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConnectiveStrategy.java
@@ -0,0 +1,114 @@
+/*
+ * 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.strategy.decoration;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Step;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AndStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConnectiveStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.OrStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.ProfileStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.StartStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.ComputerAwareStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
+
+import java.util.Set;
+
+/**
+ * ConnectiveStrategy rewrites the binary conjunction form of {@code a.and().b} into a {@link AndStep} of
+ * {@code and(a,b)} (likewise for {@link OrStep}).
+ * <p/>
+ *
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ * @author Daniel Kuppitz (http://gremlin.guru)
+ * @example <pre>
+ * __.has("name","stephen").or().where(__.out("knows").has("name","stephen")) // is replaced by __.or(__.has("name","stephen"), __.where(__.out("knows").has("name","stephen")))
+ * __.out("a").out("b").and().out("c").or().out("d") // is replaced by __.or(__.and(__.out("a").out("b"), __.out("c")), __.out("d"))
+ * __.as("a").out().as("b").and().as("c").in().as("d") // is replaced by __.and(__.as("a").out().as("b"), __.as("c").in().as("d"))
+ * </pre>
+ */
+public final class ConnectiveStrategy extends AbstractTraversalStrategy<TraversalStrategy.DecorationStrategy> implements TraversalStrategy.DecorationStrategy {
+
+ private static final ConnectiveStrategy INSTANCE = new ConnectiveStrategy();
+
+ private ConnectiveStrategy() {
+ }
+
+ @Override
+ public void apply(final Traversal.Admin<?, ?> traversal) {
+ if (TraversalHelper.hasStepOfAssignableClass(ConnectiveStep.class, traversal)) {
+ processConjunctionMarkers(traversal);
+ }
+ }
+
+ private static boolean legalCurrentStep(final Step<?, ?> step) {
+ return !(step instanceof EmptyStep || step instanceof ProfileStep || step instanceof ComputerAwareStep.EndStep || (step instanceof StartStep && !StartStep.isVariableStartStep(step)));
+ }
+
+ private static void processConjunctionMarkers(final Traversal.Admin<?, ?> traversal) {
+ processConjunctionMarker(OrStep.class, traversal);
+ processConjunctionMarker(AndStep.class, traversal);
+ }
+
+ private static void processConjunctionMarker(final Class<? extends ConnectiveStep> markerClass, final Traversal.Admin<?, ?> traversal) {
+
+ TraversalHelper.getStepsOfClass(markerClass, traversal).stream()
+ .filter(conjunctionStep -> conjunctionStep.getLocalChildren().isEmpty())
+ .findFirst().ifPresent(conjunctionStep -> {
+
+ Step<?, ?> currentStep = conjunctionStep.getNextStep();
+ final Traversal.Admin<?, ?> rightTraversal = __.start().asAdmin();
+ if (!conjunctionStep.getLabels().isEmpty()) {
+ final StartStep<?> startStep = new StartStep<>(rightTraversal);
+ final Set<String> conjunctionLabels = ((Step<?, ?>) conjunctionStep).getLabels();
+ conjunctionLabels.forEach(startStep::addLabel);
+ conjunctionLabels.forEach(label -> conjunctionStep.removeLabel(label));
+ rightTraversal.addStep(startStep);
+ }
+ while (legalCurrentStep(currentStep)) {
+ final Step<?, ?> nextStep = currentStep.getNextStep();
+ rightTraversal.addStep(currentStep);
+ traversal.removeStep(currentStep);
+ currentStep = nextStep;
+ }
+ processConjunctionMarkers(rightTraversal);
+
+ currentStep = conjunctionStep.getPreviousStep();
+ final Traversal.Admin<?, ?> leftTraversal = __.start().asAdmin();
+ while (legalCurrentStep(currentStep)) {
+ final Step<?, ?> previousStep = currentStep.getPreviousStep();
+ leftTraversal.addStep(0, currentStep);
+ traversal.removeStep(currentStep);
+ currentStep = previousStep;
+ }
+ processConjunctionMarkers(leftTraversal);
+
+ conjunctionStep.addLocalChild(leftTraversal);
+ conjunctionStep.addLocalChild(rightTraversal);
+ });
+ }
+
+ public static ConnectiveStrategy instance() {
+ return INSTANCE;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/AdjacentToIncidentStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/AdjacentToIncidentStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/AdjacentToIncidentStrategy.java
index c091805..19757d3 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/AdjacentToIncidentStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/AdjacentToIncidentStrategy.java
@@ -22,7 +22,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConjunctionStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConnectiveStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.NotStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStep;
@@ -74,7 +74,7 @@ public final class AdjacentToIncidentStrategy extends AbstractTraversalStrategy<
final Step curr = steps.get(i);
if (i == size && isOptimizable(curr)) {
final TraversalParent parent = curr.getTraversal().getParent();
- if (parent instanceof NotStep || parent instanceof TraversalFilterStep || parent instanceof WhereTraversalStep || parent instanceof ConjunctionStep) {
+ if (parent instanceof NotStep || parent instanceof TraversalFilterStep || parent instanceof WhereTraversalStep || parent instanceof ConnectiveStep) {
optimizeStep(traversal, curr);
}
} else if (isOptimizable(prev)) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java
index 1933ced..f2d60b1 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java
@@ -25,13 +25,11 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.filter.IsStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.CountGlobalStep;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.util.ConjunctionP;
-import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.process.traversal.Compare;
import org.apache.tinkerpop.gremlin.process.traversal.Contains;
import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
import java.util.Collection;
import java.util.Collections;
@@ -80,7 +78,7 @@ public final class RangeByIsCountStrategy extends AbstractTraversalStrategy<Trav
final IsStep isStep = (IsStep) next;
final P isStepPredicate = isStep.getPredicate();
Long highRange = null;
- for (P p : isStepPredicate instanceof ConjunctionP ? ((ConjunctionP<?>) isStepPredicate).getPredicates() : Collections.singletonList(isStepPredicate)) {
+ for (P p : isStepPredicate instanceof ConnectiveP ? ((ConnectiveP<?>) isStepPredicate).getPredicates() : Collections.singletonList(isStepPredicate)) {
final Object value = p.getValue();
final BiPredicate predicate = p.getBiPredicate();
if (value instanceof Number) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/AndP.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/AndP.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/AndP.java
index d95a56a..890a967 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/AndP.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/AndP.java
@@ -19,7 +19,6 @@
package org.apache.tinkerpop.gremlin.process.traversal.util;
import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import java.io.Serializable;
import java.util.function.BiPredicate;
@@ -28,7 +27,7 @@ import java.util.function.Predicate;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public final class AndP<V> extends ConjunctionP<V> {
+public final class AndP<V> extends ConnectiveP<V> {
public AndP(final P<V>... predicates) {
super(predicates);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ConjunctionP.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ConjunctionP.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ConjunctionP.java
deleted file mode 100644
index 10303b8..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ConjunctionP.java
+++ /dev/null
@@ -1,117 +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.util;
-
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public abstract class ConjunctionP<V> extends P<V> {
-
- protected List<P<V>> predicates;
-
- public ConjunctionP(final P<V>... predicates) {
- super(null, null);
- if (predicates.length < 2)
- throw new IllegalArgumentException("The provided " + this.getClass().getSimpleName() + " array must have at least two arguments: " + predicates.length);
- this.predicates = new ArrayList<>();
- Stream.of(predicates).forEach(this.predicates::add);
- }
-
- public List<P<V>> getPredicates() {
- return Collections.unmodifiableList(this.predicates);
- }
-
- @Override
- public P<V> negate() {
- final List<P<V>> negated = new ArrayList<>();
- for (final P<V> predicate : this.predicates) {
- negated.add(predicate.negate());
- }
- this.predicates = negated;
- return this;
- }
-
- protected P<V> negate(final ConjunctionP<V> p) {
- final List<P<V>> negated = new ArrayList<>();
- for (final P<V> predicate : this.predicates) {
- negated.add(predicate.negate());
- }
- p.predicates = negated;
- return p;
- }
-
- @Override
- public int hashCode() {
- int result = 0, i = 0;
- for (final P p : this.predicates) {
- result ^= Integer.rotateLeft(p.hashCode(), i++);
- }
- return result;
- }
-
- @Override
- public boolean equals(final Object other) {
- if (other != null && other.getClass().equals(this.getClass())) {
- final List<P<V>> otherPredicates = ((ConjunctionP<V>) other).predicates;
- if (this.predicates.size() == otherPredicates.size()) {
- for (int i = 0; i < this.predicates.size(); i++) {
- if (!this.predicates.get(i).equals(otherPredicates.get(i))) {
- return false;
- }
- }
- return true;
- }
- }
- return false;
- }
-
- @Override
- public ConjunctionP<V> clone() {
- final ConjunctionP<V> clone = (ConjunctionP<V>) super.clone();
- clone.predicates = new ArrayList<>();
- for (final P<V> p : this.predicates) {
- clone.predicates.add(p.clone());
- }
- return clone;
- }
-
- @Override
- public P<V> and(final Predicate<? super V> predicate) {
- if (!(predicate instanceof P))
- throw new IllegalArgumentException("Only P predicates can be and'd together");
- return new AndP<>(this, (P) predicate);
- }
-
- @Override
- public P<V> or(final Predicate<? super V> predicate) {
- if (!(predicate instanceof P))
- throw new IllegalArgumentException("Only P predicates can be or'd together");
- return new OrP<>(this, (P) predicate);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ConnectiveP.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ConnectiveP.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ConnectiveP.java
new file mode 100644
index 0000000..d5b6b32
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ConnectiveP.java
@@ -0,0 +1,115 @@
+/*
+ * 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.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+public abstract class ConnectiveP<V> extends P<V> {
+
+ protected List<P<V>> predicates;
+
+ public ConnectiveP(final P<V>... predicates) {
+ super(null, null);
+ if (predicates.length < 2)
+ throw new IllegalArgumentException("The provided " + this.getClass().getSimpleName() + " array must have at least two arguments: " + predicates.length);
+ this.predicates = new ArrayList<>();
+ Stream.of(predicates).forEach(this.predicates::add);
+ }
+
+ public List<P<V>> getPredicates() {
+ return Collections.unmodifiableList(this.predicates);
+ }
+
+ @Override
+ public P<V> negate() {
+ final List<P<V>> negated = new ArrayList<>();
+ for (final P<V> predicate : this.predicates) {
+ negated.add(predicate.negate());
+ }
+ this.predicates = negated;
+ return this;
+ }
+
+ protected P<V> negate(final ConnectiveP<V> p) {
+ final List<P<V>> negated = new ArrayList<>();
+ for (final P<V> predicate : this.predicates) {
+ negated.add(predicate.negate());
+ }
+ p.predicates = negated;
+ return p;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = 0, i = 0;
+ for (final P p : this.predicates) {
+ result ^= Integer.rotateLeft(p.hashCode(), i++);
+ }
+ return result;
+ }
+
+ @Override
+ public boolean equals(final Object other) {
+ if (other != null && other.getClass().equals(this.getClass())) {
+ final List<P<V>> otherPredicates = ((ConnectiveP<V>) other).predicates;
+ if (this.predicates.size() == otherPredicates.size()) {
+ for (int i = 0; i < this.predicates.size(); i++) {
+ if (!this.predicates.get(i).equals(otherPredicates.get(i))) {
+ return false;
+ }
+ }
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public ConnectiveP<V> clone() {
+ final ConnectiveP<V> clone = (ConnectiveP<V>) super.clone();
+ clone.predicates = new ArrayList<>();
+ for (final P<V> p : this.predicates) {
+ clone.predicates.add(p.clone());
+ }
+ return clone;
+ }
+
+ @Override
+ public P<V> and(final Predicate<? super V> predicate) {
+ if (!(predicate instanceof P))
+ throw new IllegalArgumentException("Only P predicates can be and'd together");
+ return new AndP<>(this, (P) predicate);
+ }
+
+ @Override
+ public P<V> or(final Predicate<? super V> predicate) {
+ if (!(predicate instanceof P))
+ throw new IllegalArgumentException("Only P predicates can be or'd together");
+ return new OrP<>(this, (P) predicate);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/OrP.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/OrP.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/OrP.java
index ddb8d3b..1d75515 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/OrP.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/OrP.java
@@ -27,7 +27,7 @@ import java.util.function.Predicate;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public final class OrP<V> extends ConjunctionP<V> {
+public final class OrP<V> extends ConnectiveP<V> {
public OrP(final P<V>... predicates) {
super(predicates);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
index 93ddf82..f4f96c7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
@@ -24,7 +24,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.HasContainerHolder;
import org.apache.tinkerpop.gremlin.process.traversal.step.Scoping;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.branch.RepeatStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConjunctionStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConnectiveStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.NotStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.WherePredicateStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTraversalStep;
@@ -424,7 +424,7 @@ public final class TraversalHelper {
variables.add(Scoping.Variable.START);
} else if (startStep instanceof MatchStep) {
((MatchStep<?, ?>) startStep).getGlobalChildren().forEach(child -> TraversalHelper.getVariableLocations(variables, child));
- } else if (startStep instanceof ConjunctionStep || startStep instanceof NotStep || startStep instanceof WhereTraversalStep)
+ } else if (startStep instanceof ConnectiveStep || startStep instanceof NotStep || startStep instanceof WhereTraversalStep)
((TraversalParent) startStep).getLocalChildren().forEach(child -> TraversalHelper.getVariableLocations(variables, child));
///
final Step<?, ?> endStep = traversal.getEndStep();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStepTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStepTest.java
index 3f4ae0d..9c7cef1 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStepTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStepTest.java
@@ -23,7 +23,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.CoinStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConjunctionStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConnectiveStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.WherePredicateStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTraversalStep;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.EmptyTraverser;
@@ -89,7 +89,7 @@ public class MatchStepTest extends StepTest {
//
pattern = matchStep.getGlobalChildren().get(1);
assertEquals(MatchStep.class, pattern.getStartStep().getClass());
- assertEquals(ConjunctionStep.Conjunction.OR, ((MatchStep<?, ?>) pattern.getStartStep()).getConjunction());
+ assertEquals(ConnectiveStep.Connective.OR, ((MatchStep<?, ?>) pattern.getStartStep()).getConnective());
assertEquals("c", ((MatchStep.MatchStartStep) ((MatchStep<?, ?>) pattern.getStartStep()).getGlobalChildren().get(0).getStartStep()).getSelectKey().get());
assertEquals(PathStep.class, ((MatchStep<?, ?>) pattern.getStartStep()).getGlobalChildren().get(0).getStartStep().getNextStep().getClass());
assertEquals("d", ((MatchStep.MatchEndStep) ((MatchStep<?, ?>) pattern.getStartStep()).getGlobalChildren().get(0).getEndStep()).getMatchKey().get());
@@ -115,7 +115,7 @@ public class MatchStepTest extends StepTest {
//
pattern = matchStep.getGlobalChildren().get(1);
assertEquals(MatchStep.class, pattern.getStartStep().getClass());
- assertEquals(ConjunctionStep.Conjunction.AND, ((MatchStep<?, ?>) pattern.getStartStep()).getConjunction());
+ assertEquals(ConnectiveStep.Connective.AND, ((MatchStep<?, ?>) pattern.getStartStep()).getConnective());
assertEquals("c", ((MatchStep.MatchStartStep) ((MatchStep<?, ?>) pattern.getStartStep()).getGlobalChildren().get(0).getStartStep()).getSelectKey().get());
assertEquals(PathStep.class, ((MatchStep<?, ?>) pattern.getStartStep()).getGlobalChildren().get(0).getStartStep().getNextStep().getClass());
assertEquals("d", ((MatchStep.MatchEndStep) ((MatchStep<?, ?>) pattern.getStartStep()).getGlobalChildren().get(0).getEndStep()).getMatchKey().get());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategyTest.java
deleted file mode 100644
index bf79a51..0000000
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConjunctionStrategyTest.java
+++ /dev/null
@@ -1,183 +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.strategy.decoration;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-@RunWith(Enclosed.class)
-public class ConjunctionStrategyTest {
-
- @RunWith(Parameterized.class)
- public static class StandardTest extends AbstractConjunctionStrategyTest {
-
- @Parameterized.Parameters(name = "{0}")
- public static Iterable<Object[]> data() {
- return generateTestParameters();
- }
-
- @Parameterized.Parameter(value = 0)
- public Traversal original;
-
- @Parameterized.Parameter(value = 1)
- public Traversal optimized;
-
- @Before
- public void setup() {
- this.traversalEngine = mock(TraversalEngine.class);
- when(this.traversalEngine.getType()).thenReturn(TraversalEngine.Type.STANDARD);
- }
-
- @Test
- public void shouldApplyStrategy() {
- doTest(original, optimized);
- }
- }
-
- @RunWith(Parameterized.class)
- public static class ComputerTest extends AbstractConjunctionStrategyTest {
-
- @Parameterized.Parameters(name = "{0}")
- public static Iterable<Object[]> data() {
- return generateTestParameters();
- }
-
- @Parameterized.Parameter(value = 0)
- public Traversal original;
-
- @Parameterized.Parameter(value = 1)
- public Traversal optimized;
-
- @Before
- public void setup() {
- this.traversalEngine = mock(TraversalEngine.class);
- when(this.traversalEngine.getType()).thenReturn(TraversalEngine.Type.COMPUTER);
- }
-
- @Test
- public void shouldApplyStrategy() {
- doTest(original, optimized);
- }
- }
-
- private static abstract class AbstractConjunctionStrategyTest {
-
- protected TraversalEngine traversalEngine;
-
- void applyMatchWhereStrategy(final Traversal traversal) {
- final TraversalStrategies strategies = new DefaultTraversalStrategies();
- strategies.addStrategies(ConjunctionStrategy.instance());
-
- traversal.asAdmin().setStrategies(strategies);
- traversal.asAdmin().applyStrategies();
- traversal.asAdmin().setEngine(traversalEngine);
- }
-
- public void doTest(final Traversal traversal, final Traversal optimized) {
- applyMatchWhereStrategy(traversal);
- assertEquals(optimized, traversal);
- }
-
- static Iterable<Object[]> generateTestParameters() {
-
- return Arrays.asList(new Traversal[][]{
- {__.has("name", "stephen").or().where(__.out("knows").has("name", "stephen")), __.or(__.has("name", "stephen"), __.where(__.out("knows").has("name", "stephen")))},
- {__.out("a").out("b").and().out("c").or().out("d"), __.or(__.and(__.out("a").out("b"), __.out("c")), __.out("d"))},
- {__.as("1").out("a").out("b").as("2").and().as("3").out("c").as("4").or().as("5").out("d").as("6"), __.or(__.and(__.as("1").out("a").out("b").as("2"), __.as("3").out("c").as("4")), __.as("5").out("d").as("6"))},
- {__.as("1").out("a").out("b").and().as("3").out("c").or().as("5").out("d"), __.or(__.and(__.as("1").out("a").out("b"), __.as("3").out("c")), __.as("5").out("d"))},
- {__.as("1").out("a").out("b").or().as("3").out("c").and().as("5").out("d"), __.or(__.as("1").out("a").out("b"), __.and(__.as("3").out("c"), __.as("5").out("d")))},
- {__.as("a").out().as("b").and().as("c").in().as("d"), __.and(__.as("a").out().as("b"), __.as("c").in().as("d"))},
- {__.union(__.as("a").out("l1").as("b").or().as("c").in("l2").as("d"), __.as("e").out("l3").as("f").and().as("g").in("l4").as("h")), __.union(__.or(__.as("a").out("l1").as("b"), __.as("c").in("l2").as("d")), __.and(__.as("e").out("l3").as("f"), __.as("g").in("l4").as("h")))},
- {__
- .as("a1").out("a").as("a2").or()
- .as("b1").out("b").as("b2").and()
- .as("c1").out("c").as("c2").or()
- .as("d1").out("d").as("d2").or()
- .as("e1").out("e").as("e2").and()
- .as("f1").out("f").as("f2").and()
- .as("g1").out("g").as("g2").or()
- .as("h1").out("h").as("h2").or(__
- .as("i1").out("i").as("i2").or()
- .as("j1").out("j").as("j2").and()
- .as("k1").out("k").as("k2")).and()
- .as("l1").out("l").as("l2").and()
- .as("m1").out("m").as("m2").and()
- .as("n1").out("n").as("n2"),
- // EXPECT:
- __.or(
- __.as("a1").out("a").as("a2"),
- __.or(
- __.and(
- __.as("b1").out("b").as("b2"),
- __.as("c1").out("c").as("c2")
- ),
- __.or(
- __.as("d1").out("d").as("d2"),
- __.or(
- __.and(
- __.as("e1").out("e").as("e2"),
- __.and(
- __.as("f1").out("f").as("f2"),
- __.as("g1").out("g").as("g2")
- )
- ),
- __.and(
- __.as("h1").out("h").as("h2").or(
- __.or(
- __.as("i1").out("i").as("i2"),
- __.and(
- __.as("j1").out("j").as("j2"),
- __.as("k1").out("k").as("k2")
- )
- )
- ),
- __.and(
- __.as("l1").out("l").as("l2"),
- __.and(
- __.as("m1").out("m").as("m2"),
- __.as("n1").out("n").as("n2")
- )
- )
- )
- )
- )
- )
- )
- }
- });
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConnectiveStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConnectiveStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConnectiveStrategyTest.java
new file mode 100644
index 0000000..348b2d0
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ConnectiveStrategyTest.java
@@ -0,0 +1,183 @@
+/*
+ * 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.strategy.decoration;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+@RunWith(Enclosed.class)
+public class ConnectiveStrategyTest {
+
+ @RunWith(Parameterized.class)
+ public static class StandardTest extends AbstractConnectiveStrategyTest {
+
+ @Parameterized.Parameters(name = "{0}")
+ public static Iterable<Object[]> data() {
+ return generateTestParameters();
+ }
+
+ @Parameterized.Parameter(value = 0)
+ public Traversal original;
+
+ @Parameterized.Parameter(value = 1)
+ public Traversal optimized;
+
+ @Before
+ public void setup() {
+ this.traversalEngine = mock(TraversalEngine.class);
+ when(this.traversalEngine.getType()).thenReturn(TraversalEngine.Type.STANDARD);
+ }
+
+ @Test
+ public void shouldApplyStrategy() {
+ doTest(original, optimized);
+ }
+ }
+
+ @RunWith(Parameterized.class)
+ public static class ComputerTest extends AbstractConnectiveStrategyTest {
+
+ @Parameterized.Parameters(name = "{0}")
+ public static Iterable<Object[]> data() {
+ return generateTestParameters();
+ }
+
+ @Parameterized.Parameter(value = 0)
+ public Traversal original;
+
+ @Parameterized.Parameter(value = 1)
+ public Traversal optimized;
+
+ @Before
+ public void setup() {
+ this.traversalEngine = mock(TraversalEngine.class);
+ when(this.traversalEngine.getType()).thenReturn(TraversalEngine.Type.COMPUTER);
+ }
+
+ @Test
+ public void shouldApplyStrategy() {
+ doTest(original, optimized);
+ }
+ }
+
+ private static abstract class AbstractConnectiveStrategyTest {
+
+ protected TraversalEngine traversalEngine;
+
+ void applyMatchWhereStrategy(final Traversal traversal) {
+ final TraversalStrategies strategies = new DefaultTraversalStrategies();
+ strategies.addStrategies(ConnectiveStrategy.instance());
+
+ traversal.asAdmin().setStrategies(strategies);
+ traversal.asAdmin().applyStrategies();
+ traversal.asAdmin().setEngine(traversalEngine);
+ }
+
+ public void doTest(final Traversal traversal, final Traversal optimized) {
+ applyMatchWhereStrategy(traversal);
+ assertEquals(optimized, traversal);
+ }
+
+ static Iterable<Object[]> generateTestParameters() {
+
+ return Arrays.asList(new Traversal[][]{
+ {__.has("name", "stephen").or().where(__.out("knows").has("name", "stephen")), __.or(__.has("name", "stephen"), __.where(__.out("knows").has("name", "stephen")))},
+ {__.out("a").out("b").and().out("c").or().out("d"), __.or(__.and(__.out("a").out("b"), __.out("c")), __.out("d"))},
+ {__.as("1").out("a").out("b").as("2").and().as("3").out("c").as("4").or().as("5").out("d").as("6"), __.or(__.and(__.as("1").out("a").out("b").as("2"), __.as("3").out("c").as("4")), __.as("5").out("d").as("6"))},
+ {__.as("1").out("a").out("b").and().as("3").out("c").or().as("5").out("d"), __.or(__.and(__.as("1").out("a").out("b"), __.as("3").out("c")), __.as("5").out("d"))},
+ {__.as("1").out("a").out("b").or().as("3").out("c").and().as("5").out("d"), __.or(__.as("1").out("a").out("b"), __.and(__.as("3").out("c"), __.as("5").out("d")))},
+ {__.as("a").out().as("b").and().as("c").in().as("d"), __.and(__.as("a").out().as("b"), __.as("c").in().as("d"))},
+ {__.union(__.as("a").out("l1").as("b").or().as("c").in("l2").as("d"), __.as("e").out("l3").as("f").and().as("g").in("l4").as("h")), __.union(__.or(__.as("a").out("l1").as("b"), __.as("c").in("l2").as("d")), __.and(__.as("e").out("l3").as("f"), __.as("g").in("l4").as("h")))},
+ {__
+ .as("a1").out("a").as("a2").or()
+ .as("b1").out("b").as("b2").and()
+ .as("c1").out("c").as("c2").or()
+ .as("d1").out("d").as("d2").or()
+ .as("e1").out("e").as("e2").and()
+ .as("f1").out("f").as("f2").and()
+ .as("g1").out("g").as("g2").or()
+ .as("h1").out("h").as("h2").or(__
+ .as("i1").out("i").as("i2").or()
+ .as("j1").out("j").as("j2").and()
+ .as("k1").out("k").as("k2")).and()
+ .as("l1").out("l").as("l2").and()
+ .as("m1").out("m").as("m2").and()
+ .as("n1").out("n").as("n2"),
+ // EXPECT:
+ __.or(
+ __.as("a1").out("a").as("a2"),
+ __.or(
+ __.and(
+ __.as("b1").out("b").as("b2"),
+ __.as("c1").out("c").as("c2")
+ ),
+ __.or(
+ __.as("d1").out("d").as("d2"),
+ __.or(
+ __.and(
+ __.as("e1").out("e").as("e2"),
+ __.and(
+ __.as("f1").out("f").as("f2"),
+ __.as("g1").out("g").as("g2")
+ )
+ ),
+ __.and(
+ __.as("h1").out("h").as("h2").or(
+ __.or(
+ __.as("i1").out("i").as("i2"),
+ __.and(
+ __.as("j1").out("j").as("j2"),
+ __.as("k1").out("k").as("k2")
+ )
+ )
+ ),
+ __.and(
+ __.as("l1").out("l").as("l2"),
+ __.and(
+ __.as("m1").out("m").as("m2"),
+ __.as("n1").out("n").as("n2")
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ }
+ });
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/45fc9f26/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphNoStrategyComputerProvider.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphNoStrategyComputerProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphNoStrategyComputerProvider.java
index f2fe572..ff8a7bc 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphNoStrategyComputerProvider.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphNoStrategyComputerProvider.java
@@ -21,7 +21,7 @@ package org.apache.tinkerpop.gremlin.tinkergraph.process;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.engine.ComputerTraversalEngine;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ConjunctionStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ConnectiveStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.EngineDependentStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ProfileStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ComputerVerificationStrategy;
@@ -39,7 +39,7 @@ public class TinkerGraphNoStrategyComputerProvider extends TinkerGraphComputerPr
ComputerVerificationStrategy.class,
EngineDependentStrategy.class,
ProfileStrategy.class,
- ConjunctionStrategy.class,
+ ConnectiveStrategy.class,
ComputerTraversalEngine.ComputerResultStrategy.class));
@Override