tinkerpop git commit: bla

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST 730eb293a -> 232c9987f


bla


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

Branch: refs/heads/TRAVIS-TEST
Commit: 232c9987f09f1ecd1db13a8df41700efa5bcf1a5
Parents: 730eb29
Author: Daniel Kuppitz 
Authored: Fri Mar 9 20:18:11 2018 -0700
Committer: Daniel Kuppitz 
Committed: Fri Mar 9 20:18:11 2018 -0700

--
 .../strategy/decoration/SubgraphStrategyProcessTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/232c9987/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 b62396f..1cc6222 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
@@ -267,7 +267,7 @@ public class SubgraphStrategyProcessTest extends 
AbstractGremlinProcessTest {
 final GraphTraversalSource sg = g.withStrategies(strategy);
 
 // three vertices are included in the subgraph
-assertEquals(6, g.V().count().next().longValue());
+/*assertEquals(6, g.V().count().next().longValue());
 assertEquals(3, sg.V().count().next().longValue());
 
 // three edges are explicitly included as we ignore checking of 
adjacent vertices
@@ -288,7 +288,7 @@ public class SubgraphStrategyProcessTest extends 
AbstractGremlinProcessTest {
 
 assertEquals(3, 
g.V(convertToVertexId("josh")).bothE().count().next().longValue());
 assertEquals(2, 
sg.V(convertToVertexId("josh")).bothE().count().next().longValue());
-assertEquals(3, 
g.V(convertToVertexId("josh")).both().count().next().longValue());
+assertEquals(3, 
g.V(convertToVertexId("josh")).both().count().next().longValue());*/
 final Traversal t = 
sg.V(convertToVertexId("josh")).both().count();
 try {
 assertEquals(2, t.next().longValue());

[tinkerpop] Git Push Summary [forced push!] [Forced Update!]

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1896 3cc8ba957 -> 8e23f5b12 (forced update)

tinkerpop git commit: Force Travis rebuild

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1896 8e23f5b12 -> 3cc8ba957


Force Travis rebuild


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

Branch: refs/heads/TINKERPOP-1896
Commit: 3cc8ba95786c2956b6a01416ecb6b96cf966f629
Parents: 8e23f5b
Author: Stephen Mallette 
Authored: Fri Mar 9 14:37:32 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 9 14:37:32 2018 -0500

--

--

tinkerpop git commit: bla

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST 531932715 -> 730eb293a


bla


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

Branch: refs/heads/TRAVIS-TEST
Commit: 730eb293a7e9b4b0dc011ab5cb3d4d31dff6cad4
Parents: 5319327
Author: Daniel Kuppitz 
Authored: Fri Mar 9 11:49:54 2018 -0700
Committer: Daniel Kuppitz 
Committed: Fri Mar 9 11:49:54 2018 -0700

--
 .../strategy/decoration/SubgraphStrategyProcessTest.java | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/730eb293/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 2565770..b62396f 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
@@ -289,8 +289,12 @@ public class SubgraphStrategyProcessTest extends 
AbstractGremlinProcessTest {
 assertEquals(3, 
g.V(convertToVertexId("josh")).bothE().count().next().longValue());
 assertEquals(2, 
sg.V(convertToVertexId("josh")).bothE().count().next().longValue());
 assertEquals(3, 
g.V(convertToVertexId("josh")).both().count().next().longValue());
-assertEquals(2, 
sg.V(convertToVertexId("josh")).both().count().next().longValue());
-
+final Traversal t = 
sg.V(convertToVertexId("josh")).both().count();
+try {
+assertEquals(2, t.next().longValue());
+} catch (IllegalStateException ex) {
+  throw new IllegalStateException(t.toString(), ex);
+}
 // marko not present directly because of vertexCriterion - only 
accessible via vertices in the subgraph
 assertEquals(1, 
g.V(convertToVertexId("marko")).count().next().longValue());
 assertEquals(0, 
sg.V(convertToVertexId("marko")).count().next().longValue());

tinkerpop git commit: bla

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST c8741e562 -> 531932715


bla


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

Branch: refs/heads/TRAVIS-TEST
Commit: 53193271596caecf3384c278772fc35210df8473
Parents: c8741e5
Author: Daniel Kuppitz 
Authored: Fri Mar 9 11:26:10 2018 -0700
Committer: Daniel Kuppitz 
Committed: Fri Mar 9 11:26:10 2018 -0700

--
 .../process/traversal/strategy/decoration/SubgraphStrategy.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/53193271/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 548e14e..241129b 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
@@ -93,8 +93,8 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy vertexPredicate;
 vertexPredicate = __.and(
-__.inV().filter(this.vertexCriterion.clone()),
-__.outV().filter(this.vertexCriterion).clone()).asAdmin();
+__.inV().filter(this.vertexCriterion.asAdmin().clone()),
+
__.outV().filter(this.vertexCriterion).asAdmin().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.

tinkerpop git commit: trying to fix Travis build

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST [created] c8741e562


trying to fix Travis build


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

Branch: refs/heads/TRAVIS-TEST
Commit: c8741e5624f604b5fa3afcb467cb00609d417347
Parents: b4013a2
Author: Daniel Kuppitz 
Authored: Fri Mar 9 11:19:50 2018 -0700
Committer: Daniel Kuppitz 
Committed: Fri Mar 9 11:19:50 2018 -0700

--
 .../traversal/strategy/decoration/SubgraphStrategy.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c8741e56/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 e0d260f..548e14e 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
@@ -93,8 +93,8 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy vertexPredicate;
 vertexPredicate = __.and(
-__.inV().filter(this.vertexCriterion),
-__.outV().filter(this.vertexCriterion)).asAdmin();
+__.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.
@@ -386,4 +386,4 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy

[45/50] tinkerpop git commit: Merge branch 'TINKERPOP-1738' into tp32

[dkuppitz]

Merge branch 'TINKERPOP-1738' into tp32


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

Branch: refs/heads/TINKERPOP-1447
Commit: 7bff988961587c0bcf9644b520faa3ed72a79952
Parents: 03a96f8 f35f04a
Author: Stephen Mallette 
Authored: Thu Mar 8 07:22:04 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 8 07:22:04 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../io/graphson/GraphSONTypeSerializer.java | 94 ++--
 ...aphSONMapperV2d0PartialEmbeddedTypeTest.java | 32 +++
 gremlin-shaded/pom.xml  |  2 +-
 4 files changed, 61 insertions(+), 68 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7bff9889/CHANGELOG.asciidoc
--

[28/50] tinkerpop git commit: Created issue for ignored GLV test in .NET CTR

[dkuppitz]

Created issue for ignored GLV test in .NET CTR


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

Branch: refs/heads/TINKERPOP-1447
Commit: 8ef717f6c0e04161e43c87a83f67ada0f5e60349
Parents: 153f852
Author: Stephen Mallette 
Authored: Thu Mar 1 10:31:56 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 10:31:56 2018 -0500

--
 .../test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8ef717f6/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index c2a8850..f3e823a 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -40,7 +40,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 private static readonly IDictionary 
IgnoredScenarios = new Dictionary {
 { 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
 { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
-{ "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation }
+{ "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation } // TINKERPOP-1907
 };
 
 private static class Keywords

[14/50] tinkerpop git commit: Revert "Updating kitchen sink graph"

[dkuppitz]

Revert "Updating kitchen sink graph"

This reverts commit febe0ac8ecdf1828233017864b629a644c7260a8.


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

Branch: refs/heads/TINKERPOP-1447
Commit: b0b124b84c597079b271adb0dec2044f0c2ec9b3
Parents: f03c4df
Author: Graff, Philip B 
Authored: Sun Feb 25 16:15:40 2018 -0500
Committer: Graff, Philip B 
Committed: Sun Feb 25 16:15:40 2018 -0500

--
 data/tinkerpop-sink-typed.json  |   2 --
 data/tinkerpop-sink-v2d0-typed.json |   2 --
 data/tinkerpop-sink-v2d0.json   |   2 --
 data/tinkerpop-sink.json|   2 --
 data/tinkerpop-sink.kryo| Bin 291 -> 76 bytes
 5 files changed, 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0b124b8/data/tinkerpop-sink-typed.json
--
diff --git a/data/tinkerpop-sink-typed.json b/data/tinkerpop-sink-typed.json
index 1bbdcff..f62a717 100644
--- a/data/tinkerpop-sink-typed.json
+++ b/data/tinkerpop-sink-typed.json
@@ -1,3 +1 @@
 
{"@class":"java.util.HashMap","id":["java.lang.Long",0],"label":"loops","inE":{"@class":"java.util.HashMap","self":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",2],"outV":["java.lang.Long",0]}]]},"outE":{"@class":"java.util.HashMap","self":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",2],"inV":["java.lang.Long",0]}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",1],"value":"loop"}]]}}
-{"@class":"java.util.HashMap","id":["java.lang.Long",1],"label":"message_passing_test","inE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",6],"outV":["java.lang.Long",1]}]]},"outE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",5],"inV":["java.lang.Long",2]},{"@class":"java.util.HashMap","id":["java.lang.Long",6],"inV":["java.lang.Long",1]}]]},"properties":{"@class":"java.util.HashMap","propertyin":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",3],"value":"a"}]]}}
-{"@class":"java.util.HashMap","id":["java.lang.Long",2],"label":"message_passing_test","inE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",5],"outV":["java.lang.Long",1]}]]},"properties":{"@class":"java.util.HashMap","propertyin":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",4],"value":"b"}]]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0b124b8/data/tinkerpop-sink-v2d0-typed.json
--
diff --git a/data/tinkerpop-sink-v2d0-typed.json 
b/data/tinkerpop-sink-v2d0-typed.json
index ecb5c52..df22167 100644
--- a/data/tinkerpop-sink-v2d0-typed.json
+++ b/data/tinkerpop-sink-v2d0-typed.json
@@ -1,3 +1 @@
 
{"id":{"@type":"g:Int64","@value":0},"label":"loops","inE":{"self":[{"id":{"@type":"g:Int64","@value":2},"outV":{"@type":"g:Int64","@value":0}}]},"outE":{"self":[{"id":{"@type":"g:Int64","@value":2},"inV":{"@type":"g:Int64","@value":0}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1},"value":"loop"}]}}
-{"id":{"@type":"g:Int64","@value":1},"label":"message_passing_test","inE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int64","@value":6},"outV":{"@type":"g:Int64","@value":1}}]},"outE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int64","@value":5},"inV":{"@type":"g:Int64","@value":2}},{"id":{"@type":"g:Int64","@value":6},"inV":{"@type":"g:Int64","@value":1}}]},"properties":{"propertyin":[{"id":{"@type":"g:Int64","@value":3},"value":"a"}]}}
-{"id":{"@type":"g:Int64","@value":2},"label":"message_passing_test","inE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int64","@value":5},"outV":{"@type":"g:Int64","@value":1}}]},"properties":{"propertyin":[{"id":{"@type":"g:Int64","@value":4},"value":"b"}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0b124b8/data/tinkerpop-sink-v2d0.json
--
diff --git a/data/tinkerpop-sink-v2d0.json b/data/tinkerpop-sink-v2d0.json
index 1eade99..39496ba 100644
--- a/data/tinkerpop-sink-v2d0.json
+++ b/data/tinkerpop-sink-v2d0.json
@@ -1,3 +1 @@
 
{"id":0,"label":"loops","inE":{"self":[{"id":2,"outV":0}]},"outE":{"self":[{"id":2,"inV":0}]},"properties":{"name":[{"id":1,"value":"loop"}]}}

[1/2] tinkerpop git commit: TINKERPOP-1908 Bump to Groovy 2.4.14

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 97fb12e79 -> 552820a0c


TINKERPOP-1908 Bump to Groovy 2.4.14


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

Branch: refs/heads/tp32
Commit: f409564bb1d59b3b9d09e130bf56a0da48c771f3
Parents: a61dd58
Author: Stephen Mallette 
Authored: Fri Mar 2 06:52:09 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 11:59:36 2018 -0500

--
 CHANGELOG.asciidoc   | 1 +
 .../jsr223/GremlinGroovyScriptEngineCompileStaticTest.java   | 4 ++--
 .../groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java  | 4 ++--
 .../tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java | 2 +-
 .../tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java | 2 +-
 pom.xml  | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f409564b/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a24b1fb..f73e063 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 [[release-3-2-8]]
 === TinkerPop 3.2.8 (Release Date: NOT OFFICIALLY RELEASED YET)
 
+* Bumped to Groovy 2.4.14.
 * Added `checkAdjacentVertices` option to `SubgraphStrategy`.
 * Modified `GremlinDslProcessor` so that it generated the 
`getAnonymousTraversalClass()` method to return the DSL version of `__`.
 * Added the "Kitchen Sink" test data set.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f409564b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java
--
diff --git 
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java
 
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java
index 6f3383e..0007925 100644
--- 
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java
+++ 
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java
@@ -48,7 +48,7 @@ public class GremlinGroovyScriptEngineCompileStaticTest {
 } catch (ScriptException se) {
 final Throwable root = ExceptionUtils.getRootCause(se);
 assertEquals(MultipleCompilationErrorsException.class, 
root.getClass());
-assertThat(se.getMessage(), containsString("[Static type checking] 
- Cannot find matching method java.lang.Object#getRed(). Please check if the 
declared type is right and if the method exists."));
+assertThat(se.getMessage(), containsString("[Static type checking] 
- Cannot find matching method java.lang.Object#getRed(). Please check if the 
declared type is correct and if the method exists."));
 }
 }
 
@@ -66,7 +66,7 @@ public class GremlinGroovyScriptEngineCompileStaticTest {
 } catch (ScriptException se) {
 final Throwable root = ExceptionUtils.getRootCause(se);
 assertEquals(MultipleCompilationErrorsException.class, 
root.getClass());
-assertThat(se.getMessage(), containsString("[Static type checking] 
- Cannot find matching method java.lang.Object#getRed(). Please check if the 
declared type is right and if the method exists."));
+assertThat(se.getMessage(), containsString("[Static type checking] 
- Cannot find matching method java.lang.Object#getRed(). Please check if the 
declared type is correct and if the method exists."));
 }
 }
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f409564b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java
--
diff --git 
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java
 
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java
index 6c70e8e..a0c6b0c 100644
--- 
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java
+++ 

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

[spmallette]

Merge branch 'tp32' into tp33

Conflicts:

gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java

gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java


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

Branch: refs/heads/tp33
Commit: 02e47ff9634b15f99ef331e80a227ddd3617ae2e
Parents: 4c75266 552820a
Author: Stephen Mallette 
Authored: Fri Mar 9 11:05:37 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 9 11:05:37 2018 -0500

--
 CHANGELOG.asciidoc | 1 +
 .../groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java  | 2 +-
 .../groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java| 2 +-
 .../tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java   | 2 +-
 .../tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java   | 2 +-
 pom.xml| 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/pom.xml
--

[1/3] tinkerpop git commit: TINKERPOP-1908 Bump to Groovy 2.4.14

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 4c7526689 -> 02e47ff96


TINKERPOP-1908 Bump to Groovy 2.4.14


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

Branch: refs/heads/tp33
Commit: f409564bb1d59b3b9d09e130bf56a0da48c771f3
Parents: a61dd58
Author: Stephen Mallette 
Authored: Fri Mar 2 06:52:09 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 11:59:36 2018 -0500

--
 CHANGELOG.asciidoc   | 1 +
 .../jsr223/GremlinGroovyScriptEngineCompileStaticTest.java   | 4 ++--
 .../groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java  | 4 ++--
 .../tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java | 2 +-
 .../tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java | 2 +-
 pom.xml  | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f409564b/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a24b1fb..f73e063 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 [[release-3-2-8]]
 === TinkerPop 3.2.8 (Release Date: NOT OFFICIALLY RELEASED YET)
 
+* Bumped to Groovy 2.4.14.
 * Added `checkAdjacentVertices` option to `SubgraphStrategy`.
 * Modified `GremlinDslProcessor` so that it generated the 
`getAnonymousTraversalClass()` method to return the DSL version of `__`.
 * Added the "Kitchen Sink" test data set.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f409564b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java
--
diff --git 
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java
 
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java
index 6f3383e..0007925 100644
--- 
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java
+++ 
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java
@@ -48,7 +48,7 @@ public class GremlinGroovyScriptEngineCompileStaticTest {
 } catch (ScriptException se) {
 final Throwable root = ExceptionUtils.getRootCause(se);
 assertEquals(MultipleCompilationErrorsException.class, 
root.getClass());
-assertThat(se.getMessage(), containsString("[Static type checking] 
- Cannot find matching method java.lang.Object#getRed(). Please check if the 
declared type is right and if the method exists."));
+assertThat(se.getMessage(), containsString("[Static type checking] 
- Cannot find matching method java.lang.Object#getRed(). Please check if the 
declared type is correct and if the method exists."));
 }
 }
 
@@ -66,7 +66,7 @@ public class GremlinGroovyScriptEngineCompileStaticTest {
 } catch (ScriptException se) {
 final Throwable root = ExceptionUtils.getRootCause(se);
 assertEquals(MultipleCompilationErrorsException.class, 
root.getClass());
-assertThat(se.getMessage(), containsString("[Static type checking] 
- Cannot find matching method java.lang.Object#getRed(). Please check if the 
declared type is right and if the method exists."));
+assertThat(se.getMessage(), containsString("[Static type checking] 
- Cannot find matching method java.lang.Object#getRed(). Please check if the 
declared type is correct and if the method exists."));
 }
 }
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f409564b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java
--
diff --git 
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java
 
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java
index 6c70e8e..a0c6b0c 100644
--- 
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java
+++ 

[2/3] tinkerpop git commit: Merge branch 'TINKERPOP-1908' into tp32

[spmallette]

Merge branch 'TINKERPOP-1908' into tp32


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

Branch: refs/heads/tp33
Commit: 552820a0c2539c94ce9e9621913baf4c5aafe2d5
Parents: 97fb12e f409564
Author: Stephen Mallette 
Authored: Fri Mar 9 10:28:29 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 9 10:28:29 2018 -0500

--
 CHANGELOG.asciidoc   | 1 +
 .../jsr223/GremlinGroovyScriptEngineCompileStaticTest.java   | 4 ++--
 .../groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java  | 4 ++--
 .../tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java | 2 +-
 .../tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java | 2 +-
 pom.xml  | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/552820a0/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/552820a0/pom.xml
--

[2/4] tinkerpop git commit: Merge branch 'TINKERPOP-1908' into tp32

[spmallette]

Merge branch 'TINKERPOP-1908' into tp32


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

Branch: refs/heads/master
Commit: 552820a0c2539c94ce9e9621913baf4c5aafe2d5
Parents: 97fb12e f409564
Author: Stephen Mallette 
Authored: Fri Mar 9 10:28:29 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 9 10:28:29 2018 -0500

--
 CHANGELOG.asciidoc   | 1 +
 .../jsr223/GremlinGroovyScriptEngineCompileStaticTest.java   | 4 ++--
 .../groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java  | 4 ++--
 .../tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java | 2 +-
 .../tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java | 2 +-
 pom.xml  | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/552820a0/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/552820a0/pom.xml
--

[3/4] tinkerpop git commit: Merge branch 'tp32' into tp33

[spmallette]

Merge branch 'tp32' into tp33

Conflicts:

gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java

gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java


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

Branch: refs/heads/master
Commit: 02e47ff9634b15f99ef331e80a227ddd3617ae2e
Parents: 4c75266 552820a
Author: Stephen Mallette 
Authored: Fri Mar 9 11:05:37 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 9 11:05:37 2018 -0500

--
 CHANGELOG.asciidoc | 1 +
 .../groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java  | 2 +-
 .../groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java| 2 +-
 .../tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java   | 2 +-
 .../tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java   | 2 +-
 pom.xml| 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/pom.xml
--

[4/4] tinkerpop git commit: Merge branch 'tp33'

[spmallette]

Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: b4013a2ac4c858f8e4cbd9d13d83e584f7e64be6
Parents: c559679 02e47ff
Author: Stephen Mallette 
Authored: Fri Mar 9 11:05:47 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 9 11:05:47 2018 -0500

--
 CHANGELOG.asciidoc | 1 +
 .../groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java  | 2 +-
 .../groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java| 2 +-
 .../tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java   | 2 +-
 .../tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java   | 2 +-
 pom.xml| 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b4013a2a/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b4013a2a/pom.xml
--

[1/4] tinkerpop git commit: TINKERPOP-1908 Bump to Groovy 2.4.14

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master c55967938 -> b4013a2ac


TINKERPOP-1908 Bump to Groovy 2.4.14


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

Branch: refs/heads/master
Commit: f409564bb1d59b3b9d09e130bf56a0da48c771f3
Parents: a61dd58
Author: Stephen Mallette 
Authored: Fri Mar 2 06:52:09 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 11:59:36 2018 -0500

--
 CHANGELOG.asciidoc   | 1 +
 .../jsr223/GremlinGroovyScriptEngineCompileStaticTest.java   | 4 ++--
 .../groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java  | 4 ++--
 .../tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java | 2 +-
 .../tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java | 2 +-
 pom.xml  | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f409564b/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a24b1fb..f73e063 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 [[release-3-2-8]]
 === TinkerPop 3.2.8 (Release Date: NOT OFFICIALLY RELEASED YET)
 
+* Bumped to Groovy 2.4.14.
 * Added `checkAdjacentVertices` option to `SubgraphStrategy`.
 * Modified `GremlinDslProcessor` so that it generated the 
`getAnonymousTraversalClass()` method to return the DSL version of `__`.
 * Added the "Kitchen Sink" test data set.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f409564b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java
--
diff --git 
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java
 
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java
index 6f3383e..0007925 100644
--- 
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java
+++ 
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java
@@ -48,7 +48,7 @@ public class GremlinGroovyScriptEngineCompileStaticTest {
 } catch (ScriptException se) {
 final Throwable root = ExceptionUtils.getRootCause(se);
 assertEquals(MultipleCompilationErrorsException.class, 
root.getClass());
-assertThat(se.getMessage(), containsString("[Static type checking] 
- Cannot find matching method java.lang.Object#getRed(). Please check if the 
declared type is right and if the method exists."));
+assertThat(se.getMessage(), containsString("[Static type checking] 
- Cannot find matching method java.lang.Object#getRed(). Please check if the 
declared type is correct and if the method exists."));
 }
 }
 
@@ -66,7 +66,7 @@ public class GremlinGroovyScriptEngineCompileStaticTest {
 } catch (ScriptException se) {
 final Throwable root = ExceptionUtils.getRootCause(se);
 assertEquals(MultipleCompilationErrorsException.class, 
root.getClass());
-assertThat(se.getMessage(), containsString("[Static type checking] 
- Cannot find matching method java.lang.Object#getRed(). Please check if the 
declared type is right and if the method exists."));
+assertThat(se.getMessage(), containsString("[Static type checking] 
- Cannot find matching method java.lang.Object#getRed(). Please check if the 
declared type is correct and if the method exists."));
 }
 }
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f409564b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java
--
diff --git 
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java
 
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java
index 6c70e8e..a0c6b0c 100644
--- 
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java
+++ 

[34/50] tinkerpop git commit: TINKERPOP-1862 Updated changelog

[dkuppitz]

TINKERPOP-1862 Updated changelog


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

Branch: refs/heads/TINKERPOP-1447
Commit: 7956b481b459a9998401abc8b02322f256a73ae7
Parents: 26a5770
Author: Stephen Mallette 
Authored: Fri Mar 2 11:33:21 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 11:33:21 2018 -0500

--
 CHANGELOG.asciidoc | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7956b481/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 60e0ef4..ca1053e 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -29,6 +29,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Fixed a bug in `NumberHelper` that led to wrong min/max results if numbers 
exceeded the Integer limits.
 * Delayed setting of the request identifier until `RequestMessage` 
construction by the builder.
 * Improved error messaging for failed serialization and deserialization of 
request/response messages.
+* Fixed handling of `Direction.BOTH` in `Messenger` implementations to pass 
the message to the opposite side of the `StarGraph`.
 * Removed hardcoded expectation in metrics serialization test suite as 
different providers may have different outputs.
 * Added `IndexedTraverserSet` which indexes on the value of a `Traverser` thus 
improving performance when used.
 * Utilized `IndexedTraverserSet` in `TraversalVertexProgram` to avoid extra 
iteration when doing `Vertex` lookups.

[44/50] tinkerpop git commit: Removed some dead/println code from test CTR

[dkuppitz]

Removed some dead/println code from test CTR


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

Branch: refs/heads/TINKERPOP-1447
Commit: 03a96f89609b7a84e10b2c02e35f022b6fd1e05e
Parents: c1de9f2
Author: Stephen Mallette 
Authored: Wed Mar 7 15:05:12 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Mar 7 15:08:27 2018 -0500

--
 .../process/computer/SparkMessengerTest.java| 21 
 1 file changed, 4 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/03a96f89/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkMessengerTest.java
--
diff --git 
a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkMessengerTest.java
 
b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkMessengerTest.java
index c280ab2..17224a1 100644
--- 
a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkMessengerTest.java
+++ 
b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkMessengerTest.java
@@ -19,11 +19,9 @@
 
 package org.apache.tinkerpop.gremlin.spark.process.computer;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.tinkerpop.gremlin.process.computer.MessageScope;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
 import org.apache.tinkerpop.gremlin.spark.AbstractSparkTest;
-import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
@@ -33,29 +31,22 @@ import scala.Tuple2;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.function.BiFunction;
 
 /**
  * @author Dean Zhu
  */
 public class SparkMessengerTest extends AbstractSparkTest {
-private static ObjectMapper objectmapper = new ObjectMapper();
 
 @Test
 public void testSparkMessenger() throws Exception {
 // Define scopes
 final MessageScope.Local orderSrcMessageScope = 
MessageScope.Local
-.of(__::inE, new BiFunction() {
-@Override
-public String apply(String message, Edge edge) {
-System.out.println(edge);
-if ("mocked_edge_label1".equals(edge.label())) {
-return message;
-}
-return null;
+.of(__::inE, (message, edge) -> {
+if ("mocked_edge_label1".equals(edge.label())) {
+return message;
 }
+return null;
 });
-final MessageScope.Local inMessageScope = 
MessageScope.Local.of(__::inE);
 
 // Define star graph
 final StarGraph starGraph = StarGraph.open();
@@ -75,12 +66,8 @@ public class SparkMessengerTest extends AbstractSparkTest {
 
 messenger.sendMessage(orderSrcMessageScope, "a");
 List> outgoingMessages0 = 
messenger.getOutgoingMessages();
-System.out.println(objectmapper.writeValueAsString(outgoingMessages0));
 
 Assert.assertEquals("a", outgoingMessages0.get(0)._2());
 Assert.assertNull(outgoingMessages0.get(1)._2());
-//messenger.sendMessage(inMessageScope, "a");
-//List> outgoingMessages1 = 
messenger.getOutgoingMessages();
-
//System.out.println(objectmapper.writeValueAsString(outgoingMessages1));
 }
 }
\ No newline at end of file

[31/50] tinkerpop git commit: Updated test class for loading "sink" data to spark CTR

[dkuppitz]

Updated test class for loading "sink" data to spark CTR


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

Branch: refs/heads/TINKERPOP-1447
Commit: a61dd58eea353637d74086426e4258de5927a8d9
Parents: 2350cbe
Author: Stephen Mallette 
Authored: Thu Mar 1 13:45:22 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 13:45:22 2018 -0500

--
 .../tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a61dd58e/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
--
diff --git 
a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
 
b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
index 4cd8cea..72b5b9a 100644
--- 
a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
+++ 
b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
@@ -55,6 +55,8 @@ public final class ToyGraphInputRDD implements InputRDD {
 vertices = 
IteratorUtils.list(IteratorUtils.map(TinkerFactory.createClassic().vertices(), 
VertexWritable::new));
 else if 
(configuration.getString(Constants.GREMLIN_HADOOP_INPUT_LOCATION).contains("crew"))
 vertices = 
IteratorUtils.list(IteratorUtils.map(TinkerFactory.createTheCrew().vertices(), 
VertexWritable::new));
+else if 
(configuration.getString(Constants.GREMLIN_HADOOP_INPUT_LOCATION).contains("sink"))
+vertices = 
IteratorUtils.list(IteratorUtils.map(TinkerFactory.createKitchenSink().vertices(),
 VertexWritable::new));
 else if 
(configuration.getString(Constants.GREMLIN_HADOOP_INPUT_LOCATION).contains("grateful"))
 {
 try {
 final Graph graph = TinkerGraph.open();

[36/50] tinkerpop git commit: TINKERPOP-1509 tree() tests working now

[dkuppitz]

TINKERPOP-1509 tree() tests working now

Seems like this was fixed at some point a while back. Test is passing 
consistently now. CTR


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

Branch: refs/heads/TINKERPOP-1447
Commit: 4db099137548d4dcfe2534112282f052710bff9e
Parents: a61dd58
Author: Stephen Mallette 
Authored: Fri Mar 2 15:00:49 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 15:00:49 2018 -0500

--
 .../driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java| 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4db09913/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java
--
diff --git 
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java
 
b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java
index fb9bfe2..7b25120 100644
--- 
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java
+++ 
b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java
@@ -261,7 +261,6 @@ public class GraphSONMessageSerializerGremlinV2d0Test {
 }
 
 @Test
-@org.junit.Ignore
 public void shouldSerializeToTreeJson() throws Exception {
 final TinkerGraph graph = TinkerFactory.createClassic();
 final GraphTraversalSource g = graph.traversal();

[11/50] tinkerpop git commit: Test bug fix and refactoring repeated code

[dkuppitz]

Test bug fix and refactoring repeated code


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

Branch: refs/heads/TINKERPOP-1447
Commit: 5467a33f2e17ad22b736effebede124556f049ed
Parents: 153238b
Author: Graff, Philip B 
Authored: Sun Jan 14 13:44:33 2018 -0500
Committer: Graff, Philip B 
Committed: Sun Feb 25 10:44:53 2018 -0500

--
 .../process/computer/GraphComputerTest.java | 28 +---
 1 file changed, 12 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5467a33f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index 785f03d..da0e53f 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -2689,12 +2689,8 @@ public class GraphComputerTest extends 
AbstractGremlinProcessTest {
 
 @Test
 public void testMessagePassingIn() throws Exception {
-runTest(Direction.BOTH).forEachRemaining(v -> {
-assertEquals(2, v.keys().size());
-assertTrue(v.keys().contains(VertexProgramR.PROPERTY_IN));
-assertTrue(v.keys().contains(VertexProgramR.PROPERTY_OUT));
-assertEquals(1, 
IteratorUtils.count(v.values(VertexProgramR.PROPERTY_IN)));
-assertEquals(1, 
IteratorUtils.count(v.values(VertexProgramR.PROPERTY_OUT)));
+runTest(Direction.IN).forEachRemaining(v -> {
+vertexPropertyChecks(v);
 final String in = v.value(VertexProgramR.PROPERTY_IN);
 if (in.equals("a"))
 assertEquals("ab", 
v.value(VertexProgramR.PROPERTY_OUT).toString());
@@ -2709,11 +2705,7 @@ public class GraphComputerTest extends 
AbstractGremlinProcessTest {
 @Test
 public void testMessagePassingOut() throws Exception {
 runTest(Direction.OUT).forEachRemaining(v -> {
-assertEquals(2, v.keys().size());
-assertTrue(v.keys().contains(VertexProgramR.PROPERTY_IN));
-assertTrue(v.keys().contains(VertexProgramR.PROPERTY_OUT));
-assertEquals(1, 
IteratorUtils.count(v.values(VertexProgramR.PROPERTY_IN)));
-assertEquals(1, 
IteratorUtils.count(v.values(VertexProgramR.PROPERTY_OUT)));
+vertexPropertyChecks(v);
 final String in = v.value(VertexProgramR.PROPERTY_IN);
 if (in.equals("a"))
 assertEquals("a", 
v.value(VertexProgramR.PROPERTY_OUT).toString());
@@ -2728,11 +2720,7 @@ public class GraphComputerTest extends 
AbstractGremlinProcessTest {
 @Test
 public void testMessagePassingBoth() throws Exception {
 runTest(Direction.BOTH).forEachRemaining(v -> {
-assertEquals(2, v.keys().size());
-assertTrue(v.keys().contains(VertexProgramR.PROPERTY_IN));
-assertTrue(v.keys().contains(VertexProgramR.PROPERTY_OUT));
-assertEquals(1, 
IteratorUtils.count(v.values(VertexProgramR.PROPERTY_IN)));
-assertEquals(1, 
IteratorUtils.count(v.values(VertexProgramR.PROPERTY_OUT)));
+vertexPropertyChecks(v);
 final String in = v.value(VertexProgramR.PROPERTY_IN);
 if (in.equals("a"))
 assertEquals("aab", 
v.value(VertexProgramR.PROPERTY_OUT).toString());
@@ -2754,6 +2742,14 @@ public class GraphComputerTest extends 
AbstractGremlinProcessTest {
 return result.graph().traversal().V();
 }
 
+private static void vertexPropertyChecks(Vertex v) {
+assertEquals(2, v.keys().size());
+assertTrue(v.keys().contains(VertexProgramR.PROPERTY_IN));
+assertTrue(v.keys().contains(VertexProgramR.PROPERTY_OUT));
+assertEquals(1, 
IteratorUtils.count(v.values(VertexProgramR.PROPERTY_IN)));
+assertEquals(1, 
IteratorUtils.count(v.values(VertexProgramR.PROPERTY_OUT)));
+}
+
 private static class VertexProgramR implements VertexProgram {
 private static final String SIMPLE_VERTEX_PROGRAM_CFG_PREFIX = 
"gremlin.simpleVertexProgram";
 private static final String PROPERTY_OUT = "propertyout";

[26/50] tinkerpop git commit: Fixed GLV types in tests that were failing for .NET CTR

[dkuppitz]

Fixed GLV types in tests that were failing for .NET CTR


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

Branch: refs/heads/TINKERPOP-1447
Commit: c97251297e47a3dafb3541d886e14e4cd28cc5f5
Parents: bbc96ee
Author: Stephen Mallette 
Authored: Thu Mar 1 10:16:08 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 10:16:45 2018 -0500

--
 .../Gherkin/GherkinTestRunner.cs|  4 +---
 gremlin-test/features/map/Select.feature| 16 
 2 files changed, 9 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c9725129/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 3b39cd3..cc2b540 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -41,9 +41,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 { 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
 { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
 { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation },
-{ 
"g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX",
 IgnoreReason.NeedsFurtherInvestigation },
-{ "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
-{ "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation }
+{ 
"g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX",
 IgnoreReason.NeedsFurtherInvestigation }
 };
 
 private static class Keywords

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c9725129/gremlin-test/features/map/Select.feature
--
diff --git a/gremlin-test/features/map/Select.feature 
b/gremlin-test/features/map/Select.feature
index d77e21f..35d9322 100644
--- a/gremlin-test/features/map/Select.feature
+++ b/gremlin-test/features/map/Select.feature
@@ -347,10 +347,10 @@ Feature: Step - select()
 When iterated to list
 Then the result should be unordered
   | result |
-  | d[0.5].f |
-  | d[1.0].f |
-  | d[0.4].f |
-  | d[0.2].f |
+  | d[0.5].d |
+  | d[1.0].d |
+  | d[0.4].d |
+  | d[0.2].d |
 
   Scenario: 
g_V_hasLabelXsoftwareX_asXnameX_asXlanguageX_asXcreatorsX_selectXname_language_creatorsX_byXnameX_byXlangX_byXinXcreatedX_name_fold_orderXlocalXX
 Given the modern graph
@@ -374,10 +374,10 @@ Feature: Step - select()
 When iterated to list
 Then the result should be unordered
   | result |
-  | d[0.5].f |
-  | d[1.0].f |
-  | d[0.4].f |
-  | d[0.2].f |
+  | d[0.5].d |
+  | d[1.0].d |
+  | d[0.4].d |
+  | d[0.2].d |
 
   Scenario: g_V_outE_weight_groupCount_unfold_selectXvaluesX_unfold
 Given the modern graph

[22/50] tinkerpop git commit: Removed more ignored GLV tests for .NET

[dkuppitz]

Removed more ignored GLV tests for .NET

Not sure why these suddenly pass. Makes me wonder if they were ever really 
failing in the first place. CTR


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

Branch: refs/heads/TINKERPOP-1447
Commit: 85b733879abd7836f400ecff969eaee0a5b517f2
Parents: 2c96d42
Author: Stephen Mallette 
Authored: Thu Mar 1 09:06:26 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 09:07:01 2018 -0500

--
 .../Gherkin/GherkinTestRunner.cs| 9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/85b73387/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 402a910..7fa9716 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -38,12 +38,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 public class GherkinTestRunner
 {
 private static readonly IDictionary 
IgnoredScenarios = new Dictionary {
-{ 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation },
-{ "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation },
-{ 
"g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0X_selectXa_bX",
 IgnoreReason.NeedsFurtherInvestigation },
-{ 
"g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXd_selectXa_b_c_dX",
 IgnoreReason.NeedsFurtherInvestigation },
-{ 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX",
 IgnoreReason.NeedsFurtherInvestigation },
-{ 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
 IgnoreReason.NeedsFurtherInvestigation },
+{ 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
+{ "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
 { 
"g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack",
 IgnoreReason.NeedsFurtherInvestigation },
 { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation },
 { 
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
 IgnoreReason.NeedsFurtherInvestigation },
@@ -52,7 +48,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 { "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
 { "g_V_foo_injectX99X_min", 
IgnoreReason.NeedsFurtherInvestigation },
 { 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX",
 IgnoreReason.NeedsFurtherInvestigation },
-{ "g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX", 
IgnoreReason.NeedsFurtherInvestigation },
 { 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX",
 IgnoreReason.NeedsFurtherInvestigation }
 };
 

[33/50] tinkerpop git commit: TINKERPOP-1862 Fix Messenger implementations for Spark/Giraph handling BOTH

[dkuppitz]

TINKERPOP-1862 Fix Messenger implementations for Spark/Giraph handling BOTH

These now behave like TinkerMessenger and in the case of BOTH pass the message 
to the opposite vertex in the StarGraph


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

Branch: refs/heads/TINKERPOP-1447
Commit: 26a5770efb288d60150cf9db60a5dd67568179f2
Parents: 027ae27
Author: Stephen Mallette 
Authored: Fri Mar 2 11:29:57 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 11:29:57 2018 -0500

--
 .../process/computer/GiraphMessenger.java   |  14 +-
 .../gremlin/process/ProcessComputerSuite.java   | 168 +--
 .../process/computer/GraphComputerTest.java |  41 +++--
 .../computer/util/ComputerSubmissionHelper.java |   2 +-
 .../spark/process/computer/SparkMessenger.java  |  12 +-
 .../spark/structure/io/ToyGraphInputRDD.java|   2 +
 6 files changed, 136 insertions(+), 103 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/26a5770e/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessenger.java
--
diff --git 
a/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessenger.java
 
b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessenger.java
index 03818b2..36e641e 100644
--- 
a/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessenger.java
+++ 
b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessenger.java
@@ -27,6 +27,7 @@ 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.Vertex;
+import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 
 import java.util.Iterator;
@@ -57,10 +58,19 @@ public final class GiraphMessenger implements 
Messenger {
 final MessageScope.Local localMessageScope = 
(MessageScope.Local) messageScope;
 final Traversal.Admin incidentTraversal = 
GiraphMessenger.setVertexStart(localMessageScope.getIncidentTraversal().get().asAdmin(),
 this.giraphVertex.getValue().get());
 final Direction direction = 
GiraphMessenger.getOppositeDirection(incidentTraversal);
-incidentTraversal.forEachRemaining(edge ->
+
+// handle processing for BOTH given TINKERPOP-1862 where the 
target of the message is the one opposite
+// the current vertex
+incidentTraversal.forEachRemaining(edge -> {
+if (direction.equals(Direction.IN) || 
direction.equals(Direction.OUT))
 this.giraphComputation.sendMessage(
 new 
ObjectWritable<>(edge.vertices(direction).next().id()),
-new 
ObjectWritable<>(localMessageScope.getEdgeFunction().apply(message, edge;
+new 
ObjectWritable<>(localMessageScope.getEdgeFunction().apply(message, edge)));
+else
+this.giraphComputation.sendMessage(
+new ObjectWritable<>(edge instanceof 
StarGraph.StarOutEdge ? edge.inVertex().id() : edge.outVertex().id()),
+new 
ObjectWritable<>(localMessageScope.getEdgeFunction().apply(message, edge)));
+});
 } else {
 final MessageScope.Global globalMessageScope = 
(MessageScope.Global) messageScope;
 globalMessageScope.vertices().forEach(vertex ->

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/26a5770e/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
index 1d69a76..e1c97df 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
@@ -117,90 +117,90 @@ public class ProcessComputerSuite extends 
AbstractGremlinSuite {
 GraphComputerTest.class,
 
 // branch
-

[41/50] tinkerpop git commit: TINKERPOP-1885 Fix Gremlin.Net Description for NuGet package CTR

[dkuppitz]

TINKERPOP-1885 Fix Gremlin.Net Description for NuGet package CTR

This mainly removes unnecessary line breaks.


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

Branch: refs/heads/TINKERPOP-1447
Commit: eeeb4eedf5cc2e65d558d214884a1de053fdbff4
Parents: c2940e1
Author: Florian Hockmann 
Authored: Tue Mar 6 20:14:54 2018 +0100
Committer: Florian Hockmann 
Committed: Tue Mar 6 20:14:54 2018 +0100

--
 gremlin-dotnet/glv/Gremlin.Net.csproj.template| 12 +++-
 gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 12 +++-
 2 files changed, 6 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eeeb4eed/gremlin-dotnet/glv/Gremlin.Net.csproj.template
--
diff --git a/gremlin-dotnet/glv/Gremlin.Net.csproj.template 
b/gremlin-dotnet/glv/Gremlin.Net.csproj.template
index c116f0e..48b9b3c 100644
--- a/gremlin-dotnet/glv/Gremlin.Net.csproj.template
+++ b/gremlin-dotnet/glv/Gremlin.Net.csproj.template
@@ -32,19 +32,13 @@ limitations under the License.
 Apache TinkerPop
 Gremlin.Net for Apache TinkerPop™ is a language variant and 
driver for .NET.
 
-Apache TinkerPop™ is a graph computing framework for both graph databases 
(OLTP) and graph analytic systems (OLAP).
-Gremlin is the graph traversal language of TinkerPop. It can be described as a 
functional, data-flow language
-that enables users to succinctly express complex traversals on (or queries of) 
their application’s property graph.
+Apache TinkerPop™ is a graph computing framework for both graph databases 
(OLTP) and graph analytic systems (OLAP). Gremlin is the graph traversal 
language of TinkerPop. It can be described as a functional, data-flow language 
that enables users to succinctly express complex traversals on (or queries of) 
their application’s property graph.
 
-Gremlin.Net implements Gremlin within .NET. C# syntax has the same constructs 
as Java including “dot notation”
-for function chaining (a.b.c), round bracket function arguments (a(b,c))`, and 
support for global namespaces
-(a(b()) vs a(__.b()))`. As such, anyone familiar with Gremlin-Java will 
immediately be able to work with
-Gremlin.Net. Moreover, there are a few added constructs to Gremlin.Net that 
make traversals a bit more succinct.
+Gremlin.Net implements Gremlin within .NET. C# syntax has the same constructs 
as Java including “dot notation” for function chaining (a.b.c), round 
bracket function arguments (a(b,c)), and support for global namespaces (a(b()) 
vs a(__.b())). As such, anyone familiar with Gremlin-Java will immediately be 
able to work with Gremlin.Net. Moreover, there are a few added constructs to 
Gremlin.Net that make traversals a bit more succinct.
 
 Please see the reference documentation at Apache TinkerPop for more 
information on usage.
 
-NOTE: Gremlin.Net is an extension of the Gremlin.Net driver by Florian 
Hockmann (versions: 0.y.z) and is now
-included as part of the Apache TinkerPop project.
+NOTE: Gremlin.Net is an extension of the Gremlin.Net driver by Florian 
Hockmann (versions: 0.y.z) and is now included as part of the Apache TinkerPop 
project.
 
../../build/tinkerpop.snk
 true
 true

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eeeb4eed/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj 
b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index a538b8b..25787ec 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@ -32,19 +32,13 @@ limitations under the License.
 Apache TinkerPop
 Gremlin.Net for Apache TinkerPop™ is a language variant and 
driver for .NET.
 
-Apache TinkerPop™ is a graph computing framework for both graph databases 
(OLTP) and graph analytic systems (OLAP).
-Gremlin is the graph traversal language of TinkerPop. It can be described as a 
functional, data-flow language
-that enables users to succinctly express complex traversals on (or queries of) 
their application’s property graph.
+Apache TinkerPop™ is a graph computing framework for both graph databases 
(OLTP) and graph analytic systems (OLAP). Gremlin is the graph traversal 
language of TinkerPop. It can be described as a functional, data-flow language 
that enables users to succinctly express complex traversals on (or queries of) 
their application’s property graph.
 
-Gremlin.Net implements 

[12/50] tinkerpop git commit: Updating kitchen sink graph

[dkuppitz]

Updating kitchen sink graph


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

Branch: refs/heads/TINKERPOP-1447
Commit: febe0ac8ecdf1828233017864b629a644c7260a8
Parents: 5467a33
Author: Graff, Philip B 
Authored: Sun Feb 25 12:22:39 2018 -0500
Committer: Graff, Philip B 
Committed: Sun Feb 25 12:22:39 2018 -0500

--
 data/tinkerpop-sink-typed.json  |   2 ++
 data/tinkerpop-sink-v2d0-typed.json |   2 ++
 data/tinkerpop-sink-v2d0.json   |   2 ++
 data/tinkerpop-sink.json|   2 ++
 data/tinkerpop-sink.kryo| Bin 76 -> 291 bytes
 5 files changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/febe0ac8/data/tinkerpop-sink-typed.json
--
diff --git a/data/tinkerpop-sink-typed.json b/data/tinkerpop-sink-typed.json
index f62a717..1bbdcff 100644
--- a/data/tinkerpop-sink-typed.json
+++ b/data/tinkerpop-sink-typed.json
@@ -1 +1,3 @@
 
{"@class":"java.util.HashMap","id":["java.lang.Long",0],"label":"loops","inE":{"@class":"java.util.HashMap","self":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",2],"outV":["java.lang.Long",0]}]]},"outE":{"@class":"java.util.HashMap","self":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",2],"inV":["java.lang.Long",0]}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",1],"value":"loop"}]]}}
+{"@class":"java.util.HashMap","id":["java.lang.Long",1],"label":"message_passing_test","inE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",6],"outV":["java.lang.Long",1]}]]},"outE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",5],"inV":["java.lang.Long",2]},{"@class":"java.util.HashMap","id":["java.lang.Long",6],"inV":["java.lang.Long",1]}]]},"properties":{"@class":"java.util.HashMap","propertyin":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",3],"value":"a"}]]}}
+{"@class":"java.util.HashMap","id":["java.lang.Long",2],"label":"message_passing_test","inE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",5],"outV":["java.lang.Long",1]}]]},"properties":{"@class":"java.util.HashMap","propertyin":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",4],"value":"b"}]]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/febe0ac8/data/tinkerpop-sink-v2d0-typed.json
--
diff --git a/data/tinkerpop-sink-v2d0-typed.json 
b/data/tinkerpop-sink-v2d0-typed.json
index df22167..ecb5c52 100644
--- a/data/tinkerpop-sink-v2d0-typed.json
+++ b/data/tinkerpop-sink-v2d0-typed.json
@@ -1 +1,3 @@
 
{"id":{"@type":"g:Int64","@value":0},"label":"loops","inE":{"self":[{"id":{"@type":"g:Int64","@value":2},"outV":{"@type":"g:Int64","@value":0}}]},"outE":{"self":[{"id":{"@type":"g:Int64","@value":2},"inV":{"@type":"g:Int64","@value":0}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1},"value":"loop"}]}}
+{"id":{"@type":"g:Int64","@value":1},"label":"message_passing_test","inE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int64","@value":6},"outV":{"@type":"g:Int64","@value":1}}]},"outE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int64","@value":5},"inV":{"@type":"g:Int64","@value":2}},{"id":{"@type":"g:Int64","@value":6},"inV":{"@type":"g:Int64","@value":1}}]},"properties":{"propertyin":[{"id":{"@type":"g:Int64","@value":3},"value":"a"}]}}
+{"id":{"@type":"g:Int64","@value":2},"label":"message_passing_test","inE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int64","@value":5},"outV":{"@type":"g:Int64","@value":1}}]},"properties":{"propertyin":[{"id":{"@type":"g:Int64","@value":4},"value":"b"}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/febe0ac8/data/tinkerpop-sink-v2d0.json
--
diff --git a/data/tinkerpop-sink-v2d0.json b/data/tinkerpop-sink-v2d0.json
index 39496ba..1eade99 100644
--- a/data/tinkerpop-sink-v2d0.json
+++ b/data/tinkerpop-sink-v2d0.json
@@ -1 +1,3 @@
 
{"id":0,"label":"loops","inE":{"self":[{"id":2,"outV":0}]},"outE":{"self":[{"id":2,"inV":0}]},"properties":{"name":[{"id":1,"value":"loop"}]}}

[17/50] tinkerpop git commit: Using "name" instead of "propertyin"

[dkuppitz]

Using "name" instead of "propertyin"


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

Branch: refs/heads/TINKERPOP-1447
Commit: 027ae2771d3c67bb613c525a689fe10123686b45
Parents: 0490a08
Author: Graff, Philip B 
Authored: Wed Feb 28 11:38:33 2018 -0500
Committer: Graff, Philip B 
Committed: Wed Feb 28 11:38:33 2018 -0500

--
 data/tinkerpop-sink-typed.json |   4 ++--
 data/tinkerpop-sink-v2d0-typed.json|   4 ++--
 data/tinkerpop-sink-v2d0.json  |   4 ++--
 data/tinkerpop-sink.json   |   4 ++--
 data/tinkerpop-sink.kryo   | Bin 300 -> 288 bytes
 .../process/computer/GraphComputerTest.java|   2 +-
 .../io/graphson/tinkerpop-sink-typed.json  |   4 ++--
 .../io/graphson/tinkerpop-sink-v2d0-typed.json |   4 ++--
 .../structure/io/graphson/tinkerpop-sink-v2d0.json |   4 ++--
 .../structure/io/graphson/tinkerpop-sink.json  |   4 ++--
 .../gremlin/structure/io/gryo/tinkerpop-sink.kryo  | Bin 300 -> 288 bytes
 .../tinkergraph/structure/TinkerFactory.java   |   6 +++---
 12 files changed, 20 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/027ae277/data/tinkerpop-sink-typed.json
--
diff --git a/data/tinkerpop-sink-typed.json b/data/tinkerpop-sink-typed.json
index aae410e..bc56489 100644
--- a/data/tinkerpop-sink-typed.json
+++ b/data/tinkerpop-sink-typed.json
@@ -1,3 +1,3 @@
-{"@class":"java.util.HashMap","id":2000,"label":"message_passing_test","inE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":5,"outV":2000}]]},"outE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":4,"inV":2001},{"@class":"java.util.HashMap","id":5,"inV":2000}]]},"properties":{"@class":"java.util.HashMap","propertyin":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",2],"value":"a"}]]}}
-{"@class":"java.util.HashMap","id":2001,"label":"message_passing_test","inE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":4,"outV":2000}]]},"properties":{"@class":"java.util.HashMap","propertyin":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",3],"value":"b"}]]}}
+{"@class":"java.util.HashMap","id":2000,"label":"message_passing_test","inE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":5,"outV":2000}]]},"outE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":4,"inV":2001},{"@class":"java.util.HashMap","id":5,"inV":2000}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",2],"value":"a"}]]}}
+{"@class":"java.util.HashMap","id":2001,"label":"message_passing_test","inE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":4,"outV":2000}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",3],"value":"b"}]]}}
 
{"@class":"java.util.HashMap","id":1000,"label":"loops","inE":{"@class":"java.util.HashMap","self":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":1,"outV":1000}]]},"outE":{"@class":"java.util.HashMap","self":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":1,"inV":1000}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",0],"value":"loop"}]]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/027ae277/data/tinkerpop-sink-v2d0-typed.json
--
diff --git a/data/tinkerpop-sink-v2d0-typed.json 
b/data/tinkerpop-sink-v2d0-typed.json
index e90b677..c0844a3 100644
--- a/data/tinkerpop-sink-v2d0-typed.json
+++ b/data/tinkerpop-sink-v2d0-typed.json
@@ -1,3 +1,3 @@

[21/50] tinkerpop git commit: Fixed up more GLV definitions to get more .NET tests pass

[dkuppitz]

Fixed up more GLV definitions to get more .NET tests pass


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

Branch: refs/heads/TINKERPOP-1447
Commit: 2c96d424d825ce98d8ad28d915f6fa375fc3b714
Parents: 6cfdfa9
Author: Stephen Mallette 
Authored: Thu Mar 1 08:46:53 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 08:46:53 2018 -0500

--
 .../test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs  | 2 --
 gremlin-test/features/map/Match.feature| 2 +-
 gremlin-test/features/sideEffect/SideEffectCap.feature | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c96d424/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 627570c..402a910 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -47,11 +47,9 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 { 
"g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack",
 IgnoreReason.NeedsFurtherInvestigation },
 { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation },
 { 
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
 IgnoreReason.NeedsFurtherInvestigation },
-{ "g_V_hasXageX_groupCountXaX_byXnameX_out_capXaX", 
IgnoreReason.NeedsFurtherInvestigation },
 { 
"g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX",
 IgnoreReason.NeedsFurtherInvestigation },
 { "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
 { "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
-{ "g_V_asXaX_out_asXbX_matchXa_out_count_c__b_in_count_cX", 
IgnoreReason.NeedsFurtherInvestigation },
 { "g_V_foo_injectX99X_min", 
IgnoreReason.NeedsFurtherInvestigation },
 { 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX",
 IgnoreReason.NeedsFurtherInvestigation },
 { "g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX", 
IgnoreReason.NeedsFurtherInvestigation },

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c96d424/gremlin-test/features/map/Match.feature
--
diff --git a/gremlin-test/features/map/Match.feature 
b/gremlin-test/features/map/Match.feature
index e44d363..55dffcf 100644
--- a/gremlin-test/features/map/Match.feature
+++ b/gremlin-test/features/map/Match.feature
@@ -134,7 +134,7 @@ Feature: Step - match()
 When iterated to list
 Then the result should be unordered
   | result |
-  | m[{"a":"v[marko]","b":"v[lop]","c":3}] |
+  | m[{"a":"v[marko]","b":"v[lop]","c":"d[3].l"}] |
 
   Scenario: g_V_matchXa__a_out_b__notXa_created_bXX
 Given the modern graph

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c96d424/gremlin-test/features/sideEffect/SideEffectCap.feature
--
diff --git a/gremlin-test/features/sideEffect/SideEffectCap.feature 
b/gremlin-test/features/sideEffect/SideEffectCap.feature
index 795db7e..437bd08 100644
--- a/gremlin-test/features/sideEffect/SideEffectCap.feature
+++ b/gremlin-test/features/sideEffect/SideEffectCap.feature
@@ -26,7 +26,7 @@ Feature: Step - cap()
 When iterated to list
 Then the result should be unordered
   | result |
-  | m[{"peter":"d[1].i", "vadas":"d[1].i", "josh":"d[1].i", "marko": 
"d[1].i"}] |
+  | m[{"peter":"d[1].l", "vadas":"d[1].l", "josh":"d[1].l", "marko": 
"d[1].l"}] |
 
   Scenario: 
g_V_chooseXlabel_person__age_groupCountXaX__name_groupCountXbXX_capXa_bX
 Given an unsupported test

[18/50] tinkerpop git commit: Added Gremlin's Anatomy tutorial

[dkuppitz]

Added Gremlin's Anatomy tutorial

I might add more to this, but wanted the basic component parts of Gremlin 
documented. Seemed best to make this part of a standalone document as it didn't 
quite fit that well in the reference documentation, as it already has a way of 
introducing those topics and I didn't want to disturb that too much. CTR


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

Branch: refs/heads/TINKERPOP-1447
Commit: 3aa9e70ef7e50d81886954e398b4355524f7b576
Parents: 1a857da
Author: Stephen Mallette 
Authored: Wed Feb 28 14:14:01 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 14:14:01 2018 -0500

--
 docs/src/index.asciidoc |   3 +
 .../tutorials/gremlins-anatomy/index.asciidoc   | 189 +++
 docs/static/images/gremlin-anatomy-filter.png   | Bin 0 -> 168854 bytes
 docs/static/images/gremlin-anatomy-group.png| Bin 0 -> 62410 bytes
 docs/static/images/gremlin-anatomy-navigate.png | Bin 0 -> 60514 bytes
 docs/static/images/gremlin-anatomy.png  | Bin 0 -> 87212 bytes
 pom.xml |  23 +++
 7 files changed, 215 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa9e70e/docs/src/index.asciidoc
--
diff --git a/docs/src/index.asciidoc b/docs/src/index.asciidoc
index 40fbb8c..5cc3dd5 100644
--- a/docs/src/index.asciidoc
+++ b/docs/src/index.asciidoc
@@ -57,6 +57,8 @@ Note the "+" following the link in each table entry - it 
forces an asciidoc line
 A gentle introduction to TinkerPop and the Gremlin traversal language that is 
divided into five, ten and fifteen minute tutorial blocks.
 |image:gremlin-dashboard.png[] 
|link:http://tinkerpop.apache.org/docs/x.y.z/tutorials/the-gremlin-console/[The 
Gremlin Console] +
 Provides a detailed look at The Gremlin Console and how it can be used when 
working with TinkerPop.
+^|image:gremlin-anatomy.png[width=125] 
|link:http://tinkerpop.apache.org/docs/x.y.z/gremlins-anatomy/[Gremlin's 
Anatomy]
+Identifies and explains the component parts of a Gremlin traversal.
 ^|image:gremlin-chef.png[width=125] 
|link:http://tinkerpop.apache.org/docs/x.y.z/recipes/[Gremlin Recipes]
 A collection of best practices and common traversal patterns for Gremlin.
 ^|image:gremlin-house-of-mirrors-cropped.png[width=200] 
|link:http://tinkerpop.apache.org/docs/x.y.z/tutorials/gremlin-language-variants/[Gremlin
 Language Variants]
@@ -77,6 +79,7 @@ A getting started guide for users of graph databases and the 
Gremlin query langu
 
 Unless otherwise noted, all "publications" are externally managed:
 
+* Mallette, S.P., 
link:https://www.slideshare.net/StephenMallette/gremlins-anatomy-88713465["Gremlin's
 Anatomy,"] DataStax User Group, February 2018.
 * Rodriguez, M.A., 
link:https://www.slideshare.net/slidarko/gremlin-1013-on-your-fm-dial["Gremlin 
101.3 On Your FM Dial,"] DataStax Support and Engineering Summits, Carmel 
California and Las Vegas Nevada, May 2017.
 * Rodriguez, M.A., 
link:https://www.datastax.com/2017/03/graphoendodonticology["Graphoendodonticology,;]
 DataStax Engineering Blog, March 2017
 * Rodriguez, M.A., 
link:http://www.datastax.com/dev/blog/gremlins-time-machine["Gremlin's Time 
Machine,"] DataStax Engineering Blog, September 2016.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa9e70e/docs/src/tutorials/gremlins-anatomy/index.asciidoc
--
diff --git a/docs/src/tutorials/gremlins-anatomy/index.asciidoc 
b/docs/src/tutorials/gremlins-anatomy/index.asciidoc
new file mode 100644
index 000..b36d881
--- /dev/null
+++ b/docs/src/tutorials/gremlins-anatomy/index.asciidoc
@@ -0,0 +1,189 @@
+
+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.
+
+

[23/50] tinkerpop git commit: Fixed typing in GLV tests that were failing for .NET CTR

[dkuppitz]

Fixed typing in GLV tests that were failing for .NET CTR


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

Branch: refs/heads/TINKERPOP-1447
Commit: eab4bce69d113adc766f141eb5adcba006ee6398
Parents: 85b7338
Author: Stephen Mallette 
Authored: Thu Mar 1 09:32:34 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 09:32:34 2018 -0500

--
 .../test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs  | 2 --
 gremlin-test/features/sideEffect/Sack.feature  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eab4bce6/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 7fa9716..0685d89 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -40,9 +40,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 private static readonly IDictionary 
IgnoredScenarios = new Dictionary {
 { 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
 { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
-{ 
"g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack",
 IgnoreReason.NeedsFurtherInvestigation },
 { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation },
-{ 
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
 IgnoreReason.NeedsFurtherInvestigation },
 { 
"g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX",
 IgnoreReason.NeedsFurtherInvestigation },
 { "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
 { "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eab4bce6/gremlin-test/features/sideEffect/Sack.feature
--
diff --git a/gremlin-test/features/sideEffect/Sack.feature 
b/gremlin-test/features/sideEffect/Sack.feature
index f5baf64..89e3946 100644
--- a/gremlin-test/features/sideEffect/Sack.feature
+++ b/gremlin-test/features/sideEffect/Sack.feature
@@ -80,7 +80,7 @@ Feature: Step - sack()
 When iterated to list
 Then the result should be unordered
   | result |
-  | d[1.0].d |
+  | d[1.0].m |
 
   Scenario: g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack
 Given the modern graph

[50/50] tinkerpop git commit: transformed callouts to enable easy copy/pasting from code tabs

[dkuppitz]

transformed callouts to enable easy copy/pasting from code tabs


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

Branch: refs/heads/TINKERPOP-1447
Commit: 605c0690768a4c2fcae5c3914dd59d5dac4517a1
Parents: 7629dec
Author: Daniel Kuppitz 
Authored: Wed Jan 3 10:13:06 2018 -0700
Committer: Daniel Kuppitz 
Committed: Fri Mar 9 08:34:51 2018 -0700

--
 docs/preprocessor/awk/tabify.awk | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/605c0690/docs/preprocessor/awk/tabify.awk
--
diff --git a/docs/preprocessor/awk/tabify.awk b/docs/preprocessor/awk/tabify.awk
index df92734..24d42a6 100644
--- a/docs/preprocessor/awk/tabify.awk
+++ b/docs/preprocessor/awk/tabify.awk
@@ -47,6 +47,10 @@ function print_tabs(next_id, tabs, blocks) {
   print "\n"
 }
 
+function transform_callouts(code, c) {
+  return gensub(/\s*((<[0-9]+>\s*)*<[0-9]+>)\s*\n/, " " c c " \\1\\2\n", "g", 
code)
+}
+
 BEGIN {
   id_part=systime()
   status = 0
@@ -98,7 +102,15 @@ BEGIN {
 i++
   }
   tabs[i] = lang
-  blocks[i] = "[source," lang "]" code "\n" $0 "\n"
+  switch (lang) {
+case "python":
+  c = "#"
+  break
+default:
+  c = "//"
+  break
+  }
+  blocks[i] = "[source," lang "]" transform_callouts(code, c) "\n" $0 "\n"
 }
   } else {
 if (status == 0) print

[49/50] tinkerpop git commit: Fixed issue that accidentally caused non-source code blocks to slip into the new tabbified view. cc/ @robertdale

[dkuppitz]

Fixed issue that accidentally caused non-source code blocks to slip into the 
new tabbified view.
cc/ @robertdale


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

Branch: refs/heads/TINKERPOP-1447
Commit: 7629dec025cdd8cc01d76c26c7e7f257bbc92a75
Parents: 844d997
Author: Daniel Kuppitz 
Authored: Tue Jan 2 10:41:14 2018 -0700
Committer: Daniel Kuppitz 
Committed: Fri Mar 9 08:34:51 2018 -0700

--
 docs/preprocessor/awk/tabify.awk  | 4 ++--
 docs/src/dev/provider/index.asciidoc  | 4 ++--
 docs/src/recipes/index.asciidoc   | 4 ++--
 docs/src/reference/the-graph.asciidoc | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7629dec0/docs/preprocessor/awk/tabify.awk
--
diff --git a/docs/preprocessor/awk/tabify.awk b/docs/preprocessor/awk/tabify.awk
index bc8d644..df92734 100644
--- a/docs/preprocessor/awk/tabify.awk
+++ b/docs/preprocessor/awk/tabify.awk
@@ -61,7 +61,7 @@ BEGIN {
   code = ""
 }
 
-/^\[source,/ {
+/^\[source,(csharp|groovy|java|python)/ {
   if (status == 3) {
 status = 1
 lang = gensub(/^\[source,([^\]]+).*/, "\\1", "g", $0)
@@ -69,7 +69,7 @@ BEGIN {
   }
 }
 
-! /^\[source,/ {
+! /^\[source,(csharp|groovy|java|python)/ {
   if (status == 3 && $0 != "") {
 print_tabs(next_id, tabs, blocks)
 next_id = next_id + length(tabs)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7629dec0/docs/src/dev/provider/index.asciidoc
--
diff --git a/docs/src/dev/provider/index.asciidoc 
b/docs/src/dev/provider/index.asciidoc
index 5bc4d9e..2a3fe04 100644
--- a/docs/src/dev/provider/index.asciidoc
+++ b/docs/src/dev/provider/index.asciidoc
@@ -611,7 +611,7 @@ features it implements) or should not otherwise be 
executed.  It is possible for
 by using the `@Graph.OptOut` annotation.  The following is an example of this 
annotation usage as taken from
 `HadoopGraph`:
 
-[source, java]
+[source,java]
 
 @Graph.OptIn(Graph.OptIn.SUITE_PROCESS_STANDARD)
 @Graph.OptIn(Graph.OptIn.SUITE_PROCESS_COMPUTER)
@@ -648,7 +648,7 @@ Also note that some of the tests in the Gremlin Test Suite 
are parameterized tes
 specificity to be properly ignored.  To ignore these types of tests, examine 
the name template of the parameterized
 tests.  It is defined by a Java annotation that looks like this:
 
-[source, java]
+[source,java]
 @Parameterized.Parameters(name = "expect({0})")
 
 The annotation above shows that the name of each parameterized test will be 
prefixed with "expect" and have

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7629dec0/docs/src/recipes/index.asciidoc
--
diff --git a/docs/src/recipes/index.asciidoc b/docs/src/recipes/index.asciidoc
index c59cc89..3fdee22 100644
--- a/docs/src/recipes/index.asciidoc
+++ b/docs/src/recipes/index.asciidoc
@@ -90,12 +90,12 @@ prior to submitting a recipe.
 
 To contribute a recipe, first clone the repository:
 
-[source, shell]
+[source,shell]
 git clone https://github.com/apache/tinkerpop.git
 
 The recipes can be found in this directory:
 
-[source, shell]
+[source,shell]
 ls docs/src/recipes
 
 Each recipe exists within a separate `.asciidoc` file.  The file name should 
match the name of the recipe. Recipe names

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7629dec0/docs/src/reference/the-graph.asciidoc
--
diff --git a/docs/src/reference/the-graph.asciidoc 
b/docs/src/reference/the-graph.asciidoc
index 339b392..fa8cdb5 100644
--- a/docs/src/reference/the-graph.asciidoc
+++ b/docs/src/reference/the-graph.asciidoc
@@ -721,7 +721,7 @@ f.close()
 Creating a GraphSON 2.0 mapper is done by calling 
`.version(GraphSONVersion.V2_0)` on the mapper builder. Here's is the
 example output from the code above:
 
-[source, json]
+[source,json]
 
 {
 "@type": "g:Vertex",

[42/50] tinkerpop git commit: TINKERPOP-1885 Add Gremlin.Net logo for NuGet package CTR

[dkuppitz]

TINKERPOP-1885 Add Gremlin.Net logo for NuGet package CTR


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

Branch: refs/heads/TINKERPOP-1447
Commit: 0bc84bdea2a130aede0c11a17bf3adcad741fbcb
Parents: eeeb4ee
Author: Florian Hockmann 
Authored: Tue Mar 6 20:31:27 2018 +0100
Committer: Florian Hockmann 
Committed: Tue Mar 6 20:31:27 2018 +0100

--
 docs/static/images/gremlin-dotnet-logo_256x256.png | Bin 0 -> 24406 bytes
 gremlin-dotnet/glv/Gremlin.Net.csproj.template |   1 +
 gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj  |   1 +
 3 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0bc84bde/docs/static/images/gremlin-dotnet-logo_256x256.png
--
diff --git a/docs/static/images/gremlin-dotnet-logo_256x256.png 
b/docs/static/images/gremlin-dotnet-logo_256x256.png
new file mode 100644
index 000..a7c0f2a
Binary files /dev/null and b/docs/static/images/gremlin-dotnet-logo_256x256.png 
differ

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0bc84bde/gremlin-dotnet/glv/Gremlin.Net.csproj.template
--
diff --git a/gremlin-dotnet/glv/Gremlin.Net.csproj.template 
b/gremlin-dotnet/glv/Gremlin.Net.csproj.template
index 48b9b3c..ce36e76 100644
--- a/gremlin-dotnet/glv/Gremlin.Net.csproj.template
+++ b/gremlin-dotnet/glv/Gremlin.Net.csproj.template
@@ -46,6 +46,7 @@ NOTE: Gremlin.Net is an extension of the Gremlin.Net driver 
by Florian Hockmann
 gremlin;tinkerpop;apache
 http://tinkerpop.apache.org
 
https://github.com/apache/tinkerpop/blob/master/LICENSE
+
http://tinkerpop.apache.org/docs/current/images/gremlin-dotnet-logo_256x256.png
 https://github.com/apache/tinkerpop
   
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0bc84bde/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj 
b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index 25787ec..445a9bc 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@ -46,6 +46,7 @@ NOTE: Gremlin.Net is an extension of the Gremlin.Net driver 
by Florian Hockmann
 gremlin;tinkerpop;apache
 http://tinkerpop.apache.org
 
https://github.com/apache/tinkerpop/blob/master/LICENSE
+
http://tinkerpop.apache.org/docs/current/images/gremlin-dotnet-logo_256x256.png
 https://github.com/apache/tinkerpop
   
 

[24/50] tinkerpop git commit: Fixed up failing .NET GLV test

[dkuppitz]

Fixed up failing .NET GLV test

Was using "foo" as a property key that .NET gherkin parser didn't know about. 
CTR


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

Branch: refs/heads/TINKERPOP-1447
Commit: 2ddf2e3110376acfd6ef7d8142ba156eb27de6c5
Parents: eab4bce
Author: Stephen Mallette 
Authored: Thu Mar 1 09:46:16 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 09:46:16 2018 -0500

--
 .../test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs | 1 -
 .../Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs | 3 ++-
 gremlin-test/features/map/Min.feature | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2ddf2e31/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 0685d89..a8c25ec 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -44,7 +44,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 { 
"g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX",
 IgnoreReason.NeedsFurtherInvestigation },
 { "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
 { "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
-{ "g_V_foo_injectX99X_min", 
IgnoreReason.NeedsFurtherInvestigation },
 { 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX",
 IgnoreReason.NeedsFurtherInvestigation },
 { 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX",
 IgnoreReason.NeedsFurtherInvestigation }
 };

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2ddf2e31/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
index aec3d3e..7eca018 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
@@ -37,7 +37,8 @@ namespace 
Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
 {"age", typeof(int)},
 {"name", typeof(string)},
 {"lang", typeof(string)},
-{"weight", typeof(float)}
+{"weight", typeof(float)},
+{"foo", typeof(object)} // used when for invalid property key 
lookups
 };
 
 /// 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2ddf2e31/gremlin-test/features/map/Min.feature
--
diff --git a/gremlin-test/features/map/Min.feature 
b/gremlin-test/features/map/Min.feature
index 99d53dd..d77e9f3 100644
--- a/gremlin-test/features/map/Min.feature
+++ b/gremlin-test/features/map/Min.feature
@@ -52,9 +52,10 @@ Feature: Step - min()
 
   Scenario: g_V_foo_injectX99X_min
 Given the modern graph
+And using the parameter injectVal defined as "d[99].l"
 And the traversal of
   """
-  g.V().values("foo").inject(99L).min()
+  g.V().values("foo").inject(injectVal).min()
   """
 When iterated to list
 Then the result should be unordered

[25/50] tinkerpop git commit: Fixed some types in GLV tests that were failing for .NET CTR

[dkuppitz]

Fixed some types in GLV tests that were failing for .NET CTR


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

Branch: refs/heads/TINKERPOP-1447
Commit: bbc96eeaf41e97ec0fecc1e7a36da824e9654015
Parents: 2ddf2e3
Author: Stephen Mallette 
Authored: Thu Mar 1 10:07:33 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 10:07:33 2018 -0500

--
 .../Gherkin/GherkinTestRunner.cs|  4 +---
 gremlin-test/features/map/Order.feature | 16 
 2 files changed, 9 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bbc96eea/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index a8c25ec..3b39cd3 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -43,9 +43,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation },
 { 
"g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX",
 IgnoreReason.NeedsFurtherInvestigation },
 { "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
-{ "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
-{ 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX",
 IgnoreReason.NeedsFurtherInvestigation },
-{ 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX",
 IgnoreReason.NeedsFurtherInvestigation }
+{ "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation }
 };
 
 private static class Keywords

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bbc96eea/gremlin-test/features/map/Order.feature
--
diff --git a/gremlin-test/features/map/Order.feature 
b/gremlin-test/features/map/Order.feature
index e7ff00c..6dd8ac4 100644
--- a/gremlin-test/features/map/Order.feature
+++ b/gremlin-test/features/map/Order.feature
@@ -192,7 +192,7 @@ Feature: Step - order()
 When iterated to list
 Then the result should be ordered
   | result |
-  | 
m[{"vadas":"d[0].d","peter":"d[0.2].d","josh":"d[1.4].d","marko":"d[1.9].d"}] |
+  | 
m[{"vadas":"d[0].i","peter":"d[0.2].d","josh":"d[1.4].d","marko":"d[1.9].d"}] |
 
   Scenario: g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX
 Given the modern graph
@@ -203,12 +203,12 @@ Feature: Step - order()
 When iterated to list
 Then the result should be ordered
   | result |
-  | l[d[1.0].f,d[0.4].f,d[1.0].f] |
-  | l[d[0.4].f,d[0.5].f,d[1.0].f] |
-  | l[d[0.4].f,d[0.4].f,d[0.2].f] |
-  | l[d[1.0].f]   |
-  | l[d[0.5].f]   |
-  | l[d[0.2].f]   |
+  | l[d[1.0].d,d[0.4].d,d[1.0].d] |
+  | l[d[0.4].d,d[0.5].d,d[1.0].d] |
+  | l[d[0.4].d,d[0.4].d,d[0.2].d] |
+  | l[d[1.0].d]   |
+  | l[d[0.5].d]   |
+  | l[d[0.2].d]   |
 
   Scenario: g_V_group_byXlabelX_byXname_order_byXdecrX_foldX
 Given the modern graph
@@ -233,7 +233,7 @@ Feature: Step - order()
   | m[{"marko":"d[1.9].d"}]  |
   | m[{"josh":"d[1.4].d"}]  |
   | m[{"peter":"d[0.2].d"}]  |
-  | m[{"vadas":"d[0].d"}]  |
+  | m[{"vadas":"d[0].i"}]  |
 
   Scenario: 
g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_decrX
 Given the modern graph

[37/50] tinkerpop git commit: Update to apache pom version 19 CTR

[dkuppitz]

Update to apache pom version 19 CTR


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

Branch: refs/heads/TINKERPOP-1447
Commit: 81e6ba6fc4b49cc66b1ede2dd41a97495168b8e8
Parents: 4db0991
Author: Stephen Mallette 
Authored: Mon Mar 5 07:01:02 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 5 07:01:02 2018 -0500

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81e6ba6f/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f6ff536..5a3db27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
 
 org.apache
 apache
-18
+19
 
 org.apache.tinkerpop
 tinkerpop

[38/50] tinkerpop git commit: Merge branch 'TINKERPOP-1862' into tp32

[dkuppitz]

Merge branch 'TINKERPOP-1862' into tp32


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

Branch: refs/heads/TINKERPOP-1447
Commit: 6fbf13047db83cb77292386cce4c1f5bee66101e
Parents: 81e6ba6 8db0730
Author: Stephen Mallette 
Authored: Mon Mar 5 08:39:46 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 5 08:39:46 2018 -0500

--
 CHANGELOG.asciidoc  |   1 +
 data/tinkerpop-sink-typed.json  |   4 +-
 data/tinkerpop-sink-v2d0-typed.json |   4 +-
 data/tinkerpop-sink-v2d0.json   |   4 +-
 data/tinkerpop-sink.json|   4 +-
 data/tinkerpop-sink.kryo| Bin 76 -> 288 bytes
 .../process/computer/GiraphMessenger.java   |  14 +-
 .../process/computer/GraphComputerTest.java | 192 +++
 .../io/graphson/tinkerpop-sink-typed.json   |   4 +-
 .../io/graphson/tinkerpop-sink-v2d0-typed.json  |   4 +-
 .../io/graphson/tinkerpop-sink-v2d0.json|   4 +-
 .../structure/io/graphson/tinkerpop-sink.json   |   4 +-
 .../structure/io/gryo/tinkerpop-sink.kryo   | Bin 76 -> 288 bytes
 .../computer/util/ComputerSubmissionHelper.java |   2 +-
 .../spark/process/computer/SparkMessenger.java  |  12 +-
 .../process/computer/TinkerMessenger.java   |  11 +-
 .../tinkergraph/structure/TinkerFactory.java|   7 +
 17 files changed, 258 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6fbf1304/CHANGELOG.asciidoc
--

[27/50] tinkerpop git commit: Added friendWeight to type info in .NET

[dkuppitz]

Added friendWeight to type info in .NET

Tests were failing for .NET as a result of the missing type information. We 
really shouldn't have tests that modify the toy graphs, but something to 
resolve another day. CTR


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

Branch: refs/heads/TINKERPOP-1447
Commit: 153f852b3abbe801f77d4cc3cd15ca8bc88ad5ed
Parents: c972512
Author: Stephen Mallette 
Authored: Thu Mar 1 10:22:59 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 10:22:59 2018 -0500

--
 .../test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs | 3 +--
 .../Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/153f852b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index cc2b540..c2a8850 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -40,8 +40,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 private static readonly IDictionary 
IgnoredScenarios = new Dictionary {
 { 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
 { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
-{ "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation },
-{ 
"g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX",
 IgnoreReason.NeedsFurtherInvestigation }
+{ "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation }
 };
 
 private static class Keywords

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/153f852b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
index 7eca018..327a50a 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
@@ -38,7 +38,8 @@ namespace 
Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
 {"name", typeof(string)},
 {"lang", typeof(string)},
 {"weight", typeof(float)},
-{"foo", typeof(object)} // used when for invalid property key 
lookups
+{"foo", typeof(object)}, // used when for invalid property key 
lookups
+{"friendWeight", typeof(float)}  // used in an AddVertex.feature 
test
 };
 
 /// 

[40/50] tinkerpop git commit: TINKERPOP-1885 Add Gremlin.Net logo to ref docs CTR

[dkuppitz]

TINKERPOP-1885 Add Gremlin.Net logo to ref docs CTR


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

Branch: refs/heads/TINKERPOP-1447
Commit: c2940e1ee5020f7b767b33fe7a0d2a3d7e839e09
Parents: 2c6c151
Author: Florian Hockmann 
Authored: Tue Mar 6 20:06:48 2018 +0100
Committer: Florian Hockmann 
Committed: Tue Mar 6 20:06:48 2018 +0100

--
 docs/src/reference/gremlin-variants.asciidoc |   2 +-
 docs/static/images/gremlin-dotnet-logo.png   | Bin 0 -> 40779 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c2940e1e/docs/src/reference/gremlin-variants.asciidoc
--
diff --git a/docs/src/reference/gremlin-variants.asciidoc 
b/docs/src/reference/gremlin-variants.asciidoc
index 94bcac4..f06fe02 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -311,7 +311,7 @@ g.V().out().map(lambda: "x: 
len(x.get().value('name'))").sum().toList()
 [[gremlin-DotNet]]
 == Gremlin.Net
 
-Apache TinkerPop's Gremlin.Net implements Gremlin within the C# language. It 
targets .NET Standard and can
+image:gremlin-dotnet-logo.png[width=371,float=right] Apache TinkerPop's 
Gremlin.Net implements Gremlin within the C# language. It targets .NET Standard 
and can
 therefore be used on different operating systems and with different .NET 
frameworks, such as .NET Framework
 and link:https://www.microsoft.com/net/core[.NET Core]. Since the C# syntax is 
very similar to that of Java, it should be very easy to switch between
 Gremlin-Java and Gremlin.Net. The only major syntactical difference is that 
all method names in Gremlin.Net

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c2940e1e/docs/static/images/gremlin-dotnet-logo.png
--
diff --git a/docs/static/images/gremlin-dotnet-logo.png 
b/docs/static/images/gremlin-dotnet-logo.png
new file mode 100644
index 000..30c96e4
Binary files /dev/null and b/docs/static/images/gremlin-dotnet-logo.png differ

[46/50] tinkerpop git commit: fix build docs error - CTR

[dkuppitz]

fix build docs error - CTR


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

Branch: refs/heads/TINKERPOP-1447
Commit: 34f924e50db3a20a3ba538c4e16bbfcfa9e7b873
Parents: 7bff988
Author: Robert Dale 
Authored: Thu Mar 8 15:52:40 2018 -0500
Committer: Robert Dale 
Committed: Thu Mar 8 15:52:40 2018 -0500

--
 docs/src/recipes/olap-spark-yarn.asciidoc | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/34f924e5/docs/src/recipes/olap-spark-yarn.asciidoc
--
diff --git a/docs/src/recipes/olap-spark-yarn.asciidoc 
b/docs/src/recipes/olap-spark-yarn.asciidoc
index 634adeb..1543829 100644
--- a/docs/src/recipes/olap-spark-yarn.asciidoc
+++ b/docs/src/recipes/olap-spark-yarn.asciidoc
@@ -105,6 +105,7 @@ conf.setProperty('spark.executor.extraClassPath', 
"./$archive/*:$hadoopConfDir")
 conf.setProperty('spark.driver.extraLibraryPath', 
"$hadoop/lib/native:$hadoop/lib/native/Linux-amd64-64")
 conf.setProperty('spark.executor.extraLibraryPath', 
"$hadoop/lib/native:$hadoop/lib/native/Linux-amd64-64")
 conf.setProperty('gremlin.spark.persistContext', 'true')
+hdfs.copyFromLocal('data/tinkerpop-modern.kryo', 'tinkerpop-modern.kryo')
 graph = GraphFactory.open(conf)
 g = graph.traversal().withComputer(SparkGraphComputer)
 g.V().group().by(values('name')).by(both().count())

[48/50] tinkerpop git commit: Added automatic tab generation for code snippets in asciidoc files.

[dkuppitz]

Added automatic tab generation for code snippets in asciidoc files.


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

Branch: refs/heads/TINKERPOP-1447
Commit: 844d997f34bd78895cbecb86aad8163a9e7113d4
Parents: 97fb12e
Author: Daniel Kuppitz 
Authored: Fri Dec 15 14:30:59 2017 -0700
Committer: Daniel Kuppitz 
Committed: Fri Mar 9 08:34:51 2018 -0700

--
 docs/postprocessor/processor.awk |   4 +
 docs/preprocessor/awk/tabify.awk | 108 ++
 docs/preprocessor/preprocess-file.sh |   4 +-
 docs/sass/compile|  30 +
 docs/sass/tabs.scss  | 178 ++
 docs/stylesheets/tabs.css|  19 
 6 files changed, 342 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/844d997f/docs/postprocessor/processor.awk
--
diff --git a/docs/postprocessor/processor.awk b/docs/postprocessor/processor.awk
index 18ada47..da82420 100644
--- a/docs/postprocessor/processor.awk
+++ b/docs/postprocessor/processor.awk
@@ -33,6 +33,10 @@ BEGIN {
   }
 }
 
+/"
+}
+
 !// {
   if (firstMatch || !isHeader) {
 print gensub(/()\(([0-9]+)\)(<\/b>)/,

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/844d997f/docs/preprocessor/awk/tabify.awk
--
diff --git a/docs/preprocessor/awk/tabify.awk b/docs/preprocessor/awk/tabify.awk
new file mode 100644
index 000..bc8d644
--- /dev/null
+++ b/docs/preprocessor/awk/tabify.awk
@@ -0,0 +1,108 @@
+# 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)
+#
+function print_tabs(next_id, tabs, blocks) {
+
+  num_tabs = length(tabs)
+  x = next_id
+
+  print ""
+  print ""
+
+  for (i in tabs) {
+title = tabs[i]
+print "  "
+print "  " 
title ""
+x++
+  }
+
+  for (i in blocks) {
+print "  "
+print ""
+print "\n"
+print blocks[i]
+print ""
+print ""
+print "  "
+  }
+
+  print ""
+  print "\n"
+}
+
+BEGIN {
+  id_part=systime()
+  status = 0
+  next_id = 1
+  block[0] = 0 # initialize "blocks" as an array
+  delete blocks[0]
+}
+
+/^\[gremlin-/ {
+  status = 1
+  lang = gensub(/^\[gremlin-([^,\]]+).*/, "\\1", "g", $0)
+  code = ""
+}
+
+/^\[source,/ {
+  if (status == 3) {
+status = 1
+lang = gensub(/^\[source,([^\]]+).*/, "\\1", "g", $0)
+code = ""
+  }
+}
+
+! /^\[source,/ {
+  if (status == 3 && $0 != "") {
+print_tabs(next_id, tabs, blocks)
+next_id = next_id + length(tabs)
+for (i in tabs) {
+  delete tabs[i]
+  delete blocks[i]
+}
+status = 0
+  }
+}
+
+/^$/ {
+  if (status == 1) {
+status = 2
+  } else if (status == 2) {
+status = 3
+  }
+}
+
+{ if (status == 3) {
+if ($0 == "") {
+  i = length(blocks) + 1
+  if (i == 1) {
+tabs[i] = "console (" lang ")"
+blocks[i] = code_header code "\n" $0 "\n"
+i++
+  }
+  tabs[i] = lang
+  blocks[i] = "[source," lang "]" code "\n" $0 "\n"
+}
+  } else {
+if (status == 0) print
+else if (status == 1) code_header = $0
+else code = code "\n" $0
+  }
+}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/844d997f/docs/preprocessor/preprocess-file.sh
--
diff --git a/docs/preprocessor/preprocess-file.sh 
b/docs/preprocessor/preprocess-file.sh
index d5076f1..7d3956d 100755
--- a/docs/preprocessor/preprocess-file.sh
+++ b/docs/preprocessor/preprocess-file.sh
@@ -132,6 +132,7 @@ if [ ! ${SKIP} ] && [ $(grep -c '^\[gremlin' ${input}) -gt 
0 ]; then
   fi
 
   sed 's/\t//g' ${input} |
+  awk -f ${AWK_SCRIPTS}/tabify.awk |
   awk -f ${AWK_SCRIPTS}/prepare.awk |

[13/50] tinkerpop git commit: Updating message passing tests to use kitchen sink

[dkuppitz]

Updating message passing tests to use kitchen sink


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

Branch: refs/heads/TINKERPOP-1447
Commit: f03c4df45473bafcf95d47f34467479f89af73a1
Parents: febe0ac
Author: Graff, Philip B 
Authored: Sun Feb 25 12:35:43 2018 -0500
Committer: Graff, Philip B 
Committed: Sun Feb 25 12:35:43 2018 -0500

--
 .../process/computer/GraphComputerTest.java | 21 ++--
 1 file changed, 11 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f03c4df4/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index da0e53f..4cbe584 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -69,6 +69,7 @@ import java.util.concurrent.Future;
 
 import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.GRATEFUL;
 import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
+import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.SINK;
 import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -2688,8 +2689,9 @@ public class GraphComputerTest extends 
AbstractGremlinProcessTest {
 ///
 
 @Test
+@LoadGraphWith(SINK)
 public void testMessagePassingIn() throws Exception {
-runTest(Direction.IN).forEachRemaining(v -> {
+runMPTest(Direction.IN).forEachRemaining(v -> {
 vertexPropertyChecks(v);
 final String in = v.value(VertexProgramR.PROPERTY_IN);
 if (in.equals("a"))
@@ -2703,8 +2705,9 @@ public class GraphComputerTest extends 
AbstractGremlinProcessTest {
 }
 
 @Test
+@LoadGraphWith(SINK)
 public void testMessagePassingOut() throws Exception {
-runTest(Direction.OUT).forEachRemaining(v -> {
+runMPTest(Direction.OUT).forEachRemaining(v -> {
 vertexPropertyChecks(v);
 final String in = v.value(VertexProgramR.PROPERTY_IN);
 if (in.equals("a"))
@@ -2718,8 +2721,9 @@ public class GraphComputerTest extends 
AbstractGremlinProcessTest {
 }
 
 @Test
+@LoadGraphWith(SINK)
 public void testMessagePassingBoth() throws Exception {
-runTest(Direction.BOTH).forEachRemaining(v -> {
+runMPTest(Direction.BOTH).forEachRemaining(v -> {
 vertexPropertyChecks(v);
 final String in = v.value(VertexProgramR.PROPERTY_IN);
 if (in.equals("a"))
@@ -2732,14 +2736,10 @@ public class GraphComputerTest extends 
AbstractGremlinProcessTest {
 });
 }
 
-private GraphTraversal runTest(Direction direction) throws 
Exception {
-final Vertex a = graph.addVertex(VertexProgramR.PROPERTY_IN, "a");
-final Vertex b = graph.addVertex(VertexProgramR.PROPERTY_IN, "b");
-a.addEdge("edge", b);
-a.addEdge("edge", a);
+private GraphTraversal runMPTest(Direction direction) 
throws Exception {
 final VertexProgramR svp = 
VertexProgramR.build().direction(direction).create();
-final ComputerResult result = 
graphProvider.getGraphComputer(graph).program(svp).submit().get();
-return result.graph().traversal().V();
+final ComputerResult result = 
graphProvider.getGraphComputer(graph).program(svp).vertices(__.hasLabel(VertexProgramR.VERTEX_LABEL)).submit().get();
+return 
result.graph().traversal().V().hasLabel(VertexProgramR.VERTEX_LABEL);
 }
 
 private static void vertexPropertyChecks(Vertex v) {
@@ -2754,6 +2754,7 @@ public class GraphComputerTest extends 
AbstractGremlinProcessTest {
 private static final String SIMPLE_VERTEX_PROGRAM_CFG_PREFIX = 
"gremlin.simpleVertexProgram";
 private static final String PROPERTY_OUT = "propertyout";
 private static final String PROPERTY_IN = "propertyin";
+private static final String VERTEX_LABEL = "message_passing_test";
 private static final String DIRECTION_CFG_KEY = 
SIMPLE_VERTEX_PROGRAM_CFG_PREFIX + ".direction";
 
 

[30/50] tinkerpop git commit: TINKERPOP-1894 Fixed deserialization of P.not() for GraphSON 2.x

[dkuppitz]

TINKERPOP-1894 Fixed deserialization of P.not() for GraphSON 2.x

javascript and python GLVs seemed to respond well to this fix, but .NET did 
not. The related tests are still failing.


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

Branch: refs/heads/TINKERPOP-1447
Commit: 2350cbe04b5a4ed3fdca389b8a345017a4bc7d0a
Parents: aaf5146
Author: Stephen Mallette 
Authored: Thu Mar 1 12:04:42 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 12:06:43 2018 -0500

--
 CHANGELOG.asciidoc   |  1 +
 .../gremlin/structure/io/graphson/GraphSONTokens.java|  1 +
 .../structure/io/graphson/TraversalSerializersV2d0.java  |  2 ++
 .../ser/GraphSONMessageSerializerGremlinV2d0Test.java| 11 +++
 .../gremlin-javascript/test/cucumber/feature-steps.js|  4 
 gremlin-python/src/main/jython/radish/feature_steps.py   |  5 -
 6 files changed, 15 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2350cbe0/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 92e1d9e..a24b1fb 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Added `checkAdjacentVertices` option to `SubgraphStrategy`.
 * Modified `GremlinDslProcessor` so that it generated the 
`getAnonymousTraversalClass()` method to return the DSL version of `__`.
 * Added the "Kitchen Sink" test data set.
+* Fixed deserialization of `P.not()` for GraphSON.
 * Added `idleConnectionTimeout` and `keepAliveInterval` to Gremlin Server that 
enables a "ping" and auto-close for seemingly dead clients.
 * Fixed a bug in `NumberHelper` that led to wrong min/max results if numbers 
exceeded the Integer limits.
 * Delayed setting of the request identifier until `RequestMessage` 
construction by the builder.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2350cbe0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
index 9f0648a..7ec004a 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
@@ -72,6 +72,7 @@ public final class GraphSONTokens {
 public static final String ARGUMENTS = "arguments";
 public static final String PREDICATE = "predicate";
 public static final String AND = "and";
+public static final String NOT = "not";
 public static final String OR = "or";
 public static final String SOURCE = "source";
 public static final String STEP = "step";

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2350cbe0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java
index f399cfa..a696280 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java
@@ -329,6 +329,8 @@ final class TraversalSerializersV2d0 {
 
 if (predicate.equals(GraphSONTokens.AND) || 
predicate.equals(GraphSONTokens.OR)) {
 return predicate.equals(GraphSONTokens.AND) ? new 
AndP((List) value) : new OrP((List) value);
+} else if (predicate.equals(GraphSONTokens.NOT) && value 
instanceof P) {
+return P.not((P) value);
 } else {
 try {
 if (value instanceof Collection) {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2350cbe0/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java
--
diff --git 

[02/50] tinkerpop git commit: Merge branch 'TINKERPOP-1857' into tp32

[dkuppitz]

Merge branch 'TINKERPOP-1857' into tp32


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

Branch: refs/heads/TINKERPOP-1447
Commit: d42d54d6afbcb8fb8187a6472eccfe1b41d53d1b
Parents: 545f3bf 7212253
Author: Stephen Mallette 
Authored: Tue Feb 20 13:46:53 2018 -0500
Committer: Stephen Mallette 
Committed: Tue Feb 20 13:46:53 2018 -0500

--
 .../Gherkin/GherkinTestRunner.cs|  24 +-
 .../Gherkin/IgnoreException.cs  |   6 +-
 .../Gherkin/ScenarioData.cs |   2 +-
 .../step/map/GroovyAddVertexTest.groovy |   5 -
 .../lib/driver/driver-remote-connection.js  |  35 ++
 .../test/cucumber/feature-steps.js  |   7 +
 .../gremlin-javascript/test/cucumber/world.js   |   2 +-
 gremlin-python/glv/TraversalSource.template |  14 +-
 .../jython/gremlin_python/process/traversal.py  |  14 +-
 .../src/main/jython/radish/feature_steps.py | 101 +++-
 .../src/main/jython/radish/terrain.py   |  11 +-
 .../src/test/scripts/generate-all.groovy|   4 +-
 .../src/test/scripts/test-server-start.groovy   |   2 +
 gremlin-test/features/branch/Repeat.feature |  16 +
 gremlin-test/features/branch/Union.feature  |  16 +-
 gremlin-test/features/filter/Filter.feature |  24 +
 gremlin-test/features/filter/Has.feature| 479 ++-
 gremlin-test/features/filter/Range.feature  |   4 +-
 gremlin-test/features/filter/Where.feature  | 221 +
 gremlin-test/features/map/AddVertex.feature | 165 ++-
 gremlin-test/features/map/Match.feature | 315 
 gremlin-test/features/map/Min.feature   |  11 +
 gremlin-test/features/map/Order.feature | 193 
 gremlin-test/features/map/Properties.feature|  16 +-
 gremlin-test/features/map/Select.feature| 195 +++-
 gremlin-test/features/sideEffect/Inject.feature |  17 +
 gremlin-test/features/sideEffect/Sack.feature   |  42 +-
 .../features/sideEffect/SideEffectCap.feature   |   8 +-
 .../traversal/step/branch/LocalTest.java|   2 +-
 .../traversal/step/branch/RepeatTest.java   |   2 +-
 .../traversal/step/branch/UnionTest.java|   4 +-
 .../process/traversal/step/filter/AndTest.java  |   4 +-
 .../traversal/step/filter/FilterTest.java   |   9 +-
 .../process/traversal/step/filter/HasTest.java  |  43 +-
 .../traversal/step/filter/WhereTest.java|  10 +-
 .../traversal/step/map/AddVertexTest.java   |  27 +-
 .../process/traversal/step/map/MatchTest.java   |   4 +-
 .../process/traversal/step/map/SelectTest.java  |   2 +-
 .../gremlin/process/FeatureCoverageTest.java| 120 -
 39 files changed, 2030 insertions(+), 146 deletions(-)
--

[08/50] tinkerpop git commit: Adding simple graph computer test of proper message passing in all 3 directions

[dkuppitz]

Adding simple graph computer test of proper message passing in all 3 directions


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

Branch: refs/heads/TINKERPOP-1447
Commit: 80c0b8465fe9bb6ddbe4522a36304c7ba054e909
Parents: f02ea33
Author: Graff, Philip B 
Authored: Sat Jan 13 21:32:29 2018 -0500
Committer: Graff, Philip B 
Committed: Sun Feb 25 10:44:15 2018 -0500

--
 .../process/computer/GraphComputerTest.java | 175 +++
 1 file changed, 175 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80c0b846/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index 8c846d5..c34c2dc 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -34,6 +34,7 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.Operator;
 import org.apache.tinkerpop.gremlin.process.traversal.P;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyPath;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.VerificationException;
@@ -2683,4 +2684,178 @@ public class GraphComputerTest extends 
AbstractGremlinProcessTest {
 };
 }
 }
+
+///
+
+@Test
+public void testMessagePassingIn() throws Exception {
+runTest(Direction.IN).forEachRemaining(v -> {
+String in = v.value("propin").toString();
+if (in.equals("a")) {
+assertEquals("ab", v.value("propout").toString());
+} else {
+assertEquals("", v.value("propout").toString());
+}
+});
+}
+
+@Test
+public void testMessagePassingOut() throws Exception {
+runTest(Direction.OUT).forEachRemaining(v -> {
+String in = v.value("propin").toString();
+if (in.equals("a")) {
+assertEquals("a", v.value("propout").toString());
+} else {
+assertEquals("a", v.value("propout").toString());
+}
+});
+}
+
+@Test
+public void testMessagePassingBoth() throws Exception {
+runTest(Direction.BOTH).forEachRemaining(v -> {
+String in = v.value("propin").toString();
+if (in.equals("a")) {
+assertEquals("aab", v.value("propout").toString());
+} else {
+assertEquals("a", v.value("propout").toString());
+}
+});
+}
+
+private GraphTraversal runTest(Direction direction) throws 
Exception {
+g.addV().property("propin", "a").as("a")
+.addV().property("propin", "b").as("b")
+
.addE("edge").from("a").to("b").addE("edge").from("a").to("a").iterate();
+final VertexProgramR svp = VertexProgramR.build().propertyIn("propin")
+.propertyOut("propout").direction(direction).create();
+final ComputerResult result = 
graphProvider.getGraphComputer(graph).program(svp).submit().get();
+return result.graph().traversal().V();
+}
+
+private static class VertexProgramR implements VertexProgram {
+private static final String SIMPLE_VERTEX_PROGRAM_CFG_PREFIX = 
"gremlin.simpleVertexProgram";
+private static final String PROPERTY_OUT_CFG_KEY = 
SIMPLE_VERTEX_PROGRAM_CFG_PREFIX + ".propertyout";
+private static final String PROPERTY_IN_CFG_KEY = 
SIMPLE_VERTEX_PROGRAM_CFG_PREFIX + ".propertyin";
+private static final String DIRECTION_CFG_KEY = 
SIMPLE_VERTEX_PROGRAM_CFG_PREFIX + ".direction";
+
+private final MessageScope.Local inMessageScope = 
MessageScope.Local.of(__::inE);
+private final MessageScope.Local outMessageScope = 
MessageScope.Local.of(__::outE);
+private final MessageScope.Local bothMessageScope = 
MessageScope.Local.of(__::bothE);
+private 

[06/50] tinkerpop git commit: Updated dev docs for release candidates CTR

[dkuppitz]

Updated dev docs for release candidates CTR


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

Branch: refs/heads/TINKERPOP-1447
Commit: 072f112df0faff4d8e78772e73c8b708e184a44b
Parents: 5b4bd00
Author: Stephen Mallette 
Authored: Sat Feb 24 16:00:37 2018 -0500
Committer: Stephen Mallette 
Committed: Sat Feb 24 16:00:37 2018 -0500

--
 docs/src/dev/developer/release.asciidoc | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/072f112d/docs/src/dev/developer/release.asciidoc
--
diff --git a/docs/src/dev/developer/release.asciidoc 
b/docs/src/dev/developer/release.asciidoc
index 44afe8f..fab9819 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -135,7 +135,8 @@ of the published documentation on the dev mailing list.
 
 A release candidate is an unofficial release that is represented by a tagged 
version in the Git repository.  It is
 offered in cases where there is significant change in a particular version and 
the potential for upgrades and problems
-might be high.
+might be high. Release candidates do not require a vote thread. Lazy consensus 
is acceptable for confirming their
+deployment.
 
 . `mvn clean install -DincludeNeo4j`
 .. `mvn verify -DskipIntegrationTests=false -DincludeNeo4j`
@@ -153,6 +154,14 @@ might be high.
 . Announce the release candidate to `dev` mailing list and await feedback
 . Repeat as required or proceed to the next phase
 
+Note that release candidates need not require the release of all artifacts. 
For example, if the risk is with one
+particular GLV, then a release candidate can be prepared of just that 
particular artifact. In those cases, a tag on
+the commit that represents the release candidate is sufficient and does not 
necessarily require that the versions
+be bumped to reflect the actual "-rc" version. In other words, if preparing a 
release candidate for .NET, then there
+is no need to go through the processing of bumping versions in Java artifacts 
and all GLVs. Nor is it necessary to
+alter the version of .NET to include the release candidate versioning. It can 
simply be altered locally by the
+release manager and deployed.
+
 == PMC Vote
 
 This section describes the process that process that prepares a release for 
VOTE by the community. If there are multiple

[47/50] tinkerpop git commit: fixed link - CTR

[dkuppitz]

fixed link - CTR


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

Branch: refs/heads/TINKERPOP-1447
Commit: 97fb12e79edfcf613f9a988beca4be731fc0ac48
Parents: 34f924e
Author: Robert Dale 
Authored: Fri Mar 9 07:33:03 2018 -0500
Committer: Robert Dale 
Committed: Fri Mar 9 07:33:03 2018 -0500

--
 docs/src/index.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/97fb12e7/docs/src/index.asciidoc
--
diff --git a/docs/src/index.asciidoc b/docs/src/index.asciidoc
index 5cc3dd5..f07bd99 100644
--- a/docs/src/index.asciidoc
+++ b/docs/src/index.asciidoc
@@ -57,7 +57,7 @@ Note the "+" following the link in each table entry - it 
forces an asciidoc line
 A gentle introduction to TinkerPop and the Gremlin traversal language that is 
divided into five, ten and fifteen minute tutorial blocks.
 |image:gremlin-dashboard.png[] 
|link:http://tinkerpop.apache.org/docs/x.y.z/tutorials/the-gremlin-console/[The 
Gremlin Console] +
 Provides a detailed look at The Gremlin Console and how it can be used when 
working with TinkerPop.
-^|image:gremlin-anatomy.png[width=125] 
|link:http://tinkerpop.apache.org/docs/x.y.z/gremlins-anatomy/[Gremlin's 
Anatomy]
+^|image:gremlin-anatomy.png[width=125] 
|link:http://tinkerpop.apache.org/docs/x.y.z/tutorials/gremlins-anatomy/[Gremlin's
 Anatomy]
 Identifies and explains the component parts of a Gremlin traversal.
 ^|image:gremlin-chef.png[width=125] 
|link:http://tinkerpop.apache.org/docs/x.y.z/recipes/[Gremlin Recipes]
 A collection of best practices and common traversal patterns for Gremlin.

[16/50] tinkerpop git commit: Updated branching strategy now that tp33 is present CTR

[dkuppitz]

Updated branching strategy now that tp33 is present CTR


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

Branch: refs/heads/TINKERPOP-1447
Commit: 1a857da8a09bb5289296493f21ba89b581e77882
Parents: 072f112
Author: Stephen Mallette 
Authored: Tue Feb 27 08:51:18 2018 -0500
Committer: Stephen Mallette 
Committed: Tue Feb 27 08:51:18 2018 -0500

--
 docs/src/dev/developer/for-committers.asciidoc | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1a857da8/docs/src/dev/developer/for-committers.asciidoc
--
diff --git a/docs/src/dev/developer/for-committers.asciidoc 
b/docs/src/dev/developer/for-committers.asciidoc
index b44de9a..c8b5559 100644
--- a/docs/src/dev/developer/for-committers.asciidoc
+++ b/docs/src/dev/developer/for-committers.asciidoc
@@ -65,10 +65,11 @@ TinkerPop has several release branches:
 * `tp30` - 3.0.x (no longer maintained)
 * `tp31` - 3.1.x (no longer maintained)
 * `tp32` - 3.2.x (bug fixes and documentation updates only)
-* `master` - 3.3.x
+* `tp33` - 3.3.x (current development)
+* `master` - 3.4.x (future development)
 
-Changes to `tp32` should merge to `master`. Please read more about this 
process in the <>
-section.
+Changes to `tp32` should merge to `tp33` and then `tp33` to `master`. Please 
read more about this process in the
+<> section.
 
 Other branches may be created for collaborating on features or for RFC's that 
other developers may want to inspect.
 It is suggested that the JIRA issue ID be used as the prefix, since that 
triggers certain automation, and it provides a

[10/50] tinkerpop git commit: Additional check. Tests still fail - but I think this is a problem with the implementations, not the test.

[dkuppitz]

Additional check. Tests still fail - but I think this is a problem with the 
implementations, not the test.


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

Branch: refs/heads/TINKERPOP-1447
Commit: 153238b2a8a3fc5e051251662ef6ab80f72c659f
Parents: 750677c
Author: Graff, Philip B 
Authored: Sun Jan 14 01:01:17 2018 -0500
Committer: Graff, Philip B 
Committed: Sun Feb 25 10:44:40 2018 -0500

--
 .../tinkerpop/gremlin/process/computer/GraphComputerTest.java| 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/153238b2/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index 0e8d06a..785f03d 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -2785,9 +2785,11 @@ public class GraphComputerTest extends 
AbstractGremlinProcessTest {
 case OUT:
 this.messageScope = this.outMessageScope;
 break;
-default:
+case BOTH:
 this.messageScope = this.bothMessageScope;
 break;
+default:
+throw new IllegalStateException("Should not reach this 
point!");
 }
 }
 

[05/50] tinkerpop git commit: Added some docs about Gherkin tests CTR

[dkuppitz]

Added some docs about Gherkin tests CTR


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

Branch: refs/heads/TINKERPOP-1447
Commit: 5b4bd0074f5547ecb9b08a751a3b7b0988835ed8
Parents: d970564
Author: Stephen Mallette 
Authored: Sat Feb 24 11:51:27 2018 -0500
Committer: Stephen Mallette 
Committed: Sat Feb 24 11:51:27 2018 -0500

--
 docs/src/dev/developer/for-committers.asciidoc | 216 +++-
 1 file changed, 215 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b4bd007/docs/src/dev/developer/for-committers.asciidoc
--
diff --git a/docs/src/dev/developer/for-committers.asciidoc 
b/docs/src/dev/developer/for-committers.asciidoc
index 14fa90a..b44de9a 100644
--- a/docs/src/dev/developer/for-committers.asciidoc
+++ b/docs/src/dev/developer/for-committers.asciidoc
@@ -174,7 +174,14 @@ for an example.
 
 === Gremlin Language Test Cases
 
-When writing a test case for a Gremlin step, be sure to use the following 
conventions.
+Test cases for the Gremlin Language currently requires that the newly 
developed test be added in three places:
+
+1. As a test written in Java in the `gremlin-test` module within the 
subpackages of
+`org.apache.tinkerpop.gremlin.process.traversal.step`
+2. As a test written in Groovy in the `gremlin-groovy-test` module within the 
same subpackage structure as `gremlin-test`
+3. As a test written in Gherkin in the `gremlin-test` module in the 
`/features` subdirectory
+
+When writing a Java test case for a Gremlin step, be sure to use the following 
conventions.
 
 * The name of the traversal generator should start with `get`, use `X` for 
brackets, `_` for space, and the Gremlin-Groovy sugar syntax.
 ** `get_g_V_hasLabelXpersonX_groupXaX_byXageX_byXsumX_name()`
@@ -189,6 +196,213 @@ When writing a test case for a Gremlin step, be sure to 
use the following conven
 ** `checkResults(Arrays.asList("marko","josh"), traversal)`
 ** `checkMap(new HashMap() {{ put("marko",1l); }}, 
traversal.next())`
 
+Groovy tests are implemented by extending the Java test and implementing the 
abstract method that produces the
+traversal. Simply follow existing patterns in those tests - they are 
self-evident.
+
+Gherkin tests follow some important conventions and have a sub-language that 
must be adhered to for the tests to
+function properly. Note that Gherkin tests are designed to support the testing 
of GLVs and at some point will likely
+replace the Java tests (Groovy tests have already been removed in 3.3.x). If a 
new Java test is added and an associated
+Gherkin tests is not, the overall build will fail the `FeatureCoverageTest` of 
`gremlin-test` which validates that all
+tests written in Java are also implemented in Gherkin.
+
+The basic syntax of a Gherkin test is as follows:
+
+[source,gherkin]
+
+Scenario: g_VX1X_unionXrepeatXoutX_timesX2X__outX_name
+  Given the modern graph
+  And using the parameter v1Id defined as "v[marko].id"
+  And the traversal of
+"""
+g.V(v1Id).union(__.repeat(__.out()).times(2), __.out()).values("name")
+"""
+  When iterated to list
+  Then the result should be unordered
+| result |
+| ripple |
+| lop |
+| lop   |
+| vadas |
+| josh  |
+
+
+ Scenario Name
+
+The name of the scenario needs to match the name of the Java test. If it does 
not then the `FeatureCoverageTest` will
+fail.
+
+ Given
+
+"Given" sets the context of the test. Specifically, it establishes the graph 
that will be used for the test. It
+conforms to the pattern of "Given the _xxx_ graph" where the "xxx" may be one 
of the following:
+
+* empty
+* modern
+* classic
+* crew
+* sink
+* grateful
+
+Never modify the data of any of the graphs except for the "empty" graph. The 
"empty" graph is the only graph that is
+guaranteed to be refreshed between tests. The "empty" graph maybe be modified 
by the traversal under test or by an
+additional "Given" option:
+
+[source,gherkin]
+
+Given the empty graph
+And the graph initializer of
+  """
+  g.addV("person").property(T.id, 1).property("name", "marko").property("age", 
29).as("marko").
+addV("person").property(T.id, 2).property("name", "vadas").property("age", 
27).as("vadas").
+addV("software").property(T.id, 3).property("name", 
"lop").property("lang", "java").as("lop").
+addV("person").property(T.id, 4).property("name","josh").property("age", 
32).as("josh").
+addV("software").property(T.id, 5).property("name", 
"ripple").property("lang", 

[32/50] tinkerpop git commit: TINKERPOP-1738 Bump to jackson 2.9.4

[dkuppitz]

TINKERPOP-1738 Bump to jackson 2.9.4

This fixes a problem where Jackson was missing an error in GraphSON type 
information depending on the order of the JSON elements. It required some 
internal changes to the GraphSONTypeSerializer given API shifts in jackson - 
should not really affect TinkerPop  users. Modified the original test that 
demonstrated this problem to be a bit more robust.


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

Branch: refs/heads/TINKERPOP-1447
Commit: f35f04a8da88280e8b121356ac5839fc0b8ac859
Parents: a61dd58
Author: Stephen Mallette 
Authored: Tue Feb 13 10:16:46 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 09:11:34 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../io/graphson/GraphSONTypeSerializer.java | 94 ++--
 ...aphSONMapperV2d0PartialEmbeddedTypeTest.java | 32 +++
 gremlin-shaded/pom.xml  |  2 +-
 4 files changed, 61 insertions(+), 68 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f35f04a8/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a24b1fb..f99d1a2 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -27,6 +27,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Modified `GremlinDslProcessor` so that it generated the 
`getAnonymousTraversalClass()` method to return the DSL version of `__`.
 * Added the "Kitchen Sink" test data set.
 * Fixed deserialization of `P.not()` for GraphSON.
+* Bumped to Jackson 2.9.4.
 * Added `idleConnectionTimeout` and `keepAliveInterval` to Gremlin Server that 
enables a "ping" and auto-close for seemingly dead clients.
 * Fixed a bug in `NumberHelper` that led to wrong min/max results if numbers 
exceeded the Integer limits.
 * Delayed setting of the request identifier until `RequestMessage` 
construction by the builder.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f35f04a8/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializer.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializer.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializer.java
index 78c670a..8b1ba25 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializer.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializer.java
@@ -39,6 +39,8 @@ import 
org.apache.tinkerpop.gremlin.util.function.HashMapSupplier;
 import org.apache.tinkerpop.gremlin.util.function.Lambda;
 import org.apache.tinkerpop.shaded.jackson.annotation.JsonTypeInfo;
 import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
+import org.apache.tinkerpop.shaded.jackson.core.type.WritableTypeId;
 import org.apache.tinkerpop.shaded.jackson.databind.BeanProperty;
 import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeIdResolver;
 import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
@@ -79,7 +81,7 @@ public class GraphSONTypeSerializer extends TypeSerializer {
 
 @Override
 public JsonTypeInfo.As getTypeInclusion() {
-return null;
+return JsonTypeInfo.As.WRAPPER_OBJECT;
 }
 
 @Override
@@ -93,79 +95,37 @@ public class GraphSONTypeSerializer extends TypeSerializer {
 }
 
 @Override
-public void writeTypePrefixForScalar(final Object o, final JsonGenerator 
jsonGenerator) throws IOException {
-if (canWriteTypeId()) {
-writeTypePrefix(jsonGenerator, 
getTypeIdResolver().idFromValueAndType(o, getClassFromObject(o)));
+public WritableTypeId writeTypePrefix(final JsonGenerator jsonGenerator, 
final WritableTypeId writableTypeId) throws IOException {
+if (writableTypeId.valueShape == JsonToken.VALUE_STRING) {
+if (canWriteTypeId()) {
+writeTypePrefix(jsonGenerator, 
getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, 
getClassFromObject(writableTypeId.forValue)));
+}
+} else if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
+jsonGenerator.writeStartObject();
+} else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
+

[29/50] tinkerpop git commit: CTR: Minor change in the doc generation process. In case of an error, we'll now see the last 10 lines first and after a short 5 second break the errornous file will be op

[dkuppitz]

CTR: Minor change in the doc generation process. In case of an error, we'll now
 see the last 10 lines first and after a short 5 second break the errornous
 file will be opened for full inspection. This should make it much easier to
 identify errors that are not obvious in the output of the last 10 lines.


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

Branch: refs/heads/TINKERPOP-1447
Commit: aaf51464d91e481f9bd943e9d21303122f8ca981
Parents: 8ef717f
Author: Daniel Kuppitz 
Authored: Thu Mar 1 09:15:48 2018 -0700
Committer: Daniel Kuppitz 
Committed: Thu Mar 1 09:15:48 2018 -0700

--
 docs/preprocessor/preprocess-file.sh | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aaf51464/docs/preprocessor/preprocess-file.sh
--
diff --git a/docs/preprocessor/preprocess-file.sh 
b/docs/preprocessor/preprocess-file.sh
index 0ca534a..d5076f1 100755
--- a/docs/preprocessor/preprocess-file.sh
+++ b/docs/preprocessor/preprocess-file.sh
@@ -76,6 +76,9 @@ function cleanup {
   echo -e "\n\e[1mLast 10 lines of ${output}:\e[0m\n"
   tail -n10 ${output}
   echo
+  echo "Opening ${output} for full inspection"
+  sleep 5
+  less ${output}
 fi
   fi
   rm -rf ${output} ${CONSOLE_HOME}/.ext

[03/50] tinkerpop git commit: Merge branch 'TINKERPOP-1872' into tp32

[dkuppitz]

Merge branch 'TINKERPOP-1872' into tp32

Conflicts:
CHANGELOG.asciidoc


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

Branch: refs/heads/TINKERPOP-1447
Commit: 3df6c5806a585e8e1c381e4043338110ef8b4517
Parents: d42d54d 0f0d97a
Author: Stephen Mallette 
Authored: Fri Feb 23 07:00:39 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Feb 23 07:00:39 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../process/computer/GraphComputerTest.java | 70 
 .../spark/process/computer/SparkMessenger.java  |  2 +-
 .../process/computer/SparkMessengerTest.java| 86 
 4 files changed, 158 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3df6c580/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index f1519b6,4d93912..1ed018c
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -31,7 -27,7 +31,8 @@@ image::https://raw.githubusercontent.co
  * Removed hardcoded expectation in metrics serialization test suite as 
different providers may have different outputs.
  * Added `IndexedTraverserSet` which indexes on the value of a `Traverser` 
thus improving performance when used.
  * Utilized `IndexedTraverserSet` in `TraversalVertexProgram` to avoid extra 
iteration when doing `Vertex` lookups.
 +* Fixed a bug in Gremlin Console which prevented handling of `gremlin.sh` 
flags that had an "=" between the flag and its arguments.
+ * Fixed bug where `SparkMessenger` was not applying the `edgeFunction` from 
`MessageScope`.
  * Fixed a bug in `ComputerAwareStep` that didn't handle `reset()` properly 
and thus occasionally produced some extra traversers.
  
  [[release-3-2-7]]

[07/50] tinkerpop git commit: TinkerMessenger proper handling of Direction.BOTH

[dkuppitz]

TinkerMessenger proper handling of Direction.BOTH


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

Branch: refs/heads/TINKERPOP-1447
Commit: f02ea338a8d039c50896f7c65ca57a695975fc43
Parents: 072f112
Author: Graff, Philip B 
Authored: Thu Jan 4 13:27:44 2018 -0500
Committer: Graff, Philip B 
Committed: Sun Feb 25 10:43:57 2018 -0500

--
 .../tinkergraph/process/computer/TinkerMessenger.java| 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f02ea338/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java
--
diff --git 
a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java
 
b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java
index 5a0f478..3e49c34 100644
--- 
a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java
+++ 
b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java
@@ -68,7 +68,16 @@ public final class TinkerMessenger implements 
Messenger {
 final Direction direction = 
TinkerMessenger.getDirection(incidentTraversal);
 final Edge[] edge = new Edge[1]; // simulates storage 
side-effects available in Gremlin, but not Java8 streams
 
multiIterator.addIterator(StreamSupport.stream(Spliterators.spliteratorUnknownSize(VertexProgramHelper.reverse(incidentTraversal.asAdmin()),
 Spliterator.IMMUTABLE | Spliterator.SIZED), false)
-.map(e -> 
this.messageBoard.receiveMessages.get(messageScope).get((edge[0] = 
e).vertices(direction).next()))
+.map((Edge e) -> {
+edge[0] = e;
+Vertex vv;
+if (direction.equals(Direction.IN) || 
direction.equals(Direction.OUT)) {
+vv = e.vertices(direction).next();
+} else {
+vv = e.outVertex() == this.vertex ? 
e.inVertex() : e.outVertex();
+}
+return 
this.messageBoard.receiveMessages.get(messageScope).get(vv);
+})
 .filter(q -> null != q)
 .flatMap(Queue::stream)
 .map(message -> 
localMessageScope.getEdgeFunction().apply(message, edge[0]))

[35/50] tinkerpop git commit: TINKERPOP-1862 Added back computer tests accidentally commented out

[dkuppitz]

TINKERPOP-1862 Added back computer tests accidentally commented out


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

Branch: refs/heads/TINKERPOP-1447
Commit: 8db0730a70fc693ce458603010abc831ce871f46
Parents: 7956b48
Author: Stephen Mallette 
Authored: Fri Mar 2 12:28:18 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 12:28:18 2018 -0500

--
 .../gremlin/process/ProcessComputerSuite.java   | 168 +--
 1 file changed, 84 insertions(+), 84 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8db0730a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
index e1c97df..1d69a76 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
@@ -117,90 +117,90 @@ public class ProcessComputerSuite extends 
AbstractGremlinSuite {
 GraphComputerTest.class,
 
 // branch
-//BranchTest.Traversals.class,
-//ChooseTest.Traversals.class,
-//OptionalTest.Traversals.class,
-//LocalTest.Traversals.class,
-//RepeatTest.Traversals.class,
-//UnionTest.Traversals.class,
-//
-//// filter
-//AndTest.Traversals.class,
-//CoinTest.Traversals.class,
-//CyclicPathTest.Traversals.class,
-//DedupTest.Traversals.class,
-//FilterTest.Traversals.class,
-//HasTest.Traversals.class,
-//IsTest.Traversals.class,
-//OrTest.Traversals.class,
-//RangeTest.Traversals.class,
-//SampleTest.Traversals.class,
-//SimplePathTest.Traversals.class,
-//TailTest.Traversals.class,
-//WhereTest.Traversals.class,
-//
-//// map
-//CoalesceTest.Traversals.class,
-//ConstantTest.Traversals.class,
-//CountTest.Traversals.class,
-//FlatMapTest.Traversals.class,
-//FoldTest.Traversals.class,
-//GraphTest.Traversals.class,
-//LoopsTest.Traversals.class,
-//MapTest.Traversals.class,
-//MapKeysTest.Traversals.class,
-//MapValuesTest.Traversals.class,
-//MatchTest.CountMatchTraversals.class,
-//MatchTest.GreedyMatchTraversals.class,
-//MaxTest.Traversals.class,
-//MeanTest.Traversals.class,
-//MinTest.Traversals.class,
-//SumTest.Traversals.class,
-//OrderTest.Traversals.class,
-//PageRankTest.Traversals.class,
-//PathTest.Traversals.class,
-//PeerPressureTest.Traversals.class,
-//ProfileTest.Traversals.class,
-//ProjectTest.Traversals.class,
-//ProgramTest.Traversals.class,
-//PropertiesTest.Traversals.class,
-//SelectTest.Traversals.class,
-//UnfoldTest.Traversals.class,
-//ValueMapTest.Traversals.class,
-//VertexTest.Traversals.class,
-//
-//// sideEffect
-//AddEdgeTest.Traversals.class,
-//AggregateTest.Traversals.class,
-//ExplainTest.Traversals.class,
-//GroupTest.Traversals.class,
-//GroupTestV3d0.Traversals.class,
-//GroupCountTest.Traversals.class,
-//InjectTest.Traversals.class,
-//ProfileTest.Traversals.class,
-//SackTest.Traversals.class,
-//SideEffectCapTest.Traversals.class,
-//SideEffectTest.Traversals.class,
-//StoreTest.Traversals.class,
-//SubgraphTest.Traversals.class,
-//TreeTest.Traversals.class,
-//
-//// compliance
-//ComplexTest.Traversals.class,
-//TraversalInterruptionComputerTest.class,
-//
-//// algorithms
-//PageRankVertexProgramTest.class,
-//PeerPressureVertexProgramTest.class,
-//BulkLoaderVertexProgramTest.class,
-//BulkDumperVertexProgramTest.class,
-//
-//// creations
-//TranslationStrategyProcessTest.class,
-//
-//// decorations
-//

[15/50] tinkerpop git commit: Proper update of kitchen sink through TinkerFactory

[dkuppitz]

Proper update of kitchen sink through TinkerFactory


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

Branch: refs/heads/TINKERPOP-1447
Commit: 0490a082d9b533cb7ef4a1a25bd25500844821a6
Parents: b0b124b
Author: Graff, Philip B 
Authored: Sun Feb 25 16:27:28 2018 -0500
Committer: Graff, Philip B 
Committed: Sun Feb 25 16:27:28 2018 -0500

--
 data/tinkerpop-sink-typed.json  |   4 +++-
 data/tinkerpop-sink-v2d0-typed.json |   4 +++-
 data/tinkerpop-sink-v2d0.json   |   4 +++-
 data/tinkerpop-sink.json|   4 +++-
 data/tinkerpop-sink.kryo| Bin 76 -> 300 bytes
 .../structure/io/graphson/tinkerpop-sink-typed.json |   4 +++-
 .../io/graphson/tinkerpop-sink-v2d0-typed.json  |   4 +++-
 .../structure/io/graphson/tinkerpop-sink-v2d0.json  |   4 +++-
 .../structure/io/graphson/tinkerpop-sink.json   |   4 +++-
 .../gremlin/structure/io/gryo/tinkerpop-sink.kryo   | Bin 76 -> 300 bytes
 .../tinkergraph/structure/TinkerFactory.java|   7 +++
 11 files changed, 31 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0490a082/data/tinkerpop-sink-typed.json
--
diff --git a/data/tinkerpop-sink-typed.json b/data/tinkerpop-sink-typed.json
index f62a717..aae410e 100644
--- a/data/tinkerpop-sink-typed.json
+++ b/data/tinkerpop-sink-typed.json
@@ -1 +1,3 @@
-{"@class":"java.util.HashMap","id":["java.lang.Long",0],"label":"loops","inE":{"@class":"java.util.HashMap","self":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",2],"outV":["java.lang.Long",0]}]]},"outE":{"@class":"java.util.HashMap","self":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",2],"inV":["java.lang.Long",0]}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",1],"value":"loop"}]]}}
+{"@class":"java.util.HashMap","id":2000,"label":"message_passing_test","inE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":5,"outV":2000}]]},"outE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":4,"inV":2001},{"@class":"java.util.HashMap","id":5,"inV":2000}]]},"properties":{"@class":"java.util.HashMap","propertyin":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",2],"value":"a"}]]}}
+{"@class":"java.util.HashMap","id":2001,"label":"message_passing_test","inE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":4,"outV":2000}]]},"properties":{"@class":"java.util.HashMap","propertyin":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",3],"value":"b"}]]}}
+{"@class":"java.util.HashMap","id":1000,"label":"loops","inE":{"@class":"java.util.HashMap","self":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":1,"outV":1000}]]},"outE":{"@class":"java.util.HashMap","self":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":1,"inV":1000}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",0],"value":"loop"}]]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0490a082/data/tinkerpop-sink-v2d0-typed.json
--
diff --git a/data/tinkerpop-sink-v2d0-typed.json 
b/data/tinkerpop-sink-v2d0-typed.json
index df22167..e90b677 100644
--- a/data/tinkerpop-sink-v2d0-typed.json
+++ b/data/tinkerpop-sink-v2d0-typed.json
@@ -1 +1,3 @@
-{"id":{"@type":"g:Int64","@value":0},"label":"loops","inE":{"self":[{"id":{"@type":"g:Int64","@value":2},"outV":{"@type":"g:Int64","@value":0}}]},"outE":{"self":[{"id":{"@type":"g:Int64","@value":2},"inV":{"@type":"g:Int64","@value":0}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1},"value":"loop"}]}}
+{"id":{"@type":"g:Int32","@value":2000},"label":"message_passing_test","inE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int32","@value":5},"outV":{"@type":"g:Int32","@value":2000}}]},"outE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int32","@value":4},"inV":{"@type":"g:Int32","@value":2001}},{"id":{"@type":"g:Int32","@value":5},"inV":{"@type":"g:Int32","@value":2000}}]},"properties":{"propertyin":[{"id":{"@type":"g:Int64","@value":2},"value":"a"}]}}

[09/50] tinkerpop git commit: Test cleanup - hopefully can run now

[dkuppitz]

Test cleanup - hopefully can run now


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

Branch: refs/heads/TINKERPOP-1447
Commit: 750677cf55d7445c3746870d86c6592f6cd3664d
Parents: 80c0b84
Author: Graff, Philip B 
Authored: Sat Jan 13 23:49:27 2018 -0500
Committer: Graff, Philip B 
Committed: Sun Feb 25 10:44:27 2018 -0500

--
 .../process/computer/GraphComputerTest.java | 97 +++-
 1 file changed, 52 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/750677cf/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index c34c2dc..0e8d06a 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -2689,63 +2689,84 @@ public class GraphComputerTest extends 
AbstractGremlinProcessTest {
 
 @Test
 public void testMessagePassingIn() throws Exception {
-runTest(Direction.IN).forEachRemaining(v -> {
-String in = v.value("propin").toString();
-if (in.equals("a")) {
-assertEquals("ab", v.value("propout").toString());
-} else {
-assertEquals("", v.value("propout").toString());
-}
+runTest(Direction.BOTH).forEachRemaining(v -> {
+assertEquals(2, v.keys().size());
+assertTrue(v.keys().contains(VertexProgramR.PROPERTY_IN));
+assertTrue(v.keys().contains(VertexProgramR.PROPERTY_OUT));
+assertEquals(1, 
IteratorUtils.count(v.values(VertexProgramR.PROPERTY_IN)));
+assertEquals(1, 
IteratorUtils.count(v.values(VertexProgramR.PROPERTY_OUT)));
+final String in = v.value(VertexProgramR.PROPERTY_IN);
+if (in.equals("a"))
+assertEquals("ab", 
v.value(VertexProgramR.PROPERTY_OUT).toString());
+else if (in.equals("b"))
+assertEquals("", 
v.value(VertexProgramR.PROPERTY_OUT).toString());
+else
+throw new IllegalStateException("This vertex should not exist: 
" + VertexProgramR.PROPERTY_IN
++ "=" + String.valueOf(in));
 });
 }
 
 @Test
 public void testMessagePassingOut() throws Exception {
 runTest(Direction.OUT).forEachRemaining(v -> {
-String in = v.value("propin").toString();
-if (in.equals("a")) {
-assertEquals("a", v.value("propout").toString());
-} else {
-assertEquals("a", v.value("propout").toString());
-}
+assertEquals(2, v.keys().size());
+assertTrue(v.keys().contains(VertexProgramR.PROPERTY_IN));
+assertTrue(v.keys().contains(VertexProgramR.PROPERTY_OUT));
+assertEquals(1, 
IteratorUtils.count(v.values(VertexProgramR.PROPERTY_IN)));
+assertEquals(1, 
IteratorUtils.count(v.values(VertexProgramR.PROPERTY_OUT)));
+final String in = v.value(VertexProgramR.PROPERTY_IN);
+if (in.equals("a"))
+assertEquals("a", 
v.value(VertexProgramR.PROPERTY_OUT).toString());
+else if (in.equals("b"))
+assertEquals("a", 
v.value(VertexProgramR.PROPERTY_OUT).toString());
+else
+throw new IllegalStateException("This vertex should not exist: 
" + VertexProgramR.PROPERTY_IN
++ "=" + String.valueOf(in));
 });
 }
 
 @Test
 public void testMessagePassingBoth() throws Exception {
 runTest(Direction.BOTH).forEachRemaining(v -> {
-String in = v.value("propin").toString();
-if (in.equals("a")) {
-assertEquals("aab", v.value("propout").toString());
-} else {
-assertEquals("a", v.value("propout").toString());
-}
+assertEquals(2, v.keys().size());
+assertTrue(v.keys().contains(VertexProgramR.PROPERTY_IN));
+assertTrue(v.keys().contains(VertexProgramR.PROPERTY_OUT));
+assertEquals(1, 
IteratorUtils.count(v.values(VertexProgramR.PROPERTY_IN)));
+assertEquals(1, 

tinkerpop git commit: TINKERPOP-1898 Specifically tested SubgraphStrategy for jython evaluation

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1896 d626f5b5f -> 8e23f5b12


TINKERPOP-1898 Specifically tested SubgraphStrategy for jython evaluation


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

Branch: refs/heads/TINKERPOP-1896
Commit: 8e23f5b1263527749c2b5cd1796547ba80025d0f
Parents: d626f5b
Author: Stephen Mallette 
Authored: Fri Mar 9 10:17:09 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 9 10:17:09 2018 -0500

--
 .../tinkerpop/gremlin/python/jsr223/JythonTranslator.java   | 2 +-
 .../gremlin/python/jsr223/JythonTranslatorTest.java | 9 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8e23f5b1/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java
--
diff --git 
a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java
 
b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java
index 3d7d9fe..e043278 100644
--- 
a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java
+++ 
b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java
@@ -80,6 +80,6 @@ public final class JythonTranslator extends PythonTranslator {
 if (proxy.getConfiguration().isEmpty())
 return proxy.getStrategyClass().getCanonicalName() + ".instance()";
 else
-return proxy.getStrategyClass().getCanonicalName() + ".create(new 
org.apache.commons.configuration.MapConfiguration(" + 
convertToString(ConfigurationConverter.getMap(proxy.getConfiguration())) + "))";
+return proxy.getStrategyClass().getCanonicalName() + 
".create(org.apache.commons.configuration.MapConfiguration(" + 
convertToString(ConfigurationConverter.getMap(proxy.getConfiguration())) + "))";
 }
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8e23f5b1/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
--
diff --git 
a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
 
b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
index e35898b..343819c 100644
--- 
a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
+++ 
b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
@@ -23,6 +23,7 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 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.strategy.decoration.SubgraphStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -33,6 +34,7 @@ import org.junit.Test;
 import java.util.ArrayList;
 import java.util.List;
 
+import static 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
@@ -111,9 +113,10 @@ public class JythonTranslatorTest {
 // present
 GraphTraversalSource g = TinkerFactory.createModern().traversal();
 g = g.withStrategies(new TranslationStrategy(g, 
JythonTranslator.of("g")));
-final List o = g.withStrategies(ReadOnlyStrategy.instance()).
-V().has("name").map(Lambda.function("lambda x: 
type(x.get())")).toList();
+final List o = g.withStrategies(ReadOnlyStrategy.instance(),
+
SubgraphStrategy.build().checkAdjacentVertices(false).vertices(hasLabel("person")).create()).
+ V().has("name").map(Lambda.function("lambda 
x: type(x.get())")).toList();
 
-assertEquals(6, o.size());
+assertEquals(4, o.size());
 }
 }

tinkerpop git commit: TINKERPOP-1895 Fixed jython based evaluations of withStrategies

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1896 5c5df83e7 -> d626f5b5f


TINKERPOP-1895 Fixed jython based evaluations of withStrategies

Similar to TINKERPOP-1896 in that a lambda would trigger a scriptengine 
evaluation with jython which would fail when withStrategies() was used as the 
JythonTranslator was actually producing Python valid code rather than Jython 
valid code.


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

Branch: refs/heads/TINKERPOP-1896
Commit: d626f5b5f31eefeb6ecbfa739008ef580a1373ce
Parents: 5c5df83
Author: Stephen Mallette 
Authored: Fri Mar 9 09:38:35 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 9 09:38:35 2018 -0500

--
 CHANGELOG.asciidoc   |  1 +
 .../gremlin/python/jsr223/JythonTranslator.java  | 19 +++
 .../gremlin/python/jsr223/PythonTranslator.java  | 14 --
 .../python/jsr223/JythonTranslatorTest.java  | 13 +
 4 files changed, 41 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d626f5b5/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 3b084b7..7d07aa5 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -30,6 +30,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Bumped to Jackson 2.9.4.
 * Added `idleConnectionTimeout` and `keepAliveInterval` to Gremlin Server that 
enables a "ping" and auto-close for seemingly dead clients.
 * Fixed a bug where lambdas in `gremlin-python` would trigger a failure if 
steps using python-only symbols were present (such as `as_()`).
+* Fixed a bug where lambdas in `gremlin-python` would trigger a failure if 
`withStrategies()` was evaluated.
 * Fixed a bug in `NumberHelper` that led to wrong min/max results if numbers 
exceeded the Integer limits.
 * Delayed setting of the request identifier until `RequestMessage` 
construction by the builder.
 * Improved error messaging for failed serialization and deserialization of 
request/response messages.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d626f5b5/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java
--
diff --git 
a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java
 
b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java
index f8a5bc3..3d7d9fe 100644
--- 
a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java
+++ 
b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java
@@ -19,8 +19,17 @@
 
 package org.apache.tinkerpop.gremlin.python.jsr223;
 
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationConverter;
+import org.apache.commons.configuration.MapConfiguration;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
 import org.apache.tinkerpop.gremlin.util.function.Lambda;
 
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  * @author Stephen Mallette (http://stephen.genoprime.com)
@@ -63,4 +72,14 @@ public final class JythonTranslator extends PythonTranslator 
{
 // jython one can just pass them through.
 return methodName;
 }
+
+@Override
+protected String resolveTraversalStrategyProxy(final 
TraversalStrategyProxy proxy) {
+// since this is jython we don't need a traversal proxy here - we need 
the actual JVM version of the strategy
+// since this script will be executed in Jython. 
+if (proxy.getConfiguration().isEmpty())
+return proxy.getStrategyClass().getCanonicalName() + ".instance()";
+else
+return proxy.getStrategyClass().getCanonicalName() + ".create(new 
org.apache.commons.configuration.MapConfiguration(" + 
convertToString(ConfigurationConverter.getMap(proxy.getConfiguration())) + "))";
+}
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d626f5b5/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java
--
diff --git 

tinkerpop git commit: Force travis rebuild. CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 c0078326b -> 4c7526689


Force travis rebuild. CTR


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

Branch: refs/heads/tp33
Commit: 4c752668948a8589962488ac5793af34ed7d28d0
Parents: c007832
Author: Stephen Mallette 
Authored: Fri Mar 9 09:00:17 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 9 09:00:17 2018 -0500

--

--

[2/2] tinkerpop git commit: Merge branch 'tp33'

[spmallette]

Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: c559679381a7710c05744bc867df766275cd750e
Parents: 9627214 4c75266
Author: Stephen Mallette 
Authored: Fri Mar 9 09:00:30 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 9 09:00:30 2018 -0500

--

--

[1/2] tinkerpop git commit: Force travis rebuild. CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master 9627214b9 -> c55967938


Force travis rebuild. CTR


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

Branch: refs/heads/master
Commit: 4c752668948a8589962488ac5793af34ed7d28d0
Parents: c007832
Author: Stephen Mallette 
Authored: Fri Mar 9 09:00:17 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 9 09:00:17 2018 -0500

--

--

tinkerpop git commit: fixed link - CTR

[rdale]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 34f924e50 -> 97fb12e79


fixed link - CTR


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

Branch: refs/heads/tp32
Commit: 97fb12e79edfcf613f9a988beca4be731fc0ac48
Parents: 34f924e
Author: Robert Dale 
Authored: Fri Mar 9 07:33:03 2018 -0500
Committer: Robert Dale 
Committed: Fri Mar 9 07:33:03 2018 -0500

--
 docs/src/index.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/97fb12e7/docs/src/index.asciidoc
--
diff --git a/docs/src/index.asciidoc b/docs/src/index.asciidoc
index 5cc3dd5..f07bd99 100644
--- a/docs/src/index.asciidoc
+++ b/docs/src/index.asciidoc
@@ -57,7 +57,7 @@ Note the "+" following the link in each table entry - it 
forces an asciidoc line
 A gentle introduction to TinkerPop and the Gremlin traversal language that is 
divided into five, ten and fifteen minute tutorial blocks.
 |image:gremlin-dashboard.png[] 
|link:http://tinkerpop.apache.org/docs/x.y.z/tutorials/the-gremlin-console/[The 
Gremlin Console] +
 Provides a detailed look at The Gremlin Console and how it can be used when 
working with TinkerPop.
-^|image:gremlin-anatomy.png[width=125] 
|link:http://tinkerpop.apache.org/docs/x.y.z/gremlins-anatomy/[Gremlin's 
Anatomy]
+^|image:gremlin-anatomy.png[width=125] 
|link:http://tinkerpop.apache.org/docs/x.y.z/tutorials/gremlins-anatomy/[Gremlin's
 Anatomy]
 Identifies and explains the component parts of a Gremlin traversal.
 ^|image:gremlin-chef.png[width=125] 
|link:http://tinkerpop.apache.org/docs/x.y.z/recipes/[Gremlin Recipes]
 A collection of best practices and common traversal patterns for Gremlin.

[1/3] tinkerpop git commit: fixed link - CTR

[rdale]

Repository: tinkerpop
Updated Branches:
  refs/heads/master 7433ffb51 -> 9627214b9


fixed link - CTR


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

Branch: refs/heads/master
Commit: 97fb12e79edfcf613f9a988beca4be731fc0ac48
Parents: 34f924e
Author: Robert Dale 
Authored: Fri Mar 9 07:33:03 2018 -0500
Committer: Robert Dale 
Committed: Fri Mar 9 07:33:03 2018 -0500

--
 docs/src/index.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/97fb12e7/docs/src/index.asciidoc
--
diff --git a/docs/src/index.asciidoc b/docs/src/index.asciidoc
index 5cc3dd5..f07bd99 100644
--- a/docs/src/index.asciidoc
+++ b/docs/src/index.asciidoc
@@ -57,7 +57,7 @@ Note the "+" following the link in each table entry - it 
forces an asciidoc line
 A gentle introduction to TinkerPop and the Gremlin traversal language that is 
divided into five, ten and fifteen minute tutorial blocks.
 |image:gremlin-dashboard.png[] 
|link:http://tinkerpop.apache.org/docs/x.y.z/tutorials/the-gremlin-console/[The 
Gremlin Console] +
 Provides a detailed look at The Gremlin Console and how it can be used when 
working with TinkerPop.
-^|image:gremlin-anatomy.png[width=125] 
|link:http://tinkerpop.apache.org/docs/x.y.z/gremlins-anatomy/[Gremlin's 
Anatomy]
+^|image:gremlin-anatomy.png[width=125] 
|link:http://tinkerpop.apache.org/docs/x.y.z/tutorials/gremlins-anatomy/[Gremlin's
 Anatomy]
 Identifies and explains the component parts of a Gremlin traversal.
 ^|image:gremlin-chef.png[width=125] 
|link:http://tinkerpop.apache.org/docs/x.y.z/recipes/[Gremlin Recipes]
 A collection of best practices and common traversal patterns for Gremlin.

[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33

[rdale]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/master
Commit: c0078326b9bd8f9c0e5cf435fafa8a0de2764304
Parents: b8a7cb7 97fb12e
Author: Robert Dale 
Authored: Fri Mar 9 07:33:15 2018 -0500
Committer: Robert Dale 
Committed: Fri Mar 9 07:33:15 2018 -0500

--
 docs/src/index.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

[rdale]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/tp33
Commit: c0078326b9bd8f9c0e5cf435fafa8a0de2764304
Parents: b8a7cb7 97fb12e
Author: Robert Dale 
Authored: Fri Mar 9 07:33:15 2018 -0500
Committer: Robert Dale 
Committed: Fri Mar 9 07:33:15 2018 -0500

--
 docs/src/index.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[1/2] tinkerpop git commit: fixed link - CTR

[rdale]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 b8a7cb7a5 -> c0078326b


fixed link - CTR


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

Branch: refs/heads/tp33
Commit: 97fb12e79edfcf613f9a988beca4be731fc0ac48
Parents: 34f924e
Author: Robert Dale 
Authored: Fri Mar 9 07:33:03 2018 -0500
Committer: Robert Dale 
Committed: Fri Mar 9 07:33:03 2018 -0500

--
 docs/src/index.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/97fb12e7/docs/src/index.asciidoc
--
diff --git a/docs/src/index.asciidoc b/docs/src/index.asciidoc
index 5cc3dd5..f07bd99 100644
--- a/docs/src/index.asciidoc
+++ b/docs/src/index.asciidoc
@@ -57,7 +57,7 @@ Note the "+" following the link in each table entry - it 
forces an asciidoc line
 A gentle introduction to TinkerPop and the Gremlin traversal language that is 
divided into five, ten and fifteen minute tutorial blocks.
 |image:gremlin-dashboard.png[] 
|link:http://tinkerpop.apache.org/docs/x.y.z/tutorials/the-gremlin-console/[The 
Gremlin Console] +
 Provides a detailed look at The Gremlin Console and how it can be used when 
working with TinkerPop.
-^|image:gremlin-anatomy.png[width=125] 
|link:http://tinkerpop.apache.org/docs/x.y.z/gremlins-anatomy/[Gremlin's 
Anatomy]
+^|image:gremlin-anatomy.png[width=125] 
|link:http://tinkerpop.apache.org/docs/x.y.z/tutorials/gremlins-anatomy/[Gremlin's
 Anatomy]
 Identifies and explains the component parts of a Gremlin traversal.
 ^|image:gremlin-chef.png[width=125] 
|link:http://tinkerpop.apache.org/docs/x.y.z/recipes/[Gremlin Recipes]
 A collection of best practices and common traversal patterns for Gremlin.

[3/3] tinkerpop git commit: Merge branch 'tp33'

[rdale]

Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: 9627214b9a31ac18036b09439536c12e20076790
Parents: 7433ffb c007832
Author: Robert Dale 
Authored: Fri Mar 9 07:33:24 2018 -0500
Committer: Robert Dale 
Committed: Fri Mar 9 07:33:24 2018 -0500

--
 docs/src/index.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--