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 2017/02/28 19:06:15 UTC
[29/30] tinkerpop git commit: Split ComputerVerificationStrategy into
a finalization and verification strateggy. The prior for configuring
GraphComputer steps and the latter for verifiying. This allows users who know
their OLAP job will execute but know
Split ComputerVerificationStrategy into a finalization and verification strateggy. The prior for configuring GraphComputer steps and the latter for verifiying. This allows users who know their OLAP job will execute but know that ComputerVerificationStrategy is too strict, can withoutStrategies() the verfification strategy. Tweaked up @dkuppitz's new ComplexTest to suit both OLAP and OLTP.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8604fd35
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8604fd35
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8604fd35
Branch: refs/heads/TINKERPOP-1640
Commit: 8604fd35aa8e8fc32c879a5c30c02d49ee63ca09
Parents: af13c00
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Feb 28 09:40:53 2017 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Feb 28 12:05:27 2017 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../ComputerFinalizationStrategy.java | 64 ++++++++++++++++++++
.../process/traversal/TraversalStrategies.java | 2 +
.../ComputerVerificationStrategy.java | 7 ---
.../StandardVerificationStrategy.java | 4 +-
.../process/traversal/step/ComplexTest.java | 23 ++++---
6 files changed, 84 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8604fd35/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 231b2f8..8cc2adc 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.2.5 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Split `ComputerVerificationStrategy` into two strategies: `ComputerVerificationStrategy` and `ComputerFinalizationStrategy`.
* Removed `HasTest.g_V_hasId_compilationEquality` from process test suite as it makes too many assumptions about provider compilation.
* Deprecated `CustomizerProvider` infrastructure.
* Deprecated `PluginAcceptor` infrastructure.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8604fd35/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/strategy/finalization/ComputerFinalizationStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/strategy/finalization/ComputerFinalizationStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/strategy/finalization/ComputerFinalizationStrategy.java
new file mode 100644
index 0000000..a07c66e
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/strategy/finalization/ComputerFinalizationStrategy.java
@@ -0,0 +1,64 @@
+/*
+ * 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.computer.traversal.strategy.finalization;
+
+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.GraphComputing;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ProfileStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
+
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+public final class ComputerFinalizationStrategy extends AbstractTraversalStrategy<TraversalStrategy.FinalizationStrategy> {
+
+ private static final ComputerFinalizationStrategy INSTANCE = new ComputerFinalizationStrategy();
+
+ private ComputerFinalizationStrategy() {
+ }
+
+ @Override
+ public void apply(Traversal.Admin<?, ?> traversal) {
+ if (!TraversalHelper.onGraphComputer(traversal))
+ return;
+
+ final boolean globalChild = TraversalHelper.isGlobalChild(traversal);
+ for (final Step<?, ?> step : traversal.getSteps()) {
+ // only global children are graph computing
+ if (globalChild && step instanceof GraphComputing)
+ ((GraphComputing) step).onGraphComputer();
+ }
+ }
+
+ public static ComputerFinalizationStrategy instance() {
+ return INSTANCE;
+ }
+
+ @Override
+ public Set<Class<? extends FinalizationStrategy>> applyPrior() {
+ return Collections.singleton(ProfileStrategy.class);
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8604fd35/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 7f96850..63ae23f 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
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.process.traversal;
import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
+import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.finalization.ComputerFinalizationStrategy;
import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.optimization.GraphFilterStrategy;
import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.optimization.MessagePassingReductionStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ConnectiveStrategy;
@@ -226,6 +227,7 @@ public interface TraversalStrategies extends Serializable, Cloneable {
MessagePassingReductionStrategy.instance(),
OrderLimitStrategy.instance(),
PathProcessorStrategy.instance(),
+ ComputerFinalizationStrategy.instance(),
ComputerVerificationStrategy.instance());
GRAPH_COMPUTER_CACHE.put(GraphComputer.class, graphComputerStrategies);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8604fd35/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ComputerVerificationStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ComputerVerificationStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ComputerVerificationStrategy.java
index ef9b95c..3a3c6e2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ComputerVerificationStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ComputerVerificationStrategy.java
@@ -24,7 +24,6 @@ import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.VertexPr
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.GraphComputing;
import org.apache.tinkerpop.gremlin.process.traversal.step.Mutating;
import org.apache.tinkerpop.gremlin.process.traversal.step.PathProcessor;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
@@ -61,8 +60,6 @@ public final class ComputerVerificationStrategy extends AbstractTraversalStrateg
if (!TraversalHelper.onGraphComputer(traversal))
return;
- final boolean globalChild = TraversalHelper.isGlobalChild(traversal);
-
if (traversal.getParent() instanceof TraversalVertexProgramStep) {
if (TraversalHelper.getStepsOfAssignableClassRecursively(GraphStep.class, traversal).size() > 1)
throw new VerificationException("Mid-traversal V()/E() is currently not supported on GraphComputer", traversal);
@@ -72,10 +69,6 @@ public final class ComputerVerificationStrategy extends AbstractTraversalStrateg
for (final Step<?, ?> step : traversal.getSteps()) {
- // only global children are graph computing
- if (globalChild && step instanceof GraphComputing)
- ((GraphComputing) step).onGraphComputer();
-
// you can not traverse past the local star graph with localChildren (e.g. by()-modulators).
if (step instanceof TraversalParent) {
final Optional<Traversal.Admin<Object, Object>> traversalOptional = ((TraversalParent) step).getLocalChildren().stream()
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8604fd35/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/StandardVerificationStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/StandardVerificationStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/StandardVerificationStrategy.java
index f72de50..9f8083e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/StandardVerificationStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/StandardVerificationStrategy.java
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.process.traversal.strategy.verification;
import org.apache.tinkerpop.gremlin.process.computer.traversal.step.VertexComputing;
+import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.finalization.ComputerFinalizationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
@@ -31,7 +32,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversal
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.Graph;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.Set;
@@ -47,7 +47,7 @@ public final class StandardVerificationStrategy extends AbstractTraversalStrateg
@Override
public void apply(final Traversal.Admin<?, ?> traversal) {
- if (!traversal.getStrategies().toList().contains(ComputerVerificationStrategy.instance())) {
+ if (!traversal.getStrategies().toList().contains(ComputerFinalizationStrategy.instance())) {
if (!TraversalHelper.getStepsOfAssignableClass(VertexComputing.class, traversal).isEmpty())
throw new VerificationException("VertexComputing steps must be executed with a GraphComputer: " + TraversalHelper.getStepsOfAssignableClass(VertexComputing.class, traversal), traversal);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8604fd35/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ComplexTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ComplexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ComplexTest.java
index fbbcc5a..98d19b5 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ComplexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ComplexTest.java
@@ -29,6 +29,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.PathRetractionStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ComputerVerificationStrategy;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -260,23 +261,29 @@ public abstract class ComplexTest extends AbstractGremlinProcessTest {
@Override
public Traversal<Vertex, List<Object>> getAllShortestPaths() {
// TODO: remove .withoutStrategies(PathRetractionStrategy.class)
- return g.withoutStrategies(PathRetractionStrategy.class).V().as("v").both().as("v").
- project("src", "tgt", "p").by(select(first, "v")).
+ return g.withoutStrategies(ComputerVerificationStrategy.class, PathRetractionStrategy.class).
+ V().as("v").both().as("v").
+ project("src", "tgt", "p").
+ by(select(first, "v")).
by(select(last, "v")).
by(select("v")).as("triple").
- group("x").by(select("src", "tgt")).
+ group("x").
+ by(select("src", "tgt")).
by(select("p").fold()).select("tgt").barrier().
repeat(both().as("v").
- project("src", "tgt", "p").by(select(first, "v")).
+ project("src", "tgt", "p").
+ by(select(first, "v")).
by(select(last, "v")).
by(select("v")).as("t").
filter(select("p").count(local).as("l").
- select(last, "t").select("p").dedup(local).count(local).where(eq("l"))
- ).select(last, "t").not(
- select("p").as("p").count(local).as("l").
+ select(last, "t").select("p").dedup(local).count(local).where(eq("l"))).
+ select(last, "t").
+ not(select("p").as("p").count(local).as("l").
select("x").unfold().filter(select(keys).where(eq("t")).by(select("src", "tgt"))).
filter(select(values).unfold().or(count(local).where(lt("l")), where(eq("p"))))).
- group("x").by(select("src", "tgt")).
+ barrier().
+ group("x").
+ by(select("src", "tgt")).
by(select("p").fold()).select("tgt").barrier()).
cap("x").select(values).unfold().unfold().map(unfold().id().fold());
}