You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2017/09/18 22:26:50 UTC
[1/3] tinkerpop git commit: added better error message for RepeatStep
usage errors.
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 b2850f3f1 -> 05f4f590e
added better error message for RepeatStep usage errors.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b28701f7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b28701f7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b28701f7
Branch: refs/heads/tp32
Commit: b28701f7c660c87b05edee3404a66c2fb3671089
Parents: c59393f
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Sep 11 11:56:20 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Sep 11 11:56:20 2017 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../gremlin/process/traversal/step/branch/RepeatStep.java | 8 ++++++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b28701f7/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index c15835c..6876fde 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.7 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Added better error message for illegal use of `repeat()`-step.
* Bump to Jackson 2.8.10.
* Added an `EmbeddedRemoteConnection` so that it's possible to mimic a remote connection within the same JVM.
* The Console's `plugin.txt` file is only updated if there were manually uninstalled plugins.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b28701f7/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java
index 0fc2cdd..15c8be1 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java
@@ -91,6 +91,8 @@ public final class RepeatStep<S> extends ComputerAwareStep<S, S> implements Trav
}
public Traversal.Admin<S, S> getRepeatTraversal() {
+ if(null == this.repeatTraversal)
+ throw new IllegalStateException("The repeat()-traversal was not defined: " + this);
return this.repeatTraversal;
}
@@ -181,6 +183,9 @@ public final class RepeatStep<S> extends ComputerAwareStep<S, S> implements Trav
@Override
protected Iterator<Traverser.Admin<S>> standardAlgorithm() throws NoSuchElementException {
+ if(null == this.repeatTraversal)
+ throw new IllegalStateException("The repeat()-traversal was not defined: " + this);
+
while (true) {
if (this.repeatTraversal.getEndStep().hasNext()) {
return this.repeatTraversal.getEndStep();
@@ -202,6 +207,9 @@ public final class RepeatStep<S> extends ComputerAwareStep<S, S> implements Trav
@Override
protected Iterator<Traverser.Admin<S>> computerAlgorithm() throws NoSuchElementException {
+ if(null == this.repeatTraversal)
+ throw new IllegalStateException("The repeat()-traversal was not defined: " + this);
+
final Traverser.Admin<S> start = this.starts.next();
if (doUntil(start, true)) {
start.resetLoops();
[3/3] tinkerpop git commit: Merge branch 'TINKERPOP-1746' into tp32
Posted by ok...@apache.org.
Merge branch 'TINKERPOP-1746' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/05f4f590
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/05f4f590
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/05f4f590
Branch: refs/heads/tp32
Commit: 05f4f590ebffc21936391dd436f3afdaf944fd01
Parents: b2850f3 53db262
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Sep 18 16:26:39 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Sep 18 16:26:39 2017 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../gremlin/process/traversal/step/branch/RepeatStep.java | 6 ++++++
.../traversal/strategy/optimization/RepeatUnrollStrategy.java | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05f4f590/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 70d6134,6876fde..2b526df
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,9 -26,9 +26,10 @@@ image::https://raw.githubusercontent.co
TinkerPop 3.2.7 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * Added better error message for illegal use of `repeat()`-step.
* Bump to Jackson 2.8.10.
* Added an `EmbeddedRemoteConnection` so that it's possible to mimic a remote connection within the same JVM.
+* Supported interruption for remote traversals.
* The Console's `plugin.txt` file is only updated if there were manually uninstalled plugins.
* Fixed a bug in `MatchStep` where mid-traversal `where()` variables were not being considered in start-scope.
* Generalized `MatchStep` to locally compute all clauses with barriers (not just reducing barriers).
[2/3] tinkerpop git commit: removed the Exception handling in the
getRepeatTraversal() per @dkuppitz comment. Yes,
it was stupid to throw the exception there -- lazy, dumb thinking on my part.
Posted by ok...@apache.org.
removed the Exception handling in the getRepeatTraversal() per @dkuppitz comment. Yes, it was stupid to throw the exception there -- lazy, dumb thinking on my part.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/53db2625
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/53db2625
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/53db2625
Branch: refs/heads/tp32
Commit: 53db262511e9d84b1262522fc841ded825df4fc6
Parents: b28701f
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Sep 13 09:50:26 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Sep 13 09:50:26 2017 -0600
----------------------------------------------------------------------
.../gremlin/process/traversal/step/branch/RepeatStep.java | 6 ++----
.../traversal/strategy/optimization/RepeatUnrollStrategy.java | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/53db2625/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java
index 15c8be1..bf2c203 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java
@@ -91,8 +91,6 @@ public final class RepeatStep<S> extends ComputerAwareStep<S, S> implements Trav
}
public Traversal.Admin<S, S> getRepeatTraversal() {
- if(null == this.repeatTraversal)
- throw new IllegalStateException("The repeat()-traversal was not defined: " + this);
return this.repeatTraversal;
}
@@ -183,7 +181,7 @@ public final class RepeatStep<S> extends ComputerAwareStep<S, S> implements Trav
@Override
protected Iterator<Traverser.Admin<S>> standardAlgorithm() throws NoSuchElementException {
- if(null == this.repeatTraversal)
+ if (null == this.repeatTraversal)
throw new IllegalStateException("The repeat()-traversal was not defined: " + this);
while (true) {
@@ -207,7 +205,7 @@ public final class RepeatStep<S> extends ComputerAwareStep<S, S> implements Trav
@Override
protected Iterator<Traverser.Admin<S>> computerAlgorithm() throws NoSuchElementException {
- if(null == this.repeatTraversal)
+ if (null == this.repeatTraversal)
throw new IllegalStateException("The repeat()-traversal was not defined: " + this);
final Traverser.Admin<S> start = this.starts.next();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/53db2625/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 078e749..aaf1a55 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
@@ -56,7 +56,7 @@ public final class RepeatUnrollStrategy extends AbstractTraversalStrategy<Traver
for (int i = 0; i < traversal.getSteps().size(); i++) {
if (traversal.getSteps().get(i) instanceof RepeatStep) {
final RepeatStep<?> repeatStep = (RepeatStep) traversal.getSteps().get(i);
- if (null == repeatStep.getEmitTraversal() &&
+ if (null == repeatStep.getEmitTraversal() && null != repeatStep.getRepeatTraversal() &&
repeatStep.getUntilTraversal() instanceof LoopTraversal && ((LoopTraversal) repeatStep.getUntilTraversal()).getMaxLoops() > 0 &&
!TraversalHelper.hasStepOfAssignableClassRecursively(Scope.global, DedupGlobalStep.class, repeatStep.getRepeatTraversal()) &&
!TraversalHelper.hasStepOfAssignableClassRecursively(INVALIDATING_STEPS, repeatStep.getRepeatTraversal())) {