tinkerpop git commit: TINKERPOP-1908 Bump to Groovy 2.4.14

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1908 [created] e49e59852


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/e49e5985
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e49e5985
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e49e5985

Branch: refs/heads/TINKERPOP-1908
Commit: e49e59852c683e75a5718b8a13d7d98d4191a785
Parents: a61dd58
Author: Stephen Mallette 
Authored: Fri Mar 2 06:52:09 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 06:52:09 2018 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e49e5985/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f6ff536..a83ded5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@ limitations under the License.
 1.10
 2.6
 3.3.1
-2.4.11
+2.4.14
 2.7.2
 1.2
 2.10.4

tinkerpop git commit: TINKERPOP-1908 Bump to Groovy 2.4.14 [Forced Update!]

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1908 e49e59852 -> e3da110a6 (forced update)


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/e3da110a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e3da110a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e3da110a

Branch: refs/heads/TINKERPOP-1908
Commit: e3da110a6bb1d22b96dcd6b52008f19aec9cab00
Parents: a61dd58
Author: Stephen Mallette 
Authored: Fri Mar 2 06:52:09 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 07:22:55 2018 -0500

--
 CHANGELOG.asciidoc   | 1 +
 .../jsr223/GremlinGroovyScriptEngineCompileStaticTest.java   | 4 ++--
 pom.xml  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3da110a/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/e3da110a/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/e3da110a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f6ff536..a83ded5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@ limitations under the License.
 1.10
 2.6
 3.3.1
-2.4.11
+2.4.14
 2.7.2
 1.2
 2.10.4

tinkerpop git commit: TINKERPOP-1908 Bump to Groovy 2.4.14 [Forced Update!]

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1908 e3da110a6 -> 4dad1f3be (forced update)


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/4dad1f3b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4dad1f3b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4dad1f3b

Branch: refs/heads/TINKERPOP-1908
Commit: 4dad1f3be1a715cf9282a72694e115908d52c4c4
Parents: a61dd58
Author: Stephen Mallette 
Authored: Fri Mar 2 06:52:09 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 08:02:21 2018 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4dad1f3b/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/4dad1f3b/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/4dad1f3b/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
+++ 
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java
@@ -49,7 +49,7 @@ public class GremlinGroovyScriptEngineTypeCheckedTest {
 } catch 

[tinkerpop] Git Push Summary

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1738 [deleted] 203c4c2da

tinkerpop git commit: TINKERPOP-1738 Bump to jackson 2.9.4

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1738 [created] f35f04a8d


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-1738
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_

[tinkerpop] Git Push Summary

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1738-wip [deleted] 30005fdb2

tinkerpop git commit: TINKERPOP-1908 Bump to Groovy 2.4.14 [Forced Update!]

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1908 4dad1f3be -> df4d2c515 (forced update)


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/df4d2c51
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/df4d2c51
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/df4d2c51

Branch: refs/heads/TINKERPOP-1908
Commit: df4d2c515a160ff77c262ad66dd02ac5c7e29dd3
Parents: a61dd58
Author: Stephen Mallette 
Authored: Fri Mar 2 06:52:09 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 09:51:55 2018 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/df4d2c51/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/df4d2c51/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/df4d2c51/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
+++ 
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java
@@ -49,7 +49,7 @@ 

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

[spmallette]

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-1862
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 MessageScope.Local messageScope;
+private Set vertexComputeKeys;
+
+ 

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

[spmallette]

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-1862
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!");
 }
 }
 

[03/12] tinkerpop git commit: Test cleanup - hopefully can run now

[spmallette]

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-1862
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, 
IteratorUtils.count(v.values(VertexProgramR.PROPERTY_OUT)));
+final String in = 

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

[spmallette]

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-1862
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
-BranchTest.Traversals.class,
-ChooseTest.Traversals.class,
- 

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

[spmallette]

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-1862
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.

[07/12] tinkerpop git commit: Updating message passing tests to use kitchen sink

[spmallette]

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-1862
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";
 
 private final MessageScope.Local inMessageScope = 
MessageScope.Local.of(__::inE);

[01/12] tinkerpop git commit: TinkerMessenger proper handling of Direction.BOTH

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1862 [created] 7956b481b


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-1862
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]))

[05/12] tinkerpop git commit: Test bug fix and refactoring repeated code

[spmallette]

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-1862
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";

[10/12] tinkerpop git commit: Using "name" instead of "propertyin"

