You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2017/12/15 21:32:31 UTC

[24/39] tinkerpop git commit: TINKERPOP-1846 Fixed bug in LambdaRestrictionStrategy

TINKERPOP-1846 Fixed bug in LambdaRestrictionStrategy

Traversals using Lambda scripts were not triggering this strategy. The strategy expected the word "lambda" in the toString() of the step that held it. Lambda objects weren't including that word.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f5f4a046
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f5f4a046
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f5f4a046

Branch: refs/heads/TINKERPOP-1447
Commit: f5f4a046f211851e901d303c6593975314171e55
Parents: 7cde98c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Nov 30 09:26:51 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Nov 30 09:26:51 2017 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc                                                | 1 +
 .../java/org/apache/tinkerpop/gremlin/util/function/Lambda.java   | 2 +-
 .../strategy/verification/LambdaRestrictionStrategyTest.java      | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f5f4a046/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8e29593..8a9f1fa 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Added core GraphSON classes for Gremlin-Python: `UUID`, `Date`, and `Timestamp`.
 * Provided a method to configure detachment options with `EventStrategy`.
 * Fixed a race condition in `TinkerIndex`.
+* Fixed bug in `LambdaRestrictionStrategy` where traversals using `Lambda` scripts weren't causing the strategy to trigger.
 * Improved error messaging for bytecode deserialization errors in Gremlin Server.
 * Fixed an `ArrayOutOfBoundsException` in `hasId()` for the rare situation when the provided collection is empty.
 * Bump to Netty 4.0.53

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f5f4a046/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/Lambda.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/Lambda.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/Lambda.java
index a259eb3..1031156 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/Lambda.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/Lambda.java
@@ -66,7 +66,7 @@ public interface Lambda extends Serializable {
 
         @Override
         public String toString() {
-            return this.lambdaSource;
+            return "lambda[" + this.lambdaSource + "]";
         }
 
         @Override

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f5f4a046/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/LambdaRestrictionStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/LambdaRestrictionStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/LambdaRestrictionStrategyTest.java
index 767211c..b79d2c9 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/LambdaRestrictionStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/LambdaRestrictionStrategyTest.java
@@ -29,6 +29,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrat
 import org.apache.tinkerpop.gremlin.structure.Column;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.util.function.Lambda;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -50,6 +51,8 @@ public class LambdaRestrictionStrategyTest {
     @Parameterized.Parameters(name = "{0}")
     public static Iterable<Object[]> data() {
         return Arrays.asList(new Object[][]{
+                {"map(Lambda.function('true')}", __.map(Lambda.function("true")), false},
+                {"filter(Lambda.predicate('true')}", __.filter(Lambda.predicate("true")), false},
                 {"filter(x->true)", __.filter(x -> true), false},
                 {"map(Traverser::get)", __.map(Traverser::get), false},
                 {"sideEffect(x -> {int i = 1+1;})", __.sideEffect(x -> {