You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/09/28 16:56:59 UTC
[01/44] tinkerpop git commit: Upload only diffs in `publish-docs.sh`.
[Forced Update!]
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-944 83a4cf109 -> 7a4a836d8 (forced update)
Upload only diffs in `publish-docs.sh`.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/86007ee2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/86007ee2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/86007ee2
Branch: refs/heads/TINKERPOP-944
Commit: 86007ee2029feeaf592b62978e1b3b0f9cfe2ed0
Parents: 4ed0095
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon Sep 19 15:20:50 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Sep 20 14:40:24 2016 +0200
----------------------------------------------------------------------
bin/publish-docs.awk | 31 +++++++++++++++++++++++++++++++
bin/publish-docs.sh | 42 +++++++++++++++++++++++++-----------------
2 files changed, 56 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/86007ee2/bin/publish-docs.awk
----------------------------------------------------------------------
diff --git a/bin/publish-docs.awk b/bin/publish-docs.awk
new file mode 100644
index 0000000..d3e0d64
--- /dev/null
+++ b/bin/publish-docs.awk
@@ -0,0 +1,31 @@
+# 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.
+
+#
+# @author Daniel Kuppitz (http://gremlin.guru)
+#
+/^Files / {
+ print "U " gensub("^[^/]*/[^/]*/", "", "g", $2)
+}
+
+/^Only in (java)?docs/ {
+ print "D " gensub(/:$/, "", "g", gensub("^[^/]*/[^/]*/", "", "g", $3)) "/" $4
+}
+
+/^Only in \.\./ {
+ print "A " gensub(/:$/, "", "g", gensub("^[^/]*/[^/]*/[^/]*/", "", "g", $3)) "/" $4
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/86007ee2/bin/publish-docs.sh
----------------------------------------------------------------------
diff --git a/bin/publish-docs.sh b/bin/publish-docs.sh
index 23e2d4d..49ed9bd 100755
--- a/bin/publish-docs.sh
+++ b/bin/publish-docs.sh
@@ -39,25 +39,33 @@ mkdir -p target/svn
${SVN_CMD} co --depth immediates https://svn.apache.org/repos/asf/tinkerpop/site target/svn
pushd target/svn
-${SVN_CMD} update --depth empty "docs/${VERSION}"
-${SVN_CMD} update --depth empty "javadocs/${VERSION}"
-${SVN_CMD} rm "docs/${VERSION}"
-${SVN_CMD} rm "javadocs/${VERSION}"
-${SVN_CMD} commit . -m "Docs for TinkerPop ${VERSION} are being replaced."
-popd
-mkdir -p "target/svn/docs/${VERSION}"
-mkdir -p "target/svn/javadocs/${VERSION}/core"
-mkdir -p "target/svn/javadocs/${VERSION}/full"
+${SVN_CMD} update "docs/${VERSION}"
+${SVN_CMD} update "javadocs/${VERSION}"
-cp -R target/docs/htmlsingle/. "target/svn/docs/${VERSION}"
-cp -R target/site/apidocs/core/. "target/svn/javadocs/${VERSION}/core"
-cp -R target/site/apidocs/full/. "target/svn/javadocs/${VERSION}/full"
+mkdir -p "docs/${VERSION}"
+mkdir -p "javadocs/${VERSION}/core"
+mkdir -p "javadocs/${VERSION}/full"
-pushd target/svn
-rm "docs/${VERSION}/images/tinkerpop3.graffle"
-${SVN_CMD} update --depth empty "docs/${VERSION}"
-${SVN_CMD} update --depth empty "javadocs/${VERSION}"
+diff -rq -I '^Last updated' docs/${VERSION}/ ../docs/htmlsingle/ | awk -f ../../bin/publish-docs.awk | sed 's/^\(.\) \//\1 /g' > ../publish-docs.docs
+diff -rq -I 'Generated by javadoc' -I '^<meta name="date"' javadocs/${VERSION}/ ../site/apidocs/ | awk -f ../../bin/publish-docs.awk | sed 's/^\(.\) \//\1 /g' > ../publish-docs.javadocs
+
+# copy new / modified files
+for file in $(cat ../publish-docs.docs | awk '/^[AU]/ {print $2}' | grep -v '.graffle$')
+do
+ cp "../docs/htmlsingle/${file}" "docs/${VERSION}/${file}"
+done
+for file in $(cat ../publish-docs.javadocs | awk '/^[AU]/ {print $2}')
+do
+ cp "../site/apidocs/${file}" "javadocs/${VERSION}/${file}"
+done
+
+pushd "docs/${VERSION}/"; cat ../../../publish-docs.docs | awk '/^A/ {print $2}' | grep -v '.graffle$' | xargs --no-run-if-empty svn add; popd
+pushd "javadocs/${VERSION}/"; cat ../../../publish-docs.javadocs | awk '/^A/ {print $2}' | xargs --no-run-if-empty svn add; popd
+
+# delete old files
+pushd "docs/${VERSION}/"; cat ../../../publish-docs.docs | awk '/^D/ {print $2}' | xargs --no-run-if-empty svn delete; popd
+pushd "javadocs/${VERSION}/"; cat ../../../publish-docs.javadocs | awk '/^D/ {print $2}' | xargs --no-run-if-empty svn delete; popd
for dir in "docs" "javadocs"
do
@@ -69,8 +77,8 @@ do
${SVN_CMD} update --depth empty "${dir}/${CURRENT}"
ln -s "${CURRENT}" "${dir}/current"
${SVN_CMD} update --depth empty "${dir}/current"
+ ${SVN_CMD} add "${dir}/current"
done
-${SVN_CMD} add * --force
${SVN_CMD} commit -m "Deploy docs for TinkerPop ${VERSION}"
popd
[36/44] tinkerpop git commit: I was led down a dumb hole with
TinkerGraphStepStrategy --- FilterRankStrategy does the filter sorting. Dar.
I rewrote TinkerGraphStepStrategyTest so its like the other SrategyTest
classes. It doesn't need to be a suite and
Posted by sp...@apache.org.
I was led down a dumb hole with TinkerGraphStepStrategy --- FilterRankStrategy does the filter sorting. Dar. I rewrote TinkerGraphStepStrategyTest so its like the other SrategyTest classes. It doesn't need to be a suite and all that...Now things are much more obvious as we can run parallel strategies to see how things get compiled. Also, made FilterRankStrategy is bit quicker by bailing fast is the step is not a FilterStep or OrderGlobalStep. CTR as this is basically a revert from 1458 work.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/24c14cf9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/24c14cf9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/24c14cf9
Branch: refs/heads/TINKERPOP-944
Commit: 24c14cf914fd5997160cba75cdcc479fe652e5fd
Parents: 4821dbc
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Sep 27 16:25:23 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 16:25:23 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 -
.../optimization/FilterRankingStrategy.java | 42 +++--
.../optimization/FilterRankingStrategyTest.java | 13 +-
.../optimization/TinkerGraphStepStrategy.java | 33 ++--
.../strategy/TinkerGraphStrategySuite.java | 44 -----
.../strategy/TinkerGraphStrategyTest.java | 32 ----
.../TinkerGraphStepStrategyTest.java | 160 +++++++++----------
7 files changed, 117 insertions(+), 208 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/24c14cf9/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 3fc278a..ff730f7 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -30,7 +30,6 @@ TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET)
* Fixed a end-step label bug in `MatchPredicateStrategy`.
* Fixed a bug in `MatchPredicateStrategy` where inlined traversals did not have strategies applied to it.
* Fixed a bug in `RepeatUnrollStrategy` where inlined traversal did not have strategies applied to it.
-* `TinkerGraphStepStrategy` is now smart about non-`HasContainer` filter steps.
* Added `TraversalHelper.copyLabels()` for copying (or moving) labels form one step to another.
* Added `TraversalHelper.applySingleLevelStrategies()` which will apply a subset of strategies but not walk the child tree.
* Added the concept that hidden labels using during traversal compilation are removed at the end during `StandardVerificationStrategy`. (*breaking*)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/24c14cf9/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategy.java
index eaa69bc..96843d9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategy.java
@@ -23,7 +23,17 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.step.LambdaHolder;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.*;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AndStep;
+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.FilterStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.IsStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.OrStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.SimplePathStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStep;
+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.step.map.OrderGlobalStep;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
@@ -110,39 +120,41 @@ public final class FilterRankingStrategy extends AbstractTraversalStrategy<Trave
* Ranks the given step. Steps with lower ranks can be moved in front of steps with higher ranks. 0 means that
* the step has no rank and thus is not exchangeable with its neighbors.
*
- * @param step
+ * @param step the step to get a ranking for
* @return The rank of the given step.
*/
private static int getStepRank(final Step step) {
- if (step instanceof IsStep) {
+ if (!(step instanceof FilterStep || step instanceof OrderGlobalStep))
+ return 0;
+ else if (step instanceof IsStep)
return 1;
- } else if (step instanceof HasStep) {
+ else if (step instanceof HasStep)
return 2;
- } else if (step instanceof WherePredicateStep) {
+ else if (step instanceof WherePredicateStep)
return 3;
- } else if (step instanceof SimplePathStep || step instanceof CyclicPathStep) {
+ else if (step instanceof SimplePathStep || step instanceof CyclicPathStep)
return 4;
- } else if (step instanceof TraversalFilterStep) {
+ else if (step instanceof TraversalFilterStep)
return 5;
- } else if (step instanceof WhereTraversalStep) {
+ else if (step instanceof WhereTraversalStep)
return 6;
- } else if (step instanceof OrStep) {
+ else if (step instanceof OrStep)
return 7;
- } else if (step instanceof AndStep) {
+ else if (step instanceof AndStep)
return 8;
- } else if (step instanceof DedupGlobalStep) {
+ else if (step instanceof DedupGlobalStep)
return 9;
- } else if (step instanceof OrderGlobalStep) {
+ else if (step instanceof OrderGlobalStep)
return 10;
- }
- return 0;
+ else
+ return 0;
}
/**
* If the given step has no child traversal that holds a lambda, then the actual rank determined by
* {@link #getStepRank(Step)} is returned, otherwise 0.
*
- * @param step
+ * @param step the step to get a ranking for
* @return The rank of the given step.
*/
private static int rank(final Step step) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/24c14cf9/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategyTest.java
index 71f5b4b..18ef6ca 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategyTest.java
@@ -31,6 +31,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.has;
import static org.junit.Assert.assertEquals;
/**
@@ -39,7 +40,6 @@ import static org.junit.Assert.assertEquals;
@RunWith(Parameterized.class)
public class FilterRankingStrategyTest {
-
public static Iterable<Object[]> data() {
return generateTestParameters();
}
@@ -75,11 +75,12 @@ public class FilterRankingStrategyTest {
{__.identity().order().dedup(), __.dedup().order(), Collections.singletonList(IdentityRemovalStrategy.instance())},
{__.order().identity().dedup(), __.dedup().order(), Collections.singletonList(IdentityRemovalStrategy.instance())},
{__.order().out().dedup(), __.order().out().dedup(), Collections.emptyList()},
- {__.has("value", 0).filter(__.out()).dedup(), __.has("value", 0).filter(__.out()).dedup(), Collections.emptyList()},
- {__.dedup().filter(__.out()).has("value", 0), __.has("value", 0).filter(__.out()).dedup(), Collections.emptyList()},
- {__.filter(__.out()).dedup().has("value", 0), __.has("value", 0).filter(__.out()).dedup(), Collections.emptyList()},
- {__.has("value", 0).filter(__.out()).dedup(), __.has("value", 0).filter(__.out()).dedup(), Collections.emptyList()},
- {__.has("value", 0).and(__.has("age"), __.has("name", "marko")).is(10), __.is(10).has("value", 0).has("name", "marko").has("age"), Collections.singletonList(InlineFilterStrategy.instance())},
+ {has("value", 0).filter(__.out()).dedup(), has("value", 0).filter(__.out()).dedup(), Collections.emptyList()},
+ {__.dedup().filter(__.out()).has("value", 0), has("value", 0).filter(__.out()).dedup(), Collections.emptyList()},
+ {__.filter(__.out()).dedup().has("value", 0), has("value", 0).filter(__.out()).dedup(), Collections.emptyList()},
+ {has("value", 0).filter(__.out()).dedup(), has("value", 0).filter(__.out()).dedup(), Collections.emptyList()},
+ {has("value", 0).or(has("name"), has("age")).has("value", 1).dedup(), has("value", 0).has("value", 1).or(has("name"), has("age")).dedup(), Collections.emptyList()},
+ {has("value", 0).and(has("age"), has("name", "marko")).is(10), __.is(10).has("value", 0).has("name", "marko").has("age"), Collections.singletonList(InlineFilterStrategy.instance())},
});
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/24c14cf9/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategy.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategy.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategy.java
index fc3748f..5ba68eb 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategy.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategy.java
@@ -22,11 +22,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.step.HasContainerHolder;
-import org.apache.tinkerpop.gremlin.process.traversal.step.LambdaHolder;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DropStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.FilterStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
@@ -48,28 +43,20 @@ public final class TinkerGraphStepStrategy extends AbstractTraversalStrategy<Tra
if (TraversalHelper.onGraphComputer(traversal))
return;
- TraversalHelper.getStepsOfClass(GraphStep.class, traversal).forEach(originalGraphStep -> {
+ for (final GraphStep originalGraphStep : TraversalHelper.getStepsOfClass(GraphStep.class, traversal)) {
final TinkerGraphStep<?, ?> tinkerGraphStep = new TinkerGraphStep<>(originalGraphStep);
- TraversalHelper.replaceStep(originalGraphStep, (Step) tinkerGraphStep, traversal);
- Step<?, ?> lastNonHolderStep = tinkerGraphStep;
+ TraversalHelper.replaceStep(originalGraphStep, tinkerGraphStep, traversal);
Step<?, ?> currentStep = tinkerGraphStep.getNextStep();
- while (currentStep instanceof FilterStep &&
- !(currentStep instanceof DedupGlobalStep) &&
- !(currentStep instanceof RangeGlobalStep) &&
- !(currentStep instanceof DropStep) &&
- !(currentStep instanceof LambdaHolder)) {
- if (currentStep instanceof HasContainerHolder) {
- for (final HasContainer hasContainer : ((HasContainerHolder) currentStep).getHasContainers()) {
- if (!GraphStep.processHasContainerIds(tinkerGraphStep, hasContainer))
- tinkerGraphStep.addHasContainer(hasContainer);
- }
- TraversalHelper.copyLabels(currentStep, lastNonHolderStep, false);
- traversal.removeStep(currentStep);
- } else
- lastNonHolderStep = currentStep;
+ while (currentStep instanceof HasContainerHolder) {
+ for (final HasContainer hasContainer : ((HasContainerHolder) currentStep).getHasContainers()) {
+ if (!GraphStep.processHasContainerIds(tinkerGraphStep, hasContainer))
+ tinkerGraphStep.addHasContainer(hasContainer);
+ }
+ TraversalHelper.copyLabels(currentStep, tinkerGraphStep, false);
+ traversal.removeStep(currentStep);
currentStep = currentStep.getNextStep();
}
- });
+ }
}
public static TinkerGraphStepStrategy instance() {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/24c14cf9/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/TinkerGraphStrategySuite.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/TinkerGraphStrategySuite.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/TinkerGraphStrategySuite.java
deleted file mode 100644
index 3982918..0000000
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/TinkerGraphStrategySuite.java
+++ /dev/null
@@ -1,44 +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.tinkergraph.process.traversal.strategy;
-
-import org.apache.tinkerpop.gremlin.AbstractGremlinSuite;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
-import org.apache.tinkerpop.gremlin.tinkergraph.process.traversal.strategy.optimization.TinkerGraphStepStrategyTest;
-import org.junit.runners.model.InitializationError;
-import org.junit.runners.model.RunnerBuilder;
-
-/**
- * @author Daniel Kuppitz (http://gremlin.guru)
- */
-public class TinkerGraphStrategySuite extends AbstractGremlinSuite {
-
- public TinkerGraphStrategySuite(final Class<?> klass, final RunnerBuilder builder) throws InitializationError {
-
- super(klass, builder,
- new Class<?>[]{
- TinkerGraphStepStrategyTest.class
- }, new Class<?>[]{
- TinkerGraphStepStrategyTest.class
- },
- false,
- TraversalEngine.Type.STANDARD);
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/24c14cf9/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/TinkerGraphStrategyTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/TinkerGraphStrategyTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/TinkerGraphStrategyTest.java
deleted file mode 100644
index 7942626..0000000
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/TinkerGraphStrategyTest.java
+++ /dev/null
@@ -1,32 +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.tinkergraph.process.traversal.strategy;
-
-import org.apache.tinkerpop.gremlin.GraphProviderClass;
-import org.apache.tinkerpop.gremlin.tinkergraph.TinkerGraphProvider;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.junit.runner.RunWith;
-
-/**
- * @author Daniel Kuppitz (http://gremlin.guru)
- */
-@RunWith(TinkerGraphStrategySuite.class)
-@GraphProviderClass(provider = TinkerGraphProvider.class, graph = TinkerGraph.class)
-public class TinkerGraphStrategyTest {
-}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/24c14cf9/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategyTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategyTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategyTest.java
index 6e7a383..89ca7ba 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategyTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategyTest.java
@@ -18,112 +18,98 @@
*/
package org.apache.tinkerpop.gremlin.tinkergraph.process.traversal.strategy.optimization;
-import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
-import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.DefaultGraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.OrStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.FilterRankingStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.InlineFilterStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.tinkergraph.process.traversal.step.sideEffect.TinkerGraphStep;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import static org.apache.tinkerpop.gremlin.process.traversal.P.eq;
+import static org.apache.tinkerpop.gremlin.process.traversal.P.gt;
+import static org.apache.tinkerpop.gremlin.process.traversal.P.lt;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.has;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.out;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
* @author Daniel Kuppitz (http://gremlin.guru)
*/
-public class TinkerGraphStepStrategyTest extends AbstractGremlinProcessTest {
+@RunWith(Parameterized.class)
+public class TinkerGraphStepStrategyTest {
+
+ @Parameterized.Parameter(value = 0)
+ public Traversal original;
+
+ @Parameterized.Parameter(value = 1)
+ public Traversal optimized;
+
+ @Parameterized.Parameter(value = 2)
+ public Collection<TraversalStrategy> otherStrategies;
@Test
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void shouldSkipFilterSteps() {
- GraphTraversal.Admin<?, ?> traversal = g.V().as("a").has("name", "marko").as("b").has("nothing").has("age", 32).as("c").asAdmin();
- traversal.applyStrategies();
- assertEquals(2, traversal.getSteps().size());
- assertEquals(TinkerGraphStep.class, traversal.getStartStep().getClass());
- assertEquals(TraversalFilterStep.class, traversal.getEndStep().getClass());
- assertTrue(traversal.getStartStep().getLabels().containsAll(Arrays.asList("a", "b")));
- assertTrue(traversal.getEndStep().getLabels().containsAll(Arrays.asList("c")));
- assertEquals("name", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(0).getKey());
- assertEquals("marko", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(0).getValue());
- assertEquals("age", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(1).getKey());
- assertEquals(32, ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(1).getValue());
- //
- traversal = g.V().as("a").has("name", "marko").as("b").or(has("nothing"), out("something")).has("age", 32).as("c").asAdmin();
- traversal.applyStrategies();
- assertEquals(2, traversal.getSteps().size());
- assertEquals(TinkerGraphStep.class, traversal.getStartStep().getClass());
- assertEquals(OrStep.class, traversal.getEndStep().getClass());
- assertTrue(traversal.getStartStep().getLabels().containsAll(Arrays.asList("a", "b")));
- assertTrue(traversal.getEndStep().getLabels().containsAll(Arrays.asList("c")));
- assertEquals("name", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(0).getKey());
- assertEquals("marko", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(0).getValue());
- assertEquals("age", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(1).getKey());
- assertEquals(32, ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(1).getValue());
- //
- traversal = g.V().as("a").has("name", "marko").as("b").out("something").has("age", 32).as("c").asAdmin();
- traversal.applyStrategies();
- assertEquals(3, traversal.getSteps().size());
- assertEquals(TinkerGraphStep.class, traversal.getStartStep().getClass());
- assertEquals(VertexStep.class, traversal.getSteps().get(1).getClass());
- assertEquals(HasStep.class, traversal.getEndStep().getClass());
- assertTrue(traversal.getStartStep().getLabels().containsAll(Arrays.asList("a", "b")));
- assertTrue(traversal.getEndStep().getLabels().containsAll(Arrays.asList("c")));
- assertEquals("name", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(0).getKey());
- assertEquals("marko", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(0).getValue());
+ public void doTest() {
+ final TraversalStrategies strategies = new DefaultTraversalStrategies();
+ strategies.addStrategies(TinkerGraphStepStrategy.instance());
+ for (final TraversalStrategy strategy : this.otherStrategies) {
+ strategies.addStrategies(strategy);
+ }
+ this.original.asAdmin().setStrategies(strategies);
+ this.original.asAdmin().applyStrategies();
+ assertEquals(this.optimized, this.original);
}
- @Test
- @IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void shouldFoldInHasContainers() {
- GraphTraversal.Admin traversal = g.V().has("name", "marko").asAdmin();
- assertEquals(2, traversal.getSteps().size());
- assertEquals(HasStep.class, traversal.getEndStep().getClass());
- traversal.applyStrategies();
- assertEquals(1, traversal.getSteps().size());
- assertEquals(TinkerGraphStep.class, traversal.getStartStep().getClass());
- assertEquals(TinkerGraphStep.class, traversal.getEndStep().getClass());
- assertEquals(1, ((TinkerGraphStep) traversal.getStartStep()).getHasContainers().size());
- assertEquals("name", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(0).getKey());
- assertEquals("marko", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(0).getValue());
- ////
- traversal = g.V().has("name", "marko").has("age", P.gt(20)).asAdmin();
- traversal.applyStrategies();
- assertEquals(1, traversal.getSteps().size());
- assertEquals(TinkerGraphStep.class, traversal.getStartStep().getClass());
- assertEquals(2, ((TinkerGraphStep) traversal.getStartStep()).getHasContainers().size());
- ////
- traversal = g.V().has("name", "marko").out().has("name", "daniel").asAdmin();
- traversal.applyStrategies();
- assertEquals(3, traversal.getSteps().size());
- assertEquals(TinkerGraphStep.class, traversal.getStartStep().getClass());
- assertEquals(1, ((TinkerGraphStep) traversal.getStartStep()).getHasContainers().size());
- assertEquals("name", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(0).getKey());
- assertEquals("marko", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(0).getValue());
- assertEquals(HasStep.class, traversal.getEndStep().getClass());
- ////
- traversal = g.V().has("name", "marko").out().V().has("name", "daniel").asAdmin();
- traversal.applyStrategies();
- assertEquals(3, traversal.getSteps().size());
- assertEquals(TinkerGraphStep.class, traversal.getStartStep().getClass());
- assertEquals(1, ((TinkerGraphStep) traversal.getStartStep()).getHasContainers().size());
- assertEquals("name", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(0).getKey());
- assertEquals("marko", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(0).getValue());
- assertEquals(TinkerGraphStep.class, traversal.getSteps().get(2).getClass());
- assertEquals(1, ((TinkerGraphStep) traversal.getSteps().get(2)).getHasContainers().size());
- assertEquals("name", ((TinkerGraphStep<?, ?>) traversal.getSteps().get(2)).getHasContainers().get(0).getKey());
- assertEquals("daniel", ((TinkerGraphStep<?, ?>) traversal.getSteps().get(2)).getHasContainers().get(0).getValue());
- assertEquals(TinkerGraphStep.class, traversal.getEndStep().getClass());
+ private static GraphTraversal.Admin<?, ?> g_V(final Object... hasKeyValues) {
+ final GraphTraversal.Admin<?, ?> traversal = new DefaultGraphTraversal<>();
+ final TinkerGraphStep<Vertex, Vertex> graphStep = new TinkerGraphStep<>(new GraphStep<>(traversal, Vertex.class, true));
+ for (int i = 0; i < hasKeyValues.length; i = i + 2) {
+ graphStep.addHasContainer(new HasContainer((String) hasKeyValues[i], (P) hasKeyValues[i + 1]));
+ }
+ return traversal.addStep(graphStep);
}
+ @Parameterized.Parameters(name = "{0}")
+ public static Iterable<Object[]> generateTestParameters() {
+ return Arrays.asList(new Object[][]{
+ {__.V().out(), g_V().out(), Collections.emptyList()},
+ {__.V().has("name", "marko").out(), g_V("name", eq("marko")).out(), Collections.emptyList()},
+ {__.V().has("name", "marko").has("age", gt(31).and(lt(10))).out(),
+ g_V("name", eq("marko"), "age", gt(31), "age", lt(10)).out(), Collections.emptyList()},
+ {__.V().has("name", "marko").or(has("age"), has("age", gt(32))).has("lang", "java"),
+ g_V("name", eq("marko"), "lang", eq("java")).or(has("age"), has("age", gt(32))), Collections.singletonList(FilterRankingStrategy.instance())},
+ {__.V().has("name", "marko").as("a").or(has("age"), has("age", gt(32))).has("lang", "java"),
+ g_V("name", eq("marko")).as("a").or(has("age"), has("age", gt(32))).has("lang", "java"), Collections.emptyList()},
+ {__.V().has("name", "marko").as("a").or(has("age"), has("age", gt(32))).has("lang", "java"),
+ g_V("name", eq("marko"), "lang", eq("java")).as("a").or(has("age"), has("age", gt(32))), Collections.singletonList(FilterRankingStrategy.instance())},
+ {__.V().dedup().has("name", "marko").or(has("age"), has("age", gt(32))).has("lang", "java"),
+ g_V("name", eq("marko"), "lang", eq("java")).or(has("age"), has("age", gt(32))).dedup(), Collections.singletonList(FilterRankingStrategy.instance())},
+ {__.V().as("a").dedup().has("name", "marko").or(has("age"), has("age", gt(32))).has("lang", "java"),
+ g_V("name", eq("marko"), "lang", eq("java")).as("a").or(has("age"), has("age", gt(32))).dedup(), Collections.singletonList(FilterRankingStrategy.instance())},
+ {__.V().as("a").has("name", "marko").as("b").or(has("age"), has("age", gt(32))).has("lang", "java"),
+ g_V("name", eq("marko"), "lang", eq("java")).as("a", "b").or(has("age"), has("age", gt(32))), Collections.singletonList(FilterRankingStrategy.instance())},
+ {__.V().as("a").dedup().has("name", "marko").or(has("age"), has("age", gt(32))).filter(has("name", "bob")).has("lang", "java"),
+ g_V("name", eq("marko"), "name", eq("bob"), "lang", eq("java")).as("a").or(has("age"), has("age", gt(32))).dedup(), Arrays.asList(InlineFilterStrategy.instance(), FilterRankingStrategy.instance())},
+ {__.V().as("a").dedup().has("name", "marko").or(has("age", 10), has("age", gt(32))).filter(has("name", "bob")).has("lang", "java"),
+ g_V("name", eq("marko"), "name", eq("bob"), "lang", eq("java")).as("a").or(has("age", 10), has("age", gt(32))).dedup(), TraversalStrategies.GlobalCache.getStrategies(TinkerGraph.class).toList()},
+ });
+ }
}
+
+
[12/44] tinkerpop git commit: TreeStep should trigger a failure in
IncidentToAdjacentStrategy. Fixed and added test case. TINKERPOP-1423
Posted by sp...@apache.org.
TreeStep should trigger a failure in IncidentToAdjacentStrategy. Fixed and added test case. TINKERPOP-1423
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1b1defc6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1b1defc6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1b1defc6
Branch: refs/heads/TINKERPOP-944
Commit: 1b1defc685a4cae715d65001e36e2fbe55186bc8
Parents: ab70dca
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Sep 27 10:59:04 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../optimization/IncidentToAdjacentStrategy.java | 4 +++-
.../IncidentToAdjacentStrategyTest.java | 16 ++++++----------
3 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1b1defc6/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 499046e..bb9f309 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.3 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Fixed a bug in `IncidentToAdjacentStrategy` where `TreeStep` traversals were allowed.
* Fixed a end-step label bug in `MatchPredicateStrategy`.
* Fixed a bug in `MatchPredicateStrategy` where inlined traversals did not have strategies applied to it.
* Fixed a bug in `RepeatUnrollStrategy` where inlined traversal did not have strategies applied to it.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1b1defc6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
index 18e1c50..153e43a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
@@ -25,6 +25,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.LambdaHolder;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeOtherVertexStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeVertexStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.PathStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.TreeStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
@@ -57,13 +58,14 @@ import java.util.Set;
* __.bothE().otherV() // is replaced by __.both()
* __.bothE().bothV() // will not be modified
* __.outE().inV().path() // will not be modified
+ * __.outE().inV().tree() // will not be modified
* </pre>
*/
public final class IncidentToAdjacentStrategy extends AbstractTraversalStrategy<TraversalStrategy.OptimizationStrategy>
implements TraversalStrategy.OptimizationStrategy {
private static final IncidentToAdjacentStrategy INSTANCE = new IncidentToAdjacentStrategy();
- private static final Set<Class> INVALIDATING_STEP_CLASSES = new HashSet<>(Arrays.asList(PathStep.class, LambdaHolder.class));
+ private static final Set<Class> INVALIDATING_STEP_CLASSES = new HashSet<>(Arrays.asList(PathStep.class, TreeStep.class, LambdaHolder.class));
private IncidentToAdjacentStrategy() {
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1b1defc6/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategyTest.java
index 7139f7b..6e56ab8 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategyTest.java
@@ -39,24 +39,19 @@ import static org.junit.Assert.assertEquals;
@RunWith(Parameterized.class)
public class IncidentToAdjacentStrategyTest {
-
@Parameterized.Parameter(value = 0)
public Traversal original;
@Parameterized.Parameter(value = 1)
public Traversal optimized;
- void applyIncidentToAdjacentStrategy(final Traversal traversal) {
- final TraversalStrategies strategies = new DefaultTraversalStrategies();
- strategies.addStrategies(IncidentToAdjacentStrategy.instance());
- traversal.asAdmin().setStrategies(strategies);
- traversal.asAdmin().applyStrategies();
- }
-
@Test
public void doTest() {
- applyIncidentToAdjacentStrategy(original);
- assertEquals(optimized, original);
+ final TraversalStrategies strategies = new DefaultTraversalStrategies();
+ strategies.addStrategies(IncidentToAdjacentStrategy.instance());
+ this.original.asAdmin().setStrategies(strategies);
+ this.original.asAdmin().applyStrategies();
+ assertEquals(this.optimized, this.original);
}
@Parameterized.Parameters(name = "{0}")
@@ -74,6 +69,7 @@ public class IncidentToAdjacentStrategyTest {
{__.bothE().outV(), __.bothE().outV()},
{__.outE().as("a").inV(), __.outE().as("a").inV()}, // todo: this can be optimized, but requires a lot more checks
{__.outE().inV().path(), __.outE().inV().path()},
+ {__.outE().inV().tree().as("a"), __.outE().inV().tree().as("a")},
{__.outE().inV().map(lambda), __.outE().inV().map(lambda)},
{__.union(__.outE().inV(), __.inE().outV()).path(), __.union(__.outE().inV(), __.inE().outV()).path()},
{__.as("a").outE().inV().as("b"), __.as("a").out().as("b")}});
[04/44] tinkerpop git commit: Removed "todo" and created
TINKERPOP-1465
Posted by sp...@apache.org.
Removed "todo" and created TINKERPOP-1465
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6f1ccb6f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6f1ccb6f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6f1ccb6f
Branch: refs/heads/TINKERPOP-944
Commit: 6f1ccb6f4e36f6da07e41496a9e373572f89de5d
Parents: 68188e2
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Sep 24 20:41:44 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Sep 24 20:41:44 2016 -0400
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f1ccb6f/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java
index 2436c29..93a2096 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java
@@ -114,7 +114,6 @@ public class SimpleAuthenticator implements Authenticator {
public SaslNegotiator newSaslNegotiator() {
// While this method is deprecated, it remains here to ensure backward compatibility with the old method. In
// this way the integration tests can continue to execute here
- // todo: remove this method on a future version and implement the new one
return new PlainTextSaslAuthenticator();
}
[03/44] tinkerpop git commit: Add keep-alive functionality to Java
Driver.
Posted by sp...@apache.org.
Add keep-alive functionality to Java Driver.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d881484a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d881484a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d881484a
Branch: refs/heads/TINKERPOP-944
Commit: d881484a40ef7c5924e97a1adce7d0a7bf6654ea
Parents: 01d035e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Sep 22 07:48:59 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Sep 22 07:49:45 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../src/reference/gremlin-applications.asciidoc | 1 +
.../upgrade/release-3.2.x-incubating.asciidoc | 10 +++
.../tinkerpop/gremlin/driver/Channelizer.java | 39 ++++++++---
.../tinkerpop/gremlin/driver/Cluster.java | 21 ++++++
.../tinkerpop/gremlin/driver/Connection.java | 36 +++++++++-
.../gremlin/driver/ConnectionPool.java | 2 +-
.../tinkerpop/gremlin/driver/Settings.java | 12 +++-
.../driver/handler/WebSocketClientHandler.java | 1 +
.../WebSocketGremlinResponseDecoder.java | 5 +-
.../server/GremlinDriverIntegrateTest.java | 69 ++++++++++++++++++++
11 files changed, 182 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d881484a/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 394cc33..9b323af 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -33,6 +33,7 @@ TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET)
* `TraversalRing` returns a `null` if it does not contain traversals (previously `IdentityTraversal`).
* Fixed a `JavaTranslator` bug where `Bytecode` instructions were being mutated during translation.
* Added `Path` to Gremlin-Python with respective GraphSON 2.0 deserializer.
+* Added "keep-alive" functionality to the Java driver, which will send a heartbeat to the server when normal request activity on a connection stops for a period of time.
* Renamed the `empty.result.indicator` preference to `result.indicator.null` in Gremlin Console
* If `result.indicator.null` is set to an empty string, then no "result line" is printed in Gremlin Console.
* VertexPrograms can now declare traverser requirements, e.g. to have access to the path when used with `.program()`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d881484a/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index bff9f0f..ce15d66 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -687,6 +687,7 @@ The following table describes the various configuration options for the Gremlin
|Key |Description |Default
|connectionPool.channelizer |The fully qualified classname of the client `Channelizer` that defines how to connect to the server. |`Channelizer.WebSocketChannelizer`
|connectionPool.enableSsl |Determines if SSL should be enabled or not. If enabled on the server then it must be enabled on the client. |false
+|connectionPool.keepAliveInterval |Length of time in milliseconds to wait on an idle connection before sending a keep-alive request. Set to zero to disable this feature. |1800000
|connectionPool.keyCertChainFile |The X.509 certificate chain file in PEM format. |_none_
|connectionPool.keyFile |The `PKCS#8` private key file in PEM format. |_none_
|connectionPool.keyPassword |The password of the `keyFile` if it's not password-protected |_none_
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d881484a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index f9c62e2..e85aeb9 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -59,6 +59,16 @@ gremlin>
See: link:https://issues.apache.org/jira/browse/TINKERPOP-1409[TINKERPOP-1409]
+Java Driver Keep-Alive
+^^^^^^^^^^^^^^^^^^^^^^
+
+The Java Driver now has a `keepAliveInterval` setting, which controls the amount of time in milliseconds it should wait
+on an inactive connection before it sends a message to the server to keep the connection maintained. This should help
+environments that use a load balancer in front of Gremlin Server by ensuring connections are actively maintained even
+during periods of inactivity.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1249[TINKERPOP-1249]
+
Where Step Supports By-Modulation
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d881484a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java
index 40be11c..6ed8e0f 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java
@@ -20,9 +20,7 @@ package org.apache.tinkerpop.gremlin.driver;
import io.netty.channel.Channel;
import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
-import io.netty.handler.ssl.SslContextBuilder;
-import io.netty.handler.ssl.SslProvider;
-import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
+import io.netty.handler.codec.http.websocketx.PingWebSocketFrame;
import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
import org.apache.tinkerpop.gremlin.driver.handler.NioGremlinRequestEncoder;
import org.apache.tinkerpop.gremlin.driver.handler.NioGremlinResponseDecoder;
@@ -39,10 +37,7 @@ import io.netty.handler.codec.http.HttpObjectAggregator;
import io.netty.handler.codec.http.websocketx.WebSocketClientHandshakerFactory;
import io.netty.handler.codec.http.websocketx.WebSocketVersion;
import io.netty.handler.ssl.SslContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import java.io.File;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.ConcurrentMap;
@@ -70,6 +65,21 @@ public interface Channelizer extends ChannelHandler {
public void close(final Channel channel);
/**
+ * Create a message for the driver to use as a "keep-alive" for the connection. This method will only be used if
+ * {@link #supportsKeepAlive()} is {@code true}.
+ */
+ public default Object createKeepAliveMessage() {
+ return null;
+ }
+
+ /**
+ * Determines if the channelizer supports a method for keeping the connection to the server alive.
+ */
+ public default boolean supportsKeepAlive() {
+ return false;
+ }
+
+ /**
* Called after the channel connects. The {@code Channelizer} may need to perform some functions, such as a
* handshake.
*/
@@ -80,8 +90,6 @@ public interface Channelizer extends ChannelHandler {
* Base implementation of the client side {@link Channelizer}.
*/
abstract class AbstractChannelizer extends ChannelInitializer<SocketChannel> implements Channelizer {
- private static final Logger logger = LoggerFactory.getLogger(AbstractChannelizer.class);
-
protected Connection connection;
protected Cluster cluster;
private ConcurrentMap<UUID, ResultQueue> pending;
@@ -152,6 +160,21 @@ public interface Channelizer extends ChannelHandler {
}
/**
+ * Keep-alive is supported through the ping/pong websocket protocol.
+ *
+ * @see <a href=https://tools.ietf.org/html/rfc6455#section-5.5.2>IETF RFC 6455</a>
+ */
+ @Override
+ public boolean supportsKeepAlive() {
+ return true;
+ }
+
+ @Override
+ public Object createKeepAliveMessage() {
+ return new PingWebSocketFrame();
+ }
+
+ /**
* Sends a {@code CloseWebSocketFrame} to the server for the specified channel.
*/
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d881484a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
index 9c08c3c..f79e719 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
@@ -163,6 +163,7 @@ public final class Cluster {
.port(settings.port)
.enableSsl(settings.connectionPool.enableSsl)
.trustCertificateChainFile(settings.connectionPool.trustCertChainFile)
+ .keepAliveInterval(settings.connectionPool.keepAliveInterval)
.keyCertChainFile(settings.connectionPool.keyCertChainFile)
.keyFile(settings.connectionPool.keyFile)
.keyPassword(settings.connectionPool.keyPassword)
@@ -388,6 +389,14 @@ public final class Cluster {
}
/**
+ * Gets time in milliseconds to wait after the last message is sent over a connection before sending a keep-alive
+ * message to the server.
+ */
+ public long getKeepAliveInterval() {
+ return manager.connectionPoolSettings.keepAliveInterval;
+ }
+
+ /**
* Specifies the load balancing strategy to use on the client side.
*/
public Class<? extends LoadBalancingStrategy> getLoadBalancingStrategy() {
@@ -478,6 +487,7 @@ public final class Cluster {
private int reconnectInitialDelay = Connection.RECONNECT_INITIAL_DELAY;
private int reconnectInterval = Connection.RECONNECT_INTERVAL;
private int resultIterationBatchSize = Connection.RESULT_ITERATION_BATCH_SIZE;
+ private long keepAliveInterval = Connection.KEEP_ALIVE_INTERVAL;
private String channelizer = Channelizer.WebSocketChannelizer.class.getName();
private boolean enableSsl = false;
private String trustCertChainFile = null;
@@ -573,6 +583,16 @@ public final class Cluster {
}
/**
+ * Length of time in milliseconds to wait on an idle connection before sending a keep-alive request. This
+ * setting is only relevant to {@link Channelizer} implementations that return {@code true} for
+ * {@link Channelizer#supportsKeepAlive()}. Set to zero to disable this feature.
+ */
+ public Builder keepAliveInterval(final long keepAliveInterval) {
+ this.keepAliveInterval = keepAliveInterval;
+ return this;
+ }
+
+ /**
* The X.509 certificate chain file in PEM format.
*/
public Builder keyCertChainFile(final String keyCertChainFile) {
@@ -871,6 +891,7 @@ public final class Cluster {
connectionPoolSettings.keyCertChainFile = builder.keyCertChainFile;
connectionPoolSettings.keyFile = builder.keyFile;
connectionPoolSettings.keyPassword = builder.keyPassword;
+ connectionPoolSettings.keepAliveInterval = builder.keepAliveInterval;
connectionPoolSettings.channelizer = builder.channelizer;
sslContextOptional = Optional.ofNullable(builder.sslContext);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d881484a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
index 9dc93a7..1ef9b98 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
@@ -35,6 +35,7 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -55,6 +56,7 @@ final class Connection {
private final Cluster cluster;
private final Client client;
private final ConnectionPool pool;
+ private final long keepAliveInterval;
public static final int MAX_IN_PROCESS = 4;
public static final int MIN_IN_PROCESS = 1;
@@ -64,6 +66,7 @@ final class Connection {
public static final int RECONNECT_INITIAL_DELAY = 1000;
public static final int RECONNECT_INTERVAL = 1000;
public static final int RESULT_ITERATION_BATCH_SIZE = 64;
+ public static final long KEEP_ALIVE_INTERVAL = 1800000;
/**
* When a {@code Connection} is borrowed from the pool, this number is incremented to indicate the number of
@@ -82,6 +85,7 @@ final class Connection {
private final AtomicReference<CompletableFuture<Void>> closeFuture = new AtomicReference<>();
private final AtomicBoolean shutdownInitiated = new AtomicBoolean(false);
+ private final AtomicReference<ScheduledFuture> keepAliveFuture = new AtomicReference<>();
public Connection(final URI uri, final ConnectionPool pool, final int maxInProcess) throws ConnectionException {
this.uri = uri;
@@ -89,6 +93,7 @@ final class Connection {
this.client = pool.getClient();
this.pool = pool;
this.maxInProcess = maxInProcess;
+ this.keepAliveInterval = pool.settings().keepAliveInterval;
connectionLabel = String.format("Connection{host=%s}", pool.host);
@@ -153,6 +158,10 @@ final class Connection {
if (!closeFuture.compareAndSet(null, future))
return closeFuture.get();
+ // stop any pings being sent at the server for keep-alive
+ final ScheduledFuture keepAlive = keepAliveFuture.get();
+ if (keepAlive != null) keepAlive.cancel(true);
+
// make sure all requests in the queue are fully processed before killing. if they are then shutdown
// can be immediate. if not this method will signal the readCompleted future defined in the write()
// operation to check if it can close. in this way the connection no longer receives writes, but
@@ -181,7 +190,8 @@ final class Connection {
// once there is a completed write, then create a traverser for the result set and complete
// the promise so that the client knows that that it can start checking for results.
final Connection thisConnection = this;
- final ChannelPromise promise = channel.newPromise()
+
+ final ChannelPromise requestPromise = channel.newPromise()
.addListener(f -> {
if (!f.isSuccess()) {
if (logger.isDebugEnabled())
@@ -234,9 +244,29 @@ final class Connection {
requestMessage, pool.host));
}
});
- channel.writeAndFlush(requestMessage, promise);
+ channel.writeAndFlush(requestMessage, requestPromise);
+
+ // try to keep the connection alive if the channel allows such things - websockets will
+ if (channelizer.supportsKeepAlive() && keepAliveInterval > 0) {
+
+ final ScheduledFuture oldKeepAliveFuture = keepAliveFuture.getAndSet(cluster.executor().scheduleAtFixedRate(() -> {
+ logger.debug("Request sent to server to keep {} alive", thisConnection);
+ try {
+ channel.writeAndFlush(channelizer.createKeepAliveMessage());
+ } catch (Exception ex) {
+ // will just log this for now - a future real request can be responsible for the failure that
+ // marks the host as dead. this also may not mean the host is actually dead. more robust handling
+ // is in play for real requests, not this simple ping
+ logger.warn(String.format("Keep-alive did not succeed on %s", thisConnection), ex);
+ }
+ }, keepAliveInterval, keepAliveInterval, TimeUnit.MILLISECONDS));
+
+ // try to cancel the old future if it's still un-executed - no need to ping since a new write has come
+ // through on the connection
+ if (oldKeepAliveFuture != null) oldKeepAliveFuture.cancel(true);
+ }
- return promise;
+ return requestPromise;
}
public void returnToPool() {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d881484a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
index 9955e82..f0d9044 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
@@ -170,7 +170,7 @@ final class ConnectionPool {
logger.debug("Attempting to return {} on {}", connection, host);
if (isClosed()) throw new ConnectionException(host.getHostUri(), host.getAddress(), "Pool is shutdown");
- int borrowed = connection.borrowed.decrementAndGet();
+ final int borrowed = connection.borrowed.decrementAndGet();
if (connection.isDead()) {
logger.debug("Marking {} as dead", this.host);
considerUnavailable();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d881484a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
index 43014ce..41a697c 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
@@ -20,7 +20,6 @@ package org.apache.tinkerpop.gremlin.driver;
import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0;
import org.apache.commons.configuration.Configuration;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.yaml.snakeyaml.TypeDescription;
import org.yaml.snakeyaml.Yaml;
@@ -33,7 +32,6 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
-import java.util.Properties;
import java.util.stream.Collectors;
/**
@@ -207,6 +205,9 @@ final class Settings {
if (connectionPoolConf.containsKey("resultIterationBatchSize"))
cpSettings.resultIterationBatchSize = connectionPoolConf.getInt("resultIterationBatchSize");
+ if (connectionPoolConf.containsKey("keepAliveInterval"))
+ cpSettings.keepAliveInterval = connectionPoolConf.getLong("keepAliveInterval");
+
settings.connectionPool = cpSettings;
}
@@ -251,6 +252,13 @@ final class Settings {
public int maxSize = ConnectionPool.MAX_POOL_SIZE;
/**
+ * Length of time in milliseconds to wait on an idle connection before sending a keep-alive request. This
+ * setting is only relevant to {@link Channelizer} implementations that return {@code true} for
+ * {@link Channelizer#supportsKeepAlive()}. Set to zero to disable this feature.
+ */
+ public long keepAliveInterval = Connection.KEEP_ALIVE_INTERVAL;
+
+ /**
* A connection under low use can be destroyed. This setting determines the threshold for determining when
* that connection can be released and is defaulted to 8.
*/
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d881484a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java
index 922775e..5ba0f1b 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java
@@ -86,6 +86,7 @@ public final class WebSocketClientHandler extends SimpleChannelInboundHandler<Ob
if (frame instanceof TextWebSocketFrame) {
ctx.fireChannelRead(frame.retain(2));
} else if (frame instanceof PongWebSocketFrame) {
+ logger.debug("Received response from keep-alive request");
} else if (frame instanceof BinaryWebSocketFrame) {
ctx.fireChannelRead(frame.retain(2));
} else if (frame instanceof CloseWebSocketFrame)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d881484a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java
index 0f24a9a..383e5a5 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java
@@ -18,6 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.driver.handler;
+import io.netty.handler.codec.http.websocketx.PongWebSocketFrame;
import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
import org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer;
import io.netty.channel.ChannelHandler;
@@ -47,10 +48,12 @@ public final class WebSocketGremlinResponseDecoder extends MessageToMessageDecod
if (webSocketFrame instanceof BinaryWebSocketFrame) {
final BinaryWebSocketFrame tf = (BinaryWebSocketFrame) webSocketFrame;
objects.add(serializer.deserializeResponse(tf.content()));
- } else {
+ } else if (webSocketFrame instanceof TextWebSocketFrame){
final TextWebSocketFrame tf = (TextWebSocketFrame) webSocketFrame;
final MessageTextSerializer textSerializer = (MessageTextSerializer) serializer;
objects.add(textSerializer.deserializeResponse(tf.text()));
+ } else {
+ throw new RuntimeException(String.format("WebSocket channel does not handle this type of message: %s", webSocketFrame.getClass().getName()));
}
} finally {
ReferenceCountUtil.release(webSocketFrame);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d881484a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 04faa29..96cde54 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.server;
import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.log4j.Level;
import org.apache.tinkerpop.gremlin.TestHelper;
import org.apache.tinkerpop.gremlin.driver.Channelizer;
import org.apache.tinkerpop.gremlin.driver.Client;
@@ -27,6 +28,7 @@ import org.apache.tinkerpop.gremlin.driver.Result;
import org.apache.tinkerpop.gremlin.driver.ResultSet;
import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
+import org.apache.tinkerpop.gremlin.driver.handler.WebSocketClientHandler;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer;
import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0;
@@ -35,11 +37,14 @@ import org.apache.tinkerpop.gremlin.server.channel.NioChannelizer;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.util.Log4jRecordingAppender;
import org.apache.tinkerpop.gremlin.util.TimeUtil;
import groovy.json.JsonBuilder;
import org.apache.tinkerpop.gremlin.util.function.FunctionUtils;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.hamcrest.core.IsInstanceOf;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,6 +73,9 @@ import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.endsWith;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.AllOf.allOf;
+import static org.hamcrest.number.OrderingComparison.greaterThan;
+import static org.hamcrest.number.OrderingComparison.lessThanOrEqualTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
@@ -83,6 +91,37 @@ import static org.hamcrest.core.StringStartsWith.startsWith;
*/
public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegrationTest {
private static final Logger logger = LoggerFactory.getLogger(GremlinDriverIntegrateTest.class);
+
+ private Log4jRecordingAppender recordingAppender = null;
+ private Level previousLogLevel;
+
+ @Before
+ public void setupForEachTest() {
+ recordingAppender = new Log4jRecordingAppender();
+ final org.apache.log4j.Logger rootLogger = org.apache.log4j.Logger.getRootLogger();
+
+ if (name.getMethodName().equals("shouldKeepAliveForWebSockets")) {
+ final org.apache.log4j.Logger webSocketClientHandlerLogger = org.apache.log4j.Logger.getLogger(WebSocketClientHandler.class);
+ previousLogLevel = webSocketClientHandlerLogger.getLevel();
+ webSocketClientHandlerLogger.setLevel(Level.DEBUG);
+ }
+
+ rootLogger.addAppender(recordingAppender);
+ }
+
+ @After
+ public void teardownForEachTest() {
+ final org.apache.log4j.Logger rootLogger = org.apache.log4j.Logger.getRootLogger();
+
+ if (name.getMethodName().equals("shouldKeepAliveForWebSockets")) {
+ final org.apache.log4j.Logger webSocketClientHandlerLogger = org.apache.log4j.Logger.getLogger(WebSocketClientHandler.class);
+ previousLogLevel = webSocketClientHandlerLogger.getLevel();
+ webSocketClientHandlerLogger.setLevel(previousLogLevel);
+ }
+
+ rootLogger.removeAppender(recordingAppender);
+ }
+
/**
* Configure specific Gremlin Server settings for specific tests.
*/
@@ -137,6 +176,36 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
}
@Test
+ public void shouldKeepAliveForWebSockets() throws Exception {
+ // keep the connection pool size at 1 to remove the possibility of lots of connections trying to ping which will
+ // complicate the assertion logic
+ final Cluster cluster = Cluster.build().
+ minConnectionPoolSize(1).
+ maxConnectionPoolSize(1).
+ keepAliveInterval(1000).create();
+ final Client client = cluster.connect();
+
+ // fire up lots of requests so as to schedule/deschedule lots of ping jobs
+ for (int ix = 0; ix < 500; ix++) {
+ assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
+ }
+
+ // don't send any messages for a bit so that the driver pings in the background
+ Thread.sleep(3000);
+
+ // make sure no bonus messages sorta fire off once we get back to sending requests
+ for (int ix = 0; ix < 500; ix++) {
+ assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
+ }
+
+ // there really shouldn't be more than 3 of these sent. should definitely be at least one though
+ final long messages = recordingAppender.getMessages().stream().filter(m -> m.contains("Received response from keep-alive request")).count();
+ assertThat(messages, allOf(greaterThan(0L), lessThanOrEqualTo(3L)));
+
+ cluster.close();
+ }
+
+ @Test
public void shouldEventuallySucceedAfterChannelLevelError() throws Exception {
final Cluster cluster = Cluster.build().addContactPoint("localhost")
.reconnectIntialDelay(500)
[17/44] tinkerpop git commit: SubgraphStrategy is smart about trying
to determine whether the property is a VertexProperty or a stanard Property.
If the former,
then no OrStep wrap is needed and the filter can be inlined and thus,
likely that the graph d
Posted by sp...@apache.org.
SubgraphStrategy is smart about trying to determine whether the property is a VertexProperty or a stanard Property. If the former, then no OrStep wrap is needed and the filter can be inlined and thus, likely that the graph database optimizers will use vertex-centric indices.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4783b4e0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4783b4e0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4783b4e0
Branch: refs/heads/TINKERPOP-944
Commit: 4783b4e03c753526594a416dfe936dc29b397894
Parents: 1745e4c
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Sep 21 15:06:12 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
.../strategy/decoration/SubgraphStrategy.java | 122 +++++++++++++------
1 file changed, 87 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4783b4e0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index d34f142..a49d98a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -39,6 +39,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyMapStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyValueStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
+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.DefaultTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
@@ -147,6 +148,24 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
}
}
+ private static final char processesPropertyType(Step step) {
+ while (!(step instanceof EmptyStep)) {
+ if (step instanceof FilterStep || step instanceof ConnectiveStep)
+ step = step.getPreviousStep();
+ else if (step instanceof GraphStep && ((GraphStep) step).returnsVertex())
+ return 'v';
+ else if (step instanceof EdgeVertexStep)
+ return 'v';
+ else if (step instanceof VertexStep)
+ return ((VertexStep) step).returnsVertex() ? 'v' : 'p';
+ else if (step instanceof PropertyMapStep || step instanceof PropertiesStep)
+ return 'p';
+ else
+ return 'x';
+ }
+ return 'x';
+ }
+
@Override
public void apply(final Traversal.Admin<?, ?> traversal) {
// do not apply subgraph strategy to already created subgraph filter branches (or else you get infinite recursion)
@@ -214,62 +233,95 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
}
// turn g.V().properties() to g.V().properties().xxx
- // turn g.V().values() to g.V().properties().xxx.value()\
+ // turn g.V().values() to g.V().properties().xxx.value()
if (null != this.vertexPropertyCriterion) {
- final OrStep<Object> wrappedCriterion = new OrStep(traversal,
+ final OrStep<Object> checkPropertyCriterion = new OrStep(traversal,
new DefaultTraversal<>().addStep(new ClassFilterStep<>(traversal, VertexProperty.class, false)),
this.vertexPropertyCriterionIsAllFilter ?
this.vertexPropertyCriterion.clone() :
new DefaultTraversal<>().addStep(new TraversalFilterStep<>(traversal, this.vertexPropertyCriterion.clone())));
+ final Traversal.Admin nonCheckPropertyCriterion = this.vertexPropertyCriterionIsAllFilter ?
+ this.vertexPropertyCriterion.clone() :
+ new DefaultTraversal<>().addStep(new TraversalFilterStep<>(traversal, this.vertexPropertyCriterion.clone()));
+
// turn all ElementValueTraversals into filters
for (final Step<?, ?> step : traversal.getSteps()) {
if (step instanceof TraversalParent) {
if (step instanceof PropertyMapStep) {
- final Traversal.Admin<?, ?> temp = new DefaultTraversal<>();
- temp.addStep(new PropertiesStep<>(temp, PropertyType.PROPERTY, ((PropertyMapStep) step).getPropertyKeys()));
- temp.addStep(wrappedCriterion.clone());
- ((PropertyMapStep) step).setPropertyTraversal(temp);
+ final char propertyType = processesPropertyType(step.getPreviousStep());
+ if ('p' != propertyType) {
+ final Traversal.Admin<?, ?> temp = new DefaultTraversal<>();
+ temp.addStep(new PropertiesStep<>(temp, PropertyType.PROPERTY, ((PropertyMapStep) step).getPropertyKeys()));
+ if ('v' == propertyType)
+ TraversalHelper.insertTraversal(0, nonCheckPropertyCriterion.clone(), temp);
+ else
+ temp.addStep(checkPropertyCriterion.clone());
+ ((PropertyMapStep) step).setPropertyTraversal(temp);
+ }
} else {
Stream.concat(((TraversalParent) step).getGlobalChildren().stream(), ((TraversalParent) step).getLocalChildren().stream())
.filter(t -> t instanceof ElementValueTraversal)
.forEach(t -> {
- final Traversal.Admin<?, ?> temp = new DefaultTraversal<>();
- temp.addStep(new PropertiesStep<>(temp, PropertyType.PROPERTY, ((ElementValueTraversal) t).getPropertyKey()));
- temp.addStep(wrappedCriterion.clone());
- temp.addStep(new PropertyValueStep<>(temp));
- temp.setParent((TraversalParent) step);
- ((ElementValueTraversal) t).setBypassTraversal(temp);
+ final char propertyType = processesPropertyType(step.getPreviousStep());
+ if ('p' != propertyType) {
+ final Traversal.Admin<?, ?> temp = new DefaultTraversal<>();
+ temp.addStep(new PropertiesStep<>(temp, PropertyType.PROPERTY, ((ElementValueTraversal) t).getPropertyKey()));
+ if ('v' == propertyType)
+ TraversalHelper.insertTraversal(0, nonCheckPropertyCriterion.clone(), temp);
+ else
+ temp.addStep(checkPropertyCriterion.clone());
+ temp.addStep(new PropertyValueStep<>(temp));
+ temp.setParent((TraversalParent) step);
+ ((ElementValueTraversal) t).setBypassTraversal(temp);
+ }
});
}
}
}
for (final PropertiesStep<?> step : TraversalHelper.getStepsOfAssignableClass(PropertiesStep.class, traversal)) {
- if (PropertyType.PROPERTY.equals(step.getReturnType())) {
- // if the property step returns a property, then simply append the criterion
- final OrStep<Object> clonedWrappedCriterion = (OrStep) wrappedCriterion.clone();
- TraversalHelper.insertAfterStep(clonedWrappedCriterion, (Step) step, traversal);
- for (final String label : step.getLabels()) {
- step.removeLabel(label);
- clonedWrappedCriterion.addLabel(label);
- }
- } else {
- // if the property step returns value, then replace it with a property step, append criterion, then append a value() step
- final Step propertiesStep = new PropertiesStep(traversal, PropertyType.PROPERTY, step.getPropertyKeys());
- TraversalHelper.replaceStep(step, propertiesStep, traversal);
- final Step filterStep = wrappedCriterion.clone();
- TraversalHelper.insertAfterStep(filterStep, propertiesStep, traversal);
- final Step propertyValueStep = new PropertyValueStep(traversal);
- TraversalHelper.insertAfterStep(propertyValueStep, filterStep, traversal);
- // add labels to the value step after the filter has been applied
- for (final String label : step.getLabels()) {
- propertyValueStep.addLabel(label);
+ final char propertyType = processesPropertyType(step.getPreviousStep());
+ if ('p' != propertyType) {
+ if (PropertyType.PROPERTY == ((PropertiesStep) step).getReturnType()) {
+ // if the property step returns a property, then simply append the criterion
+ if ('v' == propertyType) {
+ final Traversal.Admin<?, ?> temp = nonCheckPropertyCriterion.clone();
+ TraversalHelper.insertTraversal((Step) step, temp, traversal);
+ for (final String label : step.getLabels()) {
+ step.removeLabel(label);
+ temp.getEndStep().addLabel(label);
+ }
+ } else {
+ final Step<?, ?> temp = checkPropertyCriterion.clone();
+ TraversalHelper.insertAfterStep(temp, (Step) step, traversal);
+ for (final String label : step.getLabels()) {
+ step.removeLabel(label);
+ temp.addLabel(label);
+ }
+ }
+ } else {
+ // if the property step returns value, then replace it with a property step, append criterion, then append a value() step
+ final Step propertiesStep = new PropertiesStep(traversal, PropertyType.PROPERTY, ((PropertiesStep) step).getPropertyKeys());
+ TraversalHelper.replaceStep(step, propertiesStep, traversal);
+ final Step propertyValueStep = new PropertyValueStep(traversal);
+ for (final String label : step.getLabels()) {
+ propertyValueStep.addLabel(label);
+ }
+ if ('v' == propertyType) {
+ final Traversal.Admin<?, ?> temp = nonCheckPropertyCriterion.clone();
+ TraversalHelper.insertAfterStep(propertyValueStep, propertiesStep, traversal);
+ TraversalHelper.insertTraversal(propertiesStep, temp, traversal);
+ } else {
+ final Step filterStep = checkPropertyCriterion.clone();
+ TraversalHelper.insertAfterStep(filterStep, propertiesStep, traversal);
+ TraversalHelper.insertAfterStep(propertyValueStep, filterStep, traversal);
+ }
}
}
}
- }
- // when there is no filter()-wrap, the marked steps exist at the same traversal level
- for (final Step step : traversal.getSteps()) {
- step.removeLabel(MARKER);
+ // when there is no filter()-wrap, the marked steps exist at the same traversal level
+ for (final Step step : traversal.getSteps()) {
+ step.removeLabel(MARKER);
+ }
}
}
[08/44] tinkerpop git commit: Merge branch 'TINKERPOP-1249'
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1249'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6faf9e21
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6faf9e21
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6faf9e21
Branch: refs/heads/TINKERPOP-944
Commit: 6faf9e218b1231a9df41e624a6f84f39e1031019
Parents: 817961f d881484
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sun Sep 25 07:17:18 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sun Sep 25 07:17:18 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../src/reference/gremlin-applications.asciidoc | 1 +
.../upgrade/release-3.2.x-incubating.asciidoc | 10 +++
.../tinkerpop/gremlin/driver/Channelizer.java | 39 ++++++++---
.../tinkerpop/gremlin/driver/Cluster.java | 21 ++++++
.../tinkerpop/gremlin/driver/Connection.java | 36 +++++++++-
.../gremlin/driver/ConnectionPool.java | 2 +-
.../tinkerpop/gremlin/driver/Settings.java | 12 +++-
.../driver/handler/WebSocketClientHandler.java | 1 +
.../WebSocketGremlinResponseDecoder.java | 5 +-
.../server/GremlinDriverIntegrateTest.java | 69 ++++++++++++++++++++
11 files changed, 182 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6faf9e21/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6faf9e21/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
[16/44] tinkerpop git commit: added ClassFilterStep which checks the
class type of a traverser object. this is an internal utility class not
exposed at the GraphTraversal level.
Posted by sp...@apache.org.
added ClassFilterStep which checks the class type of a traverser object. this is an internal utility class not exposed at the GraphTraversal level.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/81e92c0a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/81e92c0a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/81e92c0a
Branch: refs/heads/TINKERPOP-944
Commit: 81e92c0aa3c21a54ee255317ae9a0f662a2cb897
Parents: 4f727b8
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Sep 21 11:48:33 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../traversal/step/filter/ClassFilterStep.java | 54 ++++++++++++++++++++
.../strategy/decoration/SubgraphStrategy.java | 5 +-
3 files changed, 57 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81e92c0a/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 1ff27b2..0c7ab91 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -29,6 +29,7 @@ TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET)
* Fixed a bug in `TraversalVertexProgram` (OLAP) around ordering and connectives (i.e. `and()` and `or()`).
* Added `AbstractGremlinProcessTest.checkOrderedResults()` to make testing ordered results easier.
* `AbstractLambdaTraversal` now supports a `bypassTraversal` and thus, it is possible for strategies to redefine such lambda traversals.
+* Added an internal utility `ClassFilterStep` which determines if the traverser object's class is an instance of the provided class.
* `SubgraphStrategy` no longer `filter()`-wraps if the criteria is a chain of filters or connectives.
* `SubgraphStrategy` now supports vertex property filtering.
* Fixed a bug in Gremlin-Python `P` where predicates reversed the order of the predicates.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81e92c0a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ClassFilterStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ClassFilterStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ClassFilterStep.java
new file mode 100644
index 0000000..1652005
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ClassFilterStep.java
@@ -0,0 +1,54 @@
+/*
+ * 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.Traverser;
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+public final class ClassFilterStep<S, T> extends FilterStep<S> {
+
+ private final Class<T> classFilter;
+ private final boolean isInstanceCheck;
+
+ public ClassFilterStep(final Traversal.Admin traversal, final Class<T> classFilter, final boolean isInstanceCheck) {
+ super(traversal);
+ this.classFilter = classFilter;
+ this.isInstanceCheck = isInstanceCheck;
+ }
+
+ public boolean filter(final Traverser.Admin<S> traverser) {
+ return !(this.isInstanceCheck ?
+ this.classFilter.isInstance(traverser.get()) :
+ this.classFilter.equals(traverser.get().getClass()));
+
+ }
+
+ public int hashCode() {
+ return super.hashCode() ^ this.classFilter.hashCode() + Boolean.valueOf(this.isInstanceCheck).hashCode();
+ }
+
+ public String toString() {
+ return StringFactory.stepString(this, this.classFilter);
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81e92c0a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index de7649d..5e92bc1 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -24,9 +24,9 @@ import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.ElementValueTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ClassFilterStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConnectiveStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.FilterStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.LambdaFilterStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.OrStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeStep;
@@ -216,13 +216,12 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
// turn g.V().values() to g.V().properties().xxx.value()\
if (null != this.vertexPropertyCriterion) {
final OrStep<Object> wrappedCriterion = new OrStep(traversal,
- new DefaultTraversal<>().addStep(new LambdaFilterStep<>(traversal, t -> !(t.get() instanceof VertexProperty))),
+ new DefaultTraversal<>().addStep(new ClassFilterStep<>(traversal, VertexProperty.class, true)),
this.vertexPropertyCriterionIsAllFilter ?
this.vertexPropertyCriterion.clone() :
new DefaultTraversal<>().addStep(new TraversalFilterStep<>(traversal, this.vertexPropertyCriterion.clone())));
// turn all ElementValueTraversals into filters
for (final Step<?, ?> step : traversal.getSteps()) {
- // gremlin> g.V().local(properties('name','stateOfMind').group().by(key()).by(value().fold()))
if (step instanceof TraversalParent) {
Stream.concat(((TraversalParent) step).getGlobalChildren().stream(), ((TraversalParent) step).getLocalChildren().stream())
.filter(t -> t instanceof ElementValueTraversal)
[32/44] tinkerpop git commit: fixed up SubgraphStrategyTest so that
non-parameterized tests are not run multiple times for each parameterization
-- stole the model from RepeatUnrollStrategyTest.
Posted by sp...@apache.org.
fixed up SubgraphStrategyTest so that non-parameterized tests are not run multiple times for each parameterization -- stole the model from RepeatUnrollStrategyTest.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bb0e22a7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bb0e22a7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bb0e22a7
Branch: refs/heads/TINKERPOP-944
Commit: bb0e22a789a4d403971f8ea82791b8fa97f0f19b
Parents: b92dba7
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Sep 26 12:33:13 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
.../strategy/decoration/SubgraphStrategy.java | 33 ++--
.../decoration/SubgraphStrategyTest.java | 172 ++++++++++---------
2 files changed, 107 insertions(+), 98 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bb0e22a7/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index 0a9cb15..0187969 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -102,23 +102,33 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
this.vertexPropertyCriterion = null == vertexPropertyCriterion ? null : vertexPropertyCriterion.asAdmin();
if (null != this.vertexCriterion)
- this.metadataLabelStartStep(this.vertexCriterion);
+ this.addLabelMarker(this.vertexCriterion);
if (null != this.edgeCriterion)
- this.metadataLabelStartStep(this.edgeCriterion);
+ this.addLabelMarker(this.edgeCriterion);
if (null != this.vertexPropertyCriterion)
- this.metadataLabelStartStep(this.vertexPropertyCriterion);
+ this.addLabelMarker(this.vertexPropertyCriterion);
}
- private final void metadataLabelStartStep(final Traversal.Admin<?, ?> traversal) {
+ private final void addLabelMarker(final Traversal.Admin<?, ?> traversal) {
traversal.getStartStep().addLabel(MARKER);
for (final Step<?, ?> step : traversal.getSteps()) {
if (step instanceof TraversalParent) {
- ((TraversalParent) step).getLocalChildren().forEach(this::metadataLabelStartStep);
- ((TraversalParent) step).getGlobalChildren().forEach(this::metadataLabelStartStep);
+ ((TraversalParent) step).getLocalChildren().forEach(this::addLabelMarker);
+ ((TraversalParent) step).getGlobalChildren().forEach(this::addLabelMarker);
}
}
}
+ private static void applyCriterion(final List<Step> stepsToApplyCriterionAfter, final Traversal.Admin traversal,
+ final Traversal.Admin<? extends Element, ?> criterion) {
+ for (final Step<?, ?> step : stepsToApplyCriterionAfter) {
+ // re-assign the step label to the criterion because the label should apply seamlessly after the filter
+ final Step filter = new TraversalFilterStep<>(traversal, criterion.clone());
+ TraversalHelper.insertAfterStep(filter, step, traversal);
+ TraversalHelper.copyLabels(step, filter, true);
+ }
+ }
+
private static final char processesPropertyType(Step step) {
while (!(step instanceof EmptyStep)) {
if (step instanceof FilterStep || step instanceof SideEffectStep)
@@ -280,21 +290,10 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
return this.vertexPropertyCriterion;
}
-
public static Builder build() {
return new Builder();
}
- private void applyCriterion(final List<Step> stepsToApplyCriterionAfter, final Traversal.Admin traversal,
- final Traversal.Admin<? extends Element, ?> criterion) {
- for (final Step<?, ?> step : stepsToApplyCriterionAfter) {
- // re-assign the step label to the criterion because the label should apply seamlessly after the filter
- final Step filter = new TraversalFilterStep<>(traversal, criterion.clone());
- TraversalHelper.insertAfterStep(filter, step, traversal);
- TraversalHelper.copyLabels(step, filter, true);
- }
- }
-
public final static class Builder {
private Traversal<Vertex, ?> vertexPredicate = null;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bb0e22a7/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyTest.java
index 2e89f6b..7082838 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyTest.java
@@ -37,6 +37,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.hamcrest.CoreMatchers;
import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -56,98 +57,107 @@ import static org.junit.Assert.assertTrue;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-@RunWith(Parameterized.class)
+@RunWith(Enclosed.class)
public class SubgraphStrategyTest {
- @Parameterized.Parameter(value = 0)
- public Traversal original;
+ @RunWith(Parameterized.class)
+ public static class ParameterizedTests {
- @Parameterized.Parameter(value = 1)
- public Traversal optimized;
+ @Parameterized.Parameter(value = 0)
+ public Traversal original;
+ @Parameterized.Parameter(value = 1)
+ public Traversal optimized;
- void applySubgraphStrategyTest(final Traversal traversal) {
- final TraversalStrategies strategies = new DefaultTraversalStrategies();
- strategies.addStrategies(SubgraphStrategy.build().
- vertices(__.and(has("name", "marko"), has("age", 29))).
- edges(hasLabel("knows")).
- vertexProperties(__.<VertexProperty, Long>values().count().and(is(P.lt(10)), is(0))).create());
- strategies.addStrategies(InlineFilterStrategy.instance());
- strategies.addStrategies(StandardVerificationStrategy.instance());
- traversal.asAdmin().setStrategies(strategies);
- traversal.asAdmin().applyStrategies();
- }
- @Test
- public void doTest() {
- applySubgraphStrategyTest(original);
- assertEquals(optimized, original);
- }
+ void applySubgraphStrategyTest(final Traversal traversal) {
+ final TraversalStrategies strategies = new DefaultTraversalStrategies();
+ strategies.addStrategies(SubgraphStrategy.build().
+ vertices(__.and(has("name", "marko"), has("age", 29))).
+ edges(hasLabel("knows")).
+ vertexProperties(__.<VertexProperty, Long>values().count().and(is(P.lt(10)), is(0))).create());
+ strategies.addStrategies(InlineFilterStrategy.instance());
+ strategies.addStrategies(StandardVerificationStrategy.instance());
+ traversal.asAdmin().setStrategies(strategies);
+ traversal.asAdmin().applyStrategies();
+ }
- @Parameterized.Parameters(name = "{0}")
- public static Iterable<Object[]> generateTestParameters() {
-
- return Arrays.asList(new Traversal[][]{
- {__.outE(), __.outE().hasLabel("knows").and(
- inV().has("name", "marko").has("age", 29),
- outV().has("name", "marko").has("age", 29))},
- {__.V(), __.V().has("name", "marko").has("age", 29)},
- {__.V().has("location", "santa fe"), __.V().has("name", "marko").has("age", 29).has("location", "santa fe")},
- {__.V().where(has("location", "santa fe")), __.V().has("name", "marko").has("age", 29).has("location", "santa fe")},
- {__.V().where(has("location", "santa fe")).values("location"), __.V().has("name", "marko").has("age", 29).has("location", "santa fe").properties("location").filter(values().count().is(P.lt(10)).is(0)).value()}
- });
- }
+ @Test
+ public void doTest() {
+ applySubgraphStrategyTest(original);
+ assertEquals(optimized, original);
+ }
- @Test
- public void shouldAddFilterAfterVertex() {
- final SubgraphStrategy strategy = SubgraphStrategy.build().vertices(__.identity()).create();
- final Traversal t = __.inV();
- strategy.apply(t.asAdmin());
- final EdgeVertexStep edgeVertexStep = (EdgeVertexStep) t.asAdmin().getStartStep();
- assertEquals(TraversalFilterStep.class, edgeVertexStep.getNextStep().getClass());
- final TraversalFilterStep h = (TraversalFilterStep) t.asAdmin().getEndStep();
- assertEquals(1, h.getLocalChildren().size());
- assertThat(((DefaultGraphTraversal) h.getLocalChildren().get(0)).getEndStep(), CoreMatchers.instanceOf(IdentityStep.class));
- }
+ @Parameterized.Parameters(name = "{0}")
+ public static Iterable<Object[]> generateTestParameters() {
- @Test
- public void shouldAddFilterAfterEdge() {
- final SubgraphStrategy strategy = SubgraphStrategy.build().edges(__.identity()).create();
- final Traversal t = __.inE();
- strategy.apply(t.asAdmin());
- final VertexStep vertexStep = (VertexStep) t.asAdmin().getStartStep();
- assertEquals(TraversalFilterStep.class, vertexStep.getNextStep().getClass());
- final TraversalFilterStep h = (TraversalFilterStep) t.asAdmin().getEndStep();
- assertEquals(1, h.getLocalChildren().size());
- assertThat(((DefaultGraphTraversal) h.getLocalChildren().get(0)).getEndStep(), CoreMatchers.instanceOf(IdentityStep.class));
+ return Arrays.asList(new Traversal[][]{
+ {__.outE(), __.outE().hasLabel("knows").and(
+ inV().has("name", "marko").has("age", 29),
+ outV().has("name", "marko").has("age", 29))},
+ {__.V(), __.V().has("name", "marko").has("age", 29)},
+ {__.V().has("location", "santa fe"), __.V().has("name", "marko").has("age", 29).has("location", "santa fe")},
+ {__.V().where(has("location", "santa fe")), __.V().has("name", "marko").has("age", 29).has("location", "santa fe")},
+ {__.V().where(has("location", "santa fe")).values("location"), __.V().has("name", "marko").has("age", 29).has("location", "santa fe").properties("location").filter(values().count().is(P.lt(10)).is(0)).value()}
+ });
+ }
}
- @Test
- public void shouldAddBothFiltersAfterVertex() {
- final SubgraphStrategy strategy = SubgraphStrategy.build().edges(__.identity()).vertices(__.identity()).create();
- final Traversal t = __.inE();
- strategy.apply(t.asAdmin());
- final VertexStep vertexStep = (VertexStep) t.asAdmin().getStartStep();
- assertEquals(TraversalFilterStep.class, vertexStep.getNextStep().getClass());
- final TraversalFilterStep h = (TraversalFilterStep) t.asAdmin().getEndStep();
- assertEquals(1, h.getLocalChildren().size());
- assertThat(((DefaultGraphTraversal) h.getLocalChildren().get(0)).getEndStep(), CoreMatchers.instanceOf(TraversalFilterStep.class));
- }
+ public static class RewriteTest {
- @Test
- public void shouldNotRetainMetadataLabelMarkers() {
- final SubgraphStrategy strategy = SubgraphStrategy.build().vertices(__.<Vertex>out().hasLabel("person")).create();
- final Traversal.Admin<?, ?> t = out().inE().asAdmin();
- t.setStrategies(t.getStrategies().clone().addStrategies(strategy, StandardVerificationStrategy.instance()));
- t.applyStrategies();
- assertEquals(t.getSteps().get(0).getClass(), VertexStep.class);
- assertEquals(t.getSteps().get(1).getClass(), TraversalFilterStep.class);
- assertEquals(AndStep.class, ((TraversalFilterStep<?>) t.getSteps().get(1)).getLocalChildren().get(0).getStartStep().getClass());
- assertEquals(0, ((TraversalFilterStep<?>) t.getSteps().get(1)).getLocalChildren().get(0).getStartStep().getLabels().size());
- assertEquals(t.getSteps().get(2).getClass(), EdgeVertexStep.class);
- assertEquals(t.getSteps().get(3).getClass(), TraversalFilterStep.class);
- assertEquals(VertexStep.class, ((TraversalFilterStep<?>) t.getSteps().get(3)).getLocalChildren().get(0).getStartStep().getClass());
- assertEquals(0, ((TraversalFilterStep<?>) t.getSteps().get(3)).getLocalChildren().get(0).getStartStep().getLabels().size());
- TraversalHelper.getStepsOfAssignableClassRecursively(Step.class, t).forEach(step -> assertTrue(step.getLabels().isEmpty()));
+ @Test
+ public void shouldAddFilterAfterVertex() {
+ final SubgraphStrategy strategy = SubgraphStrategy.build().vertices(__.identity()).create();
+ final Traversal t = __.inV();
+ strategy.apply(t.asAdmin());
+ final EdgeVertexStep edgeVertexStep = (EdgeVertexStep) t.asAdmin().getStartStep();
+ assertEquals(TraversalFilterStep.class, edgeVertexStep.getNextStep().getClass());
+ final TraversalFilterStep h = (TraversalFilterStep) t.asAdmin().getEndStep();
+ assertEquals(1, h.getLocalChildren().size());
+ assertThat(((DefaultGraphTraversal) h.getLocalChildren().get(0)).getEndStep(), CoreMatchers.instanceOf(IdentityStep.class));
+ }
+
+ @Test
+ public void shouldAddFilterAfterEdge() {
+ final SubgraphStrategy strategy = SubgraphStrategy.build().edges(__.identity()).create();
+ final Traversal t = __.inE();
+ strategy.apply(t.asAdmin());
+ final VertexStep vertexStep = (VertexStep) t.asAdmin().getStartStep();
+ assertEquals(TraversalFilterStep.class, vertexStep.getNextStep().getClass());
+ final TraversalFilterStep h = (TraversalFilterStep) t.asAdmin().getEndStep();
+ assertEquals(1, h.getLocalChildren().size());
+ assertThat(((DefaultGraphTraversal) h.getLocalChildren().get(0)).getEndStep(), CoreMatchers.instanceOf(IdentityStep.class));
+ }
+
+ @Test
+ public void shouldAddBothFiltersAfterVertex() {
+ final SubgraphStrategy strategy = SubgraphStrategy.build().edges(__.identity()).vertices(__.identity()).create();
+ final Traversal t = __.inE();
+ strategy.apply(t.asAdmin());
+ final VertexStep vertexStep = (VertexStep) t.asAdmin().getStartStep();
+ assertEquals(TraversalFilterStep.class, vertexStep.getNextStep().getClass());
+ final TraversalFilterStep h = (TraversalFilterStep) t.asAdmin().getEndStep();
+ assertEquals(1, h.getLocalChildren().size());
+ assertThat(((DefaultGraphTraversal) h.getLocalChildren().get(0)).getEndStep(), CoreMatchers.instanceOf(TraversalFilterStep.class));
+ }
+
+ @Test
+ public void shouldNotRetainMarkers() {
+ final SubgraphStrategy strategy = SubgraphStrategy.build().vertices(__.<Vertex>out().hasLabel("person")).create();
+ final Traversal.Admin<?, ?> t = out().inE().asAdmin();
+ t.setStrategies(t.getStrategies().clone().addStrategies(strategy, StandardVerificationStrategy.instance()));
+ t.applyStrategies();
+ assertEquals(t.getSteps().get(0).getClass(), VertexStep.class);
+ assertEquals(t.getSteps().get(1).getClass(), TraversalFilterStep.class);
+ assertEquals(AndStep.class, ((TraversalFilterStep<?>) t.getSteps().get(1)).getLocalChildren().get(0).getStartStep().getClass());
+ assertEquals(0, ((TraversalFilterStep<?>) t.getSteps().get(1)).getLocalChildren().get(0).getStartStep().getLabels().size());
+ assertEquals(t.getSteps().get(2).getClass(), EdgeVertexStep.class);
+ assertEquals(t.getSteps().get(3).getClass(), TraversalFilterStep.class);
+ assertEquals(VertexStep.class, ((TraversalFilterStep<?>) t.getSteps().get(3)).getLocalChildren().get(0).getStartStep().getClass());
+ assertEquals(0, ((TraversalFilterStep<?>) t.getSteps().get(3)).getLocalChildren().get(0).getStartStep().getLabels().size());
+ TraversalHelper.getStepsOfAssignableClassRecursively(Step.class, t).forEach(step -> assertTrue(step.getLabels().isEmpty()));
+ }
}
+
+
}
[20/44] tinkerpop git commit: added more test cases to
SubgraphStrategyProcessTest and cleanedup SubgraphStrategy a bit.
Posted by sp...@apache.org.
added more test cases to SubgraphStrategyProcessTest and cleanedup SubgraphStrategy a bit.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8e2c38d4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8e2c38d4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8e2c38d4
Branch: refs/heads/TINKERPOP-944
Commit: 8e2c38d4bf890b8c251b8ea571cb0c0c6273cf17
Parents: 548f662
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Sep 21 15:18:48 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
.../traversal/strategy/decoration/SubgraphStrategy.java | 8 +++-----
.../strategy/decoration/SubgraphStrategyProcessTest.java | 6 ++++++
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8e2c38d4/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index 7551d14..d961209 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -307,13 +307,11 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
propertyValueStep.addLabel(label);
}
if ('v' == propertyType) {
- final Traversal.Admin<?, ?> temp = nonCheckPropertyCriterion.clone();
TraversalHelper.insertAfterStep(propertyValueStep, propertiesStep, traversal);
- TraversalHelper.insertTraversal(propertiesStep, temp, traversal);
+ TraversalHelper.insertTraversal(propertiesStep, nonCheckPropertyCriterion.clone(), traversal);
} else {
- final Step filterStep = checkPropertyCriterion.clone();
- TraversalHelper.insertAfterStep(filterStep, propertiesStep, traversal);
- TraversalHelper.insertAfterStep(propertyValueStep, filterStep, traversal);
+ TraversalHelper.insertAfterStep(propertyValueStep, propertiesStep, traversal);
+ TraversalHelper.insertAfterStep(checkPropertyCriterion.clone(), propertiesStep, traversal);
}
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8e2c38d4/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index fe50d20..f61aedb 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -30,6 +30,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilte
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.Column;
import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -405,6 +406,11 @@ public class SubgraphStrategyProcessTest extends AbstractGremlinProcessTest {
sg = create(SubgraphStrategy.build().edges(__.<Edge>hasLabel("uses").has("skill", 5)).create());
checkResults(Arrays.asList(5, 5, 5), sg.V().outE().valueMap().select(Column.values).unfold());
checkResults(Arrays.asList(5, 5, 5), sg.V().outE().propertyMap().select(Column.values).unfold().value());
+ //
+ sg = create(SubgraphStrategy.build().vertexProperties(__.hasNot("skill")).create());
+ checkResults(Arrays.asList(3, 3, 3, 4, 4, 5, 5, 5), sg.V().outE("uses").values("skill"));
+ checkResults(Arrays.asList(3, 3, 3, 4, 4, 5, 5, 5), sg.V().as("a").properties().select("a").dedup().outE().values("skill"));
+ checkResults(Arrays.asList(3, 3, 3, 4, 4, 5, 5, 5), sg.V().as("a").properties().select("a").outE().properties("skill").as("b").dedup().select("b").by(__.value()));
}
[23/44] tinkerpop git commit: there is a bug in StarGraph property
attachment/detachment that caused a contrived test case in
SubgraphStrategyProcessTest to fail. I got the same effect with another
traversal and have logged the StarGraph bug in JIRA.
Posted by sp...@apache.org.
there is a bug in StarGraph property attachment/detachment that caused a contrived test case in SubgraphStrategyProcessTest to fail. I got the same effect with another traversal and have logged the StarGraph bug in JIRA.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/95e5e1fc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/95e5e1fc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/95e5e1fc
Branch: refs/heads/TINKERPOP-944
Commit: 95e5e1fce15c0145993de1a78d0d17a8da616a02
Parents: 8e2c38d
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Sep 22 13:45:33 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
.../traversal/strategy/decoration/SubgraphStrategyProcessTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/95e5e1fc/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index f61aedb..29910a7 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -410,7 +410,7 @@ public class SubgraphStrategyProcessTest extends AbstractGremlinProcessTest {
sg = create(SubgraphStrategy.build().vertexProperties(__.hasNot("skill")).create());
checkResults(Arrays.asList(3, 3, 3, 4, 4, 5, 5, 5), sg.V().outE("uses").values("skill"));
checkResults(Arrays.asList(3, 3, 3, 4, 4, 5, 5, 5), sg.V().as("a").properties().select("a").dedup().outE().values("skill"));
- checkResults(Arrays.asList(3, 3, 3, 4, 4, 5, 5, 5), sg.V().as("a").properties().select("a").outE().properties("skill").as("b").dedup().select("b").by(__.value()));
+ checkResults(Arrays.asList(3, 3, 3, 4, 4, 5, 5, 5), sg.V().as("a").properties().select("a").dedup().outE().properties("skill").as("b").identity().select("b").by(__.value()));
}
[35/44] tinkerpop git commit: didn't realize TailGlobalStep was NOT a
FilterStep. Minor tweak. CTR.
Posted by sp...@apache.org.
didn't realize TailGlobalStep was NOT a FilterStep. Minor tweak. CTR.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4821dbcf
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4821dbcf
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4821dbcf
Branch: refs/heads/TINKERPOP-944
Commit: 4821dbcfba4b2370089d8d71c4dbf71ae10b9903
Parents: 083b8e4
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Sep 27 13:47:08 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 13:47:08 2016 -0600
----------------------------------------------------------------------
.../strategy/optimization/InlineFilterStrategy.java | 3 ---
.../strategy/optimization/TinkerGraphStepStrategy.java | 10 +++++++++-
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4821dbcf/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
index c3f913e..7452b3b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
@@ -30,7 +30,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DropStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.FilterStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TailGlobalStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
@@ -80,7 +79,6 @@ public final class InlineFilterStrategy extends AbstractTraversalStrategy<Traver
!TraversalHelper.hasStepOfClass(childTraversal,
DropStep.class,
RangeGlobalStep.class,
- TailGlobalStep.class,
DedupGlobalStep.class,
LambdaHolder.class)) {
changed = true;
@@ -99,7 +97,6 @@ public final class InlineFilterStrategy extends AbstractTraversalStrategy<Traver
TraversalHelper.hasStepOfClass(childTraversal,
DropStep.class,
RangeGlobalStep.class,
- TailGlobalStep.class,
DedupGlobalStep.class,
LambdaHolder.class)) {
process = false;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4821dbcf/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategy.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategy.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategy.java
index 97d30e9..fc3748f 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategy.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategy.java
@@ -22,7 +22,11 @@ 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.HasContainerHolder;
+import org.apache.tinkerpop.gremlin.process.traversal.step.LambdaHolder;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DropStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.FilterStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
@@ -49,7 +53,11 @@ public final class TinkerGraphStepStrategy extends AbstractTraversalStrategy<Tra
TraversalHelper.replaceStep(originalGraphStep, (Step) tinkerGraphStep, traversal);
Step<?, ?> lastNonHolderStep = tinkerGraphStep;
Step<?, ?> currentStep = tinkerGraphStep.getNextStep();
- while (currentStep instanceof HasContainerHolder || currentStep instanceof FilterStep) {
+ while (currentStep instanceof FilterStep &&
+ !(currentStep instanceof DedupGlobalStep) &&
+ !(currentStep instanceof RangeGlobalStep) &&
+ !(currentStep instanceof DropStep) &&
+ !(currentStep instanceof LambdaHolder)) {
if (currentStep instanceof HasContainerHolder) {
for (final HasContainer hasContainer : ((HasContainerHolder) currentStep).getHasContainers()) {
if (!GraphStep.processHasContainerIds(tinkerGraphStep, hasContainer))
[02/44] tinkerpop git commit: Merge branch 'TINKERPOP-927' into
TINKERPOP-927-master
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-927' into TINKERPOP-927-master
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8d718bb2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8d718bb2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8d718bb2
Branch: refs/heads/TINKERPOP-944
Commit: 8d718bb2ea16a8f8f4f3ca5f72b932445564229a
Parents: 54ed33d 86007ee
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Sep 20 14:53:52 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Sep 20 14:53:52 2016 +0200
----------------------------------------------------------------------
bin/publish-docs.awk | 31 ++++++++++++++++++++++++++++++
bin/publish-docs.sh | 48 +++++++++++++++++++++++++++++------------------
2 files changed, 61 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8d718bb2/bin/publish-docs.sh
----------------------------------------------------------------------
diff --cc bin/publish-docs.sh
index 5fa4178,49ed9bd..1c374da
--- a/bin/publish-docs.sh
+++ b/bin/publish-docs.sh
@@@ -42,26 -39,46 +42,38 @@@ mkdir -p target/sv
${SVN_CMD} co --depth immediates https://svn.apache.org/repos/asf/tinkerpop/site target/svn
pushd target/svn
- ${SVN_CMD} update --depth empty "docs/${VERSION}"
- ${SVN_CMD} update --depth empty "javadocs/${VERSION}"
- ${SVN_CMD} rm "docs/${VERSION}"
- ${SVN_CMD} rm "javadocs/${VERSION}"
- ${SVN_CMD} commit . -m "Docs for TinkerPop ${VERSION} are being replaced."
- popd
- mkdir -p "target/svn/docs/${VERSION}"
- mkdir -p "target/svn/javadocs/${VERSION}/core"
- mkdir -p "target/svn/javadocs/${VERSION}/full"
+ ${SVN_CMD} update "docs/${VERSION}"
+ ${SVN_CMD} update "javadocs/${VERSION}"
- cp -R target/docs/htmlsingle/. "target/svn/docs/${VERSION}"
- cp -R target/site/apidocs/core/. "target/svn/javadocs/${VERSION}/core"
- cp -R target/site/apidocs/full/. "target/svn/javadocs/${VERSION}/full"
+ mkdir -p "docs/${VERSION}"
+ mkdir -p "javadocs/${VERSION}/core"
+ mkdir -p "javadocs/${VERSION}/full"
- pushd target/svn
- rm "docs/${VERSION}/images/tinkerpop3.graffle"
- ${SVN_CMD} update --depth empty "docs/${VERSION}"
- ${SVN_CMD} update --depth empty "javadocs/${VERSION}"
+ diff -rq -I '^Last updated' docs/${VERSION}/ ../docs/htmlsingle/ | awk -f ../../bin/publish-docs.awk | sed 's/^\(.\) \//\1 /g' > ../publish-docs.docs
+ diff -rq -I 'Generated by javadoc' -I '^<meta name="date"' javadocs/${VERSION}/ ../site/apidocs/ | awk -f ../../bin/publish-docs.awk | sed 's/^\(.\) \//\1 /g' > ../publish-docs.javadocs
+
+ # copy new / modified files
+ for file in $(cat ../publish-docs.docs | awk '/^[AU]/ {print $2}' | grep -v '.graffle$')
+ do
+ cp "../docs/htmlsingle/${file}" "docs/${VERSION}/${file}"
+ done
+ for file in $(cat ../publish-docs.javadocs | awk '/^[AU]/ {print $2}')
+ do
+ cp "../site/apidocs/${file}" "javadocs/${VERSION}/${file}"
+ done
+
+ pushd "docs/${VERSION}/"; cat ../../../publish-docs.docs | awk '/^A/ {print $2}' | grep -v '.graffle$' | xargs --no-run-if-empty svn add; popd
+ pushd "javadocs/${VERSION}/"; cat ../../../publish-docs.javadocs | awk '/^A/ {print $2}' | xargs --no-run-if-empty svn add; popd
+
+ # delete old files
+ pushd "docs/${VERSION}/"; cat ../../../publish-docs.docs | awk '/^D/ {print $2}' | xargs --no-run-if-empty svn delete; popd
+ pushd "javadocs/${VERSION}/"; cat ../../../publish-docs.javadocs | awk '/^D/ {print $2}' | xargs --no-run-if-empty svn delete; popd
+
-for dir in "docs" "javadocs"
-do
- CURRENT=$((${SVN_CMD} list "${dir}" ; ls "${dir}") | tr -d '/' | grep -v SNAPSHOT | grep -Fv current | sort -rV | head -n1)
-
- ${SVN_CMD} update --depth empty "${dir}/current"
- ${SVN_CMD} rm "${dir}/current"
++CHANGES=$(cat ../publish-docs.*docs | grep -v '.graffle$' | wc -l)
+
- ${SVN_CMD} update --depth empty "${dir}/${CURRENT}"
- ln -s "${CURRENT}" "${dir}/current"
- ${SVN_CMD} update --depth empty "${dir}/current"
- ${SVN_CMD} add "${dir}/current"
-done
++if [ ${CHANGES} -gt 0 ]; then
++ ${SVN_CMD} commit -m "Deploy docs for TinkerPop ${VERSION}"
++fi
- ${SVN_CMD} add * --force
--${SVN_CMD} commit -m "Deploy docs for TinkerPop ${VERSION}"
popd
[11/44] tinkerpop git commit: Merge branch 'tp31'
Posted by sp...@apache.org.
Merge branch 'tp31'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/dc60e075
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/dc60e075
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/dc60e075
Branch: refs/heads/TINKERPOP-944
Commit: dc60e0754166dc843158e28bd4e408ee538dc0d5
Parents: 619aba5 33225c5
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Sep 27 19:49:56 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Sep 27 19:49:56 2016 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[30/44] tinkerpop git commit: fixed a bug in RepeatUnrollStrategy
associated with semi-compilation of repeat-traversal prior to inlining. Added
test cases to RepeatUnrollStrategyTest that verify behavior. The added test
cases are neat in that the 3 param
Posted by sp...@apache.org.
fixed a bug in RepeatUnrollStrategy associated with semi-compilation of repeat-traversal prior to inlining. Added test cases to RepeatUnrollStrategyTest that verify behavior. The added test cases are neat in that the 3 parameter is a list of strategies to co-test with RepeatUnrollStrategy. A good pattern moving forward for seeing how different strategies play off each other.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b92dba73
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b92dba73
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b92dba73
Branch: refs/heads/TINKERPOP-944
Commit: b92dba73c8c42de4cd0cfaa7837d146b97ca266c
Parents: 79da3a6
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Sep 26 12:22:09 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
.../optimization/RepeatUnrollStrategy.java | 4 +-
.../optimization/RepeatUnrollStrategyTest.java | 65 +++++++++++---------
2 files changed, 39 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b92dba73/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategy.java
index 9e1a98d..36f20ca 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategy.java
@@ -48,9 +48,9 @@ public final class RepeatUnrollStrategy extends AbstractTraversalStrategy<Traver
final RepeatStep<?> repeatStep = (RepeatStep) traversal.getSteps().get(i);
if (null == repeatStep.getEmitTraversal() && repeatStep.getUntilTraversal() instanceof LoopTraversal && ((LoopTraversal) repeatStep.getUntilTraversal()).getMaxLoops() > 0) {
final Traversal.Admin<?, ?> repeatTraversal = repeatStep.getGlobalChildren().get(0);
- final int repeatLength = repeatTraversal.getSteps().size() - 1;
- repeatTraversal.removeStep(repeatLength); // removes the RepeatEndStep
+ repeatTraversal.removeStep(repeatTraversal.getSteps().size() - 1); // removes the RepeatEndStep
TraversalHelper.applySingleLevelStrategies(traversal, repeatTraversal, RepeatUnrollStrategy.class);
+ final int repeatLength = repeatTraversal.getSteps().size();
int insertIndex = i;
final int loops = (int) ((LoopTraversal) repeatStep.getUntilTraversal()).getMaxLoops();
for (int j = 0; j < loops; j++) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b92dba73/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategyTest.java
index 4a02218..3ebc7d8 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategyTest.java
@@ -34,10 +34,14 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
import java.util.Iterator;
import java.util.function.Predicate;
import java.util.stream.IntStream;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.out;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.path;
import static org.junit.Assert.assertEquals;
/**
@@ -56,47 +60,52 @@ public class RepeatUnrollStrategyTest {
@Parameterized.Parameter(value = 1)
public Traversal optimized;
-
- private void applyRepeatUnrollStrategy(final Traversal traversal) {
- final TraversalStrategies strategies = new DefaultTraversalStrategies();
- strategies.addStrategies(RepeatUnrollStrategy.instance());
- traversal.asAdmin().setStrategies(strategies);
- traversal.asAdmin().applyStrategies();
-
- }
+ @Parameterized.Parameter(value = 2)
+ public Collection<TraversalStrategy> otherStrategies;
@Test
public void doTest() {
- applyRepeatUnrollStrategy(original);
- assertEquals(optimized, original);
+ final TraversalStrategies strategies = new DefaultTraversalStrategies();
+ strategies.addStrategies(RepeatUnrollStrategy.instance());
+ for (final TraversalStrategy strategy : this.otherStrategies) {
+ strategies.addStrategies(strategy);
+ }
+ this.original.asAdmin().setStrategies(strategies);
+ this.original.asAdmin().applyStrategies();
+ assertEquals(this.optimized, this.original);
}
@Parameterized.Parameters(name = "{0}")
public static Iterable<Object[]> generateTestParameters() {
final int maxBarrierSize = 5000;
final Predicate<Traverser<Vertex>> predicate = t -> t.loops() > 5;
- return Arrays.asList(new Traversal[][]{
- {__.repeat(__.out()).times(0), __.repeat(__.out()).times(0)},
- {__.<Vertex>times(0).repeat(__.out()), __.<Vertex>times(0).repeat(__.out())},
- {__.identity(), __.identity()},
- {__.out().as("a").in().repeat(__.outE("created").bothV()).times(2).in(), __.out().as("a").in().outE("created").bothV().barrier(maxBarrierSize).outE("created").bothV().barrier(maxBarrierSize).in()},
- {__.out().repeat(__.outE("created").bothV()).times(1).in(), __.out().outE("created").bothV().barrier(maxBarrierSize).in()},
- {__.repeat(__.outE("created").bothV()).times(1).in(), __.outE("created").bothV().barrier(maxBarrierSize).in()},
- {__.repeat(__.out()).times(2).as("x").repeat(__.in().as("b")).times(3), __.out().barrier(maxBarrierSize).out().barrier(maxBarrierSize).as("x").in().as("b").barrier(maxBarrierSize).in().as("b").barrier(maxBarrierSize).in().as("b").barrier(maxBarrierSize)},
- {__.repeat(__.outE("created").inV()).times(2), __.outE("created").inV().barrier(maxBarrierSize).outE("created").inV().barrier(maxBarrierSize)},
- {__.repeat(__.out()).times(3), __.out().barrier(maxBarrierSize).out().barrier(maxBarrierSize).out().barrier(maxBarrierSize)},
- {__.repeat(__.local(__.select("a").out("knows"))).times(2), __.local(__.select("a").out("knows")).barrier(maxBarrierSize).local(__.select("a").out("knows")).barrier(maxBarrierSize)},
- {__.<Vertex>times(2).repeat(__.out()), __.out().barrier(maxBarrierSize).out().barrier(maxBarrierSize)},
- {__.<Vertex>out().times(2).repeat(__.out().as("a")).as("x"), __.out().out().as("a").barrier(maxBarrierSize).out().as("a").barrier(maxBarrierSize).as("x")},
- {__.repeat(__.out()).emit().times(2), __.repeat(__.out()).emit().times(2)},
- {__.repeat(__.out()).until(predicate), __.repeat(__.out()).until(predicate)},
- {__.repeat(__.out()).until(predicate).repeat(__.out()).times(2), __.repeat(__.out()).until(predicate).out().barrier(maxBarrierSize).out().barrier(maxBarrierSize)},
- {__.repeat(__.union(__.both(), __.identity())).times(2).out(), __.union(__.both(), __.identity()).barrier(maxBarrierSize).union(__.both(), __.identity()).barrier(maxBarrierSize).out()},
- {__.in().repeat(__.out("knows")).times(3).as("a").count().is(0), __.in().out("knows").barrier(maxBarrierSize).out("knows").barrier(maxBarrierSize).out("knows").as("a").count().is(0)},
+ return Arrays.asList(new Object[][]{
+ {__.repeat(out()).times(0), __.repeat(out()).times(0), Collections.emptyList()},
+ {__.<Vertex>times(0).repeat(out()), __.<Vertex>times(0).repeat(out()), Collections.emptyList()},
+ {__.identity(), __.identity(), Collections.emptyList()},
+ {out().as("a").in().repeat(__.outE("created").bothV()).times(2).in(), out().as("a").in().outE("created").bothV().barrier(maxBarrierSize).outE("created").bothV().barrier(maxBarrierSize).in(), Collections.emptyList()},
+ {out().repeat(__.outE("created").bothV()).times(1).in(), out().outE("created").bothV().barrier(maxBarrierSize).in(), Collections.emptyList()},
+ {__.repeat(__.outE("created").bothV()).times(1).in(), __.outE("created").bothV().barrier(maxBarrierSize).in(), Collections.emptyList()},
+ {__.repeat(out()).times(2).as("x").repeat(__.in().as("b")).times(3), out().barrier(maxBarrierSize).out().barrier(maxBarrierSize).as("x").in().as("b").barrier(maxBarrierSize).in().as("b").barrier(maxBarrierSize).in().as("b").barrier(maxBarrierSize), Collections.emptyList()},
+ {__.repeat(__.outE("created").inV()).times(2), __.outE("created").inV().barrier(maxBarrierSize).outE("created").inV().barrier(maxBarrierSize), Collections.emptyList()},
+ {__.repeat(out()).times(3), out().barrier(maxBarrierSize).out().barrier(maxBarrierSize).out().barrier(maxBarrierSize), Collections.emptyList()},
+ {__.repeat(__.local(__.select("a").out("knows"))).times(2), __.local(__.select("a").out("knows")).barrier(maxBarrierSize).local(__.select("a").out("knows")).barrier(maxBarrierSize), Collections.emptyList()},
+ {__.<Vertex>times(2).repeat(out()), out().barrier(maxBarrierSize).out().barrier(maxBarrierSize), Collections.emptyList()},
+ {__.<Vertex>out().times(2).repeat(out().as("a")).as("x"), out().out().as("a").barrier(maxBarrierSize).out().as("a").barrier(maxBarrierSize).as("x"), Collections.emptyList()},
+ {__.repeat(out()).emit().times(2), __.repeat(out()).emit().times(2), Collections.emptyList()},
+ {__.repeat(out()).until(predicate), __.repeat(out()).until(predicate), Collections.emptyList()},
+ {__.repeat(out()).until(predicate).repeat(out()).times(2), __.repeat(out()).until(predicate).out().barrier(maxBarrierSize).out().barrier(maxBarrierSize), Collections.emptyList()},
+ {__.repeat(__.union(__.both(), __.identity())).times(2).out(), __.union(__.both(), __.identity()).barrier(maxBarrierSize).union(__.both(), __.identity()).barrier(maxBarrierSize).out(), Collections.emptyList()},
+ {__.in().repeat(out("knows")).times(3).as("a").count().is(0), __.in().out("knows").barrier(maxBarrierSize).out("knows").barrier(maxBarrierSize).out("knows").as("a").count().is(0), Collections.emptyList()},
+ //
+ {__.repeat(__.outE().inV()).times(2), __.outE().inV().barrier(maxBarrierSize).outE().inV().barrier(maxBarrierSize), Collections.emptyList()},
+ {__.repeat(__.outE().filter(path()).inV()).times(2), __.outE().filter(path()).inV().barrier(maxBarrierSize).outE().filter(path()).inV().barrier(maxBarrierSize), Collections.singletonList(IncidentToAdjacentStrategy.instance())},
+ {__.repeat(__.outE().inV()).times(2), __.out().barrier(maxBarrierSize).out().barrier(maxBarrierSize), Collections.singletonList(IncidentToAdjacentStrategy.instance())},
});
}
}
+
public static class PerformanceTest extends TraversalStrategyPerformanceTest {
@Override
[39/44] tinkerpop git commit: Added .glv to rat exclusions and
gitignore
Posted by sp...@apache.org.
Added .glv to rat exclusions and gitignore
While tp31 has no knowledge of this file, switching branches leaves it hanging around which causes problems on builds and such. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/14708fef
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/14708fef
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/14708fef
Branch: refs/heads/TINKERPOP-944
Commit: 14708fefcba5528c58f7733d2bda9cd478d92b0a
Parents: 33225c5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sun Sep 25 17:13:48 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 28 11:05:03 2016 -0400
----------------------------------------------------------------------
.gitignore | 1 +
pom.xml | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/14708fef/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index f4779c5..a493d4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ _bsp/
doc/out
docs/*.asciidoc
ext/
+.glv
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/14708fef/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2b58f6b..a09a8c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -285,6 +285,7 @@ limitations under the License.
<exclude>**/src/main/static/**</exclude>
<exclude>**/_bsp/**</exclude>
<exclude>DEPENDENCIES</exclude>
+ <exclude>**/.glv</exclude>
</excludes>
<licenses>
<license implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20"/>
[26/44] tinkerpop git commit: AbstractLambdaTraversals now support a
bypassTraversal which allows strategies to easily change the semantics of the
lambda traversal. Found a bug in TraversalVertexProgram around order() and
the use of ConnectiveSteps. Adde
Posted by sp...@apache.org.
AbstractLambdaTraversals now support a bypassTraversal which allows strategies to easily change the semantics of the lambda traversal. Found a bug in TraversalVertexProgram around order() and the use of ConnectiveSteps. Added more tests to SubgraphStrategyProcessTest to test vertex properties and ordering. Added checkOrderedResult() to AbstractGremlinProcessTest which makes it easy to check ordered streams. Updated OrderTest to use this model -- much simpler.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9338e499
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9338e499
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9338e499
Branch: refs/heads/TINKERPOP-944
Commit: 9338e499d61e42b3e281a36e5034a0ba4bcd1490
Parents: c01b52a
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Sep 20 10:04:56 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 4 +
.../computer/traversal/MasterExecutor.java | 7 +-
.../lambda/AbstractLambdaTraversal.java | 68 ++++++++++----
.../traversal/lambda/ElementValueTraversal.java | 12 ++-
.../strategy/decoration/SubgraphStrategy.java | 16 ++++
.../process/AbstractGremlinProcessTest.java | 13 +++
.../process/traversal/step/map/OrderTest.java | 94 ++++----------------
.../decoration/SubgraphStrategyProcessTest.java | 10 +++
8 files changed, 122 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9338e499/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 5874ca7..0eef92f 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,10 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Fixed a bug in `TraversalVertexProgram` (OLAP) around ordering and connectives (i.e. `and()` and `or()`).
+* Added `AbstractGremlinProcessTest.checkOrderedResults()` to make testing ordered results easier.
+* `AbstractLambdaTraversal` now supports a `bypassTraversal` and thus, it is possible for strategies to redefine such lambda traversals.
+* `SubgraphStrategy` now supports vertex property filtering.
* Fixed a bug in Gremlin-Python `P` where predicates reversed the order of the predicates.
* Added tests to `DedupTest` for the `dedup(Scope, String...)` overload.
* Fixed a bug in serialization of `Lambda` instances in GraphSON, which prevented their use in remote traversals.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9338e499/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MasterExecutor.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MasterExecutor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MasterExecutor.java
index b83b6d6..f81ca14 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MasterExecutor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MasterExecutor.java
@@ -20,15 +20,16 @@
package org.apache.tinkerpop.gremlin.process.computer.traversal;
import org.apache.tinkerpop.gremlin.process.computer.Memory;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.HaltedTraverserStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.Barrier;
import org.apache.tinkerpop.gremlin.process.traversal.step.LocalBarrier;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConnectiveStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TailGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.WherePredicateStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.IdStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.LabelStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesStep;
@@ -38,6 +39,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyValueStep
import org.apache.tinkerpop.gremlin.process.traversal.step.map.SackStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.ReducingBarrierStep;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.HaltedTraverserStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSet;
import org.apache.tinkerpop.gremlin.process.traversal.util.PureTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMatrix;
@@ -144,6 +146,7 @@ final class MasterExecutor {
return step instanceof PropertiesStep || step instanceof PropertyMapStep ||
step instanceof IdStep || step instanceof LabelStep || step instanceof SackStep ||
step instanceof PropertyKeyStep || step instanceof PropertyValueStep ||
- step instanceof TailGlobalStep || step instanceof RangeGlobalStep || step instanceof HasStep;
+ step instanceof TailGlobalStep || step instanceof RangeGlobalStep || step instanceof HasStep ||
+ step instanceof ConnectiveStep;
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9338e499/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java
index 77b6675..b2335b9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java
@@ -45,73 +45,90 @@ public abstract class AbstractLambdaTraversal<S, E> implements Traversal.Admin<S
private static final Set<TraverserRequirement> REQUIREMENTS = Collections.singleton(TraverserRequirement.OBJECT);
+ protected Traversal.Admin<S, E> bypassTraversal = null;
+
+ public void setBypassTraversal(final Traversal.Admin<S, E> bypassTraversal) {
+ this.bypassTraversal = bypassTraversal;
+ }
+
+ @Override
public List<Step> getSteps() {
- return Collections.emptyList();
+ return null == this.bypassTraversal ? Collections.emptyList() : this.bypassTraversal.getSteps();
}
+ @Override
public Bytecode getBytecode() {
- return new Bytecode();
+ return null == this.bypassTraversal ? new Bytecode() : this.bypassTraversal.getBytecode();
}
+
@Override
public void reset() {
-
+ if (null != this.bypassTraversal)
+ this.bypassTraversal.reset();
}
@Override
public <S2, E2> Traversal.Admin<S2, E2> addStep(final int index, final Step<?, ?> step) throws IllegalStateException {
- return (Traversal.Admin<S2, E2>) this;
+ return null == this.bypassTraversal ? (Traversal.Admin<S2, E2>) this : this.bypassTraversal.addStep(index, step);
}
@Override
public <S2, E2> Traversal.Admin<S2, E2> removeStep(final int index) throws IllegalStateException {
- return (Traversal.Admin<S2, E2>) this;
+ return null == this.bypassTraversal ? (Traversal.Admin<S2, E2>) this : this.bypassTraversal.removeStep(index);
}
@Override
public void applyStrategies() throws IllegalStateException {
-
+ if (null != this.bypassTraversal)
+ this.bypassTraversal.applyStrategies();
}
@Override
public TraverserGenerator getTraverserGenerator() {
- return B_O_TraverserGenerator.instance();
+ return null == this.bypassTraversal ? B_O_TraverserGenerator.instance() : this.bypassTraversal.getTraverserGenerator();
}
@Override
public void setSideEffects(final TraversalSideEffects sideEffects) {
-
+ if (null != this.bypassTraversal)
+ this.bypassTraversal.setSideEffects(sideEffects);
}
@Override
public TraversalSideEffects getSideEffects() {
- return EmptyTraversalSideEffects.instance();
+ return null == this.bypassTraversal ? EmptyTraversalSideEffects.instance() : this.bypassTraversal.getSideEffects();
}
@Override
public void setStrategies(final TraversalStrategies strategies) {
-
+ if (null != this.bypassTraversal)
+ this.bypassTraversal.setStrategies(strategies);
}
@Override
public TraversalStrategies getStrategies() {
- return EmptyTraversalStrategies.instance();
+ return null == this.bypassTraversal ? EmptyTraversalStrategies.instance() : this.bypassTraversal.getStrategies();
}
@Override
public void setParent(final TraversalParent step) {
-
+ if (null != this.bypassTraversal)
+ this.bypassTraversal.setParent(step);
}
@Override
public TraversalParent getParent() {
- return EmptyStep.instance();
+ return null == this.bypassTraversal ? EmptyStep.instance() : this.bypassTraversal.getParent();
}
@Override
public Traversal.Admin<S, E> clone() {
try {
- return (AbstractLambdaTraversal<S, E>) super.clone();
+ final AbstractLambdaTraversal<S, E> clone = (AbstractLambdaTraversal<S, E>) super.clone();
+ if (null != this.bypassTraversal)
+ clone.bypassTraversal = this.bypassTraversal.clone();
+ return clone;
} catch (final CloneNotSupportedException e) {
throw new IllegalStateException(e.getMessage(), e);
}
@@ -119,41 +136,54 @@ public abstract class AbstractLambdaTraversal<S, E> implements Traversal.Admin<S
@Override
public E next() {
+ if (null != this.bypassTraversal)
+ return this.bypassTraversal.next();
+ throw new UnsupportedOperationException("The " + this.getClass().getSimpleName() + " can only be used as a predicate traversal");
+ }
+
+ @Override
+ public Traverser.Admin<E> nextTraverser() {
+ if (null != this.bypassTraversal)
+ return this.bypassTraversal.nextTraverser();
throw new UnsupportedOperationException("The " + this.getClass().getSimpleName() + " can only be used as a predicate traversal");
}
@Override
public boolean hasNext() {
- return true;
+ return null == this.bypassTraversal || this.bypassTraversal.hasNext();
}
@Override
public void addStart(final Traverser.Admin<S> start) {
+ if (null != this.bypassTraversal)
+ this.bypassTraversal.addStart(start);
}
@Override
public boolean isLocked() {
- return true;
+ return null == this.bypassTraversal || this.bypassTraversal.isLocked();
}
@Override
public Optional<Graph> getGraph() {
- return Optional.empty();
+ return null == this.bypassTraversal ? Optional.empty() : this.bypassTraversal.getGraph();
}
@Override
public void setGraph(final Graph graph) {
+ if (null != this.bypassTraversal)
+ this.bypassTraversal.setGraph(graph);
}
@Override
public Set<TraverserRequirement> getTraverserRequirements() {
- return REQUIREMENTS;
+ return null == this.bypassTraversal ? REQUIREMENTS : this.bypassTraversal.getTraverserRequirements();
}
@Override
public int hashCode() {
- return this.getClass().hashCode();
+ return null == this.bypassTraversal ? this.getClass().hashCode() : this.bypassTraversal.hashCode();
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9338e499/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/ElementValueTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/ElementValueTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/ElementValueTraversal.java
index a38e8e2..2e9b26c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/ElementValueTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/ElementValueTraversal.java
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.process.traversal.lambda;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
import org.apache.tinkerpop.gremlin.structure.Element;
/**
@@ -39,8 +40,13 @@ public final class ElementValueTraversal<V> extends AbstractLambdaTraversal<Elem
}
@Override
+ public boolean hasNext() {
+ return true;
+ }
+
+ @Override
public void addStart(final Traverser.Admin<Element> start) {
- this.value = start.get().value(this.propertyKey);
+ this.value = null == this.bypassTraversal ? start.get().value(this.propertyKey) : TraversalUtil.apply(start, this.bypassTraversal);
}
public String getPropertyKey() {
@@ -49,11 +55,11 @@ public final class ElementValueTraversal<V> extends AbstractLambdaTraversal<Elem
@Override
public String toString() {
- return "value(" + this.propertyKey + ')';
+ return "value(" + (null == this.bypassTraversal ? this.propertyKey : this.bypassTraversal) + ')';
}
@Override
public int hashCode() {
- return this.getClass().hashCode() ^ this.propertyKey.hashCode();
+ return super.hashCode() ^ this.propertyKey.hashCode();
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9338e499/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index f1a42cd..475a3d7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -22,6 +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.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.ElementValueTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.LambdaFilterStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.OrStep;
@@ -50,6 +51,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* This {@link TraversalStrategy} provides a way to limit the view of a {@link Traversal}. By providing
@@ -168,6 +170,20 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
final OrStep<Object> wrappedCriterion = new OrStep<>(traversal,
new DefaultTraversal<>().addStep(new LambdaFilterStep<>(traversal, t -> !(t.get() instanceof VertexProperty))),
new DefaultTraversal<>().addStep(new TraversalFilterStep<>(traversal, this.vertexPropertyCriterion.clone())));
+ // turn all ElementValueTraversals into filters
+ for (final Step<?, ?> step : traversal.getSteps()) {
+ // gremlin> g.V().local(properties('name','stateOfMind').group().by(key()).by(value().fold()))
+ if (step instanceof TraversalParent) {
+ Stream.concat(((TraversalParent) step).getGlobalChildren().stream(), ((TraversalParent) step).getLocalChildren().stream())
+ .filter(t -> t instanceof ElementValueTraversal)
+ .forEach(t -> {
+ final Traversal.Admin<?, ?> temp = new DefaultTraversal<>();
+ temp.addStep(new PropertiesStep<>(temp, PropertyType.VALUE, ((ElementValueTraversal) t).getPropertyKey()));
+ temp.setParent((TraversalParent)step);
+ ((ElementValueTraversal) t).setBypassTraversal(temp);
+ });
+ }
+ }
for (final PropertiesStep<?> step : TraversalHelper.getStepsOfAssignableClass(PropertiesStep.class, traversal)) {
if (PropertyType.PROPERTY.equals(step.getReturnType())) {
// if the property step returns a property, then simply append the criterion
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9338e499/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
index 1e37478..9dbf261 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
@@ -104,6 +104,19 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
assertEquals(StringFactory.traversalSideEffectsString(sideEffects), sideEffects.toString());
}
+ public static <T> void checkOrderedResults(final List<T> expectedResults, final Traversal<?, T> traversal) {
+ final List<T> results = traversal.toList();
+ assertFalse(traversal.hasNext());
+ if (expectedResults.size() != results.size()) {
+ logger.error("Expected results: " + expectedResults);
+ logger.error("Actual results: " + results);
+ assertEquals("Checking result size", expectedResults.size(), results.size());
+ }
+ for (int i = 0; i < expectedResults.size(); i++) {
+ assertEquals(expectedResults.get(i), results.get(i));
+ }
+ }
+
public static <T> void checkResults(final List<T> expectedResults, final Traversal<?, T> traversal) {
final List<T> results = traversal.toList();
assertFalse(traversal.hasNext());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9338e499/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
index 453a663..7935252 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
@@ -101,7 +101,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
public void g_V_name_order() {
final Traversal<Vertex, String> traversal = get_g_V_name_order();
printTraversalForm(traversal);
- assertCommon(traversal);
+ checkOrderedResults(Arrays.asList("josh", "lop", "marko", "peter", "ripple", "vadas"), traversal);
}
@Test
@@ -109,14 +109,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
public void g_V_name_order_byXa1_b1X_byXb2_a2X() {
final Traversal<Vertex, String> traversal = get_g_V_name_order_byXa1_b1X_byXb2_a2X();
printTraversalForm(traversal);
- final List<String> names = traversal.toList();
- assertEquals(names.size(), 6);
- assertEquals("marko", names.get(0));
- assertEquals("vadas", names.get(1));
- assertEquals("peter", names.get(2));
- assertEquals("ripple", names.get(3));
- assertEquals("josh", names.get(4));
- assertEquals("lop", names.get(5));
+ checkOrderedResults(Arrays.asList("marko", "vadas", "peter", "ripple", "josh", "lop"), traversal);
}
@Test
@@ -124,7 +117,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
public void g_V_order_byXname_incrX_name() {
final Traversal<Vertex, String> traversal = get_g_V_order_byXname_incrX_name();
printTraversalForm(traversal);
- assertCommon(traversal);
+ checkOrderedResults(Arrays.asList("josh", "lop", "marko", "peter", "ripple", "vadas"), traversal);
}
@Test
@@ -132,18 +125,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
public void g_V_order_byXnameX_name() {
final Traversal<Vertex, String> traversal = get_g_V_order_byXnameX_name();
printTraversalForm(traversal);
- assertCommon(traversal);
- }
-
- private static void assertCommon(Traversal<Vertex, String> traversal) {
- final List<String> names = traversal.toList();
- assertEquals(names.size(), 6);
- assertEquals("josh", names.get(0));
- assertEquals("lop", names.get(1));
- assertEquals("marko", names.get(2));
- assertEquals("peter", names.get(3));
- assertEquals("ripple", names.get(4));
- assertEquals("vadas", names.get(5));
+ checkOrderedResults(Arrays.asList("josh", "lop", "marko", "peter", "ripple", "vadas"), traversal);
}
@Test
@@ -151,15 +133,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
public void g_V_outE_order_byXweight_decrX_weight() {
final Traversal<Vertex, Double> traversal = get_g_V_outE_order_byXweight_decrX_weight();
printTraversalForm(traversal);
- final List<Double> weights = traversal.toList();
- assertEquals(6, weights.size());
- assertEquals(Double.valueOf(1.0d), weights.get(0));
- assertEquals(Double.valueOf(1.0d), weights.get(1));
- assertEquals(Double.valueOf(0.5d), weights.get(2));
- assertEquals(Double.valueOf(0.4d), weights.get(3));
- assertEquals(Double.valueOf(0.4d), weights.get(4));
- assertEquals(Double.valueOf(0.2d), weights.get(5));
-
+ checkOrderedResults(Arrays.asList(1.0d, 1.0d, 0.5d, 0.4d, 0.4d, 0.2d), traversal);
}
@Test
@@ -167,14 +141,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
public void g_V_order_byXname_a1_b1X_byXname_b2_a2X_name() {
final Traversal<Vertex, String> traversal = get_g_V_order_byXname_a1_b1X_byXname_b2_a2X_name();
printTraversalForm(traversal);
- final List<String> names = traversal.toList();
- assertEquals(names.size(), 6);
- assertEquals("marko", names.get(0));
- assertEquals("vadas", names.get(1));
- assertEquals("peter", names.get(2));
- assertEquals("ripple", names.get(3));
- assertEquals("josh", names.get(4));
- assertEquals("lop", names.get(5));
+ checkOrderedResults(Arrays.asList("marko", "vadas", "peter", "ripple", "josh", "lop"), traversal);
}
@Test
@@ -337,11 +304,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
public void g_V_hasLabelXpersonX_order_byXvalueXageX__decrX_name() {
final Traversal<Vertex, String> traversal = get_g_V_hasLabelXpersonX_order_byXvalueXageX__decrX_name();
printTraversalForm(traversal);
- assertEquals("peter", traversal.next());
- assertEquals("josh", traversal.next());
- assertEquals("marko", traversal.next());
- assertEquals("vadas", traversal.next());
- assertFalse(traversal.hasNext());
+ checkOrderedResults(Arrays.asList("peter", "josh", "marko", "vadas"), traversal);
}
@Test
@@ -349,19 +312,10 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
public void g_V_properties_order_byXkey_decrX_key() {
final Traversal<Vertex, String> traversal = get_g_V_properties_order_byXkey_decrX_key();
printTraversalForm(traversal);
- assertEquals("name", traversal.next());
- assertEquals("name", traversal.next());
- assertEquals("name", traversal.next());
- assertEquals("name", traversal.next());
- assertEquals("name", traversal.next());
- assertEquals("name", traversal.next());
- assertEquals("lang", traversal.next());
- assertEquals("lang", traversal.next());
- assertEquals("age", traversal.next());
- assertEquals("age", traversal.next());
- assertEquals("age", traversal.next());
- assertEquals("age", traversal.next());
- assertFalse(traversal.hasNext());
+ checkOrderedResults(Arrays.asList(
+ "name", "name", "name", "name", "name", "name",
+ "lang", "lang",
+ "age", "age", "age", "age"), traversal);
}
@Test
@@ -391,14 +345,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
public void g_V_both_hasLabelXpersonX_order_byXage_decrX_limitX5X_name() {
final Traversal<Vertex, String> traversal = get_g_V_both_hasLabelXpersonX_order_byXage_decrX_limitX5X_name();
printTraversalForm(traversal);
- final List<String> results = traversal.toList();
- assertEquals(5, results.size());
- assertFalse(traversal.hasNext());
- assertEquals("peter", results.get(0));
- assertEquals("josh", results.get(1));
- assertEquals("josh", results.get(2));
- assertEquals("josh", results.get(3));
- assertEquals("marko", results.get(4));
+ checkOrderedResults(Arrays.asList("peter", "josh", "josh", "josh", "marko"), traversal);
}
@Test
@@ -421,19 +368,10 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
public void g_V_hasLabelXsongX_order_byXperfomances_decrX_byXnameX_rangeX110_120X_name() {
final Traversal<Vertex, String> traversal = get_g_V_hasLabelXsongX_order_byXperfomances_decrX_byXnameX_rangeX110_120X_name();
printTraversalForm(traversal);
- final List<String> results = traversal.toList();
- assertEquals(10, results.size());
- assertEquals("WANG DANG DOODLE", results.get(0));
- assertEquals("THE ELEVEN", results.get(1));
- assertEquals("WAY TO GO HOME", results.get(2));
- assertEquals("FOOLISH HEART", results.get(3));
- assertEquals("GIMME SOME LOVING", results.get(4));
- assertEquals("DUPREES DIAMOND BLUES", results.get(5));
- assertEquals("CORRINA", results.get(6));
- assertEquals("PICASSO MOON", results.get(7));
- assertEquals("KNOCKING ON HEAVENS DOOR", results.get(8));
- assertEquals("MEMPHIS BLUES", results.get(9));
- assertFalse(traversal.hasNext());
+ checkOrderedResults(Arrays.asList(
+ "WANG DANG DOODLE", "THE ELEVEN", "WAY TO GO HOME", "FOOLISH HEART",
+ "GIMME SOME LOVING", "DUPREES DIAMOND BLUES", "CORRINA", "PICASSO MOON",
+ "KNOCKING ON HEAVENS DOOR", "MEMPHIS BLUES"), traversal);
}
public static class Traversals extends OrderTest {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9338e499/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index 1d49d92..e303281 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -21,12 +21,14 @@ package org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
+import org.apache.tinkerpop.gremlin.process.traversal.Order;
import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -39,6 +41,7 @@ import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.both;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.bothE;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.has;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasNot;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.out;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -384,6 +387,13 @@ public class SubgraphStrategyProcessTest extends AbstractGremlinProcessTest {
sg = create(SubgraphStrategy.build().vertices(has("name", P.not(P.within("stephen", "daniel")))).vertexProperties(has("startTime", P.gt(2005))).create());
checkResults(Arrays.asList("baltimore", "oakland", "seattle"), sg.V().properties("location").value());
checkResults(Arrays.asList("baltimore", "oakland", "seattle"), sg.V().values("location"));
+ //
+ sg = create(SubgraphStrategy.build().vertices(has("name", P.eq("matthias"))).vertexProperties(has("startTime", P.gte(2014))).create());
+ System.out.println(sg.V().groupCount().by("location").explain());
+ checkResults(makeMapList(1, "seattle", 1L), sg.V().groupCount().by("location"));
+ //
+ sg = create(SubgraphStrategy.build().vertices(has("location")).vertexProperties(hasNot("endTime")).create());
+ checkOrderedResults(Arrays.asList("aachen", "purcellville", "santa fe", "seattle"), sg.V().order().by("location", Order.incr).values("location"));
}
[34/44] tinkerpop git commit: simplified the hidden label removal
algorithm in StandardVerificationStrategy. Updated CHANGELOG with note about
RepeatUnrollStrategy bug fix.
Posted by sp...@apache.org.
simplified the hidden label removal algorithm in StandardVerificationStrategy. Updated CHANGELOG with note about RepeatUnrollStrategy bug fix.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/26035e68
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/26035e68
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/26035e68
Branch: refs/heads/TINKERPOP-944
Commit: 26035e68f431efdd80635d8200d9905c6b3e385a
Parents: bb0e22a
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Sep 26 12:46:14 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../strategy/verification/StandardVerificationStrategy.java | 7 +------
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/26035e68/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index cdcad3a..70b2a76 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.3 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Fixed a bug in `RepeatUnrollStrategy` where inlined traversal did not have strategies applied to it.
* `TinkerGraphStepStrategy` is now smart about non-`HasContainer` filter steps.
* Added `TraversalHelper.copyLabels()` for copying (or moving) labels form one step to another.
* Added `TraversalHelper.applySingleLevelStrategies()` which will apply a subset of strategies but not walk the child tree.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/26035e68/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 4f272cc..917fab9 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
@@ -32,7 +32,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.Graph;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Set;
/**
@@ -53,13 +52,9 @@ public final class StandardVerificationStrategy extends AbstractTraversalStrateg
}
for (final Step<?, ?> step : traversal.getSteps()) {
- final Set<String> hiddenLabels = new HashSet<>();
for (String label : step.getLabels()) {
if (Graph.Hidden.isHidden(label))
- hiddenLabels.add(label);
- }
- for(final String label : hiddenLabels) {
- step.removeLabel(label);
+ step.removeLabel(label);
}
if (step instanceof ReducingBarrierStep && step.getTraversal().getParent() instanceof RepeatStep && step.getTraversal().getParent().getGlobalChildren().get(0).getSteps().contains(step))
throw new VerificationException("The parent of a reducing barrier can not be repeat()-step: " + step, traversal);
[33/44] tinkerpop git commit: Added support for
SubgraphStrategy.vertexProperties(). Added some test cases to verify proper
functioning. Also,
cleaned up Stream-stuff in SubgraphStrategy. Going to do some more cleanup
there to make things clean and effic
Posted by sp...@apache.org.
Added support for SubgraphStrategy.vertexProperties(). Added some test cases to verify proper functioning. Also, cleaned up Stream-stuff in SubgraphStrategy. Going to do some more cleanup there to make things clean and efficient.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c01b52a9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c01b52a9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c01b52a9
Branch: refs/heads/TINKERPOP-944
Commit: c01b52a966c595fac54b3c53dea210e659bf4b08
Parents: dc60e07
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Sep 19 13:52:33 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
.../strategy/decoration/SubgraphStrategy.java | 107 ++++++++++++++-----
.../decoration/SubgraphStrategyProcessTest.java | 25 ++++-
2 files changed, 105 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c01b52a9/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index 967a19b..f1a42cd 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -23,6 +23,8 @@ 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.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.LambdaFilterStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.OrStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStartStep;
@@ -30,14 +32,19 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeOtherVertexStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeVertexStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyValueStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.PropertyType;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import java.util.ArrayList;
import java.util.List;
@@ -58,9 +65,10 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
private final Traversal.Admin<Vertex, ?> vertexCriterion;
private final Traversal.Admin<Edge, ?> edgeCriterion;
+ private final Traversal.Admin<VertexProperty, ?> vertexPropertyCriterion;
private final String MARKER = Graph.Hidden.hide(UUID.randomUUID().toString());
- private SubgraphStrategy(final Traversal<Vertex, ?> vertexCriterion, final Traversal<Edge, ?> edgeCriterion) {
+ private SubgraphStrategy(final Traversal<Vertex, ?> vertexCriterion, final Traversal<Edge, ?> edgeCriterion, final Traversal<VertexProperty, ?> vertexPropertyCriterion) {
this.vertexCriterion = null == vertexCriterion ? null : vertexCriterion.asAdmin();
// if there is no vertex predicate there is no need to test either side of the edge
@@ -79,10 +87,14 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
this.edgeCriterion = edgeCriterion.asAdmin().addStep(new TraversalFilterStep<>(edgeCriterion.asAdmin(), vertexPredicate));
}
+ this.vertexPropertyCriterion = null == vertexPropertyCriterion ? null : vertexPropertyCriterion.asAdmin();
+
if (null != this.vertexCriterion)
this.metadataLabelStartStep(this.vertexCriterion);
if (null != this.edgeCriterion)
this.metadataLabelStartStep(this.edgeCriterion);
+ if (null != this.vertexPropertyCriterion)
+ this.metadataLabelStartStep(this.vertexPropertyCriterion);
}
private final void metadataLabelStartStep(final Traversal.Admin<?, ?> traversal) {
@@ -123,61 +135,101 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
applyCriterion(edgeStepsToInsertFilterAfter, traversal, this.edgeCriterion);
}
- // explode g.V().out() to g.V().outE().inV() only if there is an edge predicate otherwise
- vertexSteps.stream().filter(VertexStep::returnsVertex).forEach(step -> {
+ // turn g.V().out() to g.V().outE().inV() only if there is an edge predicate otherwise
+ for (final VertexStep<?> step : vertexSteps) {
+ if (step.returnsEdge())
+ continue;
if (null != this.vertexCriterion && null == edgeCriterion) {
- TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, this.vertexCriterion.clone()), step, traversal);
+ TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, (Traversal) this.vertexCriterion.clone()), step, traversal);
} else {
- final VertexStep someEStep = new VertexStep<>(traversal, Edge.class, step.getDirection(), step.getEdgeLabels());
- final Step someVStep = step.getDirection() == Direction.BOTH ?
+ final VertexStep<Edge> someEStep = new VertexStep<>(traversal, Edge.class, step.getDirection(), step.getEdgeLabels());
+ final Step<Edge, Vertex> someVStep = step.getDirection() == Direction.BOTH ?
new EdgeOtherVertexStep(traversal) :
new EdgeVertexStep(traversal, step.getDirection().opposite());
- // if step was labeled then propagate those labels to the new step that will return the vertex
- transferLabels(step, someVStep);
-
- TraversalHelper.replaceStep(step, someEStep, traversal);
+ TraversalHelper.replaceStep((Step<Vertex, Edge>) step, someEStep, traversal);
TraversalHelper.insertAfterStep(someVStep, someEStep, traversal);
+ // if step was labeled then propagate those labels to the new step that will return the vertex
+ for (final String label : step.getLabels()) {
+ step.removeLabel(label);
+ someVStep.addLabel(label);
+ }
if (null != this.edgeCriterion)
TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, this.edgeCriterion.clone()), someEStep, traversal);
if (null != this.vertexCriterion)
TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, this.vertexCriterion.clone()), someVStep, traversal);
}
- });
+ }
+
+ // turn g.V().properties() to g.V().properties().xxx
+ // turn g.V().values() to g.V().properties().xxx.value()\
+ if (null != this.vertexPropertyCriterion) {
+ final OrStep<Object> wrappedCriterion = new OrStep<>(traversal,
+ new DefaultTraversal<>().addStep(new LambdaFilterStep<>(traversal, t -> !(t.get() instanceof VertexProperty))),
+ new DefaultTraversal<>().addStep(new TraversalFilterStep<>(traversal, this.vertexPropertyCriterion.clone())));
+ for (final PropertiesStep<?> step : TraversalHelper.getStepsOfAssignableClass(PropertiesStep.class, traversal)) {
+ if (PropertyType.PROPERTY.equals(step.getReturnType())) {
+ // if the property step returns a property, then simply append the criterion
+ final OrStep<Object> clonedWrappedCriterion = (OrStep) wrappedCriterion.clone();
+ TraversalHelper.insertAfterStep(clonedWrappedCriterion, (Step) step, traversal);
+ for (final String label : step.getLabels()) {
+ step.removeLabel(label);
+ clonedWrappedCriterion.addLabel(label);
+ }
+ } else {
+ // if the property step returns value, then replace it with a property step, append criterion, then append a value() step
+ final Step propertiesStep = new PropertiesStep(traversal, PropertyType.PROPERTY, step.getPropertyKeys());
+ TraversalHelper.replaceStep(step, propertiesStep, traversal);
+ final Step filterStep = wrappedCriterion.clone();
+ TraversalHelper.insertAfterStep(filterStep, propertiesStep, traversal);
+ final Step propertyValueStep = new PropertyValueStep(traversal);
+ TraversalHelper.insertAfterStep(propertyValueStep, filterStep, traversal);
+ // add labels to the value step after the filter has been applied
+ for (final String label : step.getLabels()) {
+ propertyValueStep.addLabel(label);
+ }
+ }
+ }
+ }
}
+
public Traversal<Vertex, ?> getVertexCriterion() {
- return vertexCriterion;
+ return this.vertexCriterion;
}
public Traversal<Edge, ?> getEdgeCriterion() {
- return edgeCriterion;
+ return this.edgeCriterion;
}
+ public Traversal<VertexProperty, ?> getVertexPropertyCriterion() {
+ return this.vertexPropertyCriterion;
+ }
+
+
public static Builder build() {
return new Builder();
}
private void applyCriterion(final List<Step> stepsToApplyCriterionAfter, final Traversal.Admin traversal,
final Traversal.Admin<? extends Element, ?> criterion) {
- stepsToApplyCriterionAfter.forEach(s -> {
+ for (final Step<?, ?> step : stepsToApplyCriterionAfter) {
// re-assign the step label to the criterion because the label should apply seamlessly after the filter
final Step filter = new TraversalFilterStep<>(traversal, criterion.clone());
- transferLabels(s, filter);
- TraversalHelper.insertAfterStep(filter, s, traversal);
- });
- }
-
- private static void transferLabels(final Step from, final Step to) {
- from.getLabels().forEach(label -> to.addLabel((String) label));
- to.getLabels().forEach(label -> from.removeLabel((String) label));
+ for (final String label : step.getLabels()) {
+ step.removeLabel(label);
+ filter.addLabel(label);
+ }
+ TraversalHelper.insertAfterStep(filter, step, traversal);
+ }
}
public final static class Builder {
private Traversal<Vertex, ?> vertexPredicate = null;
private Traversal<Edge, ?> edgePredicate = null;
+ private Traversal<VertexProperty, ?> vertexPropertyPredicate = null;
private Builder() {
}
@@ -192,6 +244,11 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
return this;
}
+ public Builder vertexProperties(final Traversal<VertexProperty, ?> vertexPropertyPredicate) {
+ this.vertexPropertyPredicate = vertexPropertyPredicate;
+ return this;
+ }
+
@Deprecated
/**
* @deprecated Since 3.2.2, use {@code Builder#vertices} instead.
@@ -209,9 +266,9 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
}
public SubgraphStrategy create() {
- if (null == this.edgePredicate && null == this.vertexPredicate)
- throw new IllegalStateException("A subgraph must be filtered by an edge or vertex criterion");
- return new SubgraphStrategy(this.vertexPredicate, this.edgePredicate);
+ if (null == this.vertexPredicate && null == this.edgePredicate && null == this.vertexPropertyPredicate)
+ throw new IllegalStateException("A subgraph must be filtered by a vertex, edge, or vertex property criterion");
+ return new SubgraphStrategy(this.vertexPredicate, this.edgePredicate, this.vertexPropertyPredicate);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c01b52a9/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index 41a730a..1d49d92 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -21,10 +21,8 @@ package org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
-import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.structure.Edge;
@@ -36,6 +34,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.NoSuchElementException;
+import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.CREW;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.both;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.bothE;
@@ -366,6 +365,28 @@ public class SubgraphStrategyProcessTest extends AbstractGremlinProcessTest {
sg.E(sg.E(convertToEdgeId("marko", "knows", "vadas")).next()).next();
}
+ @Test
+ @LoadGraphWith(CREW)
+ public void shouldFilterVertexProperties() throws Exception {
+ GraphTraversalSource sg = create(SubgraphStrategy.build().vertexProperties(has("startTime", P.gt(2005))).create());
+ checkResults(Arrays.asList("purcellville", "baltimore", "oakland", "seattle", "aachen"), sg.V().properties("location").value());
+ checkResults(Arrays.asList("purcellville", "baltimore", "oakland", "seattle", "aachen"), sg.V().values("location"));
+ // check to make sure edge properties are not analyzed
+ sg = create(SubgraphStrategy.build().vertexProperties(has("startTime", P.gt(2005))).create());
+ checkResults(Arrays.asList("purcellville", "baltimore", "oakland", "seattle", "aachen"), sg.V().as("a").properties("location").as("b").select("a").outE().properties().select("b").value().dedup());
+ checkResults(Arrays.asList("purcellville", "baltimore", "oakland", "seattle", "aachen"), sg.V().as("a").values("location").as("b").select("a").outE().properties().select("b").dedup());
+ //
+ //
+ sg = create(SubgraphStrategy.build().vertices(has("name", P.neq("stephen"))).vertexProperties(has("startTime", P.gt(2005))).create());
+ checkResults(Arrays.asList("baltimore", "oakland", "seattle", "aachen"), sg.V().properties("location").value());
+ checkResults(Arrays.asList("baltimore", "oakland", "seattle", "aachen"), sg.V().values("location"));
+ //
+ sg = create(SubgraphStrategy.build().vertices(has("name", P.not(P.within("stephen", "daniel")))).vertexProperties(has("startTime", P.gt(2005))).create());
+ checkResults(Arrays.asList("baltimore", "oakland", "seattle"), sg.V().properties("location").value());
+ checkResults(Arrays.asList("baltimore", "oakland", "seattle"), sg.V().values("location"));
+ }
+
+
private GraphTraversalSource create(final SubgraphStrategy strategy) {
return graphProvider.traversal(graph, strategy);
}
[24/44] tinkerpop git commit: added lots of good stuff that all
revolves around SubgraphStategy. InlineFilterStrategy tries to inline
filters. Epic. And/OrStep are now FilterSteps - epic. Lots of cleanup and
simplification of SubgraphStrategy cause of it
Posted by sp...@apache.org.
added lots of good stuff that all revolves around SubgraphStategy. InlineFilterStrategy tries to inline filters. Epic. And/OrStep are now FilterSteps - epic. Lots of cleanup and simplification of SubgraphStrategy cause of it.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/afcf8dff
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/afcf8dff
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/afcf8dff
Branch: refs/heads/TINKERPOP-944
Commit: afcf8dff97fdbca16adc33e4aa7244868cb1591f
Parents: 7a228ca
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Sep 23 16:03:37 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 8 +-
docs/src/reference/the-traversal.asciidoc | 21 +++-
.../process/traversal/TraversalStrategies.java | 3 +-
.../process/traversal/step/filter/AndStep.java | 19 +---
.../traversal/step/filter/ConnectiveStep.java | 2 +-
.../process/traversal/step/filter/NotStep.java | 2 +-
.../process/traversal/step/filter/OrStep.java | 14 +--
.../strategy/decoration/ConnectiveStrategy.java | 11 +-
.../strategy/decoration/SubgraphStrategy.java | 102 +++++--------------
.../optimization/InlineFilterStrategy.java | 100 ++++++++++++++++++
.../StandardVerificationStrategy.java | 18 +++-
.../process/traversal/util/TraversalHelper.java | 16 ++-
.../decoration/SubgraphStrategyTest.java | 67 +++++++++++-
.../optimization/InlineFilterStrategyTest.java | 78 ++++++++++++++
.../decoration/SubgraphStrategyProcessTest.java | 7 +-
.../TinkerGraphGroovyTranslatorProvider.java | 8 ++
16 files changed, 346 insertions(+), 130 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/afcf8dff/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 0c546c5..fb1160f 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,13 +26,17 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Added `TraversalHelper.applySingleLevelStrategies()` which will apply a subset of strategies but not walk the child tree.
+* Added the concept that hidden labels using during traversal compilation are removed at the end during `StandardVerificationStrategy`. (*breaking*)
+* Added `InlineFilterStrategy` which will determine if a `TraversalFilterStep` or `AndStep` children are filters and if so, inline them.
+* Removed `IdentityRemovalStrategy` from the default listing as its not worth the clock cycles.
+* Removed the "!" symbol in `NotStep.toString()` as it is confusing and the `NotStep`-name is sufficient.
* Fixed a bug in `TraversalVertexProgram` (OLAP) around ordering and connectives (i.e. `and()` and `or()`).
* Added `AbstractGremlinProcessTest.checkOrderedResults()` to make testing ordered results easier.
* `AbstractLambdaTraversal` now supports a `bypassTraversal` where it is possible for strategies to redefine such lambda traversals.
* Added an internal utility `ClassFilterStep` which determines if the traverser object's class is an instance of the provided class.
-* `ConnectiveStrategy` will concatenate two traversals instead of and'ing them if they are both filter-based.
+* `ConnectiveStep` extends `FilterStep` and thus, is more appropriately categorized in the step hierarchy.
* `PropertyMapStep` supports a provided traversal for accessing the properties of the element.
-* `SubgraphStrategy` no longer `filter()`-wraps if the criteria is a chain of filters or connectives.
* `SubgraphStrategy` now supports vertex property filtering.
* Fixed a bug in Gremlin-Python `P` where predicates reversed the order of the predicates.
* Added tests to `DedupTest` for the `dedup(Scope, String...)` overload.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/afcf8dff/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index 5d2c915..4f7bff5 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -2631,4 +2631,23 @@ This strategy is implemented such that the vertices attached to an `Edge` must b
<1> Get all vertices and their vertex property locations.
<2> Create a `SubgraphStrategy` where vertex properties must not have an `endTime`-property (thus, the current location).
-<3> Get all vertices and their current vertex property locations.
\ No newline at end of file
+<3> Get all vertices and their current vertex property locations.
+
+The example below uses all three filters: vertex, edge, and vertex property. People vertices must have lived in more than three places,
+edges must be labeled "develops," and vertex properties must be the persons current location or a non-location property.
+
+[gremlin-groovy]
+----
+graph = TinkerFactory.createTheCrew()
+g = graph.traversal().withStrategies(SubgraphStrategy.build().
+ vertices(or(hasNot('location'),properties('location').count().is(gt(3)))).
+ edges(hasLabel('develops')).
+ vertexProperties(or(hasLabel(neq('location')),hasNot('endTime'))).create())
+g.V().valueMap(true)
+g.E().valueMap(true)
+g.V().outE().inV().
+ path().
+ by('name').
+ by().
+ by('name')
+----
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/afcf8dff/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 4b89833..a01eef6 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
@@ -26,6 +26,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.Adja
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.FilterRankingStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IdentityRemovalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IncidentToAdjacentStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.InlineFilterStrategy;
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.PathProcessorStrategy;
@@ -204,8 +205,8 @@ public interface TraversalStrategies extends Serializable, Cloneable {
ConnectiveStrategy.instance(),
IncidentToAdjacentStrategy.instance(),
AdjacentToIncidentStrategy.instance(),
+ InlineFilterStrategy.instance(),
FilterRankingStrategy.instance(),
- IdentityRemovalStrategy.instance(),
MatchPredicateStrategy.instance(),
RepeatUnrollStrategy.instance(),
RangeByIsCountStrategy.instance(),
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/afcf8dff/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 9bc6f4d..5d9d124 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
@@ -22,8 +22,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
-import java.util.NoSuchElementException;
-
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
@@ -34,18 +32,11 @@ public final class AndStep<S> extends ConnectiveStep<S> {
}
@Override
- protected Traverser.Admin<S> processNextStart() throws NoSuchElementException {
- while (true) {
- final Traverser.Admin<S> start = this.starts.next();
- boolean alive = true;
- for (final Traversal.Admin<S, ?> traversal : this.traversals) {
- if (!TraversalUtil.test(start, traversal)) {
- alive = false;
- break;
- }
- }
- if (alive)
- return start;
+ protected boolean filter(final Traverser.Admin<S> traverser) {
+ for (final Traversal.Admin<S, ?> traversal : this.traversals) {
+ if (!TraversalUtil.test(traverser, traversal))
+ return false;
}
+ return true;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/afcf8dff/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
index 6eac30b..08d3b2f 100644
--- 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
@@ -33,7 +33,7 @@ import java.util.stream.Stream;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public abstract class ConnectiveStep<S> extends AbstractStep<S, S> implements TraversalParent {
+public abstract class ConnectiveStep<S> extends FilterStep<S> implements TraversalParent {
public enum Connective {AND, OR}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/afcf8dff/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/NotStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/NotStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/NotStep.java
index 83059ce..bdf9eec 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/NotStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/NotStep.java
@@ -64,7 +64,7 @@ public final class NotStep<S> extends FilterStep<S> implements TraversalParent {
@Override
public String toString() {
- return StringFactory.stepString(this, "!" + this.notTraversal);
+ return StringFactory.stepString(this, this.notTraversal);
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/afcf8dff/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 70dc430..72866a1 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
@@ -22,8 +22,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
-import java.util.NoSuchElementException;
-
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
@@ -34,13 +32,11 @@ public final class OrStep<S> extends ConnectiveStep<S> {
}
@Override
- protected Traverser.Admin<S> processNextStart() throws NoSuchElementException {
- while (true) {
- final Traverser.Admin<S> start = this.starts.next();
- for (final Traversal.Admin<S, ?> traversal : this.traversals) {
- if (TraversalUtil.test(start, traversal))
- return start;
- }
+ protected boolean filter(final Traverser.Admin<S> traverser) {
+ for (final Traversal.Admin<S, ?> traversal : this.traversals) {
+ if (TraversalUtil.test(traverser, traversal))
+ return true;
}
+ return false;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/afcf8dff/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
index 8627a70..754fb03 100644
--- 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
@@ -104,14 +104,9 @@ public final class ConnectiveStrategy extends AbstractTraversalStrategy<Traversa
}
processConnectiveMarker(leftTraversal);
- if (connectiveStep instanceof AndStep) {
- if (TraversalHelper.filterOnlyTraversal(leftTraversal) && TraversalHelper.filterOnlyTraversal(rightTraversal)) {
- TraversalHelper.insertTraversal((Step) connectiveStep, rightTraversal, traversal);
- TraversalHelper.insertTraversal((Step) connectiveStep, leftTraversal, traversal);
- } else
- TraversalHelper.replaceStep((Step) connectiveStep, new AndStep(traversal, leftTraversal, rightTraversal), traversal);
-
- } else
+ if (connectiveStep instanceof AndStep)
+ TraversalHelper.replaceStep((Step) connectiveStep, new AndStep(traversal, leftTraversal, rightTraversal), traversal);
+ else
TraversalHelper.replaceStep((Step) connectiveStep, new OrStep(traversal, leftTraversal, rightTraversal), traversal);
});
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/afcf8dff/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index d961209..6ff69b2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -39,6 +39,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyMapStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyValueStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SideEffectStep;
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.DefaultTraversal;
@@ -75,19 +76,11 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
private final Traversal.Admin<Edge, ?> edgeCriterion;
private final Traversal.Admin<VertexProperty, ?> vertexPropertyCriterion;
- private final boolean vertexCriterionIsAllFilter;
- private final boolean edgeCriterionIsAllFilter;
- private final boolean vertexPropertyCriterionIsAllFilter;
-
private static final Set<Class<? extends DecorationStrategy>> POSTS = Collections.singleton(ConnectiveStrategy.class);
private final String MARKER = Graph.Hidden.hide(UUID.randomUUID().toString());
private SubgraphStrategy(final Traversal<Vertex, ?> vertexCriterion, final Traversal<Edge, ?> edgeCriterion, final Traversal<VertexProperty, ?> vertexPropertyCriterion) {
- this.vertexCriterionIsAllFilter = isAllFilters(vertexCriterion);
- this.edgeCriterionIsAllFilter = isAllFilters(edgeCriterion);
- this.vertexPropertyCriterionIsAllFilter = isAllFilters(vertexPropertyCriterion);
-
this.vertexCriterion = null == vertexCriterion ? null : vertexCriterion.asAdmin();
@@ -96,26 +89,15 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
this.edgeCriterion = null == edgeCriterion ? null : edgeCriterion.asAdmin();
} else {
final Traversal.Admin<Edge, ?> vertexPredicate;
- if (this.vertexCriterionIsAllFilter) {
- final Traversal.Admin<Edge, Vertex> left = __.<Edge>inV().asAdmin();
- final Traversal.Admin<Edge, Vertex> right = __.<Edge>outV().asAdmin();
- TraversalHelper.insertTraversal(0, this.vertexCriterion.clone(), left);
- TraversalHelper.insertTraversal(0, this.vertexCriterion.clone(), right);
- vertexPredicate = __.<Edge>and(left, right).asAdmin();
- } else
- vertexPredicate = __.<Edge>and(
- __.inV().filter(this.vertexCriterion.clone()),
- __.outV().filter(this.vertexCriterion.clone())).asAdmin();
+ vertexPredicate = __.<Edge>and(
+ __.inV().filter(this.vertexCriterion.clone()),
+ __.outV().filter(this.vertexCriterion.clone())).asAdmin();
// if there is a vertex predicate then there is an implied edge filter on vertices even if there is no
// edge predicate provided by the user.
- if (null == edgeCriterion)
- this.edgeCriterion = vertexPredicate;
- else if (this.edgeCriterionIsAllFilter) {
- this.edgeCriterion = edgeCriterion.asAdmin();
- TraversalHelper.insertTraversal(this.edgeCriterion.getSteps().size() - 1, vertexPredicate, this.edgeCriterion);
- } else
- this.edgeCriterion = edgeCriterion.asAdmin().addStep(new TraversalFilterStep<>(edgeCriterion.asAdmin(), vertexPredicate));
+ this.edgeCriterion = null == edgeCriterion ?
+ vertexPredicate :
+ edgeCriterion.asAdmin().addStep(new TraversalFilterStep<>(edgeCriterion.asAdmin(), vertexPredicate));
}
this.vertexPropertyCriterion = null == vertexPropertyCriterion ? null : vertexPropertyCriterion.asAdmin();
@@ -128,16 +110,6 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
this.metadataLabelStartStep(this.vertexPropertyCriterion);
}
- private static final boolean isAllFilters(final Traversal<?, ?> traversal) {
- if (null == traversal)
- return false;
- for (final Step<?, ?> step : traversal.asAdmin().getSteps()) {
- if (!(step instanceof FilterStep || step instanceof ConnectiveStep))
- return false;
- }
- return true;
- }
-
private final void metadataLabelStartStep(final Traversal.Admin<?, ?> traversal) {
traversal.getStartStep().addLabel(MARKER);
for (final Step<?, ?> step : traversal.getSteps()) {
@@ -150,7 +122,7 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
private static final char processesPropertyType(Step step) {
while (!(step instanceof EmptyStep)) {
- if (step instanceof FilterStep || step instanceof ConnectiveStep)
+ if (step instanceof FilterStep || step instanceof SideEffectStep)
step = step.getPreviousStep();
else if (step instanceof GraphStep && ((GraphStep) step).returnsVertex())
return 'v';
@@ -169,10 +141,8 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
@Override
public void apply(final Traversal.Admin<?, ?> traversal) {
// do not apply subgraph strategy to already created subgraph filter branches (or else you get infinite recursion)
- if (traversal.getStartStep().getLabels().contains(MARKER)) {
- traversal.getStartStep().removeLabel(MARKER);
+ if (traversal.getStartStep().getLabels().contains(MARKER))
return;
- }
//
final List<GraphStep> graphSteps = TraversalHelper.getStepsOfAssignableClass(GraphStep.class, traversal);
final List<VertexStep> vertexSteps = TraversalHelper.getStepsOfAssignableClass(VertexStep.class, traversal);
@@ -183,7 +153,7 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
vertexStepsToInsertFilterAfter.addAll(TraversalHelper.getStepsOfAssignableClass(AddVertexStep.class, traversal));
vertexStepsToInsertFilterAfter.addAll(TraversalHelper.getStepsOfAssignableClass(AddVertexStartStep.class, traversal));
vertexStepsToInsertFilterAfter.addAll(graphSteps.stream().filter(GraphStep::returnsVertex).collect(Collectors.toList()));
- applyCriterion(vertexStepsToInsertFilterAfter, traversal, this.vertexCriterion, this.vertexCriterionIsAllFilter);
+ applyCriterion(vertexStepsToInsertFilterAfter, traversal, this.vertexCriterion);
}
if (null != this.edgeCriterion) {
@@ -191,7 +161,7 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
edgeStepsToInsertFilterAfter.addAll(TraversalHelper.getStepsOfAssignableClass(AddEdgeStep.class, traversal));
edgeStepsToInsertFilterAfter.addAll(graphSteps.stream().filter(GraphStep::returnsEdge).collect(Collectors.toList()));
edgeStepsToInsertFilterAfter.addAll(vertexSteps.stream().filter(VertexStep::returnsEdge).collect(Collectors.toList()));
- applyCriterion(edgeStepsToInsertFilterAfter, traversal, this.edgeCriterion, this.edgeCriterionIsAllFilter);
+ applyCriterion(edgeStepsToInsertFilterAfter, traversal, this.edgeCriterion);
}
// turn g.V().out() to g.V().outE().inV() only if there is an edge predicate otherwise
@@ -199,10 +169,7 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
if (step.returnsEdge())
continue;
if (null != this.vertexCriterion && null == edgeCriterion) {
- if (this.vertexCriterionIsAllFilter)
- TraversalHelper.insertTraversal((Step) step, this.vertexCriterion.clone(), traversal);
- else
- TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, (Traversal) this.vertexCriterion.clone()), step, traversal);
+ TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, (Traversal) this.vertexCriterion.clone()), step, traversal);
} else {
final VertexStep<Edge> someEStep = new VertexStep<>(traversal, Edge.class, step.getDirection(), step.getEdgeLabels());
final Step<Edge, Vertex> someVStep = step.getDirection() == Direction.BOTH ?
@@ -218,15 +185,9 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
}
if (null != this.edgeCriterion)
- if (this.edgeCriterionIsAllFilter)
- TraversalHelper.insertTraversal(someEStep, this.edgeCriterion.clone(), traversal);
- else
- TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, this.edgeCriterion.clone()), someEStep, traversal);
+ TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, this.edgeCriterion.clone()), someEStep, traversal);
if (null != this.vertexCriterion)
- if (this.edgeCriterionIsAllFilter)
- TraversalHelper.insertTraversal(someVStep, this.vertexCriterion.clone(), traversal);
- else
- TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, this.vertexCriterion.clone()), someVStep, traversal);
+ TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, this.vertexCriterion.clone()), someVStep, traversal);
}
@@ -237,12 +198,8 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
if (null != this.vertexPropertyCriterion) {
final OrStep<Object> checkPropertyCriterion = new OrStep(traversal,
new DefaultTraversal<>().addStep(new ClassFilterStep<>(traversal, VertexProperty.class, false)),
- this.vertexPropertyCriterionIsAllFilter ?
- this.vertexPropertyCriterion.clone() :
- new DefaultTraversal<>().addStep(new TraversalFilterStep<>(traversal, this.vertexPropertyCriterion.clone())));
- final Traversal.Admin nonCheckPropertyCriterion = this.vertexPropertyCriterionIsAllFilter ?
- this.vertexPropertyCriterion.clone() :
- new DefaultTraversal<>().addStep(new TraversalFilterStep<>(traversal, this.vertexPropertyCriterion.clone()));
+ new DefaultTraversal<>().addStep(new TraversalFilterStep<>(traversal, this.vertexPropertyCriterion.clone())));
+ final Traversal.Admin nonCheckPropertyCriterion = new DefaultTraversal<>().addStep(new TraversalFilterStep<>(traversal, this.vertexPropertyCriterion.clone()));
// turn all ElementValueTraversals into filters
for (final Step<?, ?> step : traversal.getSteps()) {
@@ -317,10 +274,6 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
}
}
}
- // when there is no filter()-wrap, the marked steps exist at the same traversal level
- for (final Step step : traversal.getSteps()) {
- step.removeLabel(MARKER);
- }
}
@Override
@@ -346,24 +299,15 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
}
private void applyCriterion(final List<Step> stepsToApplyCriterionAfter, final Traversal.Admin traversal,
- final Traversal.Admin<? extends Element, ?> criterion, final boolean isAllFilter) {
+ final Traversal.Admin<? extends Element, ?> criterion) {
for (final Step<?, ?> step : stepsToApplyCriterionAfter) {
- if (isAllFilter) {
- final Traversal.Admin<? extends Element, ?> criterionClone = criterion.clone();
- for (final String label : step.getLabels()) {
- step.removeLabel(label);
- criterionClone.getEndStep().addLabel(label);
- }
- TraversalHelper.insertTraversal((Step) step, criterionClone, traversal);
- } else {
- // re-assign the step label to the criterion because the label should apply seamlessly after the filter
- final Step filter = new TraversalFilterStep<>(traversal, criterion.clone());
- for (final String label : step.getLabels()) {
- step.removeLabel(label);
- filter.addLabel(label);
- }
- TraversalHelper.insertAfterStep(filter, step, traversal);
+ // re-assign the step label to the criterion because the label should apply seamlessly after the filter
+ final Step filter = new TraversalFilterStep<>(traversal, criterion.clone());
+ for (final String label : step.getLabels()) {
+ step.removeLabel(label);
+ filter.addLabel(label);
}
+ TraversalHelper.insertAfterStep(filter, step, traversal);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/afcf8dff/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
new file mode 100644
index 0000000..beeca95
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
@@ -0,0 +1,100 @@
+/*
+ * 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.computer.traversal.strategy.optimization.GraphFilterStrategy;
+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.filter.AndStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.FilterStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStep;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+public final class InlineFilterStrategy extends AbstractTraversalStrategy<TraversalStrategy.OptimizationStrategy> implements TraversalStrategy.OptimizationStrategy {
+
+ private static final InlineFilterStrategy INSTANCE = new InlineFilterStrategy();
+ private static final Set<Class<? extends OptimizationStrategy>> POSTS = new HashSet<>(Arrays.asList(
+ FilterRankingStrategy.class,
+ GraphFilterStrategy.class));
+
+ private InlineFilterStrategy() {
+ }
+
+ @Override
+ public void apply(final Traversal.Admin<?, ?> traversal) {
+ boolean changed = true; // recursively walk child traversals trying to inline them into the current traversal line.
+ while (changed) {
+ changed = false;
+ for (final TraversalFilterStep<?> step : TraversalHelper.getStepsOfAssignableClass(TraversalFilterStep.class, traversal)) {
+ final Traversal.Admin<?, ?> childTraversal = step.getLocalChildren().get(0);
+ if (TraversalHelper.allStepsInstanceOf(childTraversal, FilterStep.class, true)) {
+ changed = true;
+ TraversalHelper.applySingleLevelStrategies(childTraversal, traversal.getStrategies(), InlineFilterStrategy.class);
+ final Step<?, ?> finalStep = childTraversal.getEndStep();
+ TraversalHelper.insertTraversal((Step) step, childTraversal, traversal);
+ traversal.removeStep(step);
+ for (final String label : step.getLabels()) {
+ finalStep.addLabel(label);
+ }
+ }
+ }
+ for (final AndStep<?> step : TraversalHelper.getStepsOfAssignableClass(AndStep.class, traversal)) {
+ if (!step.getLocalChildren().stream().filter(t -> !TraversalHelper.allStepsInstanceOf(t, FilterStep.class, true)).findAny().isPresent()) {
+ changed = true;
+ final List<Traversal.Admin<?, ?>> childTraversals = (List) step.getLocalChildren();
+ Step<?, ?> finalStep = null;
+ for (int i = childTraversals.size() - 1; i >= 0; i--) {
+ final Traversal.Admin<?, ?> childTraversal = childTraversals.get(i);
+ TraversalHelper.applySingleLevelStrategies(childTraversal, traversal.getStrategies(), InlineFilterStrategy.class);
+ if (null == finalStep)
+ finalStep = childTraversal.getEndStep();
+ TraversalHelper.insertTraversal((Step) step, childTraversals.get(i), traversal);
+
+ }
+ traversal.removeStep(step);
+ if (null != finalStep) {
+ for (final String label : step.getLabels()) {
+ finalStep.addLabel(label);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ @Override
+ public Set<Class<? extends OptimizationStrategy>> applyPost() {
+ return POSTS;
+ }
+
+ public static InlineFilterStrategy instance() {
+ return INSTANCE;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/afcf8dff/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 95aa2e7..4f272cc 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
@@ -29,8 +29,10 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.util.ReducingBarrierS
import org.apache.tinkerpop.gremlin.process.traversal.step.util.RequirementsStep;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
+import org.apache.tinkerpop.gremlin.structure.Graph;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Set;
/**
@@ -50,20 +52,28 @@ public final class StandardVerificationStrategy extends AbstractTraversalStrateg
throw new VerificationException("VertexComputing steps must be executed with a GraphComputer: " + TraversalHelper.getStepsOfAssignableClass(VertexComputing.class, traversal), traversal);
}
- traversal.getSteps().forEach(step -> {
+ for (final Step<?, ?> step : traversal.getSteps()) {
+ final Set<String> hiddenLabels = new HashSet<>();
+ for (String label : step.getLabels()) {
+ if (Graph.Hidden.isHidden(label))
+ hiddenLabels.add(label);
+ }
+ for(final String label : hiddenLabels) {
+ step.removeLabel(label);
+ }
if (step instanceof ReducingBarrierStep && step.getTraversal().getParent() instanceof RepeatStep && step.getTraversal().getParent().getGlobalChildren().get(0).getSteps().contains(step))
throw new VerificationException("The parent of a reducing barrier can not be repeat()-step: " + step, traversal);
- });
+ }
// The ProfileSideEffectStep must be the last step, 2nd last step when accompanied by the cap step,
// or 3rd to last when the traversal ends with a RequirementsStep.
- final Step<?,?> endStep = traversal.asAdmin().getEndStep();
+ final Step<?, ?> endStep = traversal.asAdmin().getEndStep();
if (TraversalHelper.hasStepOfClass(ProfileSideEffectStep.class, traversal) &&
!(endStep instanceof ProfileSideEffectStep ||
(endStep instanceof SideEffectCapStep && endStep.getPreviousStep() instanceof ProfileSideEffectStep) ||
(endStep instanceof RequirementsStep && (
endStep.getPreviousStep() instanceof SideEffectCapStep ||
- endStep.getPreviousStep() instanceof ProfileSideEffectStep)))) {
+ endStep.getPreviousStep() instanceof ProfileSideEffectStep)))) {
throw new VerificationException("When specified, the profile()-Step must be the last step or followed only by the cap()-step and/or requirements step.", traversal);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/afcf8dff/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 2000a92..697dc2a 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
@@ -22,6 +22,8 @@ import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.Traversa
import org.apache.tinkerpop.gremlin.process.traversal.Scope;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.ElementValueTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.TokenTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.ByModulating;
@@ -30,7 +32,6 @@ 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.ConnectiveStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.FilterStep;
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;
@@ -571,11 +572,20 @@ public final class TraversalHelper {
}
}
- public static boolean filterOnlyTraversal(final Traversal.Admin<?, ?> traversal) {
+ public static boolean allStepsInstanceOf(final Traversal.Admin<?, ?> traversal, final Class<?> classToCheck, boolean checkIsInstanceOf) {
for (final Step step : traversal.getSteps()) {
- if (!(step instanceof FilterStep) && !(step instanceof ConnectiveStep))
+ boolean isInstance = classToCheck.isInstance(step);
+ if ((isInstance && !checkIsInstanceOf) || (!isInstance && checkIsInstanceOf))
return false;
}
return true;
}
+
+ public static void applySingleLevelStrategies(final Traversal.Admin<?, ?> traversal, final TraversalStrategies traversalStrategies, final Class<? extends TraversalStrategy> stopAfterStrategy) {
+ for (final TraversalStrategy<?> strategy : traversalStrategies.toList()) {
+ strategy.apply(traversal);
+ if (null != stopAfterStrategy && stopAfterStrategy.isInstance(strategy))
+ break;
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/afcf8dff/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyTest.java
index 86fdb67..2e89f6b 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyTest.java
@@ -18,8 +18,10 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.DefaultGraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AndStep;
@@ -27,11 +29,26 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilte
import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeVertexStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.IdentityStep;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.InlineFilterStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.StandardVerificationStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.hamcrest.CoreMatchers;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import java.util.Arrays;
+
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.has;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.inV;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.is;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.out;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outV;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.values;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -39,11 +56,51 @@ import static org.junit.Assert.assertTrue;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
+@RunWith(Parameterized.class)
public class SubgraphStrategyTest {
+ @Parameterized.Parameter(value = 0)
+ public Traversal original;
+
+ @Parameterized.Parameter(value = 1)
+ public Traversal optimized;
+
+
+ void applySubgraphStrategyTest(final Traversal traversal) {
+ final TraversalStrategies strategies = new DefaultTraversalStrategies();
+ strategies.addStrategies(SubgraphStrategy.build().
+ vertices(__.and(has("name", "marko"), has("age", 29))).
+ edges(hasLabel("knows")).
+ vertexProperties(__.<VertexProperty, Long>values().count().and(is(P.lt(10)), is(0))).create());
+ strategies.addStrategies(InlineFilterStrategy.instance());
+ strategies.addStrategies(StandardVerificationStrategy.instance());
+ traversal.asAdmin().setStrategies(strategies);
+ traversal.asAdmin().applyStrategies();
+ }
+
+ @Test
+ public void doTest() {
+ applySubgraphStrategyTest(original);
+ assertEquals(optimized, original);
+ }
+
+ @Parameterized.Parameters(name = "{0}")
+ public static Iterable<Object[]> generateTestParameters() {
+
+ return Arrays.asList(new Traversal[][]{
+ {__.outE(), __.outE().hasLabel("knows").and(
+ inV().has("name", "marko").has("age", 29),
+ outV().has("name", "marko").has("age", 29))},
+ {__.V(), __.V().has("name", "marko").has("age", 29)},
+ {__.V().has("location", "santa fe"), __.V().has("name", "marko").has("age", 29).has("location", "santa fe")},
+ {__.V().where(has("location", "santa fe")), __.V().has("name", "marko").has("age", 29).has("location", "santa fe")},
+ {__.V().where(has("location", "santa fe")).values("location"), __.V().has("name", "marko").has("age", 29).has("location", "santa fe").properties("location").filter(values().count().is(P.lt(10)).is(0)).value()}
+ });
+ }
+
@Test
public void shouldAddFilterAfterVertex() {
- final SubgraphStrategy strategy = SubgraphStrategy.build().vertexCriterion(__.identity()).create();
+ final SubgraphStrategy strategy = SubgraphStrategy.build().vertices(__.identity()).create();
final Traversal t = __.inV();
strategy.apply(t.asAdmin());
final EdgeVertexStep edgeVertexStep = (EdgeVertexStep) t.asAdmin().getStartStep();
@@ -55,7 +112,7 @@ public class SubgraphStrategyTest {
@Test
public void shouldAddFilterAfterEdge() {
- final SubgraphStrategy strategy = SubgraphStrategy.build().edgeCriterion(__.identity()).create();
+ final SubgraphStrategy strategy = SubgraphStrategy.build().edges(__.identity()).create();
final Traversal t = __.inE();
strategy.apply(t.asAdmin());
final VertexStep vertexStep = (VertexStep) t.asAdmin().getStartStep();
@@ -67,7 +124,7 @@ public class SubgraphStrategyTest {
@Test
public void shouldAddBothFiltersAfterVertex() {
- final SubgraphStrategy strategy = SubgraphStrategy.build().edgeCriterion(__.identity()).vertexCriterion(__.identity()).create();
+ final SubgraphStrategy strategy = SubgraphStrategy.build().edges(__.identity()).vertices(__.identity()).create();
final Traversal t = __.inE();
strategy.apply(t.asAdmin());
final VertexStep vertexStep = (VertexStep) t.asAdmin().getStartStep();
@@ -80,8 +137,8 @@ public class SubgraphStrategyTest {
@Test
public void shouldNotRetainMetadataLabelMarkers() {
final SubgraphStrategy strategy = SubgraphStrategy.build().vertices(__.<Vertex>out().hasLabel("person")).create();
- final Traversal.Admin<?, ?> t = __.out().inE().asAdmin();
- t.setStrategies(t.getStrategies().clone().addStrategies(strategy));
+ final Traversal.Admin<?, ?> t = out().inE().asAdmin();
+ t.setStrategies(t.getStrategies().clone().addStrategies(strategy, StandardVerificationStrategy.instance()));
t.applyStrategies();
assertEquals(t.getSteps().get(0).getClass(), VertexStep.class);
assertEquals(t.getSteps().get(1).getClass(), TraversalFilterStep.class);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/afcf8dff/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategyTest.java
new file mode 100644
index 0000000..b77ecc2
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategyTest.java
@@ -0,0 +1,78 @@
+/*
+ * 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.P;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.and;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.filter;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.has;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.out;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+@RunWith(Parameterized.class)
+public class InlineFilterStrategyTest {
+
+ @Parameterized.Parameter(value = 0)
+ public Traversal original;
+
+ @Parameterized.Parameter(value = 1)
+ public Traversal optimized;
+
+
+ void applyInlineFilterStrategy(final Traversal traversal) {
+ final TraversalStrategies strategies = new DefaultTraversalStrategies();
+ strategies.addStrategies(InlineFilterStrategy.instance());
+ traversal.asAdmin().setStrategies(strategies);
+ traversal.asAdmin().applyStrategies();
+ }
+
+ @Test
+ public void doTest() {
+ applyInlineFilterStrategy(original);
+ assertEquals(optimized, original);
+ }
+
+ @Parameterized.Parameters(name = "{0}")
+ public static Iterable<Object[]> generateTestParameters() {
+
+ return Arrays.asList(new Traversal[][]{
+ {filter(out("knows")), filter(out("knows"))},
+ {filter(has("age", P.gt(10))).as("a"), has("age", P.gt(10)).as("a")},
+ {filter(has("age", P.gt(10)).as("b")).as("a"), has("age", P.gt(10)).as("b","a")},
+ {filter(has("age", P.gt(10))), has("age", P.gt(10))},
+ {filter(and(has("age", P.gt(10)), has("name", "marko"))), has("age", P.gt(10)).has("name", "marko")},
+ {and(has("age", P.gt(10)), filter(has("age", 22))), has("age", P.gt(10)).has("age", 22)},
+ {and(has("age", P.gt(10)).as("a"), and(filter(has("age", 22).as("b")).as("c"), has("name", "marko").as("d"))), has("age", P.gt(10)).as("a").has("age", 22).as("b","c").has("name", "marko").as("d")},
+ {and(has("age", P.gt(10)), and(out("knows"), has("name", "marko"))), has("age", P.gt(10)).and(out("knows"), has("name", "marko"))}
+ });
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/afcf8dff/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index 29910a7..1a854bd 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -27,6 +27,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStep;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.InlineFilterStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.Column;
import org.apache.tinkerpop.gremlin.structure.Edge;
@@ -378,12 +379,14 @@ public class SubgraphStrategyProcessTest extends AbstractGremlinProcessTest {
GraphTraversalSource sg = create(SubgraphStrategy.build().vertexProperties(has("startTime", P.gt(2005))).create());
checkResults(Arrays.asList("purcellville", "baltimore", "oakland", "seattle", "aachen"), sg.V().properties("location").value());
checkResults(Arrays.asList("purcellville", "baltimore", "oakland", "seattle", "aachen"), sg.V().values("location"));
- assertFalse(TraversalHelper.hasStepOfAssignableClassRecursively(TraversalFilterStep.class, sg.V().properties("location").value().iterate().asAdmin()));
+ if (sg.getStrategies().getStrategy(InlineFilterStrategy.class).isPresent())
+ assertFalse(TraversalHelper.hasStepOfAssignableClassRecursively(TraversalFilterStep.class, sg.V().properties("location").value().iterate().asAdmin()));
// check to make sure edge properties are not analyzed
sg = create(SubgraphStrategy.build().vertexProperties(has("startTime", P.gt(2005))).create());
checkResults(Arrays.asList("purcellville", "baltimore", "oakland", "seattle", "aachen"), sg.V().as("a").properties("location").as("b").select("a").outE().properties().select("b").value().dedup());
checkResults(Arrays.asList("purcellville", "baltimore", "oakland", "seattle", "aachen"), sg.V().as("a").values("location").as("b").select("a").outE().properties().select("b").dedup());
- assertFalse(TraversalHelper.hasStepOfAssignableClassRecursively(TraversalFilterStep.class, sg.V().as("a").values("location").as("b").select("a").outE().properties().select("b").dedup().iterate().asAdmin()));
+ if (sg.getStrategies().getStrategy(InlineFilterStrategy.class).isPresent())
+ assertFalse(TraversalHelper.hasStepOfAssignableClassRecursively(TraversalFilterStep.class, sg.V().as("a").values("location").as("b").select("a").outE().properties().select("b").dedup().iterate().asAdmin()));
//
sg = create(SubgraphStrategy.build().vertices(has("name", P.neq("stephen"))).vertexProperties(has("startTime", P.gt(2005))).create());
checkResults(Arrays.asList("baltimore", "oakland", "seattle", "aachen"), sg.V().properties("location").value());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/afcf8dff/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
index f7a9357..a014efa 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
@@ -24,6 +24,10 @@ import org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalInterruptionComputerTest;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalInterruptionTest;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderTest;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.PageRankTest;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.PeerPressureTest;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProfileTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProgramTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ElementIdStrategyProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategy;
@@ -47,9 +51,13 @@ public class TinkerGraphGroovyTranslatorProvider extends TinkerGraphProvider {
"g_VX1X_out_injectXv2X_name",
"shouldNeverPropagateANoBulkTraverser",
"shouldNeverPropagateANullValuedTraverser",
+ OrderTest.Traversals.class.getCanonicalName(),
+ ProfileTest.Traversals.class.getCanonicalName(),
ProgramTest.Traversals.class.getCanonicalName(),
TraversalInterruptionTest.class.getCanonicalName(),
TraversalInterruptionComputerTest.class.getCanonicalName(),
+ PageRankTest.Traversals.class.getCanonicalName(),
+ PeerPressureTest.Traversals.class.getCanonicalName(),
ElementIdStrategyProcessTest.class.getCanonicalName()));
[29/44] tinkerpop git commit: per @spmallettes request -- added
JavaDoc to InlineFilter'Strategy. Also,
used the new TraversalHelper.copyLabels() method in InlineFilterStrategy.
Posted by sp...@apache.org.
per @spmallettes request -- added JavaDoc to InlineFilter'Strategy. Also, used the new TraversalHelper.copyLabels() method in InlineFilterStrategy.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/79da3a66
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/79da3a66
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/79da3a66
Branch: refs/heads/TINKERPOP-944
Commit: 79da3a6653efbc80606a60a95840ab3658c3c890
Parents: 6b1a2d9
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Sep 26 09:43:04 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
.../optimization/InlineFilterStrategy.java | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/79da3a66/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
index 0944361..ba2f832 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
@@ -35,7 +35,17 @@ import java.util.List;
import java.util.Set;
/**
+ * InlineFilterStrategy analyzes filter-steps with child traversals that themselves are pure filters.
+ * If the child traversals are pure filters then the wrapping parent filter is not needed and thus, the
+ * children can be "inlined."
+ * <p/>
+ *
* @author Marko A. Rodriguez (http://markorodriguez.com)
+ * @example <pre>
+ * __.filter(has("name","marko")) // is replaced by __.has("name","marko")
+ * __.and(has("name"),has("age")) // is replaced by __.has("name").has("age")
+ * __.and(filter(has("name","marko").has("age")),hasNot("blah")) // is replaced by __.has("name","marko").has("age").hasNot("blah")
+ * </pre>
*/
public final class InlineFilterStrategy extends AbstractTraversalStrategy<TraversalStrategy.OptimizationStrategy> implements TraversalStrategy.OptimizationStrategy {
@@ -59,10 +69,8 @@ public final class InlineFilterStrategy extends AbstractTraversalStrategy<Traver
TraversalHelper.applySingleLevelStrategies(traversal, childTraversal, InlineFilterStrategy.class);
final Step<?, ?> finalStep = childTraversal.getEndStep();
TraversalHelper.insertTraversal((Step) step, childTraversal, traversal);
+ TraversalHelper.copyLabels(step, finalStep, false);
traversal.removeStep(step);
- for (final String label : step.getLabels()) {
- finalStep.addLabel(label);
- }
}
}
for (final AndStep<?> step : TraversalHelper.getStepsOfAssignableClass(AndStep.class, traversal)) {
@@ -78,12 +86,8 @@ public final class InlineFilterStrategy extends AbstractTraversalStrategy<Traver
TraversalHelper.insertTraversal((Step) step, childTraversals.get(i), traversal);
}
+ if (null != finalStep) TraversalHelper.copyLabels(step, finalStep, false);
traversal.removeStep(step);
- if (null != finalStep) {
- for (final String label : step.getLabels()) {
- finalStep.addLabel(label);
- }
- }
}
}
}
[40/44] tinkerpop git commit: TINKERPOP-1478 Fixed memory leak and
proper redirection of output in GremlinGroovyScriptEngine
Posted by sp...@apache.org.
TINKERPOP-1478 Fixed memory leak and proper redirection of output in GremlinGroovyScriptEngine
These were bugs identified in Groovy and fixed some time ago, but given that GremlinGroovyScriptEngine is based on that class and doesn't directly use it, those fixes were never in place for it. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/762f6b22
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/762f6b22
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/762f6b22
Branch: refs/heads/TINKERPOP-944
Commit: 762f6b229925d407390e78d587ef98863205c870
Parents: 14708fe
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 28 12:48:26 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 28 12:48:26 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../src/reference/gremlin-applications.asciidoc | 25 +++-
.../jsr223/GremlinGroovyScriptEngine.java | 140 ++++++++++---------
.../jsr223/GremlinGroovyScriptEngineTest.java | 69 ++++++++-
4 files changed, 162 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/762f6b22/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 4b39cc7..d0aa8e8 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.1.5 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Fixed output redirection and potential memory leak in `GremlinGroovyScriptEngine`.
* Corrected naming of `g_withPath_V_asXaX_out_out_mapXa_name_it_nameX` and `g_withPath_V_asXaX_out_mapXa_nameX` in `MapTest`.
* Improved session cleanup when a close is triggered by the client.
* Removed the `appveyor.yml` file as the AppVeyor build is no longer enabled by Apache Infrastructure.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/762f6b22/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index cedd98f..d8b891e 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1309,12 +1309,12 @@ client.submit("[1,2,3,x]", params);
Cache Management
^^^^^^^^^^^^^^^^
-If Gremlin Server processes a large number of unique scripts, the cache will grow beyond the memory available to
-Gremlin Server and an `OutOfMemoryError` will loom. Script parameterization goes a long way to solving this problem
-and running out of memory should not be an issue for those cases. If it is a problem or if there is no script
-parameterization due to a given use case (perhaps using with use of <<sessions,sessions>>), it is possible to better
-control the nature of the script cache from the client side, by issuing scripts with a parameter to help define how
-the garbage collector should treat the references.
+If Gremlin Server processes a large number of unique scripts, the global function cache will grow beyond the memory
+available to Gremlin Server and an `OutOfMemoryError` will loom. Script parameterization goes a long way to solving
+this problem and running out of memory should not be an issue for those cases. If it is a problem or if there is no
+script parameterization due to a given use case (perhaps using with use of <<sessions,sessions>>), it is possible to
+better control the nature of the global function cache from the client side, by issuing scripts with a parameter to
+help define how the garbage collector should treat the references.
The parameter is called `#jsr223.groovy.engine.keep.globals` and has four options:
@@ -1324,9 +1324,20 @@ The parameter is called `#jsr223.groovy.engine.keep.globals` and has four option
* `phantom` - removed immediately after being evaluated by the `ScriptEngine`.
By specifying an option other than `hard`, an `OutOfMemoryError` in Gremlin Server should be avoided. Of course,
-this approach will come with the downside that compiled scripts could be garbage collected and thus removed from the
+this approach will come with the downside that functions could be garbage collected and thus removed from the
cache, forcing Gremlin Server to recompile later if that script is later encountered.
+[source,java]
+----
+Cluster cluster = Cluster.open();
+Client client = cluster.connect();
+
+Map<String,Object> params = new HashMap<>();
+params.put("x",4);
+params.put("#jsr223.groovy.engine.keep.globals", "soft");
+client.submit("[1,2,3,x]", params);
+----
+
[[sessions]]
Considering Sessions
^^^^^^^^^^^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/762f6b22/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
index ca129c6..acc7f90 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
@@ -46,7 +46,6 @@ import org.codehaus.groovy.jsr223.GroovyScriptEngineImpl;
import org.codehaus.groovy.runtime.InvokerHelper;
import org.codehaus.groovy.runtime.MetaClassHelper;
import org.codehaus.groovy.runtime.MethodClosure;
-import org.codehaus.groovy.syntax.SyntaxException;
import org.codehaus.groovy.util.ReferenceBundle;
import javax.script.Bindings;
@@ -385,8 +384,6 @@ public class GremlinGroovyScriptEngine extends GroovyScriptEngineImpl implements
final Class clazz = getScriptClass(script);
if (null == clazz) throw new ScriptException("Script class is null");
return eval(clazz, context);
- } catch (SyntaxException e) {
- throw new ScriptException(e.getMessage(), e.getSourceLocator(), e.getLine());
} catch (Exception e) {
throw new ScriptException(e);
}
@@ -422,9 +419,7 @@ public class GremlinGroovyScriptEngine extends GroovyScriptEngineImpl implements
public CompiledScript compile(final String scriptSource) throws ScriptException {
try {
return new GroovyCompiledScript(this, getScriptClass(scriptSource));
- } catch (SyntaxException e) {
- throw new ScriptException(e.getMessage(), e.getSourceLocator(), e.getLine());
- } catch (IOException | CompilationFailedException e) {
+ } catch (CompilationFailedException e) {
throw new ScriptException(e);
}
}
@@ -463,7 +458,7 @@ public class GremlinGroovyScriptEngine extends GroovyScriptEngineImpl implements
return makeInterface(thiz, clazz);
}
- Class getScriptClass(final String script) throws SyntaxException, CompilationFailedException, IOException {
+ Class getScriptClass(final String script) throws CompilationFailedException {
Class clazz = classMap.get(script);
if (clazz != null) return clazz;
@@ -477,23 +472,33 @@ public class GremlinGroovyScriptEngine extends GroovyScriptEngineImpl implements
}
Object eval(final Class scriptClass, final ScriptContext context) throws ScriptException {
- context.setAttribute("context", context, ScriptContext.ENGINE_SCOPE);
- final Writer writer = context.getWriter();
- context.setAttribute("out", writer instanceof PrintWriter ? writer : new PrintWriter(writer), ScriptContext.ENGINE_SCOPE);
- final Binding binding = new Binding() {
+ final Binding binding = new Binding(context.getBindings(ScriptContext.ENGINE_SCOPE)) {
@Override
- public Object getVariable(final String name) {
+ public Object getVariable(String name) {
synchronized (context) {
- final int scope = context.getAttributesScope(name);
+ int scope = context.getAttributesScope(name);
if (scope != -1) {
return context.getAttribute(name, scope);
}
- throw new MissingPropertyException(name, getClass());
+ // Redirect script output to context writer, if out var is not already provided
+ if ("out".equals(name)) {
+ final Writer writer = context.getWriter();
+ if (writer != null) {
+ return (writer instanceof PrintWriter) ?
+ (PrintWriter) writer :
+ new PrintWriter(writer, true);
+ }
+ }
+ // Provide access to engine context, if context var is not already provided
+ if ("context".equals(name)) {
+ return context;
+ }
}
+ throw new MissingPropertyException(name, getClass());
}
@Override
- public void setVariable(final String name, final Object value) {
+ public void setVariable(String name, Object value) {
synchronized (context) {
int scope = context.getAttributesScope(name);
if (scope == -1) {
@@ -505,67 +510,72 @@ public class GremlinGroovyScriptEngine extends GroovyScriptEngineImpl implements
};
try {
- final Script scriptObject = InvokerHelper.createScript(scriptClass, binding);
- for (Method m : scriptClass.getMethods()) {
- final String name = m.getName();
- globalClosures.put(name, new MethodClosure(scriptObject, name));
- }
+ // if this class is not an instance of Script, it's a full-blown class then simply return that class
+ if (!Script.class.isAssignableFrom(scriptClass)) {
+ return scriptClass;
+ } else {
+ final Script scriptObject = InvokerHelper.createScript(scriptClass, binding);
+ for (Method m : scriptClass.getMethods()) {
+ final String name = m.getName();
+ globalClosures.put(name, new MethodClosure(scriptObject, name));
+ }
- final MetaClass oldMetaClass = scriptObject.getMetaClass();
- scriptObject.setMetaClass(new DelegatingMetaClass(oldMetaClass) {
- @Override
- public Object invokeMethod(final Object object, final String name, final Object args) {
- if (args == null) {
- return invokeMethod(object, name, MetaClassHelper.EMPTY_ARRAY);
- } else if (args instanceof Tuple) {
- return invokeMethod(object, name, ((Tuple) args).toArray());
- } else if (args instanceof Object[]) {
- return invokeMethod(object, name, (Object[]) args);
- } else {
- return invokeMethod(object, name, new Object[]{args});
+ final MetaClass oldMetaClass = scriptObject.getMetaClass();
+ scriptObject.setMetaClass(new DelegatingMetaClass(oldMetaClass) {
+ @Override
+ public Object invokeMethod(final Object object, final String name, final Object args) {
+ if (args == null) {
+ return invokeMethod(object, name, MetaClassHelper.EMPTY_ARRAY);
+ } else if (args instanceof Tuple) {
+ return invokeMethod(object, name, ((Tuple) args).toArray());
+ } else if (args instanceof Object[]) {
+ return invokeMethod(object, name, (Object[]) args);
+ } else {
+ return invokeMethod(object, name, new Object[]{args});
+ }
}
- }
- @Override
- public Object invokeMethod(final Object object, final String name, final Object args[]) {
- try {
- return super.invokeMethod(object, name, args);
- } catch (MissingMethodException mme) {
- return callGlobal(name, args, context);
+ @Override
+ public Object invokeMethod(final Object object, final String name, final Object args[]) {
+ try {
+ return super.invokeMethod(object, name, args);
+ } catch (MissingMethodException mme) {
+ return callGlobal(name, args, context);
+ }
}
- }
- @Override
- public Object invokeStaticMethod(final Object object, final String name, final Object args[]) {
- try {
- return super.invokeStaticMethod(object, name, args);
- } catch (MissingMethodException mme) {
- return callGlobal(name, args, context);
+ @Override
+ public Object invokeStaticMethod(final Object object, final String name, final Object args[]) {
+ try {
+ return super.invokeStaticMethod(object, name, args);
+ } catch (MissingMethodException mme) {
+ return callGlobal(name, args, context);
+ }
}
- }
- });
+ });
- final Object o = scriptObject.run();
+ final Object o = scriptObject.run();
- // if interpreter mode is enable then local vars of the script are promoted to engine scope bindings.
- if (interpreterModeEnabled) {
- final Map<String, Object> localVars = (Map<String, Object>) context.getAttribute(COLLECTED_BOUND_VARS_MAP_VARNAME);
- if (localVars != null) {
- localVars.entrySet().forEach(e -> {
- // closures need to be cached for later use
- if (e.getValue() instanceof Closure)
- globalClosures.put(e.getKey(), (Closure) e.getValue());
+ // if interpreter mode is enable then local vars of the script are promoted to engine scope bindings.
+ if (interpreterModeEnabled) {
+ final Map<String, Object> localVars = (Map<String, Object>) context.getAttribute(COLLECTED_BOUND_VARS_MAP_VARNAME);
+ if (localVars != null) {
+ localVars.entrySet().forEach(e -> {
+ // closures need to be cached for later use
+ if (e.getValue() instanceof Closure)
+ globalClosures.put(e.getKey(), (Closure) e.getValue());
- context.setAttribute(e.getKey(), e.getValue(), ScriptContext.ENGINE_SCOPE);
- });
+ context.setAttribute(e.getKey(), e.getValue(), ScriptContext.ENGINE_SCOPE);
+ });
- // get rid of the temporary collected vars
- context.removeAttribute(COLLECTED_BOUND_VARS_MAP_VARNAME, ScriptContext.ENGINE_SCOPE);
- localVars.clear();
+ // get rid of the temporary collected vars
+ context.removeAttribute(COLLECTED_BOUND_VARS_MAP_VARNAME, ScriptContext.ENGINE_SCOPE);
+ localVars.clear();
+ }
}
- }
- return o;
+ return o;
+ }
} catch (Exception e) {
throw new ScriptException(e);
}
@@ -607,7 +617,7 @@ public class GremlinGroovyScriptEngine extends GroovyScriptEngineImpl implements
}
private synchronized void createClassLoader() {
- final CompilerConfiguration conf = new CompilerConfiguration();
+ final CompilerConfiguration conf = new CompilerConfiguration(CompilerConfiguration.DEFAULT);
conf.addCompilationCustomizers(this.importCustomizerProvider.create());
customizerProviders.forEach(p -> conf.addCompilationCustomizers(p.create()));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/762f6b22/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
index 19ced88..b18c020 100644
--- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
+++ b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
@@ -38,13 +38,15 @@ import javax.script.ScriptEngine;
import javax.script.ScriptException;
import javax.script.SimpleBindings;
import java.awt.*;
+import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -71,6 +73,8 @@ import static org.junit.Assert.fail;
public class GremlinGroovyScriptEngineTest {
private static final Logger logger = LoggerFactory.getLogger(GremlinGroovyScriptEngineTest.class);
+ private static final Object[] EMPTY_ARGS = new Object[0];
+
@Test
public void shouldCompileScriptWithoutRequiringVariableBindings() throws Exception {
// compile() should cache the script to avoid future compilation
@@ -426,4 +430,67 @@ public class GremlinGroovyScriptEngineTest {
assertEquals(t.getValue0() * -1, t.getValue1().get(2).intValue());
});
}
+
+ @Test
+ public void shouldInvokeFunctionRedirectsOutputToContextWriter() throws Exception {
+ final GremlinGroovyScriptEngine engine = new GremlinGroovyScriptEngine();
+ StringWriter writer = new StringWriter();
+ engine.getContext().setWriter(writer);
+
+ final String code = "def myFunction() { print \"Hello World!\" }";
+ engine.eval(code);
+ engine.invokeFunction("myFunction", EMPTY_ARGS);
+ assertEquals("Hello World!", writer.toString());
+
+ writer = new StringWriter();
+ final StringWriter writer2 = new StringWriter();
+ engine.getContext().setWriter(writer2);
+ engine.invokeFunction("myFunction", EMPTY_ARGS);
+ assertEquals("", writer.toString());
+ assertEquals("Hello World!", writer2.toString());
+ }
+
+ @Test
+ public void testInvokeFunctionRedirectsOutputToContextOut() throws Exception {
+ final GremlinGroovyScriptEngine engine = new GremlinGroovyScriptEngine();
+ StringWriter writer = new StringWriter();
+ final StringWriter unusedWriter = new StringWriter();
+ engine.getContext().setWriter(unusedWriter);
+ engine.put("out", writer);
+
+ final String code = "def myFunction() { print \"Hello World!\" }";
+ engine.eval(code);
+ engine.invokeFunction("myFunction", EMPTY_ARGS);
+ assertEquals("", unusedWriter.toString());
+ assertEquals("Hello World!", writer.toString());
+
+ writer = new StringWriter();
+ final StringWriter writer2 = new StringWriter();
+ engine.put("out", writer2);
+ engine.invokeFunction("myFunction", EMPTY_ARGS);
+ assertEquals("", unusedWriter.toString());
+ assertEquals("", writer.toString());
+ assertEquals("Hello World!", writer2.toString());
+ }
+
+ @Test
+ public void testEngineContextAccessibleToScript() throws Exception {
+ final GremlinGroovyScriptEngine engine = new GremlinGroovyScriptEngine();
+ final ScriptContext engineContext = engine.getContext();
+ engine.put("theEngineContext", engineContext);
+ final String code = "[answer: theEngineContext.is(context)]";
+ assertThat(((Map) engine.eval(code)).get("answer"), is(true));
+ }
+
+ @Test
+ public void testContextBindingOverridesEngineContext() throws Exception {
+ final GremlinGroovyScriptEngine engine = new GremlinGroovyScriptEngine();
+ final ScriptContext engineContext = engine.getContext();
+ final Map<String,Object> otherContext = new HashMap<>();
+ otherContext.put("foo", "bar");
+ engine.put("context", otherContext);
+ engine.put("theEngineContext", engineContext);
+ final String code = "[answer: context.is(theEngineContext) ? \"wrong\" : context.foo]";
+ assertEquals("bar", ((Map) engine.eval(code)).get("answer"));
+ }
}
\ No newline at end of file
[25/44] tinkerpop git commit: a little smarter about
applySingleLevelTraversal(). And added that method to RepeatUnrollStrategy as
it inlines a child traversal.
Posted by sp...@apache.org.
a little smarter about applySingleLevelTraversal(). And added that method to RepeatUnrollStrategy as it inlines a child traversal.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d870372c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d870372c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d870372c
Branch: refs/heads/TINKERPOP-944
Commit: d870372c061087c73668a433eaf770f7d024b67b
Parents: afcf8df
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Sep 23 16:56:24 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
.../strategy/optimization/InlineFilterStrategy.java | 4 ++--
.../strategy/optimization/RepeatUnrollStrategy.java | 1 +
.../gremlin/process/traversal/util/TraversalHelper.java | 10 ++++++----
.../jsr223/TinkerGraphGroovyTranslatorProvider.java | 10 ++--------
4 files changed, 11 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d870372c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
index beeca95..0944361 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
@@ -56,7 +56,7 @@ public final class InlineFilterStrategy extends AbstractTraversalStrategy<Traver
final Traversal.Admin<?, ?> childTraversal = step.getLocalChildren().get(0);
if (TraversalHelper.allStepsInstanceOf(childTraversal, FilterStep.class, true)) {
changed = true;
- TraversalHelper.applySingleLevelStrategies(childTraversal, traversal.getStrategies(), InlineFilterStrategy.class);
+ TraversalHelper.applySingleLevelStrategies(traversal, childTraversal, InlineFilterStrategy.class);
final Step<?, ?> finalStep = childTraversal.getEndStep();
TraversalHelper.insertTraversal((Step) step, childTraversal, traversal);
traversal.removeStep(step);
@@ -72,7 +72,7 @@ public final class InlineFilterStrategy extends AbstractTraversalStrategy<Traver
Step<?, ?> finalStep = null;
for (int i = childTraversals.size() - 1; i >= 0; i--) {
final Traversal.Admin<?, ?> childTraversal = childTraversals.get(i);
- TraversalHelper.applySingleLevelStrategies(childTraversal, traversal.getStrategies(), InlineFilterStrategy.class);
+ TraversalHelper.applySingleLevelStrategies(traversal, childTraversal, InlineFilterStrategy.class);
if (null == finalStep)
finalStep = childTraversal.getEndStep();
TraversalHelper.insertTraversal((Step) step, childTraversals.get(i), traversal);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d870372c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategy.java
index fdc7e85..f996ec5 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategy.java
@@ -51,6 +51,7 @@ public final class RepeatUnrollStrategy extends AbstractTraversalStrategy<Traver
final Traversal.Admin<?, ?> repeatTraversal = repeatStep.getGlobalChildren().get(0);
final int repeatLength = repeatTraversal.getSteps().size() - 1;
repeatTraversal.removeStep(repeatLength); // removes the RepeatEndStep
+ TraversalHelper.applySingleLevelStrategies(traversal, repeatTraversal, RepeatUnrollStrategy.class);
int insertIndex = i;
final int loops = (int) ((LoopTraversal) repeatStep.getUntilTraversal()).getMaxLoops();
for (int j = 0; j < loops; j++) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d870372c/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 697dc2a..054a1df 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
@@ -22,7 +22,6 @@ import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.Traversa
import org.apache.tinkerpop.gremlin.process.traversal.Scope;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.ElementValueTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.TokenTraversal;
@@ -581,9 +580,12 @@ public final class TraversalHelper {
return true;
}
- public static void applySingleLevelStrategies(final Traversal.Admin<?, ?> traversal, final TraversalStrategies traversalStrategies, final Class<? extends TraversalStrategy> stopAfterStrategy) {
- for (final TraversalStrategy<?> strategy : traversalStrategies.toList()) {
- strategy.apply(traversal);
+ public static void applySingleLevelStrategies(final Traversal.Admin<?, ?> parentTraversal, final Traversal.Admin<?, ?> childTraversal, final Class<? extends TraversalStrategy> stopAfterStrategy) {
+ childTraversal.setStrategies(parentTraversal.getStrategies());
+ childTraversal.setSideEffects(parentTraversal.getSideEffects());
+ parentTraversal.getGraph().ifPresent(childTraversal::setGraph);
+ for (final TraversalStrategy<?> strategy : parentTraversal.getStrategies().toList()) {
+ strategy.apply(childTraversal);
if (null != stopAfterStrategy && stopAfterStrategy.isInstance(strategy))
break;
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d870372c/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
index a014efa..7591bf0 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
@@ -21,13 +21,10 @@ package org.apache.tinkerpop.gremlin.tinkergraph.process.groovy.jsr223;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyTranslator;
+import org.apache.tinkerpop.gremlin.process.computer.GraphComputerTest;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalInterruptionComputerTest;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalInterruptionTest;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderTest;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.PageRankTest;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.PeerPressureTest;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProfileTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProgramTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ElementIdStrategyProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategy;
@@ -51,13 +48,10 @@ public class TinkerGraphGroovyTranslatorProvider extends TinkerGraphProvider {
"g_VX1X_out_injectXv2X_name",
"shouldNeverPropagateANoBulkTraverser",
"shouldNeverPropagateANullValuedTraverser",
- OrderTest.Traversals.class.getCanonicalName(),
- ProfileTest.Traversals.class.getCanonicalName(),
+ GraphComputerTest.class.getCanonicalName(),
ProgramTest.Traversals.class.getCanonicalName(),
TraversalInterruptionTest.class.getCanonicalName(),
TraversalInterruptionComputerTest.class.getCanonicalName(),
- PageRankTest.Traversals.class.getCanonicalName(),
- PeerPressureTest.Traversals.class.getCanonicalName(),
ElementIdStrategyProcessTest.class.getCanonicalName()));
[41/44] tinkerpop git commit: Merge branch 'tp31'
Posted by sp...@apache.org.
Merge branch 'tp31'
Conflicts:
.gitignore
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/70622cc9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/70622cc9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/70622cc9
Branch: refs/heads/TINKERPOP-944
Commit: 70622cc9d0130eab5efaecb9f15d35fb751ac4c5
Parents: 317fb0c 762f6b2
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 28 12:50:01 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 28 12:50:01 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../src/reference/gremlin-applications.asciidoc | 25 +++-
.../jsr223/GremlinGroovyScriptEngine.java | 140 ++++++++++---------
.../jsr223/GremlinGroovyScriptEngineTest.java | 69 ++++++++-
4 files changed, 162 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70622cc9/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70622cc9/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70622cc9/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
----------------------------------------------------------------------
diff --cc gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
index ecfd168,acc7f90..3ce400e
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
@@@ -669,15 -617,10 +679,15 @@@ public class GremlinGroovyScriptEngine
}
private synchronized void createClassLoader() {
- final CompilerConfiguration conf = new CompilerConfiguration();
+ final CompilerConfiguration conf = new CompilerConfiguration(CompilerConfiguration.DEFAULT);
conf.addCompilationCustomizers(this.importCustomizerProvider.create());
- customizerProviders.forEach(p -> conf.addCompilationCustomizers(p.create()));
+ // ConfigurationCustomizerProvider is treated separately
+ customizerProviders.stream().filter(cp -> !(cp instanceof ConfigurationCustomizerProvider))
+ .forEach(p -> conf.addCompilationCustomizers(p.create()));
+
+ customizerProviders.stream().filter(cp -> cp instanceof ConfigurationCustomizerProvider).findFirst()
+ .ifPresent(cp -> ((ConfigurationCustomizerProvider) cp).applyCustomization(conf));
this.loader = new GremlinGroovyClassLoader(getParentLoader(), conf);
}
[31/44] tinkerpop git commit: added PropertyMapStep note to upgrade
docs and tweaked CHANGELOG.
Posted by sp...@apache.org.
added PropertyMapStep note to upgrade docs and tweaked CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/083b8e44
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/083b8e44
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/083b8e44
Branch: refs/heads/TINKERPOP-944
Commit: 083b8e44cbd32c88060c4cbce43f61498796ce54
Parents: 1b1defc
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Sep 27 12:45:22 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
docs/src/upgrade/release-3.2.x-incubating.asciidoc | 14 ++++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/083b8e44/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index bb9f309..3fc278a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -42,7 +42,7 @@ TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET)
* `AbstractLambdaTraversal` now supports a `bypassTraversal` where it is possible for strategies to redefine such lambda traversals.
* Added an internal utility `ClassFilterStep` which determines if the traverser object's class is an instance of the provided class.
* `ConnectiveStep` extends `FilterStep` and thus, is more appropriately categorized in the step hierarchy.
-* `PropertyMapStep` supports a provided traversal for accessing the properties of the element.
+* `PropertyMapStep` supports a provided traversal for accessing the properties of the element. (*breaking*)
* `SubgraphStrategy` now supports vertex property filtering.
* Fixed a bug in Gremlin-Python `P` where predicates reversed the order of the predicates.
* Added tests to `DedupTest` for the `dedup(Scope, String...)` overload.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/083b8e44/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index e85aeb9..89a63ed 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -118,6 +118,20 @@ gremlin> g.V().hasLabel("software").count()
TinkerPop 3.2.3 fixes this misbehavior and all `has()` method overloads behave like before, except that they no longer
support no arguments.
+Upgrading for Providers
+~~~~~~~~~~~~~~~~~~~~~~~
+
+PropertyMapStep with Selection Traversal
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+`PropertyMapStep` now supports selection of properties via child property traversal. If a provider was relying solely
+on the provided property keys in a `ProviderOptimizationStrategy`, they will need to check if there is a child traversal
+and if so, use that in their introspection for respective strategies. This model was created to support `SubgraphStrategy.vertexProperties()` filtering.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1456[TINKERPOP-1456],
+link:https://issues.apache.org/jira/browse/TINKERPOP-844[TINKERPOP-844]
+
+
TinkerPop 3.2.2
---------------
[28/44] tinkerpop git commit: added propertyTraversal to toString()
of PropertyMapStep (if it exists). Added TraversalHelper.copyLabels() which
makes label copying between steps much easier and less error prone.
TinkerGraphStepStrategy is smart about hop
Posted by sp...@apache.org.
added propertyTraversal to toString() of PropertyMapStep (if it exists). Added TraversalHelper.copyLabels() which makes label copying between steps much easier and less error prone. TinkerGraphStepStrategy is smart about hoping over FilterStepp in search of more HasContainer steps.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/de31baa4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/de31baa4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/de31baa4
Branch: refs/heads/TINKERPOP-944
Commit: de31baa49942293dff43154ecea4ead5b881b25a
Parents: d870372
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Sep 26 08:41:17 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +
.../traversal/step/map/PropertyMapStep.java | 4 +-
.../strategy/decoration/SubgraphStrategy.java | 32 ++++---------
.../process/traversal/util/TraversalHelper.java | 8 ++++
.../optimization/TinkerGraphStepStrategy.java | 20 +++++---
.../TinkerGraphStepStrategyTest.java | 49 +++++++++++++++++++-
6 files changed, 82 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/de31baa4/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index fb1160f..cdcad3a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,8 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* `TinkerGraphStepStrategy` is now smart about non-`HasContainer` filter steps.
+* Added `TraversalHelper.copyLabels()` for copying (or moving) labels form one step to another.
* Added `TraversalHelper.applySingleLevelStrategies()` which will apply a subset of strategies but not walk the child tree.
* Added the concept that hidden labels using during traversal compilation are removed at the end during `StandardVerificationStrategy`. (*breaking*)
* Added `InlineFilterStrategy` which will determine if a `TraversalFilterStep` or `AndStep` children are filters and if so, inline them.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/de31baa4/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyMapStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyMapStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyMapStep.java
index d10b12b..5ab3a17 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyMapStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyMapStep.java
@@ -113,7 +113,9 @@ public class PropertyMapStep<E> extends MapStep<Element, Map<String, E>> impleme
}
public String toString() {
- return StringFactory.stepString(this, Arrays.asList(this.propertyKeys), this.returnType.name().toLowerCase());
+ return null != this.propertyTraversal ?
+ StringFactory.stepString(this, this.propertyTraversal, this.returnType.name().toLowerCase()) :
+ StringFactory.stepString(this, Arrays.asList(this.propertyKeys), this.returnType.name().toLowerCase());
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/de31baa4/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index 6ff69b2..0a9cb15 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -25,7 +25,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.ElementValueTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ClassFilterStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConnectiveStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.FilterStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.OrStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStep;
@@ -141,8 +140,10 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
@Override
public void apply(final Traversal.Admin<?, ?> traversal) {
// do not apply subgraph strategy to already created subgraph filter branches (or else you get infinite recursion)
- if (traversal.getStartStep().getLabels().contains(MARKER))
+ if (traversal.getStartStep().getLabels().contains(MARKER)) {
+ traversal.getStartStep().removeLabel(MARKER);
return;
+ }
//
final List<GraphStep> graphSteps = TraversalHelper.getStepsOfAssignableClass(GraphStep.class, traversal);
final List<VertexStep> vertexSteps = TraversalHelper.getStepsOfAssignableClass(VertexStep.class, traversal);
@@ -178,18 +179,12 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
TraversalHelper.replaceStep((Step<Vertex, Edge>) step, someEStep, traversal);
TraversalHelper.insertAfterStep(someVStep, someEStep, traversal);
- // if step was labeled then propagate those labels to the new step that will return the vertex
- for (final String label : step.getLabels()) {
- step.removeLabel(label);
- someVStep.addLabel(label);
- }
+ TraversalHelper.copyLabels(step, someVStep, true);
if (null != this.edgeCriterion)
TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, this.edgeCriterion.clone()), someEStep, traversal);
if (null != this.vertexCriterion)
TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, this.vertexCriterion.clone()), someVStep, traversal);
-
-
}
}
@@ -243,26 +238,18 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
if ('v' == propertyType) {
final Traversal.Admin<?, ?> temp = nonCheckPropertyCriterion.clone();
TraversalHelper.insertTraversal((Step) step, temp, traversal);
- for (final String label : step.getLabels()) {
- step.removeLabel(label);
- temp.getEndStep().addLabel(label);
- }
+ TraversalHelper.copyLabels(step, temp.getEndStep(), true);
} else {
final Step<?, ?> temp = checkPropertyCriterion.clone();
TraversalHelper.insertAfterStep(temp, (Step) step, traversal);
- for (final String label : step.getLabels()) {
- step.removeLabel(label);
- temp.addLabel(label);
- }
+ TraversalHelper.copyLabels(step, temp, true);
}
} else {
// if the property step returns value, then replace it with a property step, append criterion, then append a value() step
final Step propertiesStep = new PropertiesStep(traversal, PropertyType.PROPERTY, ((PropertiesStep) step).getPropertyKeys());
TraversalHelper.replaceStep(step, propertiesStep, traversal);
final Step propertyValueStep = new PropertyValueStep(traversal);
- for (final String label : step.getLabels()) {
- propertyValueStep.addLabel(label);
- }
+ TraversalHelper.copyLabels(step, propertyValueStep, false);
if ('v' == propertyType) {
TraversalHelper.insertAfterStep(propertyValueStep, propertiesStep, traversal);
TraversalHelper.insertTraversal(propertiesStep, nonCheckPropertyCriterion.clone(), traversal);
@@ -303,11 +290,8 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
for (final Step<?, ?> step : stepsToApplyCriterionAfter) {
// re-assign the step label to the criterion because the label should apply seamlessly after the filter
final Step filter = new TraversalFilterStep<>(traversal, criterion.clone());
- for (final String label : step.getLabels()) {
- step.removeLabel(label);
- filter.addLabel(label);
- }
TraversalHelper.insertAfterStep(filter, step, traversal);
+ TraversalHelper.copyLabels(step, filter, true);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/de31baa4/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 054a1df..7564741 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
@@ -571,6 +571,14 @@ public final class TraversalHelper {
}
}
+ public static void copyLabels(final Step<?, ?> fromStep, final Step<?, ?> toStep, final boolean moveLabels) {
+ for (final String label : fromStep.getLabels()) {
+ toStep.addLabel(label);
+ if (moveLabels)
+ fromStep.removeLabel(label);
+ }
+ }
+
public static boolean allStepsInstanceOf(final Traversal.Admin<?, ?> traversal, final Class<?> classToCheck, boolean checkIsInstanceOf) {
for (final Step step : traversal.getSteps()) {
boolean isInstance = classToCheck.isInstance(step);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/de31baa4/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategy.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategy.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategy.java
index a5f258a..97d30e9 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategy.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategy.java
@@ -22,7 +22,9 @@ 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.HasContainerHolder;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.FilterStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.tinkergraph.process.traversal.step.sideEffect.TinkerGraphStep;
@@ -45,14 +47,18 @@ public final class TinkerGraphStepStrategy extends AbstractTraversalStrategy<Tra
TraversalHelper.getStepsOfClass(GraphStep.class, traversal).forEach(originalGraphStep -> {
final TinkerGraphStep<?, ?> tinkerGraphStep = new TinkerGraphStep<>(originalGraphStep);
TraversalHelper.replaceStep(originalGraphStep, (Step) tinkerGraphStep, traversal);
+ Step<?, ?> lastNonHolderStep = tinkerGraphStep;
Step<?, ?> currentStep = tinkerGraphStep.getNextStep();
- while (currentStep instanceof HasContainerHolder) {
- ((HasContainerHolder) currentStep).getHasContainers().forEach(hasContainer -> {
- if (!GraphStep.processHasContainerIds(tinkerGraphStep, hasContainer))
- tinkerGraphStep.addHasContainer(hasContainer);
- });
- currentStep.getLabels().forEach(tinkerGraphStep::addLabel);
- traversal.removeStep(currentStep);
+ while (currentStep instanceof HasContainerHolder || currentStep instanceof FilterStep) {
+ if (currentStep instanceof HasContainerHolder) {
+ for (final HasContainer hasContainer : ((HasContainerHolder) currentStep).getHasContainers()) {
+ if (!GraphStep.processHasContainerIds(tinkerGraphStep, hasContainer))
+ tinkerGraphStep.addHasContainer(hasContainer);
+ }
+ TraversalHelper.copyLabels(currentStep, lastNonHolderStep, false);
+ traversal.removeStep(currentStep);
+ } else
+ lastNonHolderStep = currentStep;
currentStep = currentStep.getNextStep();
}
});
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/de31baa4/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategyTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategyTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategyTest.java
index 6e4850d..6e7a383 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategyTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategyTest.java
@@ -24,10 +24,18 @@ import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.OrStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
import org.apache.tinkerpop.gremlin.tinkergraph.process.traversal.step.sideEffect.TinkerGraphStep;
import org.junit.Test;
+import java.util.Arrays;
+
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.has;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.out;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -38,6 +46,45 @@ public class TinkerGraphStepStrategyTest extends AbstractGremlinProcessTest {
@Test
@IgnoreEngine(TraversalEngine.Type.COMPUTER)
+ public void shouldSkipFilterSteps() {
+ GraphTraversal.Admin<?, ?> traversal = g.V().as("a").has("name", "marko").as("b").has("nothing").has("age", 32).as("c").asAdmin();
+ traversal.applyStrategies();
+ assertEquals(2, traversal.getSteps().size());
+ assertEquals(TinkerGraphStep.class, traversal.getStartStep().getClass());
+ assertEquals(TraversalFilterStep.class, traversal.getEndStep().getClass());
+ assertTrue(traversal.getStartStep().getLabels().containsAll(Arrays.asList("a", "b")));
+ assertTrue(traversal.getEndStep().getLabels().containsAll(Arrays.asList("c")));
+ assertEquals("name", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(0).getKey());
+ assertEquals("marko", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(0).getValue());
+ assertEquals("age", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(1).getKey());
+ assertEquals(32, ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(1).getValue());
+ //
+ traversal = g.V().as("a").has("name", "marko").as("b").or(has("nothing"), out("something")).has("age", 32).as("c").asAdmin();
+ traversal.applyStrategies();
+ assertEquals(2, traversal.getSteps().size());
+ assertEquals(TinkerGraphStep.class, traversal.getStartStep().getClass());
+ assertEquals(OrStep.class, traversal.getEndStep().getClass());
+ assertTrue(traversal.getStartStep().getLabels().containsAll(Arrays.asList("a", "b")));
+ assertTrue(traversal.getEndStep().getLabels().containsAll(Arrays.asList("c")));
+ assertEquals("name", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(0).getKey());
+ assertEquals("marko", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(0).getValue());
+ assertEquals("age", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(1).getKey());
+ assertEquals(32, ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(1).getValue());
+ //
+ traversal = g.V().as("a").has("name", "marko").as("b").out("something").has("age", 32).as("c").asAdmin();
+ traversal.applyStrategies();
+ assertEquals(3, traversal.getSteps().size());
+ assertEquals(TinkerGraphStep.class, traversal.getStartStep().getClass());
+ assertEquals(VertexStep.class, traversal.getSteps().get(1).getClass());
+ assertEquals(HasStep.class, traversal.getEndStep().getClass());
+ assertTrue(traversal.getStartStep().getLabels().containsAll(Arrays.asList("a", "b")));
+ assertTrue(traversal.getEndStep().getLabels().containsAll(Arrays.asList("c")));
+ assertEquals("name", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(0).getKey());
+ assertEquals("marko", ((TinkerGraphStep<?, ?>) traversal.getStartStep()).getHasContainers().get(0).getValue());
+ }
+
+ @Test
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void shouldFoldInHasContainers() {
GraphTraversal.Admin traversal = g.V().has("name", "marko").asAdmin();
assertEquals(2, traversal.getSteps().size());
@@ -75,7 +122,7 @@ public class TinkerGraphStepStrategyTest extends AbstractGremlinProcessTest {
assertEquals(TinkerGraphStep.class, traversal.getSteps().get(2).getClass());
assertEquals(1, ((TinkerGraphStep) traversal.getSteps().get(2)).getHasContainers().size());
assertEquals("name", ((TinkerGraphStep<?, ?>) traversal.getSteps().get(2)).getHasContainers().get(0).getKey());
- assertEquals("daniel", ((TinkerGraphStep<?,?>) traversal.getSteps().get(2)).getHasContainers().get(0).getValue());
+ assertEquals("daniel", ((TinkerGraphStep<?, ?>) traversal.getSteps().get(2)).getHasContainers().get(0).getValue());
assertEquals(TinkerGraphStep.class, traversal.getEndStep().getClass());
}
[14/44] tinkerpop git commit: Added lots more tests to various
strategies. The inline aspect of MatchPredicateStrategy was moved to
InlineFilterStrategy. In migrating that chunk,
fixed a strategy application bug that was present in MatchPredicateStrategy
Posted by sp...@apache.org.
Added lots more tests to various strategies. The inline aspect of MatchPredicateStrategy was moved to InlineFilterStrategy. In migrating that chunk, fixed a strategy application bug that was present in MatchPredicateStrategy. Tweaked up various XXXStrategyTest in the new model where extra strategies can be provded in the parameters.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/36f3adda
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/36f3adda
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/36f3adda
Branch: refs/heads/TINKERPOP-944
Commit: 36f3adda8c1e36b82a3ca36bb9dbfeea574340cf
Parents: 26035e6
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Sep 27 08:27:02 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 4 +-
.../optimization/InlineFilterStrategy.java | 58 ++++++++-
.../optimization/MatchPredicateStrategy.java | 49 +-------
.../process/traversal/util/TraversalHelper.java | 12 +-
.../optimization/FilterRankingStrategyTest.java | 44 ++++---
.../optimization/InlineFilterStrategyTest.java | 32 +++--
.../MatchPredicateStrategyTest.java | 119 ++++++-------------
7 files changed, 147 insertions(+), 171 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/36f3adda/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 70b2a76..499046e 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,12 +26,14 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Fixed a end-step label bug in `MatchPredicateStrategy`.
+* Fixed a bug in `MatchPredicateStrategy` where inlined traversals did not have strategies applied to it.
* Fixed a bug in `RepeatUnrollStrategy` where inlined traversal did not have strategies applied to it.
* `TinkerGraphStepStrategy` is now smart about non-`HasContainer` filter steps.
* Added `TraversalHelper.copyLabels()` for copying (or moving) labels form one step to another.
* Added `TraversalHelper.applySingleLevelStrategies()` which will apply a subset of strategies but not walk the child tree.
* Added the concept that hidden labels using during traversal compilation are removed at the end during `StandardVerificationStrategy`. (*breaking*)
-* Added `InlineFilterStrategy` which will determine if a `TraversalFilterStep` or `AndStep` children are filters and if so, inline them.
+* Added `InlineFilterStrategy` which will determine if a `TraversalFilterStep`, `AndStep`, `MatchStep` children are filters and if so, inline them.
* Removed `IdentityRemovalStrategy` from the default listing as its not worth the clock cycles.
* Removed the "!" symbol in `NotStep.toString()` as it is confusing and the `NotStep`-name is sufficient.
* Fixed a bug in `TraversalVertexProgram` (OLAP) around ordering and connectives (i.e. `and()` and `or()`).
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/36f3adda/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
index ba2f832..cbc7748 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
@@ -25,10 +25,14 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AndStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.FilterStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchStep;
+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.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
@@ -45,12 +49,14 @@ import java.util.Set;
* __.filter(has("name","marko")) // is replaced by __.has("name","marko")
* __.and(has("name"),has("age")) // is replaced by __.has("name").has("age")
* __.and(filter(has("name","marko").has("age")),hasNot("blah")) // is replaced by __.has("name","marko").has("age").hasNot("blah")
+ * __.match(as('a').has(key,value),...) // is replaced by __.as('a').has(key,value).match(...)
* </pre>
*/
public final class InlineFilterStrategy extends AbstractTraversalStrategy<TraversalStrategy.OptimizationStrategy> implements TraversalStrategy.OptimizationStrategy {
private static final InlineFilterStrategy INSTANCE = new InlineFilterStrategy();
private static final Set<Class<? extends OptimizationStrategy>> POSTS = new HashSet<>(Arrays.asList(
+ MatchPredicateStrategy.class,
FilterRankingStrategy.class,
GraphFilterStrategy.class));
@@ -62,9 +68,10 @@ public final class InlineFilterStrategy extends AbstractTraversalStrategy<Traver
boolean changed = true; // recursively walk child traversals trying to inline them into the current traversal line.
while (changed) {
changed = false;
- for (final TraversalFilterStep<?> step : TraversalHelper.getStepsOfAssignableClass(TraversalFilterStep.class, traversal)) {
+ // filter(x.y) --> x.y
+ for (final TraversalFilterStep<?> step : TraversalHelper.getStepsOfClass(TraversalFilterStep.class, traversal)) {
final Traversal.Admin<?, ?> childTraversal = step.getLocalChildren().get(0);
- if (TraversalHelper.allStepsInstanceOf(childTraversal, FilterStep.class, true)) {
+ if (TraversalHelper.allStepsInstanceOf(childTraversal, FilterStep.class)) {
changed = true;
TraversalHelper.applySingleLevelStrategies(traversal, childTraversal, InlineFilterStrategy.class);
final Step<?, ?> finalStep = childTraversal.getEndStep();
@@ -73,8 +80,9 @@ public final class InlineFilterStrategy extends AbstractTraversalStrategy<Traver
traversal.removeStep(step);
}
}
- for (final AndStep<?> step : TraversalHelper.getStepsOfAssignableClass(AndStep.class, traversal)) {
- if (!step.getLocalChildren().stream().filter(t -> !TraversalHelper.allStepsInstanceOf(t, FilterStep.class, true)).findAny().isPresent()) {
+ // and(x,y) --> x.y
+ for (final AndStep<?> step : TraversalHelper.getStepsOfClass(AndStep.class, traversal)) {
+ if (!step.getLocalChildren().stream().filter(t -> !TraversalHelper.allStepsInstanceOf(t, FilterStep.class)).findAny().isPresent()) {
changed = true;
final List<Traversal.Admin<?, ?>> childTraversals = (List) step.getLocalChildren();
Step<?, ?> finalStep = null;
@@ -90,7 +98,49 @@ public final class InlineFilterStrategy extends AbstractTraversalStrategy<Traver
traversal.removeStep(step);
}
}
+ // match(as('a').has(key,value),...) --> as('a').has(key,value).match(...)
+ if (traversal.getParent() instanceof EmptyStep) {
+ for (final MatchStep<?, ?> step : TraversalHelper.getStepsOfClass(MatchStep.class, traversal)) {
+ final String startLabel = determineStartLabelForHasPullOut(step);
+ if (null != startLabel) {
+ for (final Traversal.Admin<?, ?> matchTraversal : new ArrayList<>(step.getGlobalChildren())) {
+ if (!(step.getPreviousStep() instanceof EmptyStep) &&
+ TraversalHelper.allStepsInstanceOf(matchTraversal,
+ HasStep.class,
+ MatchStep.MatchStartStep.class,
+ MatchStep.MatchEndStep.class) &&
+ matchTraversal.getStartStep() instanceof MatchStep.MatchStartStep &&
+ startLabel.equals(((MatchStep.MatchStartStep) matchTraversal.getStartStep()).getSelectKey().orElse(null))) {
+ changed = true;
+ final String endLabel = ((MatchStep.MatchEndStep) matchTraversal.getEndStep()).getMatchKey().orElse(null); // why would this exist? but just in case
+ matchTraversal.removeStep(0); // remove MatchStartStep
+ matchTraversal.removeStep(matchTraversal.getSteps().size() - 1); // remove MatchEndStep
+ TraversalHelper.applySingleLevelStrategies(traversal, matchTraversal, InlineFilterStrategy.class);
+ step.removeGlobalChild(matchTraversal);
+ step.getPreviousStep().addLabel(startLabel);
+ if (null != endLabel) matchTraversal.getEndStep().addLabel(endLabel);
+ TraversalHelper.insertTraversal((Step) step.getPreviousStep(), matchTraversal, traversal);
+ }
+ }
+ if (step.getGlobalChildren().isEmpty())
+ traversal.removeStep(step);
+ }
+ }
+ }
+ }
+ }
+
+ private static final String determineStartLabelForHasPullOut(final MatchStep<?, ?> matchStep) {
+ final String startLabel = MatchStep.Helper.computeStartLabel(matchStep.getGlobalChildren());
+ Step<?, ?> previousStep = matchStep.getPreviousStep();
+ if (previousStep.getLabels().contains(startLabel))
+ return startLabel;
+ while (!(previousStep instanceof EmptyStep)) {
+ if (!previousStep.getLabels().isEmpty())
+ return null;
+ previousStep = previousStep.getPreviousStep();
}
+ return startLabel;
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/36f3adda/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategy.java
index f025749..a93dcd9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategy.java
@@ -22,20 +22,18 @@ 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.filter.DedupGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep;
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.step.map.MatchStep;
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.util.EmptyStep;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
+import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-import java.util.stream.Collectors;
/**
* MatchWhereStrategy will fold any post-{@code where()} step that maintains a traversal constraint into
@@ -53,11 +51,7 @@ import java.util.stream.Collectors;
public final class MatchPredicateStrategy extends AbstractTraversalStrategy<TraversalStrategy.OptimizationStrategy> implements TraversalStrategy.OptimizationStrategy {
private static final MatchPredicateStrategy INSTANCE = new MatchPredicateStrategy();
- private static final Set<Class<? extends OptimizationStrategy>> PRIORS = new HashSet<>();
-
- static {
- PRIORS.add(IdentityRemovalStrategy.class);
- }
+ private static final Set<Class<? extends OptimizationStrategy>> PRIORS = new HashSet<>(Arrays.asList(IdentityRemovalStrategy.class, InlineFilterStrategy.class));
private MatchPredicateStrategy() {
}
@@ -89,48 +83,9 @@ public final class MatchPredicateStrategy extends AbstractTraversalStrategy<Trav
} else
break;
}
- // match(as('a').has(key,value),...) --> as('a').has(key,value).match(...)
- final String startLabel = this.determineStartLabelForHasPullOut(matchStep);
- if (null != startLabel) {
- ((MatchStep<?, ?>) matchStep).getGlobalChildren().stream().collect(Collectors.toList()).forEach(matchTraversal -> {
- if (matchTraversal.getStartStep() instanceof MatchStep.MatchStartStep &&
- ((MatchStep.MatchStartStep) matchTraversal.getStartStep()).getSelectKey().isPresent() &&
- ((MatchStep.MatchStartStep) matchTraversal.getStartStep()).getSelectKey().get().equals(startLabel) &&
- !(matchStep.getPreviousStep() instanceof EmptyStep) &&
- !matchTraversal.getSteps().stream()
- .filter(step -> !(step instanceof MatchStep.MatchStartStep) &&
- !(step instanceof MatchStep.MatchEndStep) &&
- !(step instanceof HasStep))
- .findAny()
- .isPresent()) {
- matchStep.removeGlobalChild(matchTraversal);
- matchTraversal.removeStep(0); // remove MatchStartStep
- matchTraversal.removeStep(matchTraversal.getSteps().size() - 1); // remove MatchEndStep
- matchStep.getPreviousStep().addLabel(startLabel);
- TraversalHelper.insertTraversal(matchStep.getPreviousStep(), matchTraversal, traversal);
- }
- });
- }
});
}
- private String determineStartLabelForHasPullOut(final MatchStep<?, ?> matchStep) {
- if (!(matchStep.getTraversal().getParent() instanceof EmptyStep))
- return null;
- else {
- final String startLabel = MatchStep.Helper.computeStartLabel(matchStep.getGlobalChildren());
- Step<?, ?> previousStep = matchStep.getPreviousStep();
- if (previousStep.getLabels().contains(startLabel))
- return startLabel;
- while (!(previousStep instanceof EmptyStep)) {
- if (!previousStep.getLabels().isEmpty())
- return null;
- previousStep = previousStep.getPreviousStep();
- }
- return startLabel;
- }
- }
-
public static MatchPredicateStrategy instance() {
return INSTANCE;
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/36f3adda/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 7564741..d38ac6e 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
@@ -579,10 +579,16 @@ public final class TraversalHelper {
}
}
- public static boolean allStepsInstanceOf(final Traversal.Admin<?, ?> traversal, final Class<?> classToCheck, boolean checkIsInstanceOf) {
+ public static boolean allStepsInstanceOf(final Traversal.Admin<?, ?> traversal, final Class<?>... classesToCheck) {
for (final Step step : traversal.getSteps()) {
- boolean isInstance = classToCheck.isInstance(step);
- if ((isInstance && !checkIsInstanceOf) || (!isInstance && checkIsInstanceOf))
+ boolean foundInstance = false;
+ for (final Class<?> classToCheck : classesToCheck) {
+ if (classToCheck.isInstance(step)) {
+ foundInstance = true;
+ break;
+ }
+ }
+ if (!foundInstance)
return false;
}
return true;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/36f3adda/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategyTest.java
index 2a57185..71f5b4b 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategyTest.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.junit.Test;
@@ -27,6 +28,8 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
import static org.junit.Assert.assertEquals;
@@ -47,33 +50,36 @@ public class FilterRankingStrategyTest {
@Parameterized.Parameter(value = 1)
public Traversal optimized;
-
- void applyFilterRankingStrategy(final Traversal traversal) {
- final TraversalStrategies strategies = new DefaultTraversalStrategies();
- strategies.addStrategies(FilterRankingStrategy.instance(), IdentityRemovalStrategy.instance());
- traversal.asAdmin().setStrategies(strategies);
- traversal.asAdmin().applyStrategies();
- }
+ @Parameterized.Parameter(value = 2)
+ public Collection<TraversalStrategy> otherStrategies;
@Test
public void doTest() {
- applyFilterRankingStrategy(original);
- assertEquals(optimized, original);
+ final TraversalStrategies strategies = new DefaultTraversalStrategies();
+ strategies.addStrategies(FilterRankingStrategy.instance());
+ for (final TraversalStrategy strategy : this.otherStrategies) {
+ strategies.addStrategies(strategy);
+ }
+ this.original.asAdmin().setStrategies(strategies);
+ this.original.asAdmin().applyStrategies();
+ assertEquals(this.optimized, this.original);
}
@Parameterized.Parameters(name = "{0}")
public static Iterable<Object[]> generateTestParameters() {
- return Arrays.asList(new Traversal[][]{
- {__.dedup().order(), __.dedup().order()},
- {__.order().dedup(), __.dedup().order()},
- {__.identity().order().dedup(), __.dedup().order()},
- {__.order().identity().dedup(), __.dedup().order()},
- {__.order().out().dedup(), __.order().out().dedup()},
- {__.has("value", 0).filter(__.out()).dedup(), __.has("value", 0).filter(__.out()).dedup()},
- {__.dedup().filter(__.out()).has("value", 0), __.has("value", 0).filter(__.out()).dedup()},
- {__.filter(__.out()).dedup().has("value", 0), __.has("value", 0).filter(__.out()).dedup()},
- {__.has("value", 0).filter(__.out()).dedup(), __.has("value", 0).filter(__.out()).dedup()},
+ return Arrays.asList(new Object[][]{
+ {__.dedup().order(), __.dedup().order(), Collections.emptyList()},
+ {__.order().dedup(), __.dedup().order(), Collections.emptyList()},
+ {__.order().as("a").dedup(), __.order().as("a").dedup(), Collections.emptyList()},
+ {__.identity().order().dedup(), __.dedup().order(), Collections.singletonList(IdentityRemovalStrategy.instance())},
+ {__.order().identity().dedup(), __.dedup().order(), Collections.singletonList(IdentityRemovalStrategy.instance())},
+ {__.order().out().dedup(), __.order().out().dedup(), Collections.emptyList()},
+ {__.has("value", 0).filter(__.out()).dedup(), __.has("value", 0).filter(__.out()).dedup(), Collections.emptyList()},
+ {__.dedup().filter(__.out()).has("value", 0), __.has("value", 0).filter(__.out()).dedup(), Collections.emptyList()},
+ {__.filter(__.out()).dedup().has("value", 0), __.has("value", 0).filter(__.out()).dedup(), Collections.emptyList()},
+ {__.has("value", 0).filter(__.out()).dedup(), __.has("value", 0).filter(__.out()).dedup(), Collections.emptyList()},
+ {__.has("value", 0).and(__.has("age"), __.has("name", "marko")).is(10), __.is(10).has("value", 0).has("name", "marko").has("age"), Collections.singletonList(InlineFilterStrategy.instance())},
});
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/36f3adda/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategyTest.java
index b77ecc2..e9e605a 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategyTest.java
@@ -29,9 +29,13 @@ import org.junit.runners.Parameterized;
import java.util.Arrays;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.V;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.and;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.as;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.filter;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.has;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.map;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.match;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.out;
import static org.junit.Assert.assertEquals;
@@ -47,18 +51,13 @@ public class InlineFilterStrategyTest {
@Parameterized.Parameter(value = 1)
public Traversal optimized;
-
- void applyInlineFilterStrategy(final Traversal traversal) {
- final TraversalStrategies strategies = new DefaultTraversalStrategies();
- strategies.addStrategies(InlineFilterStrategy.instance());
- traversal.asAdmin().setStrategies(strategies);
- traversal.asAdmin().applyStrategies();
- }
-
@Test
public void doTest() {
- applyInlineFilterStrategy(original);
- assertEquals(optimized, original);
+ final TraversalStrategies strategies = new DefaultTraversalStrategies();
+ strategies.addStrategies(InlineFilterStrategy.instance());
+ this.original.asAdmin().setStrategies(strategies);
+ this.original.asAdmin().applyStrategies();
+ assertEquals(this.optimized, this.original);
}
@Parameterized.Parameters(name = "{0}")
@@ -67,12 +66,19 @@ public class InlineFilterStrategyTest {
return Arrays.asList(new Traversal[][]{
{filter(out("knows")), filter(out("knows"))},
{filter(has("age", P.gt(10))).as("a"), has("age", P.gt(10)).as("a")},
- {filter(has("age", P.gt(10)).as("b")).as("a"), has("age", P.gt(10)).as("b","a")},
+ {filter(has("age", P.gt(10)).as("b")).as("a"), has("age", P.gt(10)).as("b", "a")},
{filter(has("age", P.gt(10))), has("age", P.gt(10))},
{filter(and(has("age", P.gt(10)), has("name", "marko"))), has("age", P.gt(10)).has("name", "marko")},
+ //
{and(has("age", P.gt(10)), filter(has("age", 22))), has("age", P.gt(10)).has("age", 22)},
- {and(has("age", P.gt(10)).as("a"), and(filter(has("age", 22).as("b")).as("c"), has("name", "marko").as("d"))), has("age", P.gt(10)).as("a").has("age", 22).as("b","c").has("name", "marko").as("d")},
- {and(has("age", P.gt(10)), and(out("knows"), has("name", "marko"))), has("age", P.gt(10)).and(out("knows"), has("name", "marko"))}
+ {and(has("age", P.gt(10)).as("a"), and(filter(has("age", 22).as("b")).as("c"), has("name", "marko").as("d"))), has("age", P.gt(10)).as("a").has("age", 22).as("b", "c").has("name", "marko").as("d")},
+ {and(has("age", P.gt(10)), and(out("knows"), has("name", "marko"))), has("age", P.gt(10)).and(out("knows"), has("name", "marko"))},
+ //
+ {V().match(as("a").has("age", 10), as("a").filter(has("name")).as("b")), V().as("a").has("age", 10).match(as("a").has("name").as("b"))},
+ {match(as("a").has("age", 10), as("a").filter(has("name")).as("b")), match(as("a").has("age", 10), as("a").has("name").as("b"))},
+ {map(match(as("a").has("age", 10), as("a").filter(has("name")).as("b"))), map(match(as("a").has("age", 10), as("a").has("name").as("b")))},
+ {V().match(as("a").has("age", 10)), V().as("a").has("age", 10)},
+ {V().match(as("a").has("age", 10).as("b"), as("a").filter(has("name")).as("b")), V().as("a").has("age", 10).as("b").match(as("a").has("name").as("b"))},
});
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/36f3adda/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategyTest.java
index 41d3525..509004c 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategyTest.java
@@ -20,113 +20,64 @@ package org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization;
import org.apache.tinkerpop.gremlin.process.traversal.P;
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.TraversalStrategy;
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 java.util.Collection;
+import java.util.Collections;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.as;
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)
+@RunWith(Parameterized.class)
public class MatchPredicateStrategyTest {
- @RunWith(Parameterized.class)
- public static class StandardTest extends AbstractMatchPredicateStrategyTest {
+ @Parameterized.Parameter(value = 0)
+ public Traversal original;
- @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;
+ @Parameterized.Parameter(value = 1)
+ public Traversal optimized;
- @Before
- public void setup() {
- this.traversalEngine = mock(TraversalEngine.class);
- when(this.traversalEngine.getType()).thenReturn(TraversalEngine.Type.STANDARD);
- }
+ @Parameterized.Parameter(value = 2)
+ public Collection<TraversalStrategy> otherStrategies;
- @Test
- public void shouldApplyStrategy() {
- doTest(original, optimized);
+ @Test
+ public void doTest() {
+ final TraversalStrategies strategies = new DefaultTraversalStrategies();
+ strategies.addStrategies(MatchPredicateStrategy.instance());
+ for (final TraversalStrategy strategy : this.otherStrategies) {
+ strategies.addStrategies(strategy);
}
+ this.original.asAdmin().setStrategies(strategies);
+ this.original.asAdmin().applyStrategies();
+ assertEquals(this.optimized, this.original);
}
- @RunWith(Parameterized.class)
- public static class ComputerTest extends AbstractMatchPredicateStrategyTest {
-
- @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);
- }
+ @Parameterized.Parameters(name = "{0}")
+ public static Iterable<Object[]> generateTestParameters() {
+
+ return Arrays.asList(new Object[][]{
+ {__.out().match(as("a").has("name", "marko"), as("a").out().as("b")), __.out().as("a").has("name", "marko").match(as("a").out().as("b")), Collections.singletonList(InlineFilterStrategy.instance())}, // has() pull out
+ {__.out().as("a").match(as("a").has("name", "marko"), as("a").out().as("b")), __.out().as("a").has("name", "marko").match(as("a").out().as("b")), Collections.singletonList(InlineFilterStrategy.instance())}, // has() pull out
+ {__.out().as("a").out().match(as("a").has("name", "marko"), as("a").out().as("b")), __.out().as("a").out().match(as("a").has("name", "marko"), as("a").out().as("b")), Collections.emptyList()}, // no has() pull out
+ {__.map(__.match(as("a").has("name", "marko"), as("a").out().as("b"))), __.map(__.match(as("a").has("name", "marko"), as("a").out().as("b"))), Collections.emptyList()}, // no has() pull out
+ {__.out().as("c").match(as("a").has("name", "marko"), as("a").out().as("b")), __.out().as("c").match(as("a").has("name", "marko"), as("a").out().as("b")), Collections.emptyList()}, // no has() pull out
+ /////////
+ {__.match(as("a").out().as("b"), __.where(as("b").out("knows").as("c"))), __.match(as("a").out().as("b"), as("b").where(__.out("knows").as("c"))), Collections.emptyList()}, // make as().where()
+ {__.match(as("a").out().as("b"), __.where("a", P.gt("b"))), __.match(as("a").out().as("b"), __.as("a").where(P.gt("b"))), Collections.emptyList()}, // make as().where()
+ /////////
+ // {__.match(as("a").out().as("b")).where(as("b").out("knows").as("c")), __.match(as("a").out().as("b"), as("b").where(__.out("knows").as("c"))), Collections.emptyList()}, // make as().where()
+ // {__.match(as("a").out().as("b")).where("a", P.gt("b")), __.match(as("a").out().as("b"), __.as("a").where(P.gt("b"))), Collections.emptyList()}, // make as().where()
+ });
}
- private static abstract class AbstractMatchPredicateStrategyTest {
-
- protected TraversalEngine traversalEngine;
-
- void applyMatchWhereStrategy(final Traversal traversal) {
- final TraversalStrategies strategies = new DefaultTraversalStrategies();
- strategies.addStrategies(MatchPredicateStrategy.instance(), IdentityRemovalStrategy.instance());
- traversal.asAdmin().setStrategies(strategies);
- //traversal.asAdmin().setEngine(this.traversalEngine);
- traversal.asAdmin().applyStrategies();
- }
-
- public void doTest(final Traversal traversal, final Traversal optimized) {
- applyMatchWhereStrategy(traversal);
- assertEquals(optimized, traversal);
- }
-
- static Iterable<Object[]> generateTestParameters() {
-
- return Arrays.asList(new Traversal[][]{
- {__.out().match(as("a").has("name", "marko"), as("a").out().as("b")), __.out().as("a").has("name", "marko").match(as("a").out().as("b"))}, // has() pull out
- {__.out().as("a").match(as("a").has("name", "marko"), as("a").out().as("b")), __.out().as("a").has("name", "marko").match(as("a").out().as("b"))}, // has() pull out
- {__.out().as("a").out().match(as("a").has("name", "marko"), as("a").out().as("b")), __.out().as("a").out().match(as("a").has("name", "marko"), as("a").out().as("b"))}, // no has() pull out
- {__.map(__.match(as("a").has("name", "marko"), as("a").out().as("b"))), __.map(__.match(as("a").has("name", "marko"), as("a").out().as("b")))}, // no has() pull out
- {__.out().as("c").match(as("a").has("name", "marko"), as("a").out().as("b")), __.out().as("c").match(as("a").has("name", "marko"), as("a").out().as("b"))}, // no has() pull out
- /////////
- {__.match(as("a").out().as("b"), __.where(as("b").out("knows").as("c"))), __.match(as("a").out().as("b"), as("b").where(__.out("knows").as("c")))}, // make as().where()
- {__.match(as("a").out().as("b"), __.where("a", P.gt("b"))), __.match(as("a").out().as("b"), __.as("a").where(P.gt("b")))}, // make as().where()
- /////////
- //{__.match(as("a").out().as("b")).where(as("b").out("knows").as("c")), __.match(as("a").out().as("b"), as("b").where(__.out("knows").as("c")))}, // make as().where()
- //{__.match(as("a").out().as("b")).where("a", P.gt("b")), __.match(as("a").out().as("b"), __.as("a").where(P.gt("b")))}, // make as().where()
- });
- }
- }
}
[37/44] tinkerpop git commit: found a insidious bug where
FilterRankStrategy wasn't sorting SubgraphStrategy filters. The reason --
SubgraphStrategy uses hidden labels to communicate information between
children. Given that hidden step labels are for com
Posted by sp...@apache.org.
found a insidious bug where FilterRankStrategy wasn't sorting SubgraphStrategy filters. The reason -- SubgraphStrategy uses hidden labels to communicate information between children. Given that hidden step labels are for compilation purposes only, FilterRankStrategy does not consider hidden labels an reason notOptimizeStep(). Added a butt ton of test cases to finally expose the problem. This is related to the SubgraphStrategy merge work earlier. CTR.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/317fb0c7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/317fb0c7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/317fb0c7
Branch: refs/heads/TINKERPOP-944
Commit: 317fb0c7894412393f93b9e0ffaebedb9aa54c60
Parents: 24c14cf
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Sep 27 18:19:13 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 18:19:13 2016 -0600
----------------------------------------------------------------------
.../optimization/FilterRankingStrategy.java | 21 +++++++++++++++-----
.../optimization/FilterRankingStrategyTest.java | 20 +++++++++++++++----
.../TinkerGraphStepStrategyTest.java | 6 ++++++
3 files changed, 38 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/317fb0c7/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategy.java
index 96843d9..04b789b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategy.java
@@ -24,11 +24,13 @@ import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.step.LambdaHolder;
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.ClassFilterStep;
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.FilterStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.IsStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.NotStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.OrStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.SimplePathStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStep;
@@ -37,6 +39,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTraversal
import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderGlobalStep;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
+import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import java.util.HashSet;
@@ -126,7 +129,7 @@ public final class FilterRankingStrategy extends AbstractTraversalStrategy<Trave
private static int getStepRank(final Step step) {
if (!(step instanceof FilterStep || step instanceof OrderGlobalStep))
return 0;
- else if (step instanceof IsStep)
+ else if (step instanceof IsStep || step instanceof ClassFilterStep)
return 1;
else if (step instanceof HasStep)
return 2;
@@ -134,7 +137,7 @@ public final class FilterRankingStrategy extends AbstractTraversalStrategy<Trave
return 3;
else if (step instanceof SimplePathStep || step instanceof CyclicPathStep)
return 4;
- else if (step instanceof TraversalFilterStep)
+ else if (step instanceof TraversalFilterStep || step instanceof NotStep)
return 5;
else if (step instanceof WhereTraversalStep)
return 6;
@@ -179,10 +182,18 @@ public final class FilterRankingStrategy extends AbstractTraversalStrategy<Trave
* Returns true if the step is not optimizable, otherwise false. A step is not optimizable if it (or any of its
* child traversals) is a lambda holder or has a label.
*
- * @param step
+ * @param step the step to check for optimizability
* @return true if the given step is optimizable, otherwise false.
*/
- private static boolean isNotOptimizableStep(final Step step) {
- return step instanceof LambdaHolder || !step.getLabels().isEmpty();
+ private static boolean isNotOptimizableStep(final Step<?, ?> step) {
+ if (step instanceof LambdaHolder)
+ return true;
+ else {
+ for (final String label : step.getLabels()) {
+ if (!Graph.Hidden.isHidden(label))
+ return true;
+ }
+ return false;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/317fb0c7/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategyTest.java
index 18ef6ca..dc0d17a 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/FilterRankingStrategyTest.java
@@ -23,6 +23,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
+import org.apache.tinkerpop.gremlin.structure.Graph;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -31,7 +32,15 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.filter;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.has;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.in;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.inE;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.not;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.or;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.out;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.properties;
import static org.junit.Assert.assertEquals;
/**
@@ -75,12 +84,15 @@ public class FilterRankingStrategyTest {
{__.identity().order().dedup(), __.dedup().order(), Collections.singletonList(IdentityRemovalStrategy.instance())},
{__.order().identity().dedup(), __.dedup().order(), Collections.singletonList(IdentityRemovalStrategy.instance())},
{__.order().out().dedup(), __.order().out().dedup(), Collections.emptyList()},
- {has("value", 0).filter(__.out()).dedup(), has("value", 0).filter(__.out()).dedup(), Collections.emptyList()},
- {__.dedup().filter(__.out()).has("value", 0), has("value", 0).filter(__.out()).dedup(), Collections.emptyList()},
- {__.filter(__.out()).dedup().has("value", 0), has("value", 0).filter(__.out()).dedup(), Collections.emptyList()},
- {has("value", 0).filter(__.out()).dedup(), has("value", 0).filter(__.out()).dedup(), Collections.emptyList()},
+ {has("value", 0).filter(out()).dedup(), has("value", 0).filter(out()).dedup(), Collections.emptyList()},
+ {__.dedup().has("value", 0).or(not(has("age")), has("age", 10)).has("value", 1), __.has("value", 0).has("value", 1).or(not(has("age")), has("age", 10)).dedup(), Collections.emptyList()},
+ {__.dedup().filter(out()).has("value", 0), has("value", 0).filter(out()).dedup(), Collections.emptyList()},
+ {filter(out()).dedup().has("value", 0), has("value", 0).filter(out()).dedup(), Collections.emptyList()},
+ {has("value", 0).filter(out()).dedup(), has("value", 0).filter(out()).dedup(), Collections.emptyList()},
{has("value", 0).or(has("name"), has("age")).has("value", 1).dedup(), has("value", 0).has("value", 1).or(has("name"), has("age")).dedup(), Collections.emptyList()},
+ {has("value", 0).or(out(), in()).as(Graph.Hidden.hide("x")).has("value", 1).dedup(), has("value", 0).has("value", 1).or(outE(), inE()).dedup(), TraversalStrategies.GlobalCache.getStrategies(Graph.class).toList()},
{has("value", 0).and(has("age"), has("name", "marko")).is(10), __.is(10).has("value", 0).has("name", "marko").has("age"), Collections.singletonList(InlineFilterStrategy.instance())},
+ {has("value", 0).filter(or(not(has("age")), has("age", 1))).has("value", 1).dedup(), has("value", 0).has("value", 1).or(not(filter(properties("age"))), has("age", 1)).dedup(), TraversalStrategies.GlobalCache.getStrategies(Graph.class).toList()},
});
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/317fb0c7/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategyTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategyTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategyTest.java
index 89ca7ba..d2bc0ea 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategyTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerGraphStepStrategyTest.java
@@ -44,7 +44,11 @@ import java.util.Collections;
import static org.apache.tinkerpop.gremlin.process.traversal.P.eq;
import static org.apache.tinkerpop.gremlin.process.traversal.P.gt;
import static org.apache.tinkerpop.gremlin.process.traversal.P.lt;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.filter;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.has;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.not;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.properties;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.values;
import static org.junit.Assert.assertEquals;
/**
@@ -108,6 +112,8 @@ public class TinkerGraphStepStrategyTest {
g_V("name", eq("marko"), "name", eq("bob"), "lang", eq("java")).as("a").or(has("age"), has("age", gt(32))).dedup(), Arrays.asList(InlineFilterStrategy.instance(), FilterRankingStrategy.instance())},
{__.V().as("a").dedup().has("name", "marko").or(has("age", 10), has("age", gt(32))).filter(has("name", "bob")).has("lang", "java"),
g_V("name", eq("marko"), "name", eq("bob"), "lang", eq("java")).as("a").or(has("age", 10), has("age", gt(32))).dedup(), TraversalStrategies.GlobalCache.getStrategies(TinkerGraph.class).toList()},
+ {__.V().has("name", "marko").or(not(has("age")), has("age", gt(32))).has("name", "bob").has("lang", "java"),
+ g_V("name", eq("marko"), "name", eq("bob"), "lang", eq("java")).or(not(filter(properties("age"))), has("age", gt(32))), TraversalStrategies.GlobalCache.getStrategies(TinkerGraph.class).toList()}
});
}
}
[09/44] tinkerpop git commit: Merge branch 'TINKERPOP-927' into tp31
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-927' into tp31
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/33225c5c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/33225c5c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/33225c5c
Branch: refs/heads/TINKERPOP-944
Commit: 33225c5c73cdf080afb7f44a17e6798c0f7f059e
Parents: ac55bd0 86007ee
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Sep 27 19:48:22 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Sep 27 19:48:22 2016 +0200
----------------------------------------------------------------------
bin/publish-docs.awk | 31 +++++++++++++++++++++++++++++++
bin/publish-docs.sh | 42 +++++++++++++++++++++++++-----------------
2 files changed, 56 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
[19/44] tinkerpop git commit: more test cases for
InlineFilterStrategy and added a constraint to make it less likely to happen
for and() and filter().
Posted by sp...@apache.org.
more test cases for InlineFilterStrategy and added a constraint to make it less likely to happen for and() and filter().
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ab70dca9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ab70dca9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ab70dca9
Branch: refs/heads/TINKERPOP-944
Commit: ab70dca9d7193320a115148fdc2ca9c54394235c
Parents: e237d9c
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Sep 27 10:40:03 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
.../optimization/InlineFilterStrategy.java | 31 ++++++++++++++++++--
.../process/traversal/util/TraversalHelper.java | 12 +++++++-
.../optimization/InlineFilterStrategyTest.java | 13 ++++++--
3 files changed, 50 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ab70dca9/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
index cbc7748..c3f913e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategy.java
@@ -23,9 +23,14 @@ import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.optimiza
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.LambdaHolder;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AndStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DropStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.FilterStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TailGlobalStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
@@ -71,7 +76,13 @@ public final class InlineFilterStrategy extends AbstractTraversalStrategy<Traver
// filter(x.y) --> x.y
for (final TraversalFilterStep<?> step : TraversalHelper.getStepsOfClass(TraversalFilterStep.class, traversal)) {
final Traversal.Admin<?, ?> childTraversal = step.getLocalChildren().get(0);
- if (TraversalHelper.allStepsInstanceOf(childTraversal, FilterStep.class)) {
+ if (TraversalHelper.hasAllStepsOfClass(childTraversal, FilterStep.class) &&
+ !TraversalHelper.hasStepOfClass(childTraversal,
+ DropStep.class,
+ RangeGlobalStep.class,
+ TailGlobalStep.class,
+ DedupGlobalStep.class,
+ LambdaHolder.class)) {
changed = true;
TraversalHelper.applySingleLevelStrategies(traversal, childTraversal, InlineFilterStrategy.class);
final Step<?, ?> finalStep = childTraversal.getEndStep();
@@ -82,7 +93,20 @@ public final class InlineFilterStrategy extends AbstractTraversalStrategy<Traver
}
// and(x,y) --> x.y
for (final AndStep<?> step : TraversalHelper.getStepsOfClass(AndStep.class, traversal)) {
- if (!step.getLocalChildren().stream().filter(t -> !TraversalHelper.allStepsInstanceOf(t, FilterStep.class)).findAny().isPresent()) {
+ boolean process = true;
+ for (final Traversal.Admin<?, ?> childTraversal : step.getLocalChildren()) {
+ if (!TraversalHelper.hasAllStepsOfClass(childTraversal, FilterStep.class) ||
+ TraversalHelper.hasStepOfClass(childTraversal,
+ DropStep.class,
+ RangeGlobalStep.class,
+ TailGlobalStep.class,
+ DedupGlobalStep.class,
+ LambdaHolder.class)) {
+ process = false;
+ break;
+ }
+ }
+ if (process) {
changed = true;
final List<Traversal.Admin<?, ?>> childTraversals = (List) step.getLocalChildren();
Step<?, ?> finalStep = null;
@@ -105,7 +129,7 @@ public final class InlineFilterStrategy extends AbstractTraversalStrategy<Traver
if (null != startLabel) {
for (final Traversal.Admin<?, ?> matchTraversal : new ArrayList<>(step.getGlobalChildren())) {
if (!(step.getPreviousStep() instanceof EmptyStep) &&
- TraversalHelper.allStepsInstanceOf(matchTraversal,
+ TraversalHelper.hasAllStepsOfClass(matchTraversal,
HasStep.class,
MatchStep.MatchStartStep.class,
MatchStep.MatchEndStep.class) &&
@@ -128,6 +152,7 @@ public final class InlineFilterStrategy extends AbstractTraversalStrategy<Traver
}
}
}
+
}
private static final String determineStartLabelForHasPullOut(final MatchStep<?, ?> matchStep) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ab70dca9/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 d38ac6e..2192666 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
@@ -579,7 +579,7 @@ public final class TraversalHelper {
}
}
- public static boolean allStepsInstanceOf(final Traversal.Admin<?, ?> traversal, final Class<?>... classesToCheck) {
+ public static boolean hasAllStepsOfClass(final Traversal.Admin<?, ?> traversal, final Class<?>... classesToCheck) {
for (final Step step : traversal.getSteps()) {
boolean foundInstance = false;
for (final Class<?> classToCheck : classesToCheck) {
@@ -594,6 +594,16 @@ public final class TraversalHelper {
return true;
}
+ public static boolean hasStepOfClass(final Traversal.Admin<?, ?> traversal, final Class<?>... classesToCheck) {
+ for (final Step<?, ?> step : traversal.getSteps()) {
+ for (final Class<?> classToCheck : classesToCheck) {
+ if (classToCheck.isInstance(step))
+ return true;
+ }
+ }
+ return false;
+ }
+
public static void applySingleLevelStrategies(final Traversal.Admin<?, ?> parentTraversal, final Traversal.Admin<?, ?> childTraversal, final Class<? extends TraversalStrategy> stopAfterStrategy) {
childTraversal.setStrategies(parentTraversal.getStrategies());
childTraversal.setSideEffects(parentTraversal.getSideEffects());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ab70dca9/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategyTest.java
index e9e605a..aeae593 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/InlineFilterStrategyTest.java
@@ -32,11 +32,15 @@ import java.util.Arrays;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.V;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.and;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.as;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.dedup;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.drop;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.filter;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.has;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.limit;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.map;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.match;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.out;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.tail;
import static org.junit.Assert.assertEquals;
/**
@@ -67,8 +71,8 @@ public class InlineFilterStrategyTest {
{filter(out("knows")), filter(out("knows"))},
{filter(has("age", P.gt(10))).as("a"), has("age", P.gt(10)).as("a")},
{filter(has("age", P.gt(10)).as("b")).as("a"), has("age", P.gt(10)).as("b", "a")},
- {filter(has("age", P.gt(10))), has("age", P.gt(10))},
- {filter(and(has("age", P.gt(10)), has("name", "marko"))), has("age", P.gt(10)).has("name", "marko")},
+ {filter(has("age", P.gt(10)).as("a")), has("age", P.gt(10)).as("a")},
+ {filter(and(has("age", P.gt(10)).as("a"), has("name", "marko"))), has("age", P.gt(10)).as("a").has("name", "marko")},
//
{and(has("age", P.gt(10)), filter(has("age", 22))), has("age", P.gt(10)).has("age", 22)},
{and(has("age", P.gt(10)).as("a"), and(filter(has("age", 22).as("b")).as("c"), has("name", "marko").as("d"))), has("age", P.gt(10)).as("a").has("age", 22).as("b", "c").has("name", "marko").as("d")},
@@ -79,6 +83,11 @@ public class InlineFilterStrategyTest {
{map(match(as("a").has("age", 10), as("a").filter(has("name")).as("b"))), map(match(as("a").has("age", 10), as("a").has("name").as("b")))},
{V().match(as("a").has("age", 10)), V().as("a").has("age", 10)},
{V().match(as("a").has("age", 10).as("b"), as("a").filter(has("name")).as("b")), V().as("a").has("age", 10).as("b").match(as("a").has("name").as("b"))},
+ //
+ {filter(dedup()), filter(dedup())},
+ {filter(filter(drop())), filter(drop())},
+ {and(has("name"), limit(10).has("age")), and(has("name"), limit(10).has("age"))},
+ {filter(tail(10).as("a")), filter(tail(10).as("a"))},
});
}
}
[38/44] tinkerpop git commit: fixed conf dir references
Posted by sp...@apache.org.
fixed conf dir references
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3cbd3719
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3cbd3719
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3cbd3719
Branch: refs/heads/TINKERPOP-944
Commit: 3cbd3719084e5dcbb9b470228bd6a40e6d050478
Parents: 33225c5
Author: Robert Dale <ro...@gmail.com>
Authored: Mon Sep 26 11:01:53 2016 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Tue Sep 27 20:42:15 2016 -0400
----------------------------------------------------------------------
docs/src/reference/gremlin-applications.asciidoc | 4 ++--
gremlin-console/src/main/bin/gremlin.sh | 4 ++--
gremlin-driver/src/main/bin/config-eval.sh | 4 ++--
gremlin-driver/src/main/bin/profile-driver.sh | 4 ++--
gremlin-server/src/main/bin/gremlin-server.sh | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3cbd3719/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index cedd98f..7e827f1 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -775,7 +775,7 @@ Configuring
~~~~~~~~~~~
As mentioned earlier, Gremlin Server is configured though a YAML file. By default, Gremlin Server will look for a
-file called `config/gremlin-server.yaml` to configure itself on startup. To override this default, supply the file
+file called `conf/gremlin-server.yaml` to configure itself on startup. To override this default, supply the file
to use to `bin/gremlin-server.sh` as in:
[source,text]
@@ -920,7 +920,7 @@ Cluster cluster = Cluster.build().credentials("stephen", "password")
.enableSsl(true).create();
If connecting with Gremlin Console, which utilizes `gremlin-driver` for remote script execution, use the provided
-`config/remote-secure.yaml` file when defining the remote. That file contains configuration for the username and
+`conf/remote-secure.yaml` file when defining the remote. That file contains configuration for the username and
password as well as enablement of SSL from the client side.
Similarly, Gremlin Server can be configured for REST and security.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3cbd3719/gremlin-console/src/main/bin/gremlin.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/bin/gremlin.sh b/gremlin-console/src/main/bin/gremlin.sh
index 84ba8179..fe28773 100755
--- a/gremlin-console/src/main/bin/gremlin.sh
+++ b/gremlin-console/src/main/bin/gremlin.sh
@@ -36,11 +36,11 @@ fi
case `uname` in
CYGWIN*)
- CP="`dirname $0`"/../config
+ CP="`dirname $0`"/../conf
CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /;/g')
;;
*)
- CP="`dirname $0`"/../config
+ CP="`dirname $0`"/../conf
CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /:/g')
esac
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3cbd3719/gremlin-driver/src/main/bin/config-eval.sh
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/bin/config-eval.sh b/gremlin-driver/src/main/bin/config-eval.sh
index c55ebf5..764d732 100644
--- a/gremlin-driver/src/main/bin/config-eval.sh
+++ b/gremlin-driver/src/main/bin/config-eval.sh
@@ -20,11 +20,11 @@
#
case `uname` in
CYGWIN*)
- CP="`dirname $0`"/../config/
+ CP="`dirname $0`"/../conf/
CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /;/g')
;;
*)
- CP="`dirname $0`"/../config/
+ CP="`dirname $0`"/../conf/
CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /:/g')
esac
#echo $CP
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3cbd3719/gremlin-driver/src/main/bin/profile-driver.sh
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/bin/profile-driver.sh b/gremlin-driver/src/main/bin/profile-driver.sh
index ce747e5..7b4ac1b 100644
--- a/gremlin-driver/src/main/bin/profile-driver.sh
+++ b/gremlin-driver/src/main/bin/profile-driver.sh
@@ -20,11 +20,11 @@
#
case `uname` in
CYGWIN*)
- CP="`dirname $0`"/../config/
+ CP="`dirname $0`"/../conf/
CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /;/g')
;;
*)
- CP="`dirname $0`"/../config/
+ CP="`dirname $0`"/../conf/
CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /:/g')
esac
#echo $CP
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3cbd3719/gremlin-server/src/main/bin/gremlin-server.sh
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/bin/gremlin-server.sh b/gremlin-server/src/main/bin/gremlin-server.sh
index a82f73f..fcede2b 100755
--- a/gremlin-server/src/main/bin/gremlin-server.sh
+++ b/gremlin-server/src/main/bin/gremlin-server.sh
@@ -20,11 +20,11 @@
#
case `uname` in
CYGWIN*)
- CP="`dirname $0`"/../config/
+ CP="`dirname $0`"/../conf/
CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /;/g')
;;
*)
- CP="`dirname $0`"/../config/
+ CP="`dirname $0`"/../conf/
CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /:/g')
esac
#echo $CP
[05/44] tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp31'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3bb8fc9c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3bb8fc9c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3bb8fc9c
Branch: refs/heads/TINKERPOP-944
Commit: 3bb8fc9c94a84ebeddbbd620c2ff25134e8324d1
Parents: b8530f7 6f1ccb6
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Sep 24 20:42:26 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Sep 24 20:42:26 2016 -0400
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
[06/44] tinkerpop git commit: Removed todo in favor of TINKERPOP-1465
Posted by sp...@apache.org.
Removed todo in favor of TINKERPOP-1465
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ac55bd05
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ac55bd05
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ac55bd05
Branch: refs/heads/TINKERPOP-944
Commit: ac55bd051e7c8b1b74c31d345048ab7741e1dfe0
Parents: 6f1ccb6
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Sep 24 20:45:49 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Sep 24 20:45:49 2016 -0400
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/server/auth/AllowAllAuthenticator.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ac55bd05/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/AllowAllAuthenticator.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/AllowAllAuthenticator.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/AllowAllAuthenticator.java
index fbc497c..584dac1 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/AllowAllAuthenticator.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/AllowAllAuthenticator.java
@@ -51,7 +51,6 @@ public final class AllowAllAuthenticator implements Authenticator {
public SaslNegotiator newSaslNegotiator() {
// While this method is deprecated, it remains here to ensure backward compatibility with the old method. In
// this way the integration tests can continue to execute here
- // todo: remove this method on a future version and implement the new one
return AUTHENTICATOR_INSTANCE;
}
[43/44] tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp31'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d80d69cb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d80d69cb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d80d69cb
Branch: refs/heads/TINKERPOP-944
Commit: d80d69cb2faae7cf7102121879c02e06b7e24238
Parents: 70622cc bdef1a4
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 28 12:54:23 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 28 12:54:23 2016 -0400
----------------------------------------------------------------------
docs/src/reference/gremlin-applications.asciidoc | 4 ++--
gremlin-console/src/main/bin/gremlin.sh | 4 ++--
gremlin-driver/src/main/bin/config-eval.sh | 4 ++--
gremlin-driver/src/main/bin/profile-driver.sh | 4 ++--
gremlin-server/src/main/bin/gremlin-server.sh | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d80d69cb/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d80d69cb/gremlin-console/src/main/bin/gremlin.sh
----------------------------------------------------------------------
[21/44] tinkerpop git commit: a loop got fuggled.
Posted by sp...@apache.org.
a loop got fuggled.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/548f6620
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/548f6620
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/548f6620
Branch: refs/heads/TINKERPOP-944
Commit: 548f66208fd7bfc2d2aec7df849242bce6a673f8
Parents: 4783b4e
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Sep 21 15:08:39 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
.../traversal/strategy/decoration/SubgraphStrategy.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/548f6620/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index a49d98a..7551d14 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -318,10 +318,10 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
}
}
}
- // when there is no filter()-wrap, the marked steps exist at the same traversal level
- for (final Step step : traversal.getSteps()) {
- step.removeLabel(MARKER);
- }
+ }
+ // when there is no filter()-wrap, the marked steps exist at the same traversal level
+ for (final Step step : traversal.getSteps()) {
+ step.removeLabel(MARKER);
}
}
[22/44] tinkerpop git commit: added a better example to
SugraphStategy in the reference docs. Also added an explain() so people can
see whats going on.
Posted by sp...@apache.org.
added a better example to SugraphStategy in the reference docs. Also added an explain() so people can see whats going on.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7a228ca5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7a228ca5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7a228ca5
Branch: refs/heads/TINKERPOP-944
Commit: 7a228ca5f63011ec0ef5f5eeba7b33a03937c7f2
Parents: 95e5e1f
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Sep 23 12:11:46 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
docs/src/reference/the-traversal.asciidoc | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7a228ca5/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index d6d89b1..5d2c915 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -2610,17 +2610,25 @@ ReadOnlyStrategy
SubgraphStrategy
~~~~~~~~~~~~~~~~
-`SubgraphStrategy` is quite similar to `PartitionStrategy` in that it restrains a `Traversal` to certain vertices
-and edges as determined by a `Traversal` criterion defined individually for each.
+`SubgraphStrategy` is similar to `PartitionStrategy` in that it constrains a `Traversal` to certain vertices, edges,
+ and vertex properties as determined by a `Traversal`-based criterion defined individually for each.
[gremlin-groovy]
----
-graph = TinkerFactory.createModern()
-strategy = SubgraphStrategy.build().edgeCriterion(hasId(8,9,10)).create()
-g = graph.traversal().withStrategies(strategy)
-g.V() // shows all vertices as no filter for vertices was specified
-g.E() // shows only the edges defined in the edgeCriterion
+graph = TinkerFactory.createTheCrew()
+g = graph.traversal()
+g.V().as('a').values('location').as('b'). <1>
+ select('a','b').by('name').by()
+g = g.withStrategies(SubgraphStrategy.build().vertexProperties(hasNot('endTime')).create()) <2>
+g.V().as('a').values('location').as('b'). <3>
+ select('a','b').by('name').by()
+g.V().as('a').values('location').as('b').
+ select('a','b').by('name').by().explain()
----
This strategy is implemented such that the vertices attached to an `Edge` must both satisfy the `vertexCriterion`
(if present) in order for the `Edge` to be considered a part of the subgraph.
+
+<1> Get all vertices and their vertex property locations.
+<2> Create a `SubgraphStrategy` where vertex properties must not have an `endTime`-property (thus, the current location).
+<3> Get all vertices and their current vertex property locations.
\ No newline at end of file
[42/44] tinkerpop git commit: Merge branch 'pr-438' into tp31
Posted by sp...@apache.org.
Merge branch 'pr-438' into tp31
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bdef1a4c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bdef1a4c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bdef1a4c
Branch: refs/heads/TINKERPOP-944
Commit: bdef1a4c281c328bc25bc9168f442145360a7eb1
Parents: 762f6b2 3cbd371
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 28 12:53:46 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 28 12:53:46 2016 -0400
----------------------------------------------------------------------
docs/src/reference/gremlin-applications.asciidoc | 4 ++--
gremlin-console/src/main/bin/gremlin.sh | 4 ++--
gremlin-driver/src/main/bin/config-eval.sh | 4 ++--
gremlin-driver/src/main/bin/profile-driver.sh | 4 ++--
gremlin-server/src/main/bin/gremlin-server.sh | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bdef1a4c/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
[27/44] tinkerpop git commit: used the new
TraversalHelper.copyLabels() in RepeatUnrollStrategy and got rid of a
stream().
Posted by sp...@apache.org.
used the new TraversalHelper.copyLabels() in RepeatUnrollStrategy and got rid of a stream().
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6b1a2d9e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6b1a2d9e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6b1a2d9e
Branch: refs/heads/TINKERPOP-944
Commit: 6b1a2d9e879dff813199a474e07639762f426b43
Parents: de31baa
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Sep 26 08:46:27 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
.../strategy/optimization/RepeatUnrollStrategy.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b1a2d9e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategy.java
index f996ec5..9e1a98d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategy.java
@@ -19,7 +19,6 @@
package org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization;
-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.lambda.LoopTraversal;
@@ -61,11 +60,8 @@ public final class RepeatUnrollStrategy extends AbstractTraversalStrategy<Traver
traversal.addStep(++insertIndex, new NoOpBarrierStep<>(traversal, 5000));
}
// label last step if repeat() was labeled
- if (!repeatStep.getLabels().isEmpty()) {
- final Step<?, ?> lastStep = traversal.getSteps().get(insertIndex);
- repeatStep.getLabels().forEach(lastStep::addLabel);
- }
-
+ if (!repeatStep.getLabels().isEmpty())
+ TraversalHelper.copyLabels(repeatStep, traversal.getSteps().get(insertIndex), false);
traversal.removeStep(i); // remove the RepeatStep
}
}
[13/44] tinkerpop git commit: more tests to
MatchPredicateStrategyTest -- as()-pullouts on where()-inserts works.
Posted by sp...@apache.org.
more tests to MatchPredicateStrategyTest -- as()-pullouts on where()-inserts works.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e237d9c0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e237d9c0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e237d9c0
Branch: refs/heads/TINKERPOP-944
Commit: e237d9c0791f3a7d25dc6b1450246b3c087902b1
Parents: 36f3add
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Sep 27 08:57:04 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
.../strategy/optimization/MatchPredicateStrategy.java | 6 +++++-
.../strategy/optimization/MatchPredicateStrategyTest.java | 6 ++++--
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e237d9c0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategy.java
index a93dcd9..28e5677 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategy.java
@@ -21,6 +21,8 @@ package org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization;
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.DefaultGraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupGlobalStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.WherePredicateStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTraversalStep;
@@ -72,7 +74,9 @@ public final class MatchPredicateStrategy extends AbstractTraversalStrategy<Trav
(nextStep instanceof SelectOneStep && ((SelectOneStep) nextStep).getLocalChildren().isEmpty())) {
if (nextStep instanceof WherePredicateStep || nextStep instanceof WhereTraversalStep) {
traversal.removeStep(nextStep);
- matchStep.addGlobalChild(new DefaultTraversal<>().addStep(nextStep));
+ matchStep.addGlobalChild(traversal instanceof GraphTraversal ?
+ new DefaultGraphTraversal<>().addStep(nextStep) :
+ new DefaultTraversal<>().addStep(nextStep));
nextStep = matchStep.getNextStep();
} else if (nextStep instanceof DedupGlobalStep && !((DedupGlobalStep) nextStep).getScopeKeys().isEmpty() && ((DedupGlobalStep) nextStep).getLocalChildren().isEmpty() && !TraversalHelper.onGraphComputer(traversal)) {
traversal.removeStep(nextStep);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e237d9c0/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategyTest.java
index 509004c..8037bd6 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/MatchPredicateStrategyTest.java
@@ -24,6 +24,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -33,6 +34,7 @@ import java.util.Collection;
import java.util.Collections;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.as;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.has;
import static org.junit.Assert.assertEquals;
/**
@@ -75,8 +77,8 @@ public class MatchPredicateStrategyTest {
{__.match(as("a").out().as("b"), __.where(as("b").out("knows").as("c"))), __.match(as("a").out().as("b"), as("b").where(__.out("knows").as("c"))), Collections.emptyList()}, // make as().where()
{__.match(as("a").out().as("b"), __.where("a", P.gt("b"))), __.match(as("a").out().as("b"), __.as("a").where(P.gt("b"))), Collections.emptyList()}, // make as().where()
/////////
- // {__.match(as("a").out().as("b")).where(as("b").out("knows").as("c")), __.match(as("a").out().as("b"), as("b").where(__.out("knows").as("c"))), Collections.emptyList()}, // make as().where()
- // {__.match(as("a").out().as("b")).where("a", P.gt("b")), __.match(as("a").out().as("b"), __.as("a").where(P.gt("b"))), Collections.emptyList()}, // make as().where()
+ {__.match(as("a").out().as("b")).where(as("b").filter(has("name")).out("knows").as("c")), __.match(as("a").out().as("b"), as("b").where(has("name").out("knows").as("c"))), Collections.singletonList(InlineFilterStrategy.instance())}, // make as().where()
+ {__.match(as("a").out().as("b")).where("a", P.gt("b")), __.match(as("a").out().as("b"), as("a").where(P.gt("b"))), Collections.emptyList()}, // make as().where()
});
}
[07/44] tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp31'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/817961f5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/817961f5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/817961f5
Branch: refs/heads/TINKERPOP-944
Commit: 817961f5c9a4d752be95731c6692016db7406c10
Parents: 3bb8fc9 ac55bd0
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Sep 24 20:47:36 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Sep 24 20:47:36 2016 -0400
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/server/auth/AllowAllAuthenticator.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
[15/44] tinkerpop git commit: SubgraphStrategy no longer
filter()-wraps criteria if the criteria is a chain of filters or connectives.
This ensures that has() folds to VertexStep and VertexEdgeSteps -- by most
providers.
Posted by sp...@apache.org.
SubgraphStrategy no longer filter()-wraps criteria if the criteria is a chain of filters or connectives. This ensures that has() folds to VertexStep and VertexEdgeSteps -- by most providers.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4f727b8d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4f727b8d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4f727b8d
Branch: refs/heads/TINKERPOP-944
Commit: 4f727b8dee3907f7aceed35827d9cfa087f16c1d
Parents: 9338e49
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Sep 20 15:05:12 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../strategy/decoration/SubgraphStrategy.java | 110 +++++++++++++++----
.../decoration/SubgraphStrategyProcessTest.java | 8 +-
3 files changed, 96 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4f727b8d/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 0eef92f..1ff27b2 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -29,6 +29,7 @@ TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET)
* Fixed a bug in `TraversalVertexProgram` (OLAP) around ordering and connectives (i.e. `and()` and `or()`).
* Added `AbstractGremlinProcessTest.checkOrderedResults()` to make testing ordered results easier.
* `AbstractLambdaTraversal` now supports a `bypassTraversal` and thus, it is possible for strategies to redefine such lambda traversals.
+* `SubgraphStrategy` no longer `filter()`-wraps if the criteria is a chain of filters or connectives.
* `SubgraphStrategy` now supports vertex property filtering.
* Fixed a bug in Gremlin-Python `P` where predicates reversed the order of the predicates.
* Added tests to `DedupTest` for the `dedup(Scope, String...)` overload.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4f727b8d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index 475a3d7..de7649d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -24,6 +24,8 @@ import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.ElementValueTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConnectiveStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.FilterStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.LambdaFilterStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.OrStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStep;
@@ -48,7 +50,9 @@ import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
+import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -68,24 +72,47 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
private final Traversal.Admin<Vertex, ?> vertexCriterion;
private final Traversal.Admin<Edge, ?> edgeCriterion;
private final Traversal.Admin<VertexProperty, ?> vertexPropertyCriterion;
+
+ private final boolean vertexCriterionIsAllFilter;
+ private final boolean edgeCriterionIsAllFilter;
+ private final boolean vertexPropertyCriterionIsAllFilter;
+
+ private static final Set<Class<? extends DecorationStrategy>> POSTS = Collections.singleton(ConnectiveStrategy.class);
+
private final String MARKER = Graph.Hidden.hide(UUID.randomUUID().toString());
private SubgraphStrategy(final Traversal<Vertex, ?> vertexCriterion, final Traversal<Edge, ?> edgeCriterion, final Traversal<VertexProperty, ?> vertexPropertyCriterion) {
+ this.vertexCriterionIsAllFilter = isAllFilters(vertexCriterion);
+ this.edgeCriterionIsAllFilter = isAllFilters(edgeCriterion);
+ this.vertexPropertyCriterionIsAllFilter = isAllFilters(vertexPropertyCriterion);
+
+
this.vertexCriterion = null == vertexCriterion ? null : vertexCriterion.asAdmin();
// if there is no vertex predicate there is no need to test either side of the edge
if (null == this.vertexCriterion) {
this.edgeCriterion = null == edgeCriterion ? null : edgeCriterion.asAdmin();
} else {
- final Traversal.Admin<Edge, ?> vertexPredicate = __.<Edge>and(
- __.inV().filter(this.vertexCriterion.clone()),
- __.outV().filter(this.vertexCriterion.clone())).asAdmin();
+ final Traversal.Admin<Edge, ?> vertexPredicate;
+ if (this.vertexCriterionIsAllFilter) {
+ final Traversal.Admin<Edge, Vertex> left = __.<Edge>inV().asAdmin();
+ final Traversal.Admin<Edge, Vertex> right = __.<Edge>outV().asAdmin();
+ TraversalHelper.insertTraversal(0, this.vertexCriterion.clone(), left);
+ TraversalHelper.insertTraversal(0, this.vertexCriterion.clone(), right);
+ vertexPredicate = __.<Edge>and(left, right).asAdmin();
+ } else
+ vertexPredicate = __.<Edge>and(
+ __.inV().filter(this.vertexCriterion.clone()),
+ __.outV().filter(this.vertexCriterion.clone())).asAdmin();
// if there is a vertex predicate then there is an implied edge filter on vertices even if there is no
// edge predicate provided by the user.
if (null == edgeCriterion)
this.edgeCriterion = vertexPredicate;
- else
+ else if (this.edgeCriterionIsAllFilter) {
+ this.edgeCriterion = edgeCriterion.asAdmin();
+ TraversalHelper.insertTraversal(this.edgeCriterion.getSteps().size() - 1, vertexPredicate, this.edgeCriterion);
+ } else
this.edgeCriterion = edgeCriterion.asAdmin().addStep(new TraversalFilterStep<>(edgeCriterion.asAdmin(), vertexPredicate));
}
@@ -99,6 +126,16 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
this.metadataLabelStartStep(this.vertexPropertyCriterion);
}
+ private static final boolean isAllFilters(final Traversal<?, ?> traversal) {
+ if (null == traversal)
+ return false;
+ for (final Step<?, ?> step : traversal.asAdmin().getSteps()) {
+ if (!(step instanceof FilterStep || step instanceof ConnectiveStep))
+ return false;
+ }
+ return true;
+ }
+
private final void metadataLabelStartStep(final Traversal.Admin<?, ?> traversal) {
traversal.getStartStep().addLabel(MARKER);
for (final Step<?, ?> step : traversal.getSteps()) {
@@ -126,7 +163,7 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
vertexStepsToInsertFilterAfter.addAll(TraversalHelper.getStepsOfAssignableClass(AddVertexStep.class, traversal));
vertexStepsToInsertFilterAfter.addAll(TraversalHelper.getStepsOfAssignableClass(AddVertexStartStep.class, traversal));
vertexStepsToInsertFilterAfter.addAll(graphSteps.stream().filter(GraphStep::returnsVertex).collect(Collectors.toList()));
- applyCriterion(vertexStepsToInsertFilterAfter, traversal, this.vertexCriterion);
+ applyCriterion(vertexStepsToInsertFilterAfter, traversal, this.vertexCriterion, this.vertexCriterionIsAllFilter);
}
if (null != this.edgeCriterion) {
@@ -134,7 +171,7 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
edgeStepsToInsertFilterAfter.addAll(TraversalHelper.getStepsOfAssignableClass(AddEdgeStep.class, traversal));
edgeStepsToInsertFilterAfter.addAll(graphSteps.stream().filter(GraphStep::returnsEdge).collect(Collectors.toList()));
edgeStepsToInsertFilterAfter.addAll(vertexSteps.stream().filter(VertexStep::returnsEdge).collect(Collectors.toList()));
- applyCriterion(edgeStepsToInsertFilterAfter, traversal, this.edgeCriterion);
+ applyCriterion(edgeStepsToInsertFilterAfter, traversal, this.edgeCriterion, this.edgeCriterionIsAllFilter);
}
// turn g.V().out() to g.V().outE().inV() only if there is an edge predicate otherwise
@@ -142,7 +179,10 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
if (step.returnsEdge())
continue;
if (null != this.vertexCriterion && null == edgeCriterion) {
- TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, (Traversal) this.vertexCriterion.clone()), step, traversal);
+ if (this.vertexCriterionIsAllFilter)
+ TraversalHelper.insertTraversal((Step) step, this.vertexCriterion.clone(), traversal);
+ else
+ TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, (Traversal) this.vertexCriterion.clone()), step, traversal);
} else {
final VertexStep<Edge> someEStep = new VertexStep<>(traversal, Edge.class, step.getDirection(), step.getEdgeLabels());
final Step<Edge, Vertex> someVStep = step.getDirection() == Direction.BOTH ?
@@ -158,18 +198,28 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
}
if (null != this.edgeCriterion)
- TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, this.edgeCriterion.clone()), someEStep, traversal);
+ if (this.edgeCriterionIsAllFilter)
+ TraversalHelper.insertTraversal(someEStep, this.edgeCriterion.clone(), traversal);
+ else
+ TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, this.edgeCriterion.clone()), someEStep, traversal);
if (null != this.vertexCriterion)
- TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, this.vertexCriterion.clone()), someVStep, traversal);
+ if (this.edgeCriterionIsAllFilter)
+ TraversalHelper.insertTraversal(someVStep, this.vertexCriterion.clone(), traversal);
+ else
+ TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, this.vertexCriterion.clone()), someVStep, traversal);
+
+
}
}
// turn g.V().properties() to g.V().properties().xxx
// turn g.V().values() to g.V().properties().xxx.value()\
if (null != this.vertexPropertyCriterion) {
- final OrStep<Object> wrappedCriterion = new OrStep<>(traversal,
+ final OrStep<Object> wrappedCriterion = new OrStep(traversal,
new DefaultTraversal<>().addStep(new LambdaFilterStep<>(traversal, t -> !(t.get() instanceof VertexProperty))),
- new DefaultTraversal<>().addStep(new TraversalFilterStep<>(traversal, this.vertexPropertyCriterion.clone())));
+ this.vertexPropertyCriterionIsAllFilter ?
+ this.vertexPropertyCriterion.clone() :
+ new DefaultTraversal<>().addStep(new TraversalFilterStep<>(traversal, this.vertexPropertyCriterion.clone())));
// turn all ElementValueTraversals into filters
for (final Step<?, ?> step : traversal.getSteps()) {
// gremlin> g.V().local(properties('name','stateOfMind').group().by(key()).by(value().fold()))
@@ -178,9 +228,12 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
.filter(t -> t instanceof ElementValueTraversal)
.forEach(t -> {
final Traversal.Admin<?, ?> temp = new DefaultTraversal<>();
- temp.addStep(new PropertiesStep<>(temp, PropertyType.VALUE, ((ElementValueTraversal) t).getPropertyKey()));
- temp.setParent((TraversalParent)step);
+ temp.addStep(new PropertiesStep<>(temp, PropertyType.PROPERTY, ((ElementValueTraversal) t).getPropertyKey()));
+ temp.addStep(wrappedCriterion.clone());
+ temp.addStep(new PropertyValueStep<>(temp));
+ temp.setParent((TraversalParent) step);
((ElementValueTraversal) t).setBypassTraversal(temp);
+ ((TraversalParent) step).integrateChild(temp);
});
}
}
@@ -208,8 +261,16 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
}
}
}
+ // when there is no filter()-wrap, the marked steps exist at the same traversal level
+ for (final Step step : traversal.getSteps()) {
+ step.removeLabel(MARKER);
+ }
}
+ @Override
+ public Set<Class<? extends DecorationStrategy>> applyPost() {
+ return POSTS;
+ }
public Traversal<Vertex, ?> getVertexCriterion() {
return this.vertexCriterion;
@@ -229,15 +290,24 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
}
private void applyCriterion(final List<Step> stepsToApplyCriterionAfter, final Traversal.Admin traversal,
- final Traversal.Admin<? extends Element, ?> criterion) {
+ final Traversal.Admin<? extends Element, ?> criterion, final boolean isAllFilter) {
for (final Step<?, ?> step : stepsToApplyCriterionAfter) {
- // re-assign the step label to the criterion because the label should apply seamlessly after the filter
- final Step filter = new TraversalFilterStep<>(traversal, criterion.clone());
- for (final String label : step.getLabels()) {
- step.removeLabel(label);
- filter.addLabel(label);
+ if (isAllFilter) {
+ final Traversal.Admin<? extends Element, ?> criterionClone = criterion.clone();
+ for (final String label : step.getLabels()) {
+ step.removeLabel(label);
+ criterionClone.getEndStep().addLabel(label);
+ }
+ TraversalHelper.insertTraversal((Step) step, criterionClone, traversal);
+ } else {
+ // re-assign the step label to the criterion because the label should apply seamlessly after the filter
+ final Step filter = new TraversalFilterStep<>(traversal, criterion.clone());
+ for (final String label : step.getLabels()) {
+ step.removeLabel(label);
+ filter.addLabel(label);
+ }
+ TraversalHelper.insertAfterStep(filter, step, traversal);
}
- TraversalHelper.insertAfterStep(filter, step, traversal);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4f727b8d/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index e303281..c5b2d5a 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -26,9 +26,10 @@ import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStep;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -47,6 +48,7 @@ import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsCollectionContaining.hasItems;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -374,11 +376,12 @@ public class SubgraphStrategyProcessTest extends AbstractGremlinProcessTest {
GraphTraversalSource sg = create(SubgraphStrategy.build().vertexProperties(has("startTime", P.gt(2005))).create());
checkResults(Arrays.asList("purcellville", "baltimore", "oakland", "seattle", "aachen"), sg.V().properties("location").value());
checkResults(Arrays.asList("purcellville", "baltimore", "oakland", "seattle", "aachen"), sg.V().values("location"));
+ assertFalse(TraversalHelper.hasStepOfAssignableClassRecursively(TraversalFilterStep.class, sg.V().properties("location").value().iterate().asAdmin()));
// check to make sure edge properties are not analyzed
sg = create(SubgraphStrategy.build().vertexProperties(has("startTime", P.gt(2005))).create());
checkResults(Arrays.asList("purcellville", "baltimore", "oakland", "seattle", "aachen"), sg.V().as("a").properties("location").as("b").select("a").outE().properties().select("b").value().dedup());
checkResults(Arrays.asList("purcellville", "baltimore", "oakland", "seattle", "aachen"), sg.V().as("a").values("location").as("b").select("a").outE().properties().select("b").dedup());
- //
+ assertFalse(TraversalHelper.hasStepOfAssignableClassRecursively(TraversalFilterStep.class, sg.V().as("a").values("location").as("b").select("a").outE().properties().select("b").dedup().iterate().asAdmin()));
//
sg = create(SubgraphStrategy.build().vertices(has("name", P.neq("stephen"))).vertexProperties(has("startTime", P.gt(2005))).create());
checkResults(Arrays.asList("baltimore", "oakland", "seattle", "aachen"), sg.V().properties("location").value());
@@ -389,7 +392,6 @@ public class SubgraphStrategyProcessTest extends AbstractGremlinProcessTest {
checkResults(Arrays.asList("baltimore", "oakland", "seattle"), sg.V().values("location"));
//
sg = create(SubgraphStrategy.build().vertices(has("name", P.eq("matthias"))).vertexProperties(has("startTime", P.gte(2014))).create());
- System.out.println(sg.V().groupCount().by("location").explain());
checkResults(makeMapList(1, "seattle", 1L), sg.V().groupCount().by("location"));
//
sg = create(SubgraphStrategy.build().vertices(has("location")).vertexProperties(hasNot("endTime")).create());
[18/44] tinkerpop git commit: PropertyMapStep now supports a
propertyTraversal for accessing properties from the element.
ConnectiveStrategy will concatenate two AND traversals if they are both
filter based. SubgraphStrategy now handles valueMap() and pr
Posted by sp...@apache.org.
PropertyMapStep now supports a propertyTraversal for accessing properties from the element. ConnectiveStrategy will concatenate two AND traversals if they are both filter based. SubgraphStrategy now handles valueMap() and propertyMap() correctly. Added TraversalHelper.isAllFilters() to check if a traversal is completely filter-based.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1745e4c2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1745e4c2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1745e4c2
Branch: refs/heads/TINKERPOP-944
Commit: 1745e4c205dc34402c1eb52e8bca571b405de0ac
Parents: 81e92c0
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Sep 21 14:11:47 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 27 12:45:49 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 4 +-
.../lambda/AbstractLambdaTraversal.java | 4 +-
.../traversal/step/filter/ClassFilterStep.java | 15 ++-
.../traversal/step/map/PropertyMapStep.java | 97 +++++++++++++++-----
.../strategy/decoration/ConnectiveStrategy.java | 13 ++-
.../strategy/decoration/SubgraphStrategy.java | 31 ++++---
.../process/traversal/util/TraversalHelper.java | 11 ++-
.../decoration/SubgraphStrategyProcessTest.java | 9 ++
8 files changed, 130 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1745e4c2/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 0c7ab91..0c546c5 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,8 +28,10 @@ TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET)
* Fixed a bug in `TraversalVertexProgram` (OLAP) around ordering and connectives (i.e. `and()` and `or()`).
* Added `AbstractGremlinProcessTest.checkOrderedResults()` to make testing ordered results easier.
-* `AbstractLambdaTraversal` now supports a `bypassTraversal` and thus, it is possible for strategies to redefine such lambda traversals.
+* `AbstractLambdaTraversal` now supports a `bypassTraversal` where it is possible for strategies to redefine such lambda traversals.
* Added an internal utility `ClassFilterStep` which determines if the traverser object's class is an instance of the provided class.
+* `ConnectiveStrategy` will concatenate two traversals instead of and'ing them if they are both filter-based.
+* `PropertyMapStep` supports a provided traversal for accessing the properties of the element.
* `SubgraphStrategy` no longer `filter()`-wraps if the criteria is a chain of filters or connectives.
* `SubgraphStrategy` now supports vertex property filtering.
* Fixed a bug in Gremlin-Python `P` where predicates reversed the order of the predicates.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1745e4c2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java
index b2335b9..8f910a0 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java
@@ -113,8 +113,10 @@ public abstract class AbstractLambdaTraversal<S, E> implements Traversal.Admin<S
@Override
public void setParent(final TraversalParent step) {
- if (null != this.bypassTraversal)
+ if (null != this.bypassTraversal) {
this.bypassTraversal.setParent(step);
+ step.integrateChild(this.bypassTraversal);
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1745e4c2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ClassFilterStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ClassFilterStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ClassFilterStep.java
index 1652005..13f2aac 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ClassFilterStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ClassFilterStep.java
@@ -29,26 +29,23 @@ import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
public final class ClassFilterStep<S, T> extends FilterStep<S> {
private final Class<T> classFilter;
- private final boolean isInstanceCheck;
+ private final boolean allowClasses;
- public ClassFilterStep(final Traversal.Admin traversal, final Class<T> classFilter, final boolean isInstanceCheck) {
+ public ClassFilterStep(final Traversal.Admin traversal, final Class<T> classFilter, final boolean allowClasses) {
super(traversal);
this.classFilter = classFilter;
- this.isInstanceCheck = isInstanceCheck;
+ this.allowClasses = allowClasses;
}
public boolean filter(final Traverser.Admin<S> traverser) {
- return !(this.isInstanceCheck ?
- this.classFilter.isInstance(traverser.get()) :
- this.classFilter.equals(traverser.get().getClass()));
-
+ return this.allowClasses == this.classFilter.isInstance(traverser.get());
}
public int hashCode() {
- return super.hashCode() ^ this.classFilter.hashCode() + Boolean.valueOf(this.isInstanceCheck).hashCode();
+ return super.hashCode() ^ this.classFilter.hashCode() ^ Boolean.hashCode(this.allowClasses);
}
public String toString() {
- return StringFactory.stepString(this, this.classFilter);
+ return StringFactory.stepString(this, this.classFilter.getSimpleName());
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1745e4c2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyMapStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyMapStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyMapStep.java
index 8e4e110..d10b12b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyMapStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyMapStep.java
@@ -20,56 +20,84 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
-import org.apache.tinkerpop.gremlin.structure.*;
-import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.PropertyType;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class PropertyMapStep<E> extends MapStep<Element, Map<String, E>> {
+public class PropertyMapStep<E> extends MapStep<Element, Map<String, E>> implements TraversalParent {
protected final String[] propertyKeys;
protected final PropertyType returnType;
protected final boolean includeTokens;
+ protected Traversal.Admin<Element, ? extends Property> propertyTraversal;
public PropertyMapStep(final Traversal.Admin traversal, final boolean includeTokens, final PropertyType propertyType, final String... propertyKeys) {
super(traversal);
this.includeTokens = includeTokens;
this.propertyKeys = propertyKeys;
this.returnType = propertyType;
+ this.propertyTraversal = null;
}
@Override
protected Map<String, E> map(final Traverser.Admin<Element> traverser) {
- if (this.returnType.equals(PropertyType.VALUE)) {
- final Element element = traverser.get();
- final Map map = traverser.get() instanceof Vertex ?
- (Map) ElementHelper.vertexPropertyValueMap((Vertex) element, propertyKeys) :
- (Map) ElementHelper.propertyValueMap(element, propertyKeys);
- if (includeTokens) {
- if (element instanceof VertexProperty) {
- map.put(T.id, element.id());
- map.put(T.key, ((VertexProperty) element).key());
- map.put(T.value, ((VertexProperty) element).value());
- } else {
- map.put(T.id, element.id());
- map.put(T.label, element.label());
+ final Map<Object, Object> map = new HashMap<>();
+ final Element element = traverser.get();
+ final boolean isVertex = traverser.get() instanceof Vertex;
+ final Iterator<? extends Property> properties = null == this.propertyTraversal ?
+ (Iterator) element.properties(this.propertyKeys) :
+ TraversalUtil.applyAll(traverser, this.propertyTraversal);
+ while (properties.hasNext()) {
+ final Property property = properties.next();
+ if (isVertex) {
+ List values = (List) map.get(property.key());
+ if (null == values) {
+ values = new ArrayList();
+ map.put(property.key(), values);
}
+ values.add(this.returnType == PropertyType.VALUE ? property.value() : property);
+ } else
+ map.put(property.key(), this.returnType == PropertyType.VALUE ? property.value() : property);
+ }
+ if (this.returnType == PropertyType.VALUE && this.includeTokens) {
+ if (element instanceof VertexProperty) {
+ map.put(T.id, element.id());
+ map.put(T.key, ((VertexProperty) element).key());
+ map.put(T.value, ((VertexProperty) element).value());
+ } else {
+ map.put(T.id, element.id());
+ map.put(T.label, element.label());
}
- return map;
-
- } else {
- return traverser.get() instanceof Vertex ?
- (Map) ElementHelper.vertexPropertyMap((Vertex) traverser.get(), propertyKeys) :
- (Map) ElementHelper.propertyMap(traverser.get(), propertyKeys);
}
+ return (Map) map;
+ }
+
+ @Override
+ public List<Traversal.Admin<Element, ? extends Property>> getLocalChildren() {
+ return null == this.propertyTraversal ? Collections.emptyList() : Collections.singletonList(this.propertyTraversal);
+ }
+
+ public void setPropertyTraversal(final Traversal.Admin<Element, ? extends Property> propertyTraversal) {
+ this.propertyTraversal = this.integrateChild(propertyTraversal);
}
public PropertyType getReturnType() {
@@ -89,16 +117,35 @@ public class PropertyMapStep<E> extends MapStep<Element, Map<String, E>> {
}
@Override
+ public PropertyMapStep<E> clone() {
+ final PropertyMapStep<E> clone = (PropertyMapStep<E>) super.clone();
+ if (null != this.propertyTraversal)
+ clone.propertyTraversal = this.propertyTraversal.clone();
+ return clone;
+ }
+
+ @Override
public int hashCode() {
int result = super.hashCode() ^ this.returnType.hashCode() ^ Boolean.hashCode(this.includeTokens);
- for (final String propertyKey : this.propertyKeys) {
- result ^= propertyKey.hashCode();
+ if (null == this.propertyTraversal) {
+ for (final String propertyKey : this.propertyKeys) {
+ result ^= propertyKey.hashCode();
+ }
+ } else {
+ result ^= this.propertyTraversal.hashCode();
}
return result;
}
@Override
+ public void setTraversal(final Traversal.Admin<?, ?> parentTraversal) {
+ super.setTraversal(parentTraversal);
+ if (null != this.propertyTraversal)
+ this.integrateChild(this.propertyTraversal);
+ }
+
+ @Override
public Set<TraverserRequirement> getRequirements() {
- return Collections.singleton(TraverserRequirement.OBJECT);
+ return this.getSelfAndChildRequirements(TraverserRequirement.OBJECT);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1745e4c2/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
index 7ec1742..8627a70 100644
--- 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
@@ -104,10 +104,15 @@ public final class ConnectiveStrategy extends AbstractTraversalStrategy<Traversa
}
processConnectiveMarker(leftTraversal);
- TraversalHelper.replaceStep(connectiveStep,
- connectiveStep instanceof AndStep ?
- new AndStep(traversal, leftTraversal, rightTraversal) :
- new OrStep(traversal, leftTraversal, rightTraversal), traversal);
+ if (connectiveStep instanceof AndStep) {
+ if (TraversalHelper.filterOnlyTraversal(leftTraversal) && TraversalHelper.filterOnlyTraversal(rightTraversal)) {
+ TraversalHelper.insertTraversal((Step) connectiveStep, rightTraversal, traversal);
+ TraversalHelper.insertTraversal((Step) connectiveStep, leftTraversal, traversal);
+ } else
+ TraversalHelper.replaceStep((Step) connectiveStep, new AndStep(traversal, leftTraversal, rightTraversal), traversal);
+
+ } else
+ TraversalHelper.replaceStep((Step) connectiveStep, new OrStep(traversal, leftTraversal, rightTraversal), traversal);
});
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1745e4c2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index 5e92bc1..d34f142 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -36,6 +36,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeOtherVertexSt
import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeVertexStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyMapStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyValueStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
@@ -216,24 +217,30 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
// turn g.V().values() to g.V().properties().xxx.value()\
if (null != this.vertexPropertyCriterion) {
final OrStep<Object> wrappedCriterion = new OrStep(traversal,
- new DefaultTraversal<>().addStep(new ClassFilterStep<>(traversal, VertexProperty.class, true)),
+ new DefaultTraversal<>().addStep(new ClassFilterStep<>(traversal, VertexProperty.class, false)),
this.vertexPropertyCriterionIsAllFilter ?
this.vertexPropertyCriterion.clone() :
new DefaultTraversal<>().addStep(new TraversalFilterStep<>(traversal, this.vertexPropertyCriterion.clone())));
// turn all ElementValueTraversals into filters
for (final Step<?, ?> step : traversal.getSteps()) {
if (step instanceof TraversalParent) {
- Stream.concat(((TraversalParent) step).getGlobalChildren().stream(), ((TraversalParent) step).getLocalChildren().stream())
- .filter(t -> t instanceof ElementValueTraversal)
- .forEach(t -> {
- final Traversal.Admin<?, ?> temp = new DefaultTraversal<>();
- temp.addStep(new PropertiesStep<>(temp, PropertyType.PROPERTY, ((ElementValueTraversal) t).getPropertyKey()));
- temp.addStep(wrappedCriterion.clone());
- temp.addStep(new PropertyValueStep<>(temp));
- temp.setParent((TraversalParent) step);
- ((ElementValueTraversal) t).setBypassTraversal(temp);
- ((TraversalParent) step).integrateChild(temp);
- });
+ if (step instanceof PropertyMapStep) {
+ final Traversal.Admin<?, ?> temp = new DefaultTraversal<>();
+ temp.addStep(new PropertiesStep<>(temp, PropertyType.PROPERTY, ((PropertyMapStep) step).getPropertyKeys()));
+ temp.addStep(wrappedCriterion.clone());
+ ((PropertyMapStep) step).setPropertyTraversal(temp);
+ } else {
+ Stream.concat(((TraversalParent) step).getGlobalChildren().stream(), ((TraversalParent) step).getLocalChildren().stream())
+ .filter(t -> t instanceof ElementValueTraversal)
+ .forEach(t -> {
+ final Traversal.Admin<?, ?> temp = new DefaultTraversal<>();
+ temp.addStep(new PropertiesStep<>(temp, PropertyType.PROPERTY, ((ElementValueTraversal) t).getPropertyKey()));
+ temp.addStep(wrappedCriterion.clone());
+ temp.addStep(new PropertyValueStep<>(temp));
+ temp.setParent((TraversalParent) step);
+ ((ElementValueTraversal) t).setBypassTraversal(temp);
+ });
+ }
}
}
for (final PropertiesStep<?> step : TraversalHelper.getStepsOfAssignableClass(PropertiesStep.class, traversal)) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1745e4c2/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 14c0b5f..2000a92 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
@@ -22,8 +22,6 @@ import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.Traversa
import org.apache.tinkerpop.gremlin.process.traversal.Scope;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.ElementValueTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.TokenTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.ByModulating;
@@ -32,6 +30,7 @@ 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.ConnectiveStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.FilterStep;
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;
@@ -571,4 +570,12 @@ public final class TraversalHelper {
traversal.removeStep(0);
}
}
+
+ public static boolean filterOnlyTraversal(final Traversal.Admin<?, ?> traversal) {
+ for (final Step step : traversal.getSteps()) {
+ if (!(step instanceof FilterStep) && !(step instanceof ConnectiveStep))
+ return false;
+ }
+ return true;
+ }
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1745e4c2/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index c5b2d5a..fe50d20 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -28,6 +28,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSo
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStep;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
+import org.apache.tinkerpop.gremlin.structure.Column;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
@@ -396,6 +397,14 @@ public class SubgraphStrategyProcessTest extends AbstractGremlinProcessTest {
//
sg = create(SubgraphStrategy.build().vertices(has("location")).vertexProperties(hasNot("endTime")).create());
checkOrderedResults(Arrays.asList("aachen", "purcellville", "santa fe", "seattle"), sg.V().order().by("location", Order.incr).values("location"));
+ //
+ sg = create(SubgraphStrategy.build().vertices(has("location")).vertexProperties(hasNot("endTime")).create());
+ checkResults(Arrays.asList("aachen", "purcellville", "santa fe", "seattle"), sg.V().valueMap("location").select(Column.values).unfold().unfold());
+ checkResults(Arrays.asList("aachen", "purcellville", "santa fe", "seattle"), sg.V().propertyMap("location").select(Column.values).unfold().unfold().value());
+ //
+ sg = create(SubgraphStrategy.build().edges(__.<Edge>hasLabel("uses").has("skill", 5)).create());
+ checkResults(Arrays.asList(5, 5, 5), sg.V().outE().valueMap().select(Column.values).unfold());
+ checkResults(Arrays.asList(5, 5, 5), sg.V().outE().propertyMap().select(Column.values).unfold().value());
}
[10/44] tinkerpop git commit: Merge branch 'TINKERPOP-927-master'
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-927-master'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/619aba51
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/619aba51
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/619aba51
Branch: refs/heads/TINKERPOP-944
Commit: 619aba512525cd499f108c997ae9550a8803a870
Parents: 6faf9e2 8d718bb
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Sep 27 19:49:48 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Sep 27 19:49:48 2016 +0200
----------------------------------------------------------------------
bin/publish-docs.awk | 31 ++++++++++++++++++++++++++++++
bin/publish-docs.sh | 48 +++++++++++++++++++++++++++++------------------
2 files changed, 61 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
[44/44] tinkerpop git commit: Deprecate
Graph.Exceptions.elementNotFound()
Posted by sp...@apache.org.
Deprecate Graph.Exceptions.elementNotFound()
This exception wasn't used in the code base at all except for tests. Seems best to just deprecate (in case a graph provider is publically using it). Didn't change the nature of the tests that were using this method, so this should be a non-breaking change.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7a4a836d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7a4a836d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7a4a836d
Branch: refs/heads/TINKERPOP-944
Commit: 7a4a836d80b30444a0dcfc0814efba6cd3f172e4
Parents: d80d69c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Sep 24 20:23:59 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 28 12:56:43 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../src/upgrade/release-3.2.x-incubating.asciidoc | 18 +++++++++++++++++-
.../apache/tinkerpop/gremlin/structure/Graph.java | 12 ++++++++++++
.../tinkerpop/gremlin/structure/GraphTest.java | 6 ++++--
.../gremlin/structure/TransactionTest.java | 3 ++-
5 files changed, 36 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7a4a836d/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index c8b7577..47d4bbf 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -49,6 +49,7 @@ TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET)
* Fixed a naming bug in Gremlin-Python where `P._and` and `P._or` should be `P.and_` and `P.or_`. (*breaking*)
* `where()` predicate-based steps now support `by()`-modulation.
* `TraversalRing` returns a `null` if it does not contain traversals (previously `IdentityTraversal`).
+* Deprecated `Graph.Exceptions.elementNotFoundException()` as it was not used in the code base outside of the test suite.
* Fixed a `JavaTranslator` bug where `Bytecode` instructions were being mutated during translation.
* Added `Path` to Gremlin-Python with respective GraphSON 2.0 deserializer.
* Added "keep-alive" functionality to the Java driver, which will send a heartbeat to the server when normal request activity on a connection stops for a period of time.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7a4a836d/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index 89a63ed..a6be1c6 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -121,8 +121,24 @@ support no arguments.
Upgrading for Providers
~~~~~~~~~~~~~~~~~~~~~~~
+Graph System Providers
+^^^^^^^^^^^^^^^^^^^^^^
+
+Deprecated elementNotFound
+++++++++++++++++++++++++++
+
+Both `Graph.Exceptions.elementNotFound()` methods have been deprecated. These exceptions were being asserted in the
+test suite but were not being used anywhere in `gremlin-core` itself. The assertions have been modified to simply
+assert that `NoSuchElementException` was thrown, which is precisely the behavior that was being indirected asserted
+when `Graph.Exceptions.elementNotFound()` were being used.
+
+Providers should not need to take any action in this case for their tests to pass, however, it would be wise to remove
+uses of these exception builders as they will be removed in the future.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-944[TINKERPOP-944]
+
PropertyMapStep with Selection Traversal
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+++++++++++++++++++++++++++++++++++++++++
`PropertyMapStep` now supports selection of properties via child property traversal. If a provider was relying solely
on the provided property keys in a `ProviderOptimizationStrategy`, they will need to check if there is a child traversal
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7a4a836d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
index c82ccd5..01379f4 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
@@ -1160,12 +1160,24 @@ public interface Graph extends AutoCloseable, Host {
return new IllegalArgumentException(String.format("The provided argument can not be null: %s", argument));
}
+ /**
+ * Deprecated as of 3.2.3, not replaced.
+ *
+ * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-944">TINKERPOP-944</a>
+ */
+ @Deprecated
public static NoSuchElementException elementNotFound(final Class<? extends Element> elementClass, final Object id) {
return (null == id) ?
new NoSuchElementException("The " + elementClass.getSimpleName().toLowerCase() + " with id null does not exist in the graph") :
new NoSuchElementException("The " + elementClass.getSimpleName().toLowerCase() + " with id " + id + " of type " + id.getClass().getSimpleName() + " does not exist in the graph");
}
+ /**
+ * Deprecated as of 3.2.3, not replaced.
+ *
+ * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-944">TINKERPOP-944</a>
+ */
+ @Deprecated
public static NoSuchElementException elementNotFound(final Class<? extends Element> elementClass, final Object id, final Exception rootCause) {
NoSuchElementException elementNotFoundException;
if (null == id)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7a4a836d/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java
index 6b703b2..a667e6f 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java
@@ -29,6 +29,7 @@ import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceFactory;
import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.hamcrest.core.IsInstanceOf;
import org.junit.Test;
import java.lang.reflect.Method;
@@ -37,6 +38,7 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.NoSuchElementException;
import java.util.Random;
import java.util.Set;
import java.util.UUID;
@@ -99,7 +101,7 @@ public class GraphTest extends AbstractGremlinTest {
graph.vertices(graphProvider.convertId(10000l, Vertex.class)).next();
fail("Call to g.vertices(10000l) should throw an exception");
} catch (Exception ex) {
- assertThat(ex, instanceOf(Graph.Exceptions.elementNotFound(Vertex.class, graphProvider.convertId(10000l, Vertex.class)).getClass()));
+ assertThat(ex, IsInstanceOf.instanceOf(NoSuchElementException.class));
}
}
@@ -109,7 +111,7 @@ public class GraphTest extends AbstractGremlinTest {
graph.edges(graphProvider.convertId(10000l, Edge.class)).next();
fail("Call to g.edges(10000l) should throw an exception");
} catch (Exception ex) {
- assertThat(ex, instanceOf(Graph.Exceptions.elementNotFound(Edge.class, graphProvider.convertId(10000l, Edge.class)).getClass()));
+ assertThat(ex, IsInstanceOf.instanceOf(NoSuchElementException.class));
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7a4a836d/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/TransactionTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/TransactionTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/TransactionTest.java
index 9ec7e04..2b953ab 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/TransactionTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/TransactionTest.java
@@ -28,6 +28,7 @@ import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.junit.Test;
import java.util.HashSet;
+import java.util.NoSuchElementException;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
@@ -413,7 +414,7 @@ public class TransactionTest extends AbstractGremlinTest {
graph.vertices(oid.get()).next();
fail("Vertex should not be found as close behavior was set to rollback");
} catch (Exception ex) {
- validateException(Graph.Exceptions.elementNotFound(Vertex.class, oid), ex);
+ assertThat(ex, instanceOf(NoSuchElementException.class));
}
}