[spmallette]

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-1862
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 @@
-{"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"}]}}
-{"id":{"@type":"g:Int32","@val

[08/12] tinkerpop git commit: Revert "Updating kitchen sink graph"

[spmallette]

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-1862
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"}]}}
-{"id":1,"label":"message_passing_test","inE":{"msg_pass_test_edge":[{"id":5,"outV":1}]},"outE"

[09/12] tinkerpop git commit: Proper update of kitchen sink through TinkerFactory

[spmallette]

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-1862
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"}]}}
+{"id":{"@type":"g:Int32","@value":2001},"label":"message_passing_test","inE":{"msg_pass_test_edge":[{"id":{"@t

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

[spmallette]

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-1862
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"}]}}
+{"id":1,"label":"message_passing_test","inE":{"msg_pass_test_edge":[{"id":5,"outV":1}]},"outE":{"msg_pass_test_edge":[{"id":4,"inV":2},{"id":5,"inV":1}]},"properties

tinkerpop git commit: This closes #801

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master 32b39d372 -> 385881822


This closes #801


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

Branch: refs/heads/master
Commit: 385881822adb0d92111590c104675074e3493ef1
Parents: 32b39d3
Author: Stephen Mallette 
Authored: Fri Mar 2 11:43:46 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 11:43:46 2018 -0500

--

--

tinkerpop git commit: TINKERPOP-1908 Bump to Groovy 2.4.14 [Forced Update!]

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1908 df4d2c515 -> f409564bb (forced update)


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/TINKERPOP-1908
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
+++ 
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groov

tinkerpop git commit: TINKERPOP-1862 Added back computer tests accidentally commented out

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1862 7956b481b -> 8db0730a7


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-1862
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,
-//

[29/30] tinkerpop git commit: Fixed expected data type in sum() test

[dkuppitz]

Fixed expected data type in sum() test


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

Branch: refs/heads/TINKERPOP-1777
Commit: 674d800a587ba630a716729673786cdd323a2816
Parents: 3310b31
Author: Daniel Kuppitz 
Authored: Fri Mar 2 10:40:15 2018 -0700
Committer: Daniel Kuppitz 
Committed: Fri Mar 2 10:40:15 2018 -0700

--
 gremlin-test/features/map/Sum.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/674d800a/gremlin-test/features/map/Sum.feature
--
diff --git a/gremlin-test/features/map/Sum.feature 
b/gremlin-test/features/map/Sum.feature
index 816fd2b..0e20368 100644
--- a/gremlin-test/features/map/Sum.feature
+++ b/gremlin-test/features/map/Sum.feature
@@ -26,7 +26,7 @@ Feature: Step - sum()
 When iterated to list
 Then the result should be unordered
   | result |
-  | d[123].i |
+  | d[123].l |
 
   Scenario: g_V_foo_sum
 Given the modern graph

[02/30] 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-1777
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.
+
+
+image::apache-tinkerpop-logo.png[width=500,link="http://tinkerpop.apache.org";]
+
+*x.y.

[05/30] tinkerpop git commit: Updated gremlin console location to 3.4.0-SNAPSHOT CTR

[dkuppitz]

Updated gremlin console location to 3.4.0-SNAPSHOT CTR


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

Branch: refs/heads/TINKERPOP-1777
Commit: a418226574f85d3289807f8bae5d28adc2114895
Parents: df3e834
Author: Stephen Mallette 
Authored: Wed Feb 28 15:33:08 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 15:33:08 2018 -0500

--
 gremlin-console/bin/gremlin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4182265/gremlin-console/bin/gremlin.sh
--
diff --git a/gremlin-console/bin/gremlin.sh b/gremlin-console/bin/gremlin.sh
index 0a92aa1..197a398 12
--- a/gremlin-console/bin/gremlin.sh
+++ b/gremlin-console/bin/gremlin.sh
@@ -1 +1 @@
-../target/apache-tinkerpop-gremlin-console-3.3.2-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file
+../target/apache-tinkerpop-gremlin-console-3.4.0-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file

[12/30] 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-1777
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

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

[dkuppitz]

Merge branch 'tp32' into tp33

Conflicts:

gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs


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

Branch: refs/heads/TINKERPOP-1777
Commit: 247e008c4ef12cc2c12b731e445ffe743523ee5e
Parents: b516a6a 8ef717f
Author: Stephen Mallette 
Authored: Thu Mar 1 10:34:44 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 10:34:44 2018 -0500

--
 .../Gherkin/GherkinTestRunner.cs| 32 +---
 .../ModernGraphTypeInformation.cs   |  4 ++-
 gremlin-test/features/map/Match.feature |  2 +-
 gremlin-test/features/map/Min.feature   |  3 +-
 gremlin-test/features/map/Order.feature | 16 +-
 gremlin-test/features/map/Select.feature| 16 +-
 gremlin-test/features/sideEffect/Sack.feature   |  2 +-
 .../features/sideEffect/SideEffectCap.feature   |  2 +-
 8 files changed, 32 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/247e008c/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index bb97867,f3e823a..7e15757
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -37,30 -37,11 +37,14 @@@ namespace Gremlin.Net.IntegrationTest.G
  {
  public class GherkinTestRunner
  {
- private static readonly IDictionary 
IgnoredScenarios =
- new Dictionary
- {
- { "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },
- { "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported },
- { 
"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_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 },
- { 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX",
 IgnoreReason.NeedsFurtherInvestigation }
- };
 -private static readonly IDictionary 
IgnoredSc

[01/30] tinkerpop git commit: TINKERPOP-1586 Added checkAdjacentVertices option to SubgraphStrategy [Forced Update!]

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1777 be3a5db18 -> 087525e24 (forced update)


TINKERPOP-1586 Added checkAdjacentVertices option to SubgraphStrategy

This change allows the user to turn off an aspect of SubgraphStrategy that 
prevents it from working properly in OLAP situations.


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

Branch: refs/heads/TINKERPOP-1777
Commit: d1121544017acf1189f0270f60b5f1f402fec0ea
Parents: bcffaad
Author: Stephen Mallette 
Authored: Thu Feb 15 16:22:58 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Feb 15 16:24:54 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../strategy/decoration/SubgraphStrategy.java   | 58 ++
 .../decoration/SubgraphStrategyProcessTest.java | 84 
 3 files changed, 127 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d1121544/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index f1519b6..1701342 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)
 
+* 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 a bug in `NumberHelper` that led to wrong min/max results if numbers 
exceeded the Integer limits.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d1121544/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 4747cd4..e0d260f 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
@@ -82,13 +82,14 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy vertexCriterion, final 
Traversal edgeCriterion, final Traversal 
vertexPropertyCriterion) {
+private SubgraphStrategy(final Builder builder) {
 
-this.vertexCriterion = null == vertexCriterion ? null : 
vertexCriterion.asAdmin().clone();
+this.vertexCriterion = null == builder.vertexCriterion ? null : 
builder.vertexCriterion.asAdmin().clone();
 
-// if there is no vertex predicate there is no need to test either 
side of the edge
-if (null == this.vertexCriterion) {
-this.edgeCriterion = null == edgeCriterion ? null : 
edgeCriterion.asAdmin().clone();
+// if there is no vertex predicate there is no need to test either 
side of the edge - also this option can
+// be simply configured in the builder to not be used
+if (null == this.vertexCriterion || !builder.checkAdjacentVertices) {
+this.edgeCriterion = null == builder.edgeCriterion ? null : 
builder.edgeCriterion.asAdmin().clone();
 } else {
 final Traversal.Admin vertexPredicate;
 vertexPredicate = __.and(
@@ -97,12 +98,12 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy(edgeCriterion.asAdmin(), vertexPredicate));
+builder.edgeCriterion.asAdmin().clone().addStep(new 
TraversalFilterStep<>(builder.edgeCriterion.asAdmin(), vertexPredicate));
 }
 
-this.vertexPropertyCriterion = null == vertexPropertyCriterion ? null 
: vertexPropertyCriterion.asAdmin().clone();
+this.vertexPropertyCriterion = null == builder.vertexPropertyCriterion 
? null : builder.vertexPropertyCriterion.asAdmin().clone();
 
 if (null != this.vertexCriterion)
 TraversalHelper.applyTraversalRecursively(t -> 
t.getStartStep().addLabel(MARKER), this.vertexCriterion);
@@ -316,25 +317,50 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy vertexPredicate = null;
-private Traversal edgePredicate = null;
-private Traversal vertexPropertyPredicate = null;
+private Traversal vertexCriterion = nu

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

[dkuppitz]

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/032124a5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/032124a5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/032124a5

Branch: refs/heads/TINKERPOP-1777
Commit: 032124a504c3d324708d96c1d4b52e8ed2b22346
Parents: 69a355f 3aa9e70
Author: Stephen Mallette 
Authored: Wed Feb 28 14:15:22 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 14:15:22 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/032124a5/pom.xml
--

[14/30] 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-1777
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

[17/30] 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-1777
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

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

[dkuppitz]

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/e1d7f80b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e1d7f80b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e1d7f80b

Branch: refs/heads/TINKERPOP-1777
Commit: e1d7f80ba01b7ad186f23979d98c69cb559a24c1
Parents: 032124a d520516
Author: Stephen Mallette 
Authored: Wed Feb 28 15:40:37 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 15:40:37 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../strategy/decoration/SubgraphStrategy.java   | 58 ++
 .../decoration/SubgraphStrategyProcessTest.java | 84 
 3 files changed, 127 insertions(+), 16 deletions(-)
--


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

[15/30] 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-1777
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

[16/30] 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-1777
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

[09/30] tinkerpop git commit: Fixed a GLV test definition.

[dkuppitz]

Fixed a GLV test definition.

This allowed some ignored tests to pass CTR


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

Branch: refs/heads/TINKERPOP-1777
Commit: 6cfdfa93787ff7620ac73dcda70dc8e11be519cc
Parents: d520516
Author: Stephen Mallette 
Authored: Thu Mar 1 08:35:57 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 08:35:57 2018 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cfdfa93/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 69af86f..627570c 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -39,7 +39,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 private static readonly IDictionary 
IgnoredScenarios = new Dictionary {
 { 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation },
-{ "g_V_hasIdXwithinXemptyXX_count", 
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 },
@@ -53,7 +52,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 { "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_matchXa_knows_b__andXa_created_c__b_created_c__andXb_created_count_d__a_knows_count_dXXX",
 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/6cfdfa93/gremlin-test/features/map/Match.feature
--
diff --git a/gremlin-test/features/map/Match.feature 
b/gremlin-test/features/map/Match.feature
index 006692a..e44d363 100644
--- a/gremlin-test/features/map/Match.feature
+++ b/gremlin-test/features/map/Match.feature
@@ -230,7 +230,7 @@ Feature: Step - match()
 When iterated to list
 Then the result should be unordered
   | result |
-  | m[{"a":"v[marko]","b":"v[josh]","c":"v[lop]","d":2}] |
+  | m[{"a":"v[marko]","b":"v[josh]","c":"v[lop]","d":"d[2].l"}] |
 
   Scenario: 
g_V_matchXa_whereXa_neqXcXX__a_created_b__orXa_knows_vadas__a_0knows_and_a_hasXlabel_personXX__b_0created_c__b_0created_count_isXgtX1XXX_selectXa_b_cX_byXidX
 Given the modern graph

[28/30] tinkerpop git commit: Fixed a few test cases

[dkuppitz]

Fixed a few test cases


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

Branch: refs/heads/TINKERPOP-1777
Commit: 3310b310244fa1aad1615da05ab907a6a46bf6c5
Parents: fb05ea7
Author: Daniel Kuppitz 
Authored: Wed Feb 28 15:34:00 2018 -0700
Committer: Daniel Kuppitz 
Committed: Thu Mar 1 09:23:03 2018 -0700

--
 .../Gherkin/GherkinTestRunner.cs| 12 +--
 gremlin-test/features/branch/Union.feature  |  3 +-
 gremlin-test/features/map/Max.feature   | 29 
 gremlin-test/features/map/Mean.feature  | 31 -
 gremlin-test/features/map/Min.feature   | 29 
 gremlin-test/features/map/Order.feature |  7 ++--
 gremlin-test/features/map/Sum.feature   | 35 ++--
 gremlin-test/features/sideEffect/Group.feature  |  4 +--
 .../process/computer/GraphComputerTest.java | 12 +++
 .../traversal/step/branch/UnionTest.java|  2 +-
 .../process/traversal/step/map/OrderTest.java   | 18 --
 .../process/traversal/step/map/SumTest.java | 18 +-
 .../traversal/step/sideEffect/GroupTest.java| 11 ++
 13 files changed, 161 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3310b310/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 eb0a7e1..580708c 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -43,7 +43,15 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 { "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
 { 
"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 }  // TINKERPOP-1907
+{ "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation },  // TINKERPOP-1907
+{ "g_V_foo_min", IgnoreReason.NeedsFurtherInvestigation },
+{ "g_V_foo_fold_minXlocalX", 
IgnoreReason.NeedsFurtherInvestigation },
+{ "g_V_foo_max", IgnoreReason.NeedsFurtherInvestigation },
+{ "g_V_foo_fold_maxXlocalX", 
IgnoreReason.NeedsFurtherInvestigation },
+{ "g_V_foo_mean", IgnoreReason.NeedsFurtherInvestigation },
+{ "g_V_foo_fold_meanXlocalX", 
IgnoreReason.NeedsFurtherInvestigation },
+{ "g_V_foo_sum", IgnoreReason.NeedsFurtherInvestigation },
+{ "g_V_foo_fold_sumXlocalX", 
IgnoreReason.NeedsFurtherInvestigation }
 };
 
 private static class Keywords
@@ -384,4 +392,4 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 return rootDir.FullName;
 }
 }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3310b310/gremlin-test/features/branch/Union.feature
--
diff --git a/gremlin-test/features/branch/Union.feature 
b/gremlin-test/features/branch/Union.feature
index 83318f6..8f5297e 100644
--- a/gremlin-test/features/branch/Union.feature
+++ b/gremlin-test/features/branch/Union.feature
@@ -135,7 +135,6 @@ Feature: Step - union()
   | d[3].l   |
   | d[0].l   |
   | d[1.9].d |
-  | d[0].i   |
   | d[0].l   |
   | d[1].l   |
 
@@ -151,4 +150,4 @@ Feature: Step - union()
 Then the result should be unordered
   | result |
   | d[1].l   |
-  | d[1].l   |
\ No newline at end of file
+  | d[1].l   |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3310b310/gremlin-test/features/map/Max.feature
--
diff --git a/gremlin-test/features/map/Max.feature 
b/gremlin-test/features/map/Max.feature
index ad0a270..7139f65 100644
--- a/gremlin-test/features/map/Max.feature
+++ b/gremlin-test/features/map/Max.feature
@@ -28,6 +28,35 @@ Feature: Step - max()
   | result |
   | d[35].i |
 
+  Scenario: g_V_

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

[dkuppitz]

Merge branch 'tp32' into tp33

Conflicts:

gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs


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

Branch: refs/heads/TINKERPOP-1777
Commit: b516a6a571e3a1891af4f4245d42ac408638329f
Parents: e1d7f80 6cfdfa9
Author: Stephen Mallette 
Authored: Thu Mar 1 08:37:53 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 08:37:53 2018 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b516a6a5/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 5f331cb,627570c..bb97867
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -37,32 -37,26 +37,30 @@@ namespace Gremlin.Net.IntegrationTest.G
  {
  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_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 },
 -{ 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX",
 IgnoreReason.NeedsFurtherInvestigation }
 -};
 +private static readonly IDictionary 
IgnoredScenarios =
 +new Dictionary
 +{
 +{ "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },
 +{ "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported },
 +{ 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.NeedsFurtherInvestigation },
 +{ "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation },
 +   

[23/30] tinkerpop git commit: Merge branch 'tp33'

[dkuppitz]

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/b31e27d0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b31e27d0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b31e27d0

Branch: refs/heads/TINKERPOP-1777
Commit: b31e27d047878462e2f99c2bfb8ca814f4a60548
Parents: c722cda 532a5de
Author: Stephen Mallette 
Authored: Thu Mar 1 10:37:46 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 10:37:46 2018 -0500

--
 .../Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[08/30] tinkerpop git commit: Merge branch 'tp33'

[dkuppitz]

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/773d5101
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/773d5101
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/773d5101

Branch: refs/heads/TINKERPOP-1777
Commit: 773d5101400af98394728677f6a216ebad7088c8
Parents: a418226 e1d7f80
Author: Stephen Mallette 
Authored: Wed Feb 28 15:40:44 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 15:40:44 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../strategy/decoration/SubgraphStrategy.java   | 58 ++
 .../decoration/SubgraphStrategyProcessTest.java | 84 
 3 files changed, 127 insertions(+), 16 deletions(-)
--


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

[18/30] 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-1777
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
 };
 
 /// 

[06/30] tinkerpop git commit: Merge branch 'TINKERPOP-1586' into tp32

[dkuppitz]

Merge branch 'TINKERPOP-1586' into tp32


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

Branch: refs/heads/TINKERPOP-1777
Commit: d52051615783c83f7d185b257059ec2d37e97095
Parents: 3aa9e70 d112154
Author: Stephen Mallette 
Authored: Wed Feb 28 15:40:20 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 15:40:20 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../strategy/decoration/SubgraphStrategy.java   | 58 ++
 .../decoration/SubgraphStrategyProcessTest.java | 84 
 3 files changed, 127 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d5205161/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 60e0ef4,1701342..92e1d9e
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -23,9 -23,9 +23,10 @@@ image::https://raw.githubusercontent.co
  [[release-3-2-8]]
  === TinkerPop 3.2.8 (Release Date: NOT OFFICIALLY RELEASED YET)
  
+ * 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.
 +* 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.
  * Improved error messaging for failed serialization and deserialization of 
request/response messages.

[24/30] 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-1777
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

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

[dkuppitz]

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/9eed217f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9eed217f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9eed217f

Branch: refs/heads/TINKERPOP-1777
Commit: 9eed217fb50e82fc09e17462e0fe1fd655177384
Parents: 532a5de aaf5146
Author: Daniel Kuppitz 
Authored: Thu Mar 1 09:18:15 2018 -0700
Committer: Daniel Kuppitz 
Committed: Thu Mar 1 09:18:15 2018 -0700

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

[08/17] tinkerpop git commit: Merge branch 'tp33'

[dkuppitz]

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/a8bfabd2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a8bfabd2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a8bfabd2

Branch: refs/heads/TINKERPOP-1777
Commit: a8bfabd27f51e89cacbca14e61189a4efba69d25
Parents: 4e8d63c e56823b
Author: Stephen Mallette 
Authored: Thu Mar 1 13:45:56 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 13:45:56 2018 -0500

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

[05/17] tinkerpop git commit: Merge branch 'tp33'

[dkuppitz]

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/4e8d63c4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4e8d63c4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4e8d63c4

Branch: refs/heads/TINKERPOP-1777
Commit: 4e8d63c4ab4d9d131eb86b362e2cd6df94a8991d
Parents: 5d36ec1 92e899f
Author: Stephen Mallette 
Authored: Thu Mar 1 12:52:36 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 12:52:36 2018 -0500

--

--

[11/17] tinkerpop git commit: Added a remark about the test framework for 4.x in future dev docs CTR

[dkuppitz]

Added a remark about the test framework for 4.x in future dev docs CTR


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

Branch: refs/heads/TINKERPOP-1777
Commit: 07df6b35eb43d39fd423e7420234de1cd9f80933
Parents: fb8facf
Author: Stephen Mallette 
Authored: Thu Mar 1 18:41:25 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 18:42:03 2018 -0500

--
 docs/src/dev/future/index.asciidoc | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/07df6b35/docs/src/dev/future/index.asciidoc
--
diff --git a/docs/src/dev/future/index.asciidoc 
b/docs/src/dev/future/index.asciidoc
index 5e86ecf..4a51f57 100644
--- a/docs/src/dev/future/index.asciidoc
+++ b/docs/src/dev/future/index.asciidoc
@@ -142,4 +142,10 @@ This has an interesting potential impact on GLVs because 
"Little Gremlin" could
 client-side traversals over remote subgraphs, where the subgraph is like a 
remote transaction. All graph mutations
 essentially build a subgraph which is merged into the primary graph. That 
subgraph is effectively the "transaction".
 Build it locally then submit it remotely and have the server sort out the 
merging. It's perhaps the most natural way
-to load data. With "Gremlinito" you then get the added power of being able to 
traverse a local subgraph.
\ No newline at end of file
+to load data. With "Gremlinito" you then get the added power of being able to 
traverse a local subgraph.
+
+== Testing Framework
+
+Consider a testing framework based on the Gherkin tests from 3.x and a 
`gremlin-test` parent module for all the test
+framework modules that will potentially be needed. In 3.x, we found situation 
where having test modules beyond
+`gremlin-test` would have been helpful, so a parent module that held all those 
would probably be smart.
\ No newline at end of file

[06/17] 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-1777
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();

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

[dkuppitz]

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/e56823b6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e56823b6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e56823b6

Branch: refs/heads/TINKERPOP-1777
Commit: e56823b673262ba05267785aa82b45e893a77557
Parents: 92e899f a61dd58
Author: Stephen Mallette 
Authored: Thu Mar 1 13:45:47 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 13:45:47 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/e56823b6/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
--

[01/17] tinkerpop git commit: TINKERPOP-1894 Fixed deserialization of P.not() for GraphSON 2.x [Forced Update!]

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1777 087525e24 -> 912139ee6 (forced update)


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-1777
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
--

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

[dkuppitz]

Merge branch 'tp32' into tp33

Conflicts:
gremlin-python/src/main/jython/radish/feature_steps.py


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

Branch: refs/heads/TINKERPOP-1777
Commit: 92e899f4ceb6c5aa7e614087bca633d46f2fa61d
Parents: 9eed217 2350cbe
Author: Stephen Mallette 
Authored: Thu Mar 1 12:52:27 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 12:52:27 2018 -0500

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


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/92e899f4/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/92e899f4/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java
index c629b3f,000..fd11f25
mode 100644,00..100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java
@@@ -1,472 -1,0 +1,474 @@@
 +/*
 + *  Licensed to the Apache Software Foundation (ASF) under one
 + *  or more contributor license agreements.  See the NOTICE file
 + *  distributed with this work for additional information
 + *  regarding copyright ownership.  The ASF licenses this file
 + *  to you under the Apache License, Version 2.0 (the
 + *  "License"); you may not use this file except in compliance
 + *  with the License.  You may obtain a copy of the License at
 + *
 + *  http://www.apache.org/licenses/LICENSE-2.0
 + *
 + *  Unless required by applicable law or agreed to in writing,
 + *  software distributed under the License is distributed on an
 + *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + *  KIND, either express or implied.  See the License for the
 + *  specific language governing permissions and limitations
 + *  under the License.
 + */
 +
 +package org.apache.tinkerpop.gremlin.structure.io.graphson;
 +
 +import org.apache.commons.configuration.ConfigurationConverter;
 +import org.apache.commons.configuration.MapConfiguration;
 +import 
org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
 +import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 +import org.apache.tinkerpop.gremlin.process.traversal.P;
 +import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 +import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
 +import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
 +import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
 +import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
 +import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
 +import org.apache.tinkerpop.gremlin.util.function.Lambda;
 +import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
 +import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
 +import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
 +import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
 +import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
 +import org.apache.tinkerpop.shaded.jackson.databind.JavaType;
 +import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
 +import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
 +import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
 +import 
org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
 +import org.

[10/17] tinkerpop git commit: Merge branch 'tp33'

[dkuppitz]

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/18ba893f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/18ba893f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/18ba893f

Branch: refs/heads/TINKERPOP-1777
Commit: 18ba893fb04b96c256370ada38f274094d70adea
Parents: a8bfabd fb8facf
Author: Stephen Mallette 
Authored: Thu Mar 1 18:25:05 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 18:25:05 2018 -0500

--
 docs/src/dev/future/index.asciidoc | 27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)
--

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

[dkuppitz]

Merge branch 'tp32' into tp33

Conflicts:
gremlin-python/src/main/jython/radish/feature_steps.py


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

Branch: refs/heads/TINKERPOP-1777
Commit: 5ec7774793f2686a7136cfb9c2fb6ff5805957f4
Parents: 532a5de 2350cbe
Author: Stephen Mallette 
Authored: Thu Mar 1 12:49:24 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 12:49:24 2018 -0500

--
 CHANGELOG.asciidoc   |  1 +
 docs/preprocessor/preprocess-file.sh |  3 +++
 .../gremlin/structure/io/graphson/GraphSONTokens.java|  1 +
 .../structure/io/graphson/TraversalSerializersV2d0.java  |  2 ++
 .../structure/io/graphson/TraversalSerializersV3d0.java  |  2 ++
 .../ser/GraphSONMessageSerializerGremlinV2d0Test.java| 11 +++
 .../driver/ser/GraphSONMessageSerializerV3d0Test.java| 11 +++
 .../gremlin-javascript/test/cucumber/feature-steps.js|  4 
 gremlin-python/src/main/jython/radish/feature_steps.py   |  5 -
 9 files changed, 31 insertions(+), 9 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ec77747/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ec77747/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java
index c629b3f,000..fd11f25
mode 100644,00..100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java
@@@ -1,472 -1,0 +1,474 @@@
 +/*
 + *  Licensed to the Apache Software Foundation (ASF) under one
 + *  or more contributor license agreements.  See the NOTICE file
 + *  distributed with this work for additional information
 + *  regarding copyright ownership.  The ASF licenses this file
 + *  to you under the Apache License, Version 2.0 (the
 + *  "License"); you may not use this file except in compliance
 + *  with the License.  You may obtain a copy of the License at
 + *
 + *  http://www.apache.org/licenses/LICENSE-2.0
 + *
 + *  Unless required by applicable law or agreed to in writing,
 + *  software distributed under the License is distributed on an
 + *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + *  KIND, either express or implied.  See the License for the
 + *  specific language governing permissions and limitations
 + *  under the License.
 + */
 +
 +package org.apache.tinkerpop.gremlin.structure.io.graphson;
 +
 +import org.apache.commons.configuration.ConfigurationConverter;
 +import org.apache.commons.configuration.MapConfiguration;
 +import 
org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
 +import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 +import org.apache.tinkerpop.gremlin.process.traversal.P;
 +import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 +import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
 +import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
 +import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
 +import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
 +import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
 +import org.apache.tinkerpop.gremlin.util.function.Lambda;
 +import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
 +import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
 +import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
 +import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
 +import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
 +import org.apache.tinkerpop.shaded.jackson.databind.JavaType;
 +import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
 +import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
 +import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
 +import 
org.apache.tinkerpop

[03/17] tinkerpop git commit: Merge branch 'tp33'

[dkuppitz]

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/5d36ec11
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5d36ec11
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5d36ec11

Branch: refs/heads/TINKERPOP-1777
Commit: 5d36ec116da9976e3e08cb09c03f4aa3823c9c9c
Parents: cef13dd 5ec7774
Author: Stephen Mallette 
Authored: Thu Mar 1 12:49:41 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 12:49:41 2018 -0500

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


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

[13/30] 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-1777
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 }
 };
 

[26/30] tinkerpop git commit: Merge branch 'tp33'

[dkuppitz]

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/cef13dd6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cef13dd6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cef13dd6

Branch: refs/heads/TINKERPOP-1777
Commit: cef13dd659a360b93f7f6911e9868c943e060575
Parents: b31e27d 9eed217
Author: Daniel Kuppitz 
Authored: Thu Mar 1 09:18:33 2018 -0700
Committer: Daniel Kuppitz 
Committed: Thu Mar 1 09:18:33 2018 -0700

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

[27/30] tinkerpop git commit: Fixed the behavior of `min()`, `max()`, `mean()` and `sum()`. If no input is given, these steps will now throw a `FastNoElementException`.

[dkuppitz]

Fixed the behavior of `min()`, `max()`, `mean()` and `sum()`.
If no input is given, these steps will now throw a `FastNoElementException`.


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

Branch: refs/heads/TINKERPOP-1777
Commit: fb05ea797ae95611ce03b6b027513a79567b6a25
Parents: cef13dd
Author: Daniel Kuppitz 
Authored: Tue Feb 27 10:15:07 2018 -0700
Committer: Daniel Kuppitz 
Committed: Thu Mar 1 09:20:29 2018 -0700

--
 CHANGELOG.asciidoc  |  2 +
 .../traversal/step/map/ComputerResultStep.java  |  4 +-
 .../process/traversal/step/filter/AndStep.java  |  2 +-
 .../traversal/step/map/MaxGlobalStep.java   |  8 ++-
 .../traversal/step/map/MaxLocalStep.java|  9 ++-
 .../traversal/step/map/MeanGlobalStep.java  |  6 ++
 .../traversal/step/map/MeanLocalStep.java   |  4 +-
 .../traversal/step/map/MinGlobalStep.java   |  6 ++
 .../traversal/step/map/MinLocalStep.java|  9 ++-
 .../traversal/step/map/SumGlobalStep.java   |  8 ++-
 .../traversal/step/map/SumLocalStep.java|  9 ++-
 .../process/traversal/step/map/MaxTest.java | 48 +++-
 .../process/traversal/step/map/MeanTest.java| 43 --
 .../process/traversal/step/map/MinTest.java | 46 +++
 .../process/traversal/step/map/SumTest.java | 60 ++--
 .../SparkStarBarrierInterceptor.java| 32 ++-
 .../structure/TinkerGraphPlayTest.java  |  7 +--
 17 files changed, 251 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 26d53b4..a07128b 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,8 @@ NEED AND IMAGE
 
 This release also includes changes from <>.
 
+* Fixed a bug in `ReducingBarrierStep`, that returned the provided seed value 
despite no elements being available.
+
 
 == TinkerPop 3.3.0 (Gremlin Symphony #40 in G Minor)
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
index b5fd8e8..95e572d 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
@@ -66,7 +66,9 @@ public final class ComputerResultStep extends 
AbstractStep
 return this.currentIterator.next();
 else {
 final ComputerResult result = this.starts.next().get();
-this.currentIterator = 
attach(result.memory().>get(TraversalVertexProgram.HALTED_TRAVERSERS).iterator(),
 result.graph());
+this.currentIterator = 
attach(result.memory().exists(TraversalVertexProgram.HALTED_TRAVERSERS)
+? 
result.memory().>get(TraversalVertexProgram.HALTED_TRAVERSERS).iterator()
+: EmptyIterator.instance(), result.graph());
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java
index 5d9d124..5c20cd8 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java
@@ -39,4 +39,4 @@ public final class AndStep extends ConnectiveStep {
 }
 return true;
 }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxGlobalStep.java
--
diff --git 
a/gremlin-core/src/ma

[30/30] tinkerpop git commit: fixed sum() in Spark

[dkuppitz]

fixed sum() in Spark


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

Branch: refs/heads/TINKERPOP-1777
Commit: 087525e2449741aa7278f38c729d048b633ee5bc
Parents: 674d800
Author: Daniel Kuppitz 
Authored: Fri Mar 2 10:40:39 2018 -0700
Committer: Daniel Kuppitz 
Committed: Fri Mar 2 10:40:39 2018 -0700

--
 .../optimization/interceptor/SparkStarBarrierInterceptor.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/087525e2/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java
--
diff --git 
a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java
 
b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java
index 3c89c1d..6509928 100644
--- 
a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java
+++ 
b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java
@@ -98,9 +98,9 @@ public final class SparkStarBarrierInterceptor implements 
SparkVertexProgramInte
 // USE SPARK DSL FOR THE RESPECTIVE END REDUCING BARRIER STEP OF THE 
TRAVERSAL
 final Object result;
 if (endStep instanceof CountGlobalStep)
-result = nextRDD.map(Traverser::bulk).fold(0l, (a, b) -> a + b);
+result = nextRDD.map(Traverser::bulk).fold(0L, (a, b) -> a + b);
 else if (endStep instanceof SumGlobalStep) {
-result = nextRDD
+result = nextRDD.isEmpty() ? null : nextRDD
 .map(traverser -> NumberHelper.mul(traverser.bulk(), 
(Number) traverser.get()))
 .fold(0, NumberHelper::add);
 } else if (endStep instanceof MeanGlobalStep) {

[11/30] tinkerpop git commit: Merge branch 'tp33'

[dkuppitz]

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/e48e8340
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e48e8340
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e48e8340

Branch: refs/heads/TINKERPOP-1777
Commit: e48e8340f4b2ac14ffd0bbf87b3cc2bcb61da97b
Parents: 773d510 b516a6a
Author: Stephen Mallette 
Authored: Thu Mar 1 08:38:00 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 08:38:00 2018 -0500

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

[19/30] 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-1777
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

[22/30] tinkerpop git commit: Added JIRA issue for ignored GLV test for .NET CTR

[dkuppitz]

Added JIRA issue for ignored GLV test 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/532a5de2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/532a5de2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/532a5de2

Branch: refs/heads/TINKERPOP-1777
Commit: 532a5de26fb7b5ec64c00ce7c99d431d16c48dba
Parents: 247e008
Author: Stephen Mallette 
Authored: Thu Mar 1 10:37:28 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 10:37:28 2018 -0500

--
 .../Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/532a5de2/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 7e15757..eb0a7e1 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -39,8 +39,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 private static readonly IDictionary 
IgnoredScenarios = new Dictionary
 {
-{ "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },
-{ "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported },
+{ "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
+{ "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
 { 
"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 }  // TINKERPOP-1907

[04/30] tinkerpop git commit: Merge branch 'tp33'

[dkuppitz]

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/df3e8341
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/df3e8341
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/df3e8341

Branch: refs/heads/TINKERPOP-1777
Commit: df3e834191ec6061ece1dc64a659b4306faaa676
Parents: 05c1c04 032124a
Author: Stephen Mallette 
Authored: Wed Feb 28 14:15:31 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 14:15:31 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/df3e8341/pom.xml
--

[21/30] tinkerpop git commit: Merge branch 'tp33'

[dkuppitz]

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/c722cda0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c722cda0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c722cda0

Branch: refs/heads/TINKERPOP-1777
Commit: c722cda0541ed1ef3133ce19a5a5c10863a445af
Parents: e48e834 247e008
Author: Stephen Mallette 
Authored: Thu Mar 1 10:34:57 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 10:34:57 2018 -0500

--
 .../Gherkin/GherkinTestRunner.cs| 32 +---
 .../ModernGraphTypeInformation.cs   |  4 ++-
 gremlin-test/features/map/Match.feature |  2 +-
 gremlin-test/features/map/Min.feature   |  3 +-
 gremlin-test/features/map/Order.feature | 16 +-
 gremlin-test/features/map/Select.feature| 16 +-
 gremlin-test/features/sideEffect/Sack.feature   |  2 +-
 .../features/sideEffect/SideEffectCap.feature   |  2 +-
 8 files changed, 32 insertions(+), 45 deletions(-)
--

[16/17] tinkerpop git commit: Fixed expected data type in sum() test

[dkuppitz]

Fixed expected data type in sum() test


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

Branch: refs/heads/TINKERPOP-1777
Commit: e51c8c86d03f4dece894e24b34175b40482c2e7e
Parents: 6c9ae97
Author: Daniel Kuppitz 
Authored: Fri Mar 2 10:40:15 2018 -0700
Committer: Daniel Kuppitz 
Committed: Fri Mar 2 10:41:36 2018 -0700

--
 gremlin-test/features/map/Sum.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e51c8c86/gremlin-test/features/map/Sum.feature
--
diff --git a/gremlin-test/features/map/Sum.feature 
b/gremlin-test/features/map/Sum.feature
index 816fd2b..0e20368 100644
--- a/gremlin-test/features/map/Sum.feature
+++ b/gremlin-test/features/map/Sum.feature
@@ -26,7 +26,7 @@ Feature: Step - sum()
 When iterated to list
 Then the result should be unordered
   | result |
-  | d[123].i |
+  | d[123].l |
 
   Scenario: g_V_foo_sum
 Given the modern graph

[15/17] tinkerpop git commit: fixed sum() in Spark

[dkuppitz]

fixed sum() in Spark


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

Branch: refs/heads/TINKERPOP-1777
Commit: 912139ee6b38e63138ca45009d8ef019c8b11da4
Parents: e51c8c8
Author: Daniel Kuppitz 
Authored: Fri Mar 2 10:40:39 2018 -0700
Committer: Daniel Kuppitz 
Committed: Fri Mar 2 10:41:36 2018 -0700

--
 .../optimization/interceptor/SparkStarBarrierInterceptor.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/912139ee/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java
--
diff --git 
a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java
 
b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java
index 3c89c1d..6509928 100644
--- 
a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java
+++ 
b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java
@@ -98,9 +98,9 @@ public final class SparkStarBarrierInterceptor implements 
SparkVertexProgramInte
 // USE SPARK DSL FOR THE RESPECTIVE END REDUCING BARRIER STEP OF THE 
TRAVERSAL
 final Object result;
 if (endStep instanceof CountGlobalStep)
-result = nextRDD.map(Traverser::bulk).fold(0l, (a, b) -> a + b);
+result = nextRDD.map(Traverser::bulk).fold(0L, (a, b) -> a + b);
 else if (endStep instanceof SumGlobalStep) {
-result = nextRDD
+result = nextRDD.isEmpty() ? null : nextRDD
 .map(traverser -> NumberHelper.mul(traverser.bulk(), 
(Number) traverser.get()))
 .fold(0, NumberHelper::add);
 } else if (endStep instanceof MeanGlobalStep) {

[17/17] tinkerpop git commit: Fixed the behavior of `min()`, `max()`, `mean()` and `sum()`. If no input is given, these steps will now throw a `FastNoElementException`.

[dkuppitz]

Fixed the behavior of `min()`, `max()`, `mean()` and `sum()`.
If no input is given, these steps will now throw a `FastNoElementException`.


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

Branch: refs/heads/TINKERPOP-1777
Commit: 6f51fbda2e3bec1e35e79dce5df09c2e350283f7
Parents: 3858818
Author: Daniel Kuppitz 
Authored: Tue Feb 27 10:15:07 2018 -0700
Committer: Daniel Kuppitz 
Committed: Fri Mar 2 10:41:36 2018 -0700

--
 CHANGELOG.asciidoc  |  2 +
 .../traversal/step/map/ComputerResultStep.java  |  4 +-
 .../process/traversal/step/filter/AndStep.java  |  2 +-
 .../traversal/step/map/MaxGlobalStep.java   |  8 ++-
 .../traversal/step/map/MaxLocalStep.java|  9 ++-
 .../traversal/step/map/MeanGlobalStep.java  |  6 ++
 .../traversal/step/map/MeanLocalStep.java   |  4 +-
 .../traversal/step/map/MinGlobalStep.java   |  6 ++
 .../traversal/step/map/MinLocalStep.java|  9 ++-
 .../traversal/step/map/SumGlobalStep.java   |  8 ++-
 .../traversal/step/map/SumLocalStep.java|  9 ++-
 .../process/traversal/step/map/MaxTest.java | 48 +++-
 .../process/traversal/step/map/MeanTest.java| 43 --
 .../process/traversal/step/map/MinTest.java | 46 +++
 .../process/traversal/step/map/SumTest.java | 60 ++--
 .../SparkStarBarrierInterceptor.java| 32 ++-
 .../structure/TinkerGraphPlayTest.java  |  7 +--
 17 files changed, 251 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f51fbda/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a3de12f..0bad01a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,8 @@ NEED AND IMAGE
 
 This release also includes changes from <>.
 
+* Fixed a bug in `ReducingBarrierStep`, that returned the provided seed value 
despite no elements being available.
+
 
 == TinkerPop 3.3.0 (Gremlin Symphony #40 in G Minor)
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f51fbda/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
index b5fd8e8..95e572d 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
@@ -66,7 +66,9 @@ public final class ComputerResultStep extends 
AbstractStep
 return this.currentIterator.next();
 else {
 final ComputerResult result = this.starts.next().get();
-this.currentIterator = 
attach(result.memory().>get(TraversalVertexProgram.HALTED_TRAVERSERS).iterator(),
 result.graph());
+this.currentIterator = 
attach(result.memory().exists(TraversalVertexProgram.HALTED_TRAVERSERS)
+? 
result.memory().>get(TraversalVertexProgram.HALTED_TRAVERSERS).iterator()
+: EmptyIterator.instance(), result.graph());
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f51fbda/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java
index 5d9d124..5c20cd8 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java
@@ -39,4 +39,4 @@ public final class AndStep extends ConnectiveStep {
 }
 return true;
 }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f51fbda/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxGlobalStep.java
--
diff --git 
a/gremlin-core/src/ma

[14/17] tinkerpop git commit: Fixed a few test cases

[dkuppitz]

Fixed a few test cases


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

Branch: refs/heads/TINKERPOP-1777
Commit: 6c9ae97c05b284717701e5da0153430af9c50ac6
Parents: 6f51fbd
Author: Daniel Kuppitz 
Authored: Wed Feb 28 15:34:00 2018 -0700
Committer: Daniel Kuppitz 
Committed: Fri Mar 2 10:41:36 2018 -0700

--
 .../Gherkin/GherkinTestRunner.cs| 12 +--
 gremlin-test/features/branch/Union.feature  |  3 +-
 gremlin-test/features/map/Max.feature   | 29 
 gremlin-test/features/map/Mean.feature  | 31 -
 gremlin-test/features/map/Min.feature   | 29 
 gremlin-test/features/map/Order.feature |  7 ++--
 gremlin-test/features/map/Sum.feature   | 35 ++--
 gremlin-test/features/sideEffect/Group.feature  |  4 +--
 .../process/computer/GraphComputerTest.java | 12 +++
 .../traversal/step/branch/UnionTest.java|  2 +-
 .../process/traversal/step/map/OrderTest.java   | 18 --
 .../process/traversal/step/map/SumTest.java | 18 +-
 .../traversal/step/sideEffect/GroupTest.java| 11 ++
 13 files changed, 161 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6c9ae97c/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 eb0a7e1..580708c 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -43,7 +43,15 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 { "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
 { 
"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 }  // TINKERPOP-1907
+{ "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation },  // TINKERPOP-1907
+{ "g_V_foo_min", IgnoreReason.NeedsFurtherInvestigation },
+{ "g_V_foo_fold_minXlocalX", 
IgnoreReason.NeedsFurtherInvestigation },
+{ "g_V_foo_max", IgnoreReason.NeedsFurtherInvestigation },
+{ "g_V_foo_fold_maxXlocalX", 
IgnoreReason.NeedsFurtherInvestigation },
+{ "g_V_foo_mean", IgnoreReason.NeedsFurtherInvestigation },
+{ "g_V_foo_fold_meanXlocalX", 
IgnoreReason.NeedsFurtherInvestigation },
+{ "g_V_foo_sum", IgnoreReason.NeedsFurtherInvestigation },
+{ "g_V_foo_fold_sumXlocalX", 
IgnoreReason.NeedsFurtherInvestigation }
 };
 
 private static class Keywords
@@ -384,4 +392,4 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 return rootDir.FullName;
 }
 }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6c9ae97c/gremlin-test/features/branch/Union.feature
--
diff --git a/gremlin-test/features/branch/Union.feature 
b/gremlin-test/features/branch/Union.feature
index 83318f6..8f5297e 100644
--- a/gremlin-test/features/branch/Union.feature
+++ b/gremlin-test/features/branch/Union.feature
@@ -135,7 +135,6 @@ Feature: Step - union()
   | d[3].l   |
   | d[0].l   |
   | d[1.9].d |
-  | d[0].i   |
   | d[0].l   |
   | d[1].l   |
 
@@ -151,4 +150,4 @@ Feature: Step - union()
 Then the result should be unordered
   | result |
   | d[1].l   |
-  | d[1].l   |
\ No newline at end of file
+  | d[1].l   |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6c9ae97c/gremlin-test/features/map/Max.feature
--
diff --git a/gremlin-test/features/map/Max.feature 
b/gremlin-test/features/map/Max.feature
index ad0a270..7139f65 100644
--- a/gremlin-test/features/map/Max.feature
+++ b/gremlin-test/features/map/Max.feature
@@ -28,6 +28,35 @@ Feature: Step - max()
   | result |
   | d[35].i |
 
+  Scenario: g_V_

[12/17] tinkerpop git commit: Merge branch 'tp33'

[dkuppitz]

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/32b39d37
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/32b39d37
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/32b39d37

Branch: refs/heads/TINKERPOP-1777
Commit: 32b39d3727dc329eaf2acd81a34dbca9cdc170a4
Parents: 18ba893 07df6b3
Author: Stephen Mallette 
Authored: Thu Mar 1 18:42:18 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 18:42:18 2018 -0500

--
 docs/src/dev/future/index.asciidoc | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--

[09/17] tinkerpop git commit: Added TINKERPOP-1417 to the future dev doc CTR

[dkuppitz]

Added TINKERPOP-1417 to the future dev doc CTR


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

Branch: refs/heads/TINKERPOP-1777
Commit: fb8facfd35adf5cb18fd761d7610e455a9bbfea3
Parents: e56823b
Author: Stephen Mallette 
Authored: Thu Mar 1 18:24:30 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 18:24:30 2018 -0500

--
 docs/src/dev/future/index.asciidoc | 27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb8facfd/docs/src/dev/future/index.asciidoc
--
diff --git a/docs/src/dev/future/index.asciidoc 
b/docs/src/dev/future/index.asciidoc
index 63900e8..5e86ecf 100644
--- a/docs/src/dev/future/index.asciidoc
+++ b/docs/src/dev/future/index.asciidoc
@@ -49,7 +49,6 @@ These items include:
 ** The role of Blueprints should be significantly reduced.
 ** The role of Gremlin should be significantly increased.
 
-
 == Hiding Blueprints
 
 Originally from the 
link:https://lists.apache.org/thread.html/b4d80072ad36849b4e9cd3308f87115660574e3e7a4abb7ee68e959b@%3Cdev.tinkerpop.apache.org%3E[mailing
 list]:
@@ -118,3 +117,29 @@ now is rooted in the Neo4j approach to transactions and is 
often more trouble th
 Distributed transactions are a challenge and don't apply to every provider. 
Transactions are further complicated by
 GLVs. The idea of local subgraphs for mutations and transaction management 
might be good but that goes against having
 just `ReferenceGraph`.
+
+== Gremlin Language Subset
+
+On link:https://issues.apache.org/jira/browse/TINKERPOP-1417[TINKERPOP-1417], 
it was suggested that we "Create a
+Gremlin language subset that is easy to implement on any VM". Implementing the 
Gremlin VM in another language is
+pretty straightforward. However, its a lot of code.. all these steps 
implementations. One thing we could do to make
+it easy for database providers not on the JVM (e.g. ArangoDB and C) is to 
create "Gremlito" (Gremlin--). This language
+subset wouldn't support side-effects, sacks, match, etc. Basically, just 
simple traversal steps and reducing barrier
+terminals.
+
+Thus:
+
+* out, in, both, values, outE, inV, id, label, etc.
+* repeat
+* select, project
+* where, has, limit, range, is, dedup
+* path, simplePath, cyclicPath
+* groupCount, sum, group, count, max, min, etc. (reducing barriers)
+
+=== Comments
+
+This has an interesting potential impact on GLVs because "Little Gremlin" 
could be implemented within them for
+client-side traversals over remote subgraphs, where the subgraph is like a 
remote transaction. All graph mutations
+essentially build a subgraph which is merged into the primary graph. That 
subgraph is effectively the "transaction".
+Build it locally then submit it remotely and have the server sort out the 
merging. It's perhaps the most natural way
+to load data. With "Gremlinito" you then get the added power of being able to 
traverse a local subgraph.
\ No newline at end of file

[13/17] tinkerpop git commit: This closes #801

[dkuppitz]

This closes #801


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

Branch: refs/heads/TINKERPOP-1777
Commit: 385881822adb0d92111590c104675074e3493ef1
Parents: 32b39d3
Author: Stephen Mallette 
Authored: Fri Mar 2 11:43:46 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 11:43:46 2018 -0500

--

--

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

[spmallette]

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/31762f7c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/31762f7c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/31762f7c

Branch: refs/heads/master
Commit: 31762f7c411c44d38249c635e0e39c9345e34264
Parents: 07df6b3 4db0991
Author: Stephen Mallette 
Authored: Fri Mar 2 15:02:13 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 15:02:13 2018 -0500

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

tinkerpop git commit: TINKERPOP-1509 tree() tests working now

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 a61dd58ee -> 4db099137


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/tp32
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();

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

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 07df6b35e -> 31762f7c4


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/tp33
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();

[3/3] 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/4579a0e2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4579a0e2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4579a0e2

Branch: refs/heads/master
Commit: 4579a0e29a0a65e904dd865e59d10a654b16f91f
Parents: 3858818 31762f7
Author: Stephen Mallette 
Authored: Fri Mar 2 15:09:48 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 15:09:48 2018 -0500

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

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

[spmallette]

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/31762f7c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/31762f7c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/31762f7c

Branch: refs/heads/tp33
Commit: 31762f7c411c44d38249c635e0e39c9345e34264
Parents: 07df6b3 4db0991
Author: Stephen Mallette 
Authored: Fri Mar 2 15:02:13 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 15:02:13 2018 -0500

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

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

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master 385881822 -> 4579a0e29


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/master
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();

tinkerpop git commit: Fixed the behavior of `min()`, `max()`, `mean()` and `sum()`. If no input is given, these steps will now throw a `FastNoElementException`. [Forced Update!]

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1777 912139ee6 -> 32014426f (forced update)


Fixed the behavior of `min()`, `max()`, `mean()` and `sum()`.
If no input is given, these steps will now throw a `FastNoElementException`.

Also adjusted existing test cases to be in line with the new behavior.


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

Branch: refs/heads/TINKERPOP-1777
Commit: 32014426f12478e13d73b3c1bdca8df6d79d08da
Parents: 3858818
Author: Daniel Kuppitz 
Authored: Tue Feb 27 10:15:07 2018 -0700
Committer: Daniel Kuppitz 
Committed: Fri Mar 2 13:39:26 2018 -0700

--
 CHANGELOG.asciidoc  |  2 +
 .../traversal/step/map/ComputerResultStep.java  |  4 +-
 .../process/traversal/step/filter/AndStep.java  |  2 +-
 .../traversal/step/map/MaxGlobalStep.java   |  8 ++-
 .../traversal/step/map/MaxLocalStep.java|  9 ++-
 .../traversal/step/map/MeanGlobalStep.java  |  6 ++
 .../traversal/step/map/MeanLocalStep.java   |  4 +-
 .../traversal/step/map/MinGlobalStep.java   |  6 ++
 .../traversal/step/map/MinLocalStep.java|  9 ++-
 .../traversal/step/map/SumGlobalStep.java   |  8 ++-
 .../traversal/step/map/SumLocalStep.java|  9 ++-
 .../Gherkin/GherkinTestRunner.cs|  2 +-
 gremlin-test/features/branch/Union.feature  |  3 +-
 gremlin-test/features/map/Max.feature   | 29 ++
 gremlin-test/features/map/Mean.feature  | 31 +-
 gremlin-test/features/map/Min.feature   | 29 ++
 gremlin-test/features/map/Order.feature |  7 +--
 gremlin-test/features/map/Sum.feature   | 33 ++-
 gremlin-test/features/sideEffect/Group.feature  |  4 +-
 .../process/computer/GraphComputerTest.java | 12 ++--
 .../traversal/step/branch/UnionTest.java|  2 +-
 .../process/traversal/step/map/MaxTest.java | 48 +++-
 .../process/traversal/step/map/MeanTest.java| 43 --
 .../process/traversal/step/map/MinTest.java | 46 +++
 .../process/traversal/step/map/OrderTest.java   | 18 ++
 .../process/traversal/step/map/SumTest.java | 60 ++--
 .../traversal/step/sideEffect/GroupTest.java| 11 +---
 .../SparkStarBarrierInterceptor.java| 36 ++--
 .../structure/TinkerGraphPlayTest.java  |  7 +--
 29 files changed, 395 insertions(+), 93 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/32014426/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a3de12f..0bad01a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,8 @@ NEED AND IMAGE
 
 This release also includes changes from <>.
 
+* Fixed a bug in `ReducingBarrierStep`, that returned the provided seed value 
despite no elements being available.
+
 
 == TinkerPop 3.3.0 (Gremlin Symphony #40 in G Minor)
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/32014426/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
index b5fd8e8..95e572d 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
@@ -66,7 +66,9 @@ public final class ComputerResultStep extends 
AbstractStep
 return this.currentIterator.next();
 else {
 final ComputerResult result = this.starts.next().get();
-this.currentIterator = 
attach(result.memory().>get(TraversalVertexProgram.HALTED_TRAVERSERS).iterator(),
 result.graph());
+this.currentIterator = 
attach(result.memory().exists(TraversalVertexProgram.HALTED_TRAVERSERS)
+? 
result.memory().>get(TraversalVertexProgram.HALTED_TRAVERSERS).iterator()
+: EmptyIterator.instance(), result.graph());
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/32014426/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java
---

[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/4113f0e8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4113f0e8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4113f0e8

Branch: refs/heads/master
Commit: 4113f0e8f5b2adc714429477c99680998c27b68c
Parents: 4579a0e 27cc574
Author: Stephen Mallette 
Authored: Fri Mar 2 15:48:44 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 15:48:44 2018 -0500

--
 CHANGELOG.asciidoc|  1 +
 .../structure/io/graphson/GraphSONTypeSerializerV3d0.java | 10 +++---
 .../driver/ser/GraphSONMessageSerializerV3d0Test.java |  3 +--
 3 files changed, 9 insertions(+), 5 deletions(-)
--


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

[1/2] tinkerpop git commit: TINKERPOP-1509 Fixed bug in Tree serialization for GraphSON

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master 4579a0e29 -> 4113f0e8f


TINKERPOP-1509 Fixed bug in Tree serialization for GraphSON

Needed to ensure that Tree didn't serialize as Map now that Map has special 
formatting in GraphSON 3.0 CTR


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

Branch: refs/heads/master
Commit: 27cc57469492e9ea6bca8b7db3962fa8e8a9ad4c
Parents: 31762f7
Author: Stephen Mallette 
Authored: Fri Mar 2 15:47:41 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 15:47:41 2018 -0500

--
 CHANGELOG.asciidoc|  1 +
 .../structure/io/graphson/GraphSONTypeSerializerV3d0.java | 10 +++---
 .../driver/ser/GraphSONMessageSerializerV3d0Test.java |  3 +--
 3 files changed, 9 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27cc5746/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index dcbf547..e6074e9 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -27,6 +27,7 @@ This release also includes changes from <>.
 
 * Fixed regression issue where the HTTPChannelizer doesn't instantiate the 
specified AuthenticationHandler
 * Defaulted GLV tests for gremlin-python to run for GraphSON 3.0.
+* Fixed a bug with `Tree` serialization in GraphSON 3.0.
 * In gremlin-python, the GraphSON 3.0 `g:Set` type is now deserialized to 
`List`.
 
 [[release-3-3-1]]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27cc5746/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
index 6d47ad9..0724e25 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
@@ -26,6 +26,7 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
 import org.apache.tinkerpop.gremlin.process.traversal.Scope;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import 
org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
 import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
 import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
 import org.apache.tinkerpop.gremlin.structure.Column;
@@ -106,9 +107,12 @@ public class GraphSONTypeSerializerV3d0 extends 
AbstractGraphSONTypeSerializer {
 return classMap.get(c);
 
 final Class mapped;
-if (Map.class.isAssignableFrom(c))
-mapped = Map.class;
-else if (List.class.isAssignableFrom(c))
+if (Map.class.isAssignableFrom(c)) {
+if (Tree.class.isAssignableFrom(c))
+mapped = Tree.class;
+else
+mapped = Map.class;
+} else if (List.class.isAssignableFrom(c))
 mapped = List.class;
 else if (Set.class.isAssignableFrom(c))
 mapped = Set.class;

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27cc5746/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
--
diff --git 
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
 
b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
index b6398f5..88dfcf0 100644
--- 
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
+++ 
b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
@@ -259,11 +259,10 @@ public class GraphSONMessageSerializerV3d0Test {
 }
 
 @Test
-@org.junit.Ignore
 public void shouldSerializeToTreeJson() throws Exception {
 final TinkerGraph graph = TinkerFactory.createClassic();
 final GraphTraversalSource g = graph.traversal();
-final Map t = g.V(1).out().properties("name").tree().next();
+final Tree t = g.V(1).out().properties("name").tree().

tinkerpop git commit: TINKERPOP-1509 Fixed bug in Tree serialization for GraphSON

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 31762f7c4 -> 27cc57469


TINKERPOP-1509 Fixed bug in Tree serialization for GraphSON

Needed to ensure that Tree didn't serialize as Map now that Map has special 
formatting in GraphSON 3.0 CTR


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

Branch: refs/heads/tp33
Commit: 27cc57469492e9ea6bca8b7db3962fa8e8a9ad4c
Parents: 31762f7
Author: Stephen Mallette 
Authored: Fri Mar 2 15:47:41 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 15:47:41 2018 -0500

--
 CHANGELOG.asciidoc|  1 +
 .../structure/io/graphson/GraphSONTypeSerializerV3d0.java | 10 +++---
 .../driver/ser/GraphSONMessageSerializerV3d0Test.java |  3 +--
 3 files changed, 9 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27cc5746/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index dcbf547..e6074e9 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -27,6 +27,7 @@ This release also includes changes from <>.
 
 * Fixed regression issue where the HTTPChannelizer doesn't instantiate the 
specified AuthenticationHandler
 * Defaulted GLV tests for gremlin-python to run for GraphSON 3.0.
+* Fixed a bug with `Tree` serialization in GraphSON 3.0.
 * In gremlin-python, the GraphSON 3.0 `g:Set` type is now deserialized to 
`List`.
 
 [[release-3-3-1]]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27cc5746/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
index 6d47ad9..0724e25 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
@@ -26,6 +26,7 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
 import org.apache.tinkerpop.gremlin.process.traversal.Scope;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import 
org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
 import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
 import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
 import org.apache.tinkerpop.gremlin.structure.Column;
@@ -106,9 +107,12 @@ public class GraphSONTypeSerializerV3d0 extends 
AbstractGraphSONTypeSerializer {
 return classMap.get(c);
 
 final Class mapped;
-if (Map.class.isAssignableFrom(c))
-mapped = Map.class;
-else if (List.class.isAssignableFrom(c))
+if (Map.class.isAssignableFrom(c)) {
+if (Tree.class.isAssignableFrom(c))
+mapped = Tree.class;
+else
+mapped = Map.class;
+} else if (List.class.isAssignableFrom(c))
 mapped = List.class;
 else if (Set.class.isAssignableFrom(c))
 mapped = Set.class;

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27cc5746/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
--
diff --git 
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
 
b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
index b6398f5..88dfcf0 100644
--- 
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
+++ 
b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
@@ -259,11 +259,10 @@ public class GraphSONMessageSerializerV3d0Test {
 }
 
 @Test
-@org.junit.Ignore
 public void shouldSerializeToTreeJson() throws Exception {
 final TinkerGraph graph = TinkerFactory.createClassic();
 final GraphTraversalSource g = graph.traversal();
-final Map t = g.V(1).out().properties("name").tree().next();
+final Tree t = g.V(1).out().properties("name").tree().next

tinkerpop git commit: Updated release docs

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1777 32014426f -> 7149f8e8c


Updated release docs


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

Branch: refs/heads/TINKERPOP-1777
Commit: 7149f8e8c1c255420b19748632ee4d928480f2e2
Parents: 3201442
Author: Daniel Kuppitz 
Authored: Fri Mar 2 14:04:58 2018 -0700
Committer: Daniel Kuppitz 
Committed: Fri Mar 2 14:04:58 2018 -0700

--
 docs/src/upgrade/release-3.4.x.asciidoc | 42 
 1 file changed, 42 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7149f8e8/docs/src/upgrade/release-3.4.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.4.x.asciidoc 
b/docs/src/upgrade/release-3.4.x.asciidoc
index ff7b458..5a355fa 100644
--- a/docs/src/upgrade/release-3.4.x.asciidoc
+++ b/docs/src/upgrade/release-3.4.x.asciidoc
@@ -28,3 +28,45 @@ NEED AN IMAGE
 Please see the 
link:https://github.com/apache/tinkerpop/blob/3.4.0/CHANGELOG.asciidoc#release-3-4-0[changelog]
 for a complete list of all the modifications that are part of this release.
 
 === Upgrading for Users
+
+ Modifications to reducing barrier steps
+
+The behavior of `min()`, `max()`, `mean()` and `sum()` has been modified to 
return no result if there's no input. Previously these steps yielded the 
internal seed value:
+
+[source,groovy]
+
+gremlin> g.V().values('foo').min()
+==>NaN
+gremlin> g.V().values('foo').max()
+==>NaN
+gremlin> g.V().values('foo').mean()
+==>NaN
+gremlin> g.V().values('foo').sum()
+==>0
+
+
+These traversals will no longer emit a result. Note, that this also affects 
more complex scenarios, e.g. if these steps are used in `by()` modulators:
+
+[source,groovy]
+
+gremlin> g.V().group().
+..1>   by(label).
+..2>   by(outE().values("weight").sum())
+==>[software:0,person:3.5]
+
+
+Since software vertices have no outgoing edges and thus no weight values to 
sum, `software` will no longer show up in the result. In order to get the same 
result as before, one would
+have to add a `coalesce()`-step:
+
+[source,groovy]
+
+gremlin> g.V().group().
+..1>   by(label).
+..2>   by(outE().values("weight").sum())
+==>[person:3.5]
+gremlin> 
+gremlin> g.V().group().
+..1>   by(label).
+..2>   by(coalesce(outE().values("weight"), constant(0)).sum())
+==>[software:0,person:3.5]
+

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

[spmallette]

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-1535
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

[16/50] 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/e48e8340
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e48e8340
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e48e8340

Branch: refs/heads/TINKERPOP-1535
Commit: e48e8340f4b2ac14ffd0bbf87b3cc2bcb61da97b
Parents: 773d510 b516a6a
Author: Stephen Mallette 
Authored: Thu Mar 1 08:38:00 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 08:38:00 2018 -0500

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

[47/50] 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/4579a0e2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4579a0e2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4579a0e2

Branch: refs/heads/TINKERPOP-1535
Commit: 4579a0e29a0a65e904dd865e59d10a654b16f91f
Parents: 3858818 31762f7
Author: Stephen Mallette 
Authored: Fri Mar 2 15:09:48 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 15:09:48 2018 -0500

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

[48/50] tinkerpop git commit: TINKERPOP-1509 Fixed bug in Tree serialization for GraphSON

[spmallette]

TINKERPOP-1509 Fixed bug in Tree serialization for GraphSON

Needed to ensure that Tree didn't serialize as Map now that Map has special 
formatting in GraphSON 3.0 CTR


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

Branch: refs/heads/TINKERPOP-1535
Commit: 27cc57469492e9ea6bca8b7db3962fa8e8a9ad4c
Parents: 31762f7
Author: Stephen Mallette 
Authored: Fri Mar 2 15:47:41 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 15:47:41 2018 -0500

--
 CHANGELOG.asciidoc|  1 +
 .../structure/io/graphson/GraphSONTypeSerializerV3d0.java | 10 +++---
 .../driver/ser/GraphSONMessageSerializerV3d0Test.java |  3 +--
 3 files changed, 9 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27cc5746/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index dcbf547..e6074e9 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -27,6 +27,7 @@ This release also includes changes from <>.
 
 * Fixed regression issue where the HTTPChannelizer doesn't instantiate the 
specified AuthenticationHandler
 * Defaulted GLV tests for gremlin-python to run for GraphSON 3.0.
+* Fixed a bug with `Tree` serialization in GraphSON 3.0.
 * In gremlin-python, the GraphSON 3.0 `g:Set` type is now deserialized to 
`List`.
 
 [[release-3-3-1]]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27cc5746/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
index 6d47ad9..0724e25 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
@@ -26,6 +26,7 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
 import org.apache.tinkerpop.gremlin.process.traversal.Scope;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import 
org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
 import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
 import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
 import org.apache.tinkerpop.gremlin.structure.Column;
@@ -106,9 +107,12 @@ public class GraphSONTypeSerializerV3d0 extends 
AbstractGraphSONTypeSerializer {
 return classMap.get(c);
 
 final Class mapped;
-if (Map.class.isAssignableFrom(c))
-mapped = Map.class;
-else if (List.class.isAssignableFrom(c))
+if (Map.class.isAssignableFrom(c)) {
+if (Tree.class.isAssignableFrom(c))
+mapped = Tree.class;
+else
+mapped = Map.class;
+} else if (List.class.isAssignableFrom(c))
 mapped = List.class;
 else if (Set.class.isAssignableFrom(c))
 mapped = Set.class;

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27cc5746/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
--
diff --git 
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
 
b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
index b6398f5..88dfcf0 100644
--- 
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
+++ 
b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
@@ -259,11 +259,10 @@ public class GraphSONMessageSerializerV3d0Test {
 }
 
 @Test
-@org.junit.Ignore
 public void shouldSerializeToTreeJson() throws Exception {
 final TinkerGraph graph = TinkerFactory.createClassic();
 final GraphTraversalSource g = graph.traversal();
-final Map t = g.V(1).out().properties("name").tree().next();
+final Tree t = g.V(1).out().properties("name").tree().next();
 
 final ResponseMessage response = convert(t);
 asse

[50/50] tinkerpop git commit: TINKERPOP-1535 Bump to Giraph 1.2.0

[spmallette]

TINKERPOP-1535 Bump to Giraph 1.2.0


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

Branch: refs/heads/TINKERPOP-1535
Commit: ae4d8af2d45613d7b4666bca0e8f33f11f7d977a
Parents: 4113f0e
Author: Stephen Mallette 
Authored: Fri Mar 2 17:29:17 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 17:29:17 2018 -0500

--
 CHANGELOG.asciidoc | 1 +
 giraph-gremlin/pom.xml | 2 +-
 .../gremlin/giraph/process/computer/GiraphMessageCombiner.java | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae4d8af2/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 46b0e5b..7be4311 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,7 @@ NEED AND IMAGE
 
 This release also includes changes from <>.
 
+* Bumped to support Giraph 1.2.0.
 
 == TinkerPop 3.3.0 (Gremlin Symphony #40 in G Minor)
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae4d8af2/giraph-gremlin/pom.xml
--
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index 8cf3f5b..56ad1d4 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -64,7 +64,7 @@ limitations under the License.
 
 org.apache.giraph
 giraph-core
-1.1.0-hadoop2
+1.2.0-hadoop2
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae4d8af2/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessageCombiner.java
--
diff --git 
a/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessageCombiner.java
 
b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessageCombiner.java
index 4d725b2..4c2a12e 100644
--- 
a/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessageCombiner.java
+++ 
b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMessageCombiner.java
@@ -30,7 +30,7 @@ import 
org.apache.tinkerpop.gremlin.process.computer.VertexProgram;
 /**
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  */
-public final class GiraphMessageCombiner extends 
org.apache.giraph.combiner.MessageCombiner 
implements ImmutableClassesGiraphConfigurable {
+public final class GiraphMessageCombiner implements 
org.apache.giraph.combiner.MessageCombiner, 
ImmutableClassesGiraphConfigurable {
 
 private MessageCombiner messageCombiner;
 private ImmutableClassesGiraphConfiguration configuration;

[13/50] 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/773d5101
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/773d5101
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/773d5101

Branch: refs/heads/TINKERPOP-1535
Commit: 773d5101400af98394728677f6a216ebad7088c8
Parents: a418226 e1d7f80
Author: Stephen Mallette 
Authored: Wed Feb 28 15:40:44 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 15:40:44 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../strategy/decoration/SubgraphStrategy.java   | 58 ++
 .../decoration/SubgraphStrategyProcessTest.java | 84 
 3 files changed, 127 insertions(+), 16 deletions(-)
--


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

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

[spmallette]

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-1535
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
 };
 
 /// 

[41/50] 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/18ba893f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/18ba893f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/18ba893f

Branch: refs/heads/TINKERPOP-1535
Commit: 18ba893fb04b96c256370ada38f274094d70adea
Parents: a8bfabd fb8facf
Author: Stephen Mallette 
Authored: Thu Mar 1 18:25:05 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 18:25:05 2018 -0500

--
 docs/src/dev/future/index.asciidoc | 27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)
--

[49/50] 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/4113f0e8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4113f0e8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4113f0e8

Branch: refs/heads/TINKERPOP-1535
Commit: 4113f0e8f5b2adc714429477c99680998c27b68c
Parents: 4579a0e 27cc574
Author: Stephen Mallette 
Authored: Fri Mar 2 15:48:44 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 15:48:44 2018 -0500

--
 CHANGELOG.asciidoc|  1 +
 .../structure/io/graphson/GraphSONTypeSerializerV3d0.java | 10 +++---
 .../driver/ser/GraphSONMessageSerializerV3d0Test.java |  3 +--
 3 files changed, 9 insertions(+), 5 deletions(-)
--


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

[05/50] 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/c99ac1fd
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c99ac1fd
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c99ac1fd

Branch: refs/heads/TINKERPOP-1535
Commit: c99ac1fdb5d459f0e4c6f135e7959957c40bf5f5
Parents: 1b7fba3 69a355f
Author: Stephen Mallette 
Authored: Tue Feb 27 08:52:24 2018 -0500
Committer: Stephen Mallette 
Committed: Tue Feb 27 08:52:24 2018 -0500

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

[40/50] tinkerpop git commit: Added TINKERPOP-1417 to the future dev doc CTR

[spmallette]

Added TINKERPOP-1417 to the future dev doc CTR


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

Branch: refs/heads/TINKERPOP-1535
Commit: fb8facfd35adf5cb18fd761d7610e455a9bbfea3
Parents: e56823b
Author: Stephen Mallette 
Authored: Thu Mar 1 18:24:30 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 18:24:30 2018 -0500

--
 docs/src/dev/future/index.asciidoc | 27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb8facfd/docs/src/dev/future/index.asciidoc
--
diff --git a/docs/src/dev/future/index.asciidoc 
b/docs/src/dev/future/index.asciidoc
index 63900e8..5e86ecf 100644
--- a/docs/src/dev/future/index.asciidoc
+++ b/docs/src/dev/future/index.asciidoc
@@ -49,7 +49,6 @@ These items include:
 ** The role of Blueprints should be significantly reduced.
 ** The role of Gremlin should be significantly increased.
 
-
 == Hiding Blueprints
 
 Originally from the 
link:https://lists.apache.org/thread.html/b4d80072ad36849b4e9cd3308f87115660574e3e7a4abb7ee68e959b@%3Cdev.tinkerpop.apache.org%3E[mailing
 list]:
@@ -118,3 +117,29 @@ now is rooted in the Neo4j approach to transactions and is 
often more trouble th
 Distributed transactions are a challenge and don't apply to every provider. 
Transactions are further complicated by
 GLVs. The idea of local subgraphs for mutations and transaction management 
might be good but that goes against having
 just `ReferenceGraph`.
+
+== Gremlin Language Subset
+
+On link:https://issues.apache.org/jira/browse/TINKERPOP-1417[TINKERPOP-1417], 
it was suggested that we "Create a
+Gremlin language subset that is easy to implement on any VM". Implementing the 
Gremlin VM in another language is
+pretty straightforward. However, its a lot of code.. all these steps 
implementations. One thing we could do to make
+it easy for database providers not on the JVM (e.g. ArangoDB and C) is to 
create "Gremlito" (Gremlin--). This language
+subset wouldn't support side-effects, sacks, match, etc. Basically, just 
simple traversal steps and reducing barrier
+terminals.
+
+Thus:
+
+* out, in, both, values, outE, inV, id, label, etc.
+* repeat
+* select, project
+* where, has, limit, range, is, dedup
+* path, simplePath, cyclicPath
+* groupCount, sum, group, count, max, min, etc. (reducing barriers)
+
+=== Comments
+
+This has an interesting potential impact on GLVs because "Little Gremlin" 
could be implemented within them for
+client-side traversals over remote subgraphs, where the subgraph is like a 
remote transaction. All graph mutations
+essentially build a subgraph which is merged into the primary graph. That 
subgraph is effectively the "transaction".
+Build it locally then submit it remotely and have the server sort out the 
merging. It's perhaps the most natural way
+to load data. With "Gremlinito" you then get the added power of being able to 
traverse a local subgraph.
\ No newline at end of file

[34/50] 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/5d36ec11
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5d36ec11
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5d36ec11

Branch: refs/heads/TINKERPOP-1535
Commit: 5d36ec116da9976e3e08cb09c03f4aa3823c9c9c
Parents: cef13dd 5ec7774
Author: Stephen Mallette 
Authored: Thu Mar 1 12:49:41 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 12:49:41 2018 -0500

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


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

[28/50] 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/b31e27d0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b31e27d0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b31e27d0

Branch: refs/heads/TINKERPOP-1535
Commit: b31e27d047878462e2f99c2bfb8ca814f4a60548
Parents: c722cda 532a5de
Author: Stephen Mallette 
Authored: Thu Mar 1 10:37:46 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 10:37:46 2018 -0500

--
 .../Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

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

[spmallette]

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-1535
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

[06/50] tinkerpop git commit: Updated .net/js to 3.4.0-SNAPSHOT

[spmallette]

Updated .net/js to 3.4.0-SNAPSHOT


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

Branch: refs/heads/TINKERPOP-1535
Commit: 05c1c047219186d53104de81e787124e26ec5638
Parents: c99ac1f
Author: Stephen Mallette 
Authored: Tue Feb 27 09:06:48 2018 -0500
Committer: Stephen Mallette 
Committed: Tue Feb 27 09:06:48 2018 -0500

--
 gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj  | 6 +++---
 .../src/main/javascript/gremlin-javascript/package.json| 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05c1c047/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 397b6a6..7d07e71 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@ -25,9 +25,9 @@ limitations under the License.
   
 
   
-3.3.2-SNAPSHOT
-3.3.2.0
-3.3.0.0
+3.4.0-SNAPSHOT
+3.4.0.0
+3.4.0.0
 Gremlin.Net
 Apache TinkerPop
 Gremlin.Net for Apache TinkerPop™ is a language variant and 
driver for .NET.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05c1c047/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
index b9e7cdd..71b58b2 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gremlin-javascript",
-  "version": "3.3.2-alpha1",
+  "version": "3.4.0-alpha1",
   "description": "JavaScript Gremlin Language Variant",
   "author": "Apache TinkerPop team",
   "keywords": [

[09/50] 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/df3e8341
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/df3e8341
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/df3e8341

Branch: refs/heads/TINKERPOP-1535
Commit: df3e834191ec6061ece1dc64a659b4306faaa676
Parents: 05c1c04 032124a
Author: Stephen Mallette 
Authored: Wed Feb 28 14:15:31 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 14:15:31 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/df3e8341/pom.xml
--

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

[spmallette]

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/032124a5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/032124a5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/032124a5

Branch: refs/heads/TINKERPOP-1535
Commit: 032124a504c3d324708d96c1d4b52e8ed2b22346
Parents: 69a355f 3aa9e70
Author: Stephen Mallette 
Authored: Wed Feb 28 14:15:22 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 14:15:22 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/032124a5/pom.xml
--

[10/50] tinkerpop git commit: Updated gremlin console location to 3.4.0-SNAPSHOT CTR

[spmallette]

Updated gremlin console location to 3.4.0-SNAPSHOT CTR


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

Branch: refs/heads/TINKERPOP-1535
Commit: a418226574f85d3289807f8bae5d28adc2114895
Parents: df3e834
Author: Stephen Mallette 
Authored: Wed Feb 28 15:33:08 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 15:33:08 2018 -0500

--
 gremlin-console/bin/gremlin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4182265/gremlin-console/bin/gremlin.sh
--
diff --git a/gremlin-console/bin/gremlin.sh b/gremlin-console/bin/gremlin.sh
index 0a92aa1..197a398 12
--- a/gremlin-console/bin/gremlin.sh
+++ b/gremlin-console/bin/gremlin.sh
@@ -1 +1 @@
-../target/apache-tinkerpop-gremlin-console-3.3.2-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file
+../target/apache-tinkerpop-gremlin-console-3.4.0-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file

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

[spmallette]

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-1535
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 
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSe

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

[spmallette]

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-1535
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.
+
+
+image::apache-tinkerpop-logo.png[width=500,link="http://tinkerpop.apache.org";]
+
+*x.y.