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 2016/03/25 16:01:30 UTC
incubator-tinkerpop git commit: Created SelectLinearizationStrategy
which for OLAP. Right now,
it just does the easy part of making select('a').by('name') into
select('a').map(values('name')). This doesn't cover the full range of what we
want, but a star
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1236 [created] 7a52aa4eb
Created SelectLinearizationStrategy which for OLAP. Right now, it just does the easy part of making select('a').by('name') into select('a').map(values('name')). This doesn't cover the full range of what we want, but a start.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/7a52aa4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/7a52aa4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/7a52aa4e
Branch: refs/heads/TINKERPOP-1236
Commit: 7a52aa4ebd072cdacdf07005eb587815e39835e7
Parents: 51d9b1c
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Mar 25 09:01:19 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Mar 25 09:01:19 2016 -0600
----------------------------------------------------------------------
.../process/traversal/TraversalStrategies.java | 2 +
.../SelectLinearizationStrategy.java | 66 ++++++++++++++++++++
.../structure/TinkerGraphPlayTest.java | 3 +-
3 files changed, 70 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7a52aa4e/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 7b5a84c..26605f5 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
@@ -27,6 +27,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.Inci
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.MatchPredicateStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.OrderLimitStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.RangeByIsCountStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.SelectLinearizationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.StandardVerificationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -190,6 +191,7 @@ public interface TraversalStrategies extends Serializable, Cloneable {
IdentityRemovalStrategy.instance(),
MatchPredicateStrategy.instance(),
RangeByIsCountStrategy.instance(),
+ SelectLinearizationStrategy.instance(),
OrderLimitStrategy.instance(),
StandardVerificationStrategy.instance());
//LambdaRestrictionStrategy.instance(),
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7a52aa4e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/SelectLinearizationStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/SelectLinearizationStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/SelectLinearizationStrategy.java
new file mode 100644
index 0000000..42c9af9
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/SelectLinearizationStrategy.java
@@ -0,0 +1,66 @@
+/*
+ * 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.optimization;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.ElementValueTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.step.PathProcessor;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectOneStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalMapStep;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
+
+import java.util.List;
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+public final class SelectLinearizationStrategy extends AbstractTraversalStrategy<TraversalStrategy.OptimizationStrategy> implements TraversalStrategy.OptimizationStrategy {
+
+ private static final SelectLinearizationStrategy INSTANCE = new SelectLinearizationStrategy();
+
+ private SelectLinearizationStrategy() {
+ }
+
+ @Override
+ public void apply(final Traversal.Admin<?, ?> traversal) {
+ if (!TraversalHelper.onGraphComputer(traversal) || traversal.getParent().isLocalChild(traversal))
+ return;
+
+ final List<SelectOneStep> selectOneSteps = TraversalHelper.getStepsOfClass(SelectOneStep.class, traversal);
+ for (final SelectOneStep<?, ?> selectOneStep : selectOneSteps) {
+ if (selectOneStep.getMaxRequirement().compareTo(PathProcessor.ElementRequirement.ID) > 0) {
+ final int index = TraversalHelper.stepIndex(selectOneStep, traversal);
+ final Traversal.Admin<?, ?> localChild = selectOneStep.getLocalChildren().get(0);
+ if (localChild instanceof ElementValueTraversal) { // need to generalize to get more coverage -- unfold()-style selects break.
+ selectOneStep.removeLocalChild(localChild);
+ final TraversalMapStep<?, ?> mapStep = new TraversalMapStep<>(traversal, localChild.clone());
+ traversal.addStep(index + 1, mapStep);
+ }
+ }
+ }
+ }
+
+ public static SelectLinearizationStrategy instance() {
+ return INSTANCE;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7a52aa4e/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
index 8202055..b2cfa4d 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
@@ -70,7 +70,8 @@ public class TinkerGraphPlayTest {
//System.out.println(g.V().outE("knows").identity().inV().count().is(P.eq(5)).explain());
//System.out.println(g.V().hasLabel("person").fold().order(Scope.local).by("age").toList());
//System.out.println(g.V().repeat(out()).times(2).profile("m").explain());
- final Traversal<?, ?> traversal = g.V().repeat(__.union(__.<Vertex>identity().as("a"), out())).times(2).profile();
+ final Traversal<?, ?> traversal = g.V().as("a").select("a").by("name");
+ System.out.println(traversal.explain());
//System.out.println(g.V().hasLabel("person").pageRank().by("rank").by(bothE()).values("rank").profile("m").explain());
//System.out.println(traversal.asAdmin().clone().toString());
// final Traversal<?,?> clone = traversal.asAdmin().clone();