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

Branch: refs/heads/tp33
Commit: dd3a54ec394ec1920879276794026c737026f78b
Parents: 812439f 03a96f8
Author: Stephen Mallette 
Authored: Wed Mar 7 15:08:36 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Mar 7 15:08:36 2018 -0500

--

--

[1/2] tinkerpop git commit: Removed some dead/println code from test CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 812439f5b -> dd3a54ec3


Removed some dead/println code from test CTR


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

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

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


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

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

Branch: refs/heads/master
Commit: 25ae1a1ea6a7547fbecbd27abc260b3d87b089b8
Parents: 26c7c1f dd3a54e
Author: Stephen Mallette 
Authored: Wed Mar 7 15:08:45 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Mar 7 15:08:45 2018 -0500

--

--

[1/3] tinkerpop git commit: Removed some dead/println code from test CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master 26c7c1fb5 -> 25ae1a1ea


Removed some dead/println code from test CTR


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

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

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


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

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

Branch: refs/heads/master
Commit: dd3a54ec394ec1920879276794026c737026f78b
Parents: 812439f 03a96f8
Author: Stephen Mallette 
Authored: Wed Mar 7 15:08:36 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Mar 7 15:08:36 2018 -0500

--

--

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

Branch: refs/heads/tp33
Commit: 812439f5b1c9f2d00c9132ddc24cbba4c0a051c3
Parents: 98ad2fd f31a890
Author: Stephen Mallette 
Authored: Wed Mar 7 15:05:33 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Mar 7 15:05:33 2018 -0500

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

[1/3] tinkerpop git commit: Removed some dead/println code from test CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master abc11c872 -> 26c7c1fb5


Removed some dead/println code from test CTR


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

Branch: refs/heads/master
Commit: f31a8902121d274245b9d9e9527ca75a892771be
Parents: 2c6c151
Author: Stephen Mallette 
Authored: Wed Mar 7 15:05:12 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Mar 7 15:05:12 2018 -0500

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


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

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

Branch: refs/heads/master
Commit: 812439f5b1c9f2d00c9132ddc24cbba4c0a051c3
Parents: 98ad2fd f31a890
Author: Stephen Mallette 
Authored: Wed Mar 7 15:05:33 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Mar 7 15:05:33 2018 -0500

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

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

Branch: refs/heads/master
Commit: 26c7c1fb5ea68dae1ba1d46568fe5a04d0cc2da2
Parents: abc11c8 812439f
Author: Stephen Mallette 
Authored: Wed Mar 7 15:05:58 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Mar 7 15:05:58 2018 -0500

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

[2/2] tinkerpop git commit: TINKERPOP-1913 Added status attribute access to traversal side-effects

[spmallette]

TINKERPOP-1913 Added status attribute access to traversal side-effects


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

Branch: refs/heads/TINKERPOP-1913
Commit: 40dc50db3d19a1f234c8b302cc21cb12490650a8
Parents: 81fd840
Author: Stephen Mallette 
Authored: Wed Mar 7 12:05:23 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Mar 7 12:05:23 2018 -0500

--
 .../driver/remote/DriverRemoteTraversal.java|  4 +---
 .../DriverRemoteTraversalSideEffects.java   | 25 
 .../op/traversal/TraversalOpProcessor.java  |  1 +
 .../server/GremlinServerIntegrateTest.java  |  8 ++-
 4 files changed, 34 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/40dc50db/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversal.java
--
diff --git 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversal.java
 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversal.java
index d3f290c..87087de 100644
--- 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversal.java
+++ 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversal.java
@@ -66,9 +66,7 @@ public class DriverRemoteTraversal extends 
AbstractRemoteTraversal {
 }
 
 this.rs = rs;
-this.sideEffects = new DriverRemoteTraversalSideEffects(client,
-rs.getOriginalRequestMessage().getRequestId(),
-rs.getHost(), rs.allItemsAvailableAsync());
+this.sideEffects = new DriverRemoteTraversalSideEffects(client,rs);
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/40dc50db/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffects.java
--
diff --git 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffects.java
 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffects.java
index 4305567..9a3cdab 100644
--- 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffects.java
+++ 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffects.java
@@ -22,6 +22,7 @@ import org.apache.commons.lang.exception.ExceptionUtils;
 import org.apache.tinkerpop.gremlin.driver.Client;
 import org.apache.tinkerpop.gremlin.driver.Host;
 import org.apache.tinkerpop.gremlin.driver.Result;
+import org.apache.tinkerpop.gremlin.driver.ResultSet;
 import org.apache.tinkerpop.gremlin.driver.Tokens;
 import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
 import 
org.apache.tinkerpop.gremlin.process.remote.traversal.AbstractRemoteTraversalSideEffects;
@@ -52,13 +53,37 @@ public class DriverRemoteTraversalSideEffects extends 
AbstractRemoteTraversalSid
 private boolean closed = false;
 private boolean retrievedAllKeys = false;
 private final CompletableFuture ready;
+private final CompletableFuture> statusAttributes;
 
+/**
+ * @deprecated As of release 3.3.2, replaced by {@link 
#DriverRemoteTraversalSideEffects(Client, ResultSet)}
+ */
+@Deprecated
 public DriverRemoteTraversalSideEffects(final Client client, final UUID 
serverSideEffect, final Host host,
 final CompletableFuture 
ready) {
 this.client = client;
 this.serverSideEffect = serverSideEffect;
 this.host = host;
 this.ready = ready;
+this.statusAttributes = 
CompletableFuture.completedFuture(Collections.emptyMap());
+}
+
+public DriverRemoteTraversalSideEffects(final Client client, final 
ResultSet rs) {
+this.client = client;
+this.serverSideEffect = rs.getOriginalRequestMessage().getRequestId();
+this.host = rs.getHost();
+this.ready = rs.allItemsAvailableAsync();
+this.statusAttributes = rs.statusAttributes();
+}
+
+/**
+ * Gets the status attributes from the response from the server. This 
method will block until all results have
+ * been retrieved.
+ */
+public Map statusAttributes() {
+// wait for the read to complete (i.e. iteration on the server) before 
allowing the caller to 

[1/2] tinkerpop git commit: TINKERPOP-1913 Made status attributes available to the ResultSet

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1913 98ad2fd88 -> 40dc50db3


TINKERPOP-1913 Made status attributes available to the ResultSet


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

Branch: refs/heads/TINKERPOP-1913
Commit: 81fd8403b77a440b99a8757d154e52f7aa63e297
Parents: 98ad2fd
Author: Stephen Mallette 
Authored: Wed Mar 7 10:29:11 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Mar 7 10:29:11 2018 -0500

--
 .../tinkerpop/gremlin/driver/Handler.java   | 13 -
 .../tinkerpop/gremlin/driver/ResultQueue.java   |  2 +
 .../tinkerpop/gremlin/driver/ResultSet.java | 12 
 .../tinkerpop/gremlin/driver/ResultSetTest.java | 25 +
 .../gremlin/server/op/AbstractOpProcessor.java  | 58 ++--
 .../op/traversal/TraversalOpProcessor.java  | 10 +++-
 .../server/GremlinResultSetIntegrateTest.java   |  9 +++
 7 files changed, 121 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81fd8403/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
--
diff --git 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
index c6c1022..12c6866 100644
--- 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
+++ 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
@@ -248,9 +248,18 @@ final class Handler {
 }
 }
 
-// as this is a non-PARTIAL_CONTENT code - the stream is done
-if (response.getStatus().getCode() != 
ResponseStatusCode.PARTIAL_CONTENT)
+// the last message in a OK stream could have meta-data that 
is useful to the result. note that error
+// handling of the status attributes is handled separately 
above
+if (statusCode == ResponseStatusCode.SUCCESS || statusCode == 
ResponseStatusCode.NO_CONTENT) {
+// in 3.4.0 this should get refactored. i think the that 
the markComplete() could just take the
+// status attributes as its argument - need to investigate 
that further
+queue.statusAttributes = 
response.getStatus().getAttributes();
+}
+
+// as this is a non-PARTIAL_CONTENT code - the stream is done.
+if (statusCode != ResponseStatusCode.PARTIAL_CONTENT) {
 pending.remove(response.getRequestId()).markComplete();
+}
 } finally {
 // in the event of an exception above the exception is tossed 
and handled by whatever channelpipeline
 // error handling is at play.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81fd8403/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
--
diff --git 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
index e21e265..7340763 100644
--- 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
+++ 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
@@ -56,6 +56,8 @@ final class ResultQueue {
 
 private final Queue,Integer>> waiting 
= new ConcurrentLinkedQueue<>();
 
+Map statusAttributes = null;
+
 public ResultQueue(final LinkedBlockingQueue 
resultLinkedBlockingQueue, final CompletableFuture readComplete) {
 this.resultLinkedBlockingQueue = resultLinkedBlockingQueue;
 this.readComplete = readComplete;

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81fd8403/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java
--
diff --git 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java
 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java
index f82876c..f608f06 100644
--- 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java
+++ 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java
@@ -21,8 +21,10 @@ package org.apache.tinkerpop.gremlin.driver;
 import 

[18/50] 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/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/TINKERPOP-1522
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(-)
--

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

[dkuppitz]

Merge branch 'TINKERPOP-1862' into tp32


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

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

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


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

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

Branch: refs/heads/TINKERPOP-1522
Commit: 98ad2fd888ce2fda11539fb6b63b25486f58da46
Parents: eb6b1e5 c1de9f2
Author: Florian Hockmann 
Authored: Tue Mar 6 20:57:43 2018 +0100
Committer: Florian Hockmann 
Committed: Tue Mar 6 20:57:43 2018 +0100

--
 docs/src/reference/gremlin-variants.asciidoc|   2 +-
 docs/static/images/gremlin-dotnet-logo.png  | Bin 0 -> 40779 bytes
 .../images/gremlin-dotnet-logo_256x256.png  | Bin 0 -> 24406 bytes
 gremlin-dotnet/README.md|  40 +++
 gremlin-dotnet/glv/Gremlin.Net.csproj.template  |  13 ++
 .../src/Gremlin.Net/Gremlin.Net.csproj  |  13 ++
 6 files changed, 49 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/98ad2fd8/docs/src/reference/gremlin-variants.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/98ad2fd8/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
--

[30/50] tinkerpop git commit: Update "sink" data on 3.3.x CTR

[dkuppitz]

Update "sink" data on 3.3.x CTR


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

Branch: refs/heads/TINKERPOP-1522
Commit: f3f85b2aa2195d029659b255adc3491af58fc7a5
Parents: 107960d
Author: Stephen Mallette 
Authored: Mon Mar 5 09:00:12 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 5 09:01:01 2018 -0500

--
 .../io/graphson/tinkerpop-sink-typed-v1d0.json  |   2 ++
 .../io/graphson/tinkerpop-sink-typed-v2d0.json  |   2 ++
 .../structure/io/graphson/tinkerpop-sink-v1d0.json  |   2 ++
 .../structure/io/graphson/tinkerpop-sink-v2d0.json  |   2 ++
 .../structure/io/graphson/tinkerpop-sink-v3d0.json  |   2 ++
 .../structure/io/gryo/tinkerpop-sink-v1d0.kryo  | Bin 0 -> 288 bytes
 .../structure/io/gryo/tinkerpop-sink-v3d0.kryo  | Bin 79 -> 288 bytes
 .../tinkergraph/structure/IoDataGenerationTest.java |  10 ++
 8 files changed, 20 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f3f85b2a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1d0.json
--
diff --git 
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1d0.json
 
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1d0.json
index c37b54a..bc56489 100644
--- 
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1d0.json
+++ 
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1d0.json
@@ -1 +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","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/f3f85b2a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v2d0.json
--
diff --git 
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v2d0.json
 
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v2d0.json
index c953075..c0844a3 100644
--- 
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v2d0.json
+++ 
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v2d0.json
@@ -1 +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":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"a"}]}}
+{"id":{"@type":"g:Int32","@value":2001},"label":"message_passing_test","inE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int32","@value":4},"outV":{"@type":"g:Int32","@value":2000}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":3},"value":"b"}]}}
 

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

Branch: refs/heads/TINKERPOP-1522
Commit: 51f4771f8547892d7a908ab73c19630059086d74
Parents: 92ec0ab 8757963
Author: Stephen Mallette 
Authored: Mon Mar 5 09:26:43 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 5 09:26:43 2018 -0500

--
 data/tinkerpop-sink.json|   3 +++
 data/tinkerpop-sink.kryo| Bin 0 -> 288 bytes
 .../structure/IoDataGenerationTest.java |  21 +++
 3 files changed, 24 insertions(+)
--

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

[dkuppitz]

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

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


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

Branch: refs/heads/TINKERPOP-1522
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
-

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

Branch: refs/heads/TINKERPOP-1522
Commit: cb1de6020b4da0536078fbe6b9af5c1b05be9af3
Parents: 4113f0e 920a3d9
Author: Stephen Mallette 
Authored: Mon Mar 5 07:01:57 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 5 07:01:57 2018 -0500

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


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

[45/50] tinkerpop git commit: added Jira link in upgrade docs.

[dkuppitz]

added Jira link in upgrade docs.


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

Branch: refs/heads/TINKERPOP-1522
Commit: b6501ca0836548957501e21c817d7f07c5934fb3
Parents: 7149f8e
Author: Daniel Kuppitz 
Authored: Wed Mar 7 08:18:51 2018 -0700
Committer: Daniel Kuppitz 
Committed: Wed Mar 7 08:18:51 2018 -0700

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b6501ca0/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 5a355fa..6f7ef11 100644
--- a/docs/src/upgrade/release-3.4.x.asciidoc
+++ b/docs/src/upgrade/release-3.4.x.asciidoc
@@ -70,3 +70,6 @@ gremlin> g.V().group().
 ..2>   by(coalesce(outE().values("weight"), constant(0)).sum())
 ==>[software:0,person:3.5]
 
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1777[TINKERPOP-1777]
+

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

Branch: refs/heads/TINKERPOP-1522
Commit: 62299a1e3d7de793e7444b167a7c3fb4f514709e
Parents: 51f4771 eb6b1e5
Author: Stephen Mallette 
Authored: Mon Mar 5 14:23:15 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 5 14:23:15 2018 -0500

--
 .../traversal/step/util/BulkSetTest.java|  92 
 .../traversal/util/TraversalHelperTest.java | 424 +++
 .../gremlin/process/util/BulkSetTest.java   |  92 
 .../process/util/TraversalHelperTest.java   | 424 ---
 4 files changed, 516 insertions(+), 516 deletions(-)
--

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

Branch: refs/heads/TINKERPOP-1522
Commit: 137f1e59313a03d7977862016d2f500630d6588a
Parents: 5914aa1 98ad2fd
Author: Florian Hockmann 
Authored: Tue Mar 6 20:59:23 2018 +0100
Committer: Florian Hockmann 
Committed: Tue Mar 6 20:59:23 2018 +0100

--
 docs/src/reference/gremlin-variants.asciidoc|   2 +-
 docs/static/images/gremlin-dotnet-logo.png  | Bin 0 -> 40779 bytes
 .../images/gremlin-dotnet-logo_256x256.png  | Bin 0 -> 24406 bytes
 gremlin-dotnet/README.md|  40 +++
 gremlin-dotnet/glv/Gremlin.Net.csproj.template  |  13 ++
 .../src/Gremlin.Net/Gremlin.Net.csproj  |  13 ++
 6 files changed, 49 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/137f1e59/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
--

[34/50] tinkerpop git commit: Moved some tests to the correct packages CTR

[dkuppitz]

Moved some tests to the correct packages CTR


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

Branch: refs/heads/TINKERPOP-1522
Commit: 2c6c151fc491fbad5541edcd49902899ee7a4b12
Parents: 6fbf130
Author: Stephen Mallette 
Authored: Mon Mar 5 14:17:22 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 5 14:17:22 2018 -0500

--
 .../traversal/step/util/BulkSetTest.java|  92 
 .../traversal/util/TraversalHelperTest.java | 424 +++
 .../gremlin/process/util/BulkSetTest.java   |  92 
 .../process/util/TraversalHelperTest.java   | 424 ---
 4 files changed, 516 insertions(+), 516 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c6c151f/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/BulkSetTest.java
--
diff --git 
a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/BulkSetTest.java
 
b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/BulkSetTest.java
new file mode 100644
index 000..9b4980f
--- /dev/null
+++ 
b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/BulkSetTest.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
+import org.junit.Test;
+
+import java.util.Iterator;
+import java.util.Random;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+public class BulkSetTest {
+
+@Test
+public void shouldHaveProperHashAndEquality() {
+final BulkSet a = new BulkSet<>();
+final BulkSet b = new BulkSet<>();
+a.add("stephen", 12);
+a.add("marko", 32);
+a.add("daniel", 74);
+b.add("stephen", 12);
+b.add("marko", 32);
+b.add("daniel", 74);
+assertEquals(a, b);
+assertTrue(a.equals(b));
+assertEquals(a.hashCode(), b.hashCode());
+assertTrue(a.hashCode() == b.hashCode());
+assertEquals(12, a.get("stephen"));
+assertEquals(12, b.get("stephen"));
+a.add("matthias", 99);
+assertFalse(a.equals(b));
+assertFalse(a.hashCode() == b.hashCode());
+assertNotEquals(a.hashCode(), b.hashCode());
+}
+
+@Test
+public void shouldHaveProperCountAndNotOutOfMemoryException() {
+final Set list = new BulkSet<>();
+final Random random = new Random();
+for (int i = 0; i < 1000; i++) {
+list.add(random.nextBoolean());
+}
+assertEquals(1000, list.size());
+}
+
+@Test
+public void shouldHaveCorrectBulkCounts() {
+final BulkSet set = new BulkSet<>();
+set.add("marko");
+set.add("matthias");
+set.add("marko", 7);
+set.add("stephen");
+set.add("stephen");
+assertEquals(8, set.get("marko"));
+assertEquals(1, set.get("matthias"));
+assertEquals(2, set.get("stephen"));
+final Iterator iterator = set.iterator();
+for (int i = 0; i < 11; i++) {
+if (i < 8)
+assertEquals("marko", iterator.next());
+else if (i < 9)
+assertEquals("matthias", iterator.next());
+else
+assertEquals("stephen", iterator.next());
+}
+assertEquals(11, set.size());
+}
+}

[23/50] tinkerpop git commit: Updated release docs

[dkuppitz]

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-1522
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]
+

[09/50] 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-1522
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

[48/50] tinkerpop git commit: added new test case to verify new select scope order

[dkuppitz]

added new test case to verify new select scope order


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

Branch: refs/heads/TINKERPOP-1522
Commit: 5535e5b364ebe0064ffb4bfda234f1c5a19e5353
Parents: 24f629b
Author: Daniel Kuppitz 
Authored: Mon Feb 26 11:19:21 2018 -0700
Committer: Daniel Kuppitz 
Committed: Wed Mar 7 08:36:39 2018 -0700

--
 gremlin-test/features/map/Select.feature  | 18 +-
 .../process/traversal/step/map/SelectTest.java| 15 +++
 2 files changed, 24 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5535e5b3/gremlin-test/features/map/Select.feature
--
diff --git a/gremlin-test/features/map/Select.feature 
b/gremlin-test/features/map/Select.feature
index 35d9322..bf0a890 100644
--- a/gremlin-test/features/map/Select.feature
+++ b/gremlin-test/features/map/Select.feature
@@ -204,6 +204,22 @@ Feature: Step - select()
   | v[ripple] |
   | v[peter] |
 
+  Scenario: g_VX1X_groupXaX_byXconstantXaXX_byXnameX_selectXaX_selectXaX
+Given the modern graph
+And using the parameter v1Id defined as "v[marko].id"
+And the traversal of
+  """
+  g.V(v1Id).group("a").
+  by(__.constant("a")).
+  by(__.values("name")).
+barrier().
+select("a").select("a")
+  """
+When iterated to list
+Then the result should be unordered
+  | result |
+  | marko |
+
   Scenario: g_VX1X_asXhereX_out_selectXhereX
 Given the modern graph
 And using the parameter v1Id defined as "v[marko].id"
@@ -514,4 +530,4 @@ Feature: Step - select()
 Then the result should be unordered
   | result |
   | d[2].l |
-  | d[2].l |
\ No newline at end of file
+  | d[2].l |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5535e5b3/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
index 3ca2068..6a7a43b 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
@@ -83,7 +83,7 @@ public abstract class SelectTest extends 
AbstractGremlinProcessTest {
 
 public abstract Traversal 
get_g_V_chooseXoutE_count_isX0X__asXaX__asXbXX_chooseXselectXaX__selectXaX__selectXbXX();
 
-public abstract Traversal 
get_g_withSideEffectXa_a_markoX_injectX1X_selectXaX_select_XaX();
+public abstract Traversal 
get_g_VX1X_groupXaX_byXconstantXaXX_byXnameX_selectXaX_selectXaX(final Object 
v1Id);
 
 // below are original back()-tests
 
@@ -345,8 +345,8 @@ public abstract class SelectTest extends 
AbstractGremlinProcessTest {
 
 @Test
 @LoadGraphWith(MODERN)
-public void g_withSideEffectXa_a_markoX_injectX1X_selectXaX_select_XaX() {
-final Traversal traversal = 
get_g_withSideEffectXa_a_markoX_injectX1X_selectXaX_select_XaX();
+public void g_VX1X_groupXaX_byXconstantXaXX_byXnameX_selectXaX_selectXaX() 
{
+final Traversal traversal = 
get_g_VX1X_groupXaX_byXconstantXaXX_byXnameX_selectXaX_selectXaX(convertToVertexId("marko"));
 printTraversalForm(traversal);
 assertTrue(traversal.hasNext());
 assertEquals("marko", traversal.next());
@@ -658,7 +658,6 @@ public abstract class SelectTest extends 
AbstractGremlinProcessTest {
 }
 assertFalse(traversal.hasNext());
 }
-
 @Test
 @LoadGraphWith(MODERN)
 public void g_VX1X_asXaX_repeatXout_asXaXX_timesX2X_selectXfirst_aX() {
@@ -734,10 +733,10 @@ public abstract class SelectTest extends 
AbstractGremlinProcessTest {
 return g.V().choose(__.outE().count().is(0L), __.as("a"), 
__.as("b")).choose(__.select("a"), __.select("a"), __.select("b"));
 }
 
-public Traversal 
get_g_withSideEffectXa_a_markoX_injectX1X_selectXaX_select_XaX() {
-final Map m = new HashMap<>(1);
-m.put("a", "marko");
-return g.withSideEffect("a", m).inject(1).select("a").select("a");
+public Traversal

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

[dkuppitz]

TINKERPOP-1862 Added back computer tests accidentally commented out


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

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

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


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

[46/50] tinkerpop git commit: Merge branch 'TINKERPOP-1777'

[dkuppitz]

Merge branch 'TINKERPOP-1777'


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

Branch: refs/heads/TINKERPOP-1522
Commit: a35f009a043eac62f610ffaa28e43d7f6fbb86b6
Parents: 137f1e5 b6501ca
Author: Daniel Kuppitz 
Authored: Wed Mar 7 08:19:41 2018 -0700
Committer: Daniel Kuppitz 
Committed: Wed Mar 7 08:19:41 2018 -0700

--
 CHANGELOG.asciidoc  |  2 +
 docs/src/upgrade/release-3.4.x.asciidoc | 45 +++
 .../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 +--
 30 files changed, 440 insertions(+), 93 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a35f009a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
--

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

[dkuppitz]

TINKERPOP-1862 Updated changelog


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

Branch: refs/heads/TINKERPOP-1522
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.

[37/50] tinkerpop git commit: Added some notes about certain Structure API bits for 4.x CTR

[dkuppitz]

Added some notes about certain Structure API bits for 4.x CTR


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

Branch: refs/heads/TINKERPOP-1522
Commit: 512a4b8b05fe036c828c3562bd72a50fc1b79e76
Parents: 62299a1
Author: Stephen Mallette 
Authored: Mon Mar 5 19:42:34 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 5 19:42:34 2018 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/512a4b8b/docs/src/dev/future/index.asciidoc
--
diff --git a/docs/src/dev/future/index.asciidoc 
b/docs/src/dev/future/index.asciidoc
index 4a51f57..d37f3e1 100644
--- a/docs/src/dev/future/index.asciidoc
+++ b/docs/src/dev/future/index.asciidoc
@@ -118,6 +118,14 @@ Distributed transactions are a challenge and don't apply 
to every provider. Tran
 GLVs. The idea of local subgraphs for mutations and transaction management 
might be good but that goes against having
 just `ReferenceGraph`.
 
+In "hiding blueprints" we should probably consider what relevance certain 
components of the Structure API still have:
+
+* `io()` - this sorta fell short a few ways: API was a bit clunky, no 
integration with loading via OLAP, etc.
+* `variables()` - one of the problems with variables is that they were not 
persisted by `io()` which was generally a
+problem for TinkerGraph which relied on `io()` for flushing to file storage. 
This topic was discussed a bit on
+link:https://issues.apache.org/jira/browse/TINKERPOP-892[TINKERPOP-892]
+* `tx()` - as discussed in the earlier paragraph
+
 == Gremlin Language Subset
 
 On link:https://issues.apache.org/jira/browse/TINKERPOP-1417[TINKERPOP-1417], 
it was suggested that we "Create a

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

[dkuppitz]

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

This mainly removes unnecessary line breaks.


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

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

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


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

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

[12/50] tinkerpop git commit: 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-1522
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(-)
--

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

[dkuppitz]

Update to apache pom version 19 CTR


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

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

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


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

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

Branch: refs/heads/TINKERPOP-1522
Commit: 92ec0abe68767f4d3f7dbef54371db5585a821bb
Parents: 44253e6 f3f85b2
Author: Stephen Mallette 
Authored: Mon Mar 5 09:01:15 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 5 09:01:15 2018 -0500

--
 .../io/graphson/tinkerpop-sink-typed-v1d0.json  |   2 ++
 .../io/graphson/tinkerpop-sink-typed-v2d0.json  |   2 ++
 .../structure/io/graphson/tinkerpop-sink-v1d0.json  |   2 ++
 .../structure/io/graphson/tinkerpop-sink-v2d0.json  |   2 ++
 .../structure/io/graphson/tinkerpop-sink-v3d0.json  |   2 ++
 .../structure/io/gryo/tinkerpop-sink-v1d0.kryo  | Bin 0 -> 288 bytes
 .../structure/io/gryo/tinkerpop-sink-v3d0.kryo  | Bin 79 -> 288 bytes
 .../tinkergraph/structure/IoDataGenerationTest.java |  10 ++
 8 files changed, 20 insertions(+)
--

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

[dkuppitz]

TINKERPOP-1885 Add README for Gremlin.Net CTR


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

Branch: refs/heads/TINKERPOP-1522
Commit: c1de9f2d0198f398da626a441b257257d30cea06
Parents: 0bc84bd
Author: Florian Hockmann 
Authored: Tue Mar 6 20:50:44 2018 +0100
Committer: Florian Hockmann 
Committed: Tue Mar 6 20:50:44 2018 +0100

--
 gremlin-dotnet/README.md | 40 
 1 file changed, 40 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c1de9f2d/gremlin-dotnet/README.md
--
diff --git a/gremlin-dotnet/README.md b/gremlin-dotnet/README.md
new file mode 100644
index 000..de80335
--- /dev/null
+++ b/gremlin-dotnet/README.md
@@ -0,0 +1,40 @@
+
+
+# Gremlin.Net
+
+[Apache TinkerPop™][tk] is a graph computing framework for both graph 
databases (OLTP) and graph analytic systems
+(OLAP). [Gremlin][gremlin] is the graph traversal language of TinkerPop. It 
can be described as a functional,
+data-flow language that enables users to succinctly express complex traversals 
on (or queries of) their application's
+property graph.
+
+Gremlin.Net implements Gremlin within the C# language. It targets .NET 
Standard and can therefore be used on different
+operating systems and with different .NET frameworks, such as .NET Framework 
and .NET Core.
+
+```bash
+nuget install Gremlin.Net
+```
+
+Please see the [reference documentation][docs] at Apache TinkerPop for more 
information.
+
+[tk]: http://tinkerpop.apache.org
+[gremlin]: http://tinkerpop.apache.org/gremlin.html
+[docs]: http://tinkerpop.apache.org/docs/current/reference/#gremlin-DotNet
\ No newline at end of file

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

[dkuppitz]

TINKERPOP-1509 tree() tests working now

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


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

Branch: refs/heads/TINKERPOP-1522
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();

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

Branch: refs/heads/TINKERPOP-1522
Commit: eb6b1e5474c6cc5933df54f64d73d30d714ec325
Parents: 8757963 2c6c151
Author: Stephen Mallette 
Authored: Mon Mar 5 14:23:08 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 5 14:23:08 2018 -0500

--
 .../traversal/step/util/BulkSetTest.java|  92 
 .../traversal/util/TraversalHelperTest.java | 424 +++
 .../gremlin/process/util/BulkSetTest.java   |  92 
 .../process/util/TraversalHelperTest.java   | 424 ---
 4 files changed, 516 insertions(+), 516 deletions(-)
--

[3/4] tinkerpop git commit: updated CHANGELOG

[dkuppitz]

updated CHANGELOG


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

Branch: refs/heads/master
Commit: 26684e38ce3db0a6bbe5ac6607b220d84e5c9ce5
Parents: 5535e5b
Author: Daniel Kuppitz 
Authored: Tue Feb 27 08:49:17 2018 -0700
Committer: Daniel Kuppitz 
Committed: Wed Mar 7 08:37:27 2018 -0700

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/26684e38/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index b4511ad..c74bb1b 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,7 +26,7 @@ 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.
-
+* Changed the order of `select()` scopes. The order is now: maps, 
side-effects, paths.
 
 == TinkerPop 3.3.0 (Gremlin Symphony #40 in G Minor)
 

[1/4] tinkerpop git commit: added new test case to verify new select scope order

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/master a35f009a0 -> abc11c872


added new test case to verify new select scope order


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

Branch: refs/heads/master
Commit: 5535e5b364ebe0064ffb4bfda234f1c5a19e5353
Parents: 24f629b
Author: Daniel Kuppitz 
Authored: Mon Feb 26 11:19:21 2018 -0700
Committer: Daniel Kuppitz 
Committed: Wed Mar 7 08:36:39 2018 -0700

--
 gremlin-test/features/map/Select.feature  | 18 +-
 .../process/traversal/step/map/SelectTest.java| 15 +++
 2 files changed, 24 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5535e5b3/gremlin-test/features/map/Select.feature
--
diff --git a/gremlin-test/features/map/Select.feature 
b/gremlin-test/features/map/Select.feature
index 35d9322..bf0a890 100644
--- a/gremlin-test/features/map/Select.feature
+++ b/gremlin-test/features/map/Select.feature
@@ -204,6 +204,22 @@ Feature: Step - select()
   | v[ripple] |
   | v[peter] |
 
+  Scenario: g_VX1X_groupXaX_byXconstantXaXX_byXnameX_selectXaX_selectXaX
+Given the modern graph
+And using the parameter v1Id defined as "v[marko].id"
+And the traversal of
+  """
+  g.V(v1Id).group("a").
+  by(__.constant("a")).
+  by(__.values("name")).
+barrier().
+select("a").select("a")
+  """
+When iterated to list
+Then the result should be unordered
+  | result |
+  | marko |
+
   Scenario: g_VX1X_asXhereX_out_selectXhereX
 Given the modern graph
 And using the parameter v1Id defined as "v[marko].id"
@@ -514,4 +530,4 @@ Feature: Step - select()
 Then the result should be unordered
   | result |
   | d[2].l |
-  | d[2].l |
\ No newline at end of file
+  | d[2].l |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5535e5b3/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
index 3ca2068..6a7a43b 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
@@ -83,7 +83,7 @@ public abstract class SelectTest extends 
AbstractGremlinProcessTest {
 
 public abstract Traversal 
get_g_V_chooseXoutE_count_isX0X__asXaX__asXbXX_chooseXselectXaX__selectXaX__selectXbXX();
 
-public abstract Traversal 
get_g_withSideEffectXa_a_markoX_injectX1X_selectXaX_select_XaX();
+public abstract Traversal 
get_g_VX1X_groupXaX_byXconstantXaXX_byXnameX_selectXaX_selectXaX(final Object 
v1Id);
 
 // below are original back()-tests
 
@@ -345,8 +345,8 @@ public abstract class SelectTest extends 
AbstractGremlinProcessTest {
 
 @Test
 @LoadGraphWith(MODERN)
-public void g_withSideEffectXa_a_markoX_injectX1X_selectXaX_select_XaX() {
-final Traversal traversal = 
get_g_withSideEffectXa_a_markoX_injectX1X_selectXaX_select_XaX();
+public void g_VX1X_groupXaX_byXconstantXaXX_byXnameX_selectXaX_selectXaX() 
{
+final Traversal traversal = 
get_g_VX1X_groupXaX_byXconstantXaXX_byXnameX_selectXaX_selectXaX(convertToVertexId("marko"));
 printTraversalForm(traversal);
 assertTrue(traversal.hasNext());
 assertEquals("marko", traversal.next());
@@ -658,7 +658,6 @@ public abstract class SelectTest extends 
AbstractGremlinProcessTest {
 }
 assertFalse(traversal.hasNext());
 }
-
 @Test
 @LoadGraphWith(MODERN)
 public void g_VX1X_asXaX_repeatXout_asXaXX_timesX2X_selectXfirst_aX() {
@@ -734,10 +733,10 @@ public abstract class SelectTest extends 
AbstractGremlinProcessTest {
 return g.V().choose(__.outE().count().is(0L), __.as("a"), 
__.as("b")).choose(__.select("a"), __.select("a"), __.select("b"));
 }
 
-public Traversal 
get_g_withSideEffectXa_a_markoX_injectX1X_selectXaX_select_XaX() {
-final Map m = new HashMap<>(1);
-m.put("a", "marko");
-return g.withSideEffect("a", 

[4/4] tinkerpop git commit: added a note in upgrade docs regarding the change of order of select scopes

[dkuppitz]

added a note in upgrade docs regarding the change of order of select scopes


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

Branch: refs/heads/master
Commit: abc11c8720b2eeb25163fdc1d9e86f0b4ab07d6f
Parents: 26684e3
Author: Daniel Kuppitz 
Authored: Fri Mar 2 22:39:05 2018 -0700
Committer: Daniel Kuppitz 
Committed: Wed Mar 7 08:45:24 2018 -0700

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/abc11c87/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 6f7ef11..1916da8 100644
--- a/docs/src/upgrade/release-3.4.x.asciidoc
+++ b/docs/src/upgrade/release-3.4.x.asciidoc
@@ -64,7 +64,6 @@ 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())
@@ -73,3 +72,45 @@ gremlin> g.V().group().
 
 See: link:https://issues.apache.org/jira/browse/TINKERPOP-1777[TINKERPOP-1777]
 
+ Change in order of select() scopes
+
+The order of select scopes has been changed to: maps, side-effects, paths
+Previously the order was: side-effects, maps, paths - which made it almost 
impossible to select a specific map entry if a side-effect with the same name 
existed.
+
+The following snippets illustrate the changed behavior:
+
+[source,groovy]
+
+gremlin> g.V(1).
+..1>   group("a").
+..2> by(__.constant("a")).
+..3> by(__.values("name")).
+..4>   select("a")
+==>[a:marko]
+gremlin> g.V(1).
+..1>   group("a").
+..2> by(__.constant("a")).
+..3> by(__.values("name")).
+..4>   select("a").select("a")
+==>[a:marko]
+
+
+Above is the old behavior; the second `select("a")` has no effect, it selects 
the side-effect `a` again, although one would expect to get the map entry `a`. 
What follows is the new behavior:
+
+[source,groovy]
+
+gremlin> g.V(1).
+..1>   group("a").
+..2> by(__.constant("a")).
+..3> by(__.values("name")).
+..4>   select("a")
+==>[a:marko]
+gremlin> g.V(1).
+..1>   group("a").
+..2> by(__.constant("a")).
+..3> by(__.values("name")).
+..4>   select("a").select("a")
+==>marko
+
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1522[TINKERPOP-1522]

[32/50] tinkerpop git commit: Added GraphSON/Gryo 3.0 versions of "sink" data CTR

[dkuppitz]

Added GraphSON/Gryo 3.0 versions of "sink" data CTR


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

Branch: refs/heads/TINKERPOP-1522
Commit: 875796372019977a177471f952637c4c80f68f97
Parents: f3f85b2
Author: Stephen Mallette 
Authored: Mon Mar 5 09:26:18 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 5 09:26:18 2018 -0500

--
 data/tinkerpop-sink.json|   3 +++
 data/tinkerpop-sink.kryo| Bin 0 -> 288 bytes
 .../structure/IoDataGenerationTest.java |  21 +++
 3 files changed, 24 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87579637/data/tinkerpop-sink.json
--
diff --git a/data/tinkerpop-sink.json b/data/tinkerpop-sink.json
new file mode 100644
index 000..c0844a3
--- /dev/null
+++ b/data/tinkerpop-sink.json
@@ -0,0 +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":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"a"}]}}
+{"id":{"@type":"g:Int32","@value":2001},"label":"message_passing_test","inE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int32","@value":4},"outV":{"@type":"g:Int32","@value":2000}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":3},"value":"b"}]}}
+{"id":{"@type":"g:Int32","@value":1000},"label":"loops","inE":{"self":[{"id":{"@type":"g:Int32","@value":1},"outV":{"@type":"g:Int32","@value":1000}}]},"outE":{"self":[{"id":{"@type":"g:Int32","@value":1},"inV":{"@type":"g:Int32","@value":1000}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"loop"}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87579637/data/tinkerpop-sink.kryo
--
diff --git a/data/tinkerpop-sink.kryo b/data/tinkerpop-sink.kryo
new file mode 100644
index 000..24a3468
Binary files /dev/null and b/data/tinkerpop-sink.kryo differ

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87579637/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
--
diff --git 
a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
 
b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
index 2c9f220..9ee0ce2 100644
--- 
a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
+++ 
b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
@@ -180,6 +180,16 @@ public class IoDataGenerationTest {
  * No assertions.  Just write out the graph for convenience.
  */
 @Test
+public void shouldWriteDEFAULTSinkGraphAsGryoV3d0() throws IOException {
+final OutputStream os = new FileOutputStream(tempPath + 
"tinkerpop-sink.kryo");
+
GryoWriter.build().mapper(GryoMapper.build().version(GryoVersion.V3_0).create()).create().writeGraph(os,
 TinkerFactory.createKitchenSink());
+os.close();
+}
+
+/**
+ * No assertions.  Just write out the graph for convenience.
+ */
+@Test
 public void shouldWriteClassicGraphAsGraphML() throws IOException {
 try (final OutputStream os = new FileOutputStream(tempPath + 
"tinkerpop-classic.xml")) {
 GraphMLWriter.build().create().writeGraph(os, 
TinkerFactory.createClassic());
@@ -491,6 +501,17 @@ public class IoDataGenerationTest {
  * No assertions.  Just write out the graph for convenience.
  */
 @Test
+public void shouldWriteDEFAULTSinkGraphAsGraphSONV3d0() throws IOException 
{
+final OutputStream os = new FileOutputStream(tempPath + 
"tinkerpop-sink.json");
+
GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V3_0).create()).create()
+.writeGraph(os, TinkerFactory.createKitchenSink());
+os.close();
+}
+
+/**
+ * No assertions.  Just write out the graph for convenience.
+ */
+@Test
 public void shouldWriteClassicGraphNormalizedAsGraphSONV3d0() throws 
IOException {
 

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

[dkuppitz]

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


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

Branch: refs/heads/TINKERPOP-1522
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/50] 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-1522
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
--

[20/50] 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`.

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

[47/50] tinkerpop git commit: Changed order of `select()` scopes. Maps (local objects) come firstm then side-effects, then paths.

[dkuppitz]

Changed order of `select()` scopes. Maps (local objects) come firstm then 
side-effects, then paths.


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

Branch: refs/heads/TINKERPOP-1522
Commit: 24f629b5f2cf80596b3ea258219e86ea8c903766
Parents: a35f009
Author: Daniel Kuppitz 
Authored: Wed Feb 21 13:52:53 2018 -0700
Committer: Daniel Kuppitz 
Committed: Wed Mar 7 08:36:39 2018 -0700

--
 .../gremlin/process/traversal/step/Scoping.java   | 12 ++--
 .../process/traversal/step/map/SelectTest.java| 18 ++
 2 files changed, 24 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/24f629b5/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Scoping.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Scoping.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Scoping.java
index c86f91f..da7b0eb 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Scoping.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Scoping.java
@@ -110,13 +110,13 @@ public interface Scoping {
 public enum Variable {START, END}
 
 public default  S getScopeValue(final Pop pop, final String key, final 
Traverser.Admin traverser) throws IllegalArgumentException {
-if (traverser.getSideEffects().exists(key))
-return traverser.getSideEffects().get(key);
-///
 final Object object = traverser.get();
 if (object instanceof Map && ((Map) 
object).containsKey(key))
 return ((Map) object).get(key);
 ///
+if (traverser.getSideEffects().exists(key))
+return traverser.getSideEffects().get(key);
+///
 final Path path = traverser.path();
 if (path.hasLabel(key))
 return path.get(pop, key);
@@ -125,13 +125,13 @@ public interface Scoping {
 }
 
 public default  S getNullableScopeValue(final Pop pop, final String 
key, final Traverser.Admin traverser) {
-if (traverser.getSideEffects().exists(key))
-return traverser.getSideEffects().get(key);
-///
 final Object object = traverser.get();
 if (object instanceof Map && ((Map) 
object).containsKey(key))
 return ((Map) object).get(key);
 ///
+if (traverser.getSideEffects().exists(key))
+return traverser.getSideEffects().get(key);
+///
 final Path path = traverser.path();
 if (path.hasLabel(key))
 return path.get(pop, key);

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/24f629b5/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
index 3620456..3ca2068 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
@@ -83,6 +83,8 @@ public abstract class SelectTest extends 
AbstractGremlinProcessTest {
 
 public abstract Traversal 
get_g_V_chooseXoutE_count_isX0X__asXaX__asXbXX_chooseXselectXaX__selectXaX__selectXbXX();
 
+public abstract Traversal 
get_g_withSideEffectXa_a_markoX_injectX1X_selectXaX_select_XaX();
+
 // below are original back()-tests
 
 public abstract Traversal 
get_g_VX1X_asXhereX_out_selectXhereX(final Object v1Id);
@@ -341,6 +343,16 @@ public abstract class SelectTest extends 
AbstractGremlinProcessTest {
 assertEquals(3, xCounter);
 }
 
+@Test
+@LoadGraphWith(MODERN)
+public void g_withSideEffectXa_a_markoX_injectX1X_selectXaX_select_XaX() {
+final Traversal traversal = 
get_g_withSideEffectXa_a_markoX_injectX1X_selectXaX_select_XaX();
+printTraversalForm(traversal);
+assertTrue(traversal.hasNext());
+assertEquals("marko", traversal.next());
+assertFalse(traversal.hasNext());
+}
+
 // below are original back()-tests
 
 @Test
@@ 

[08/50] 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-1522
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(+)
--

[50/50] tinkerpop git commit: added a note in upgrade docs regarding the change of order of select scopes

[dkuppitz]

added a note in upgrade docs regarding the change of order of select scopes


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

Branch: refs/heads/TINKERPOP-1522
Commit: abc11c8720b2eeb25163fdc1d9e86f0b4ab07d6f
Parents: 26684e3
Author: Daniel Kuppitz 
Authored: Fri Mar 2 22:39:05 2018 -0700
Committer: Daniel Kuppitz 
Committed: Wed Mar 7 08:45:24 2018 -0700

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/abc11c87/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 6f7ef11..1916da8 100644
--- a/docs/src/upgrade/release-3.4.x.asciidoc
+++ b/docs/src/upgrade/release-3.4.x.asciidoc
@@ -64,7 +64,6 @@ 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())
@@ -73,3 +72,45 @@ gremlin> g.V().group().
 
 See: link:https://issues.apache.org/jira/browse/TINKERPOP-1777[TINKERPOP-1777]
 
+ Change in order of select() scopes
+
+The order of select scopes has been changed to: maps, side-effects, paths
+Previously the order was: side-effects, maps, paths - which made it almost 
impossible to select a specific map entry if a side-effect with the same name 
existed.
+
+The following snippets illustrate the changed behavior:
+
+[source,groovy]
+
+gremlin> g.V(1).
+..1>   group("a").
+..2> by(__.constant("a")).
+..3> by(__.values("name")).
+..4>   select("a")
+==>[a:marko]
+gremlin> g.V(1).
+..1>   group("a").
+..2> by(__.constant("a")).
+..3> by(__.values("name")).
+..4>   select("a").select("a")
+==>[a:marko]
+
+
+Above is the old behavior; the second `select("a")` has no effect, it selects 
the side-effect `a` again, although one would expect to get the map entry `a`. 
What follows is the new behavior:
+
+[source,groovy]
+
+gremlin> g.V(1).
+..1>   group("a").
+..2> by(__.constant("a")).
+..3> by(__.values("name")).
+..4>   select("a")
+==>[a:marko]
+gremlin> g.V(1).
+..1>   group("a").
+..2> by(__.constant("a")).
+..3> by(__.values("name")).
+..4>   select("a").select("a")
+==>marko
+
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1522[TINKERPOP-1522]

[03/50] 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-1522
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
--

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

[dkuppitz]

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-1522
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();
 
  

[15/50] 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-1522
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

--

--

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

Branch: refs/heads/TINKERPOP-1522
Commit: 44253e6da48412474c38066615e543cd0f5f8fe6
Parents: cb1de60 107960d
Author: Stephen Mallette 
Authored: Mon Mar 5 08:53:53 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 5 08:53:53 2018 -0500

--
 CHANGELOG.asciidoc  |   1 +
 .../process/computer/GiraphMessenger.java   |  14 +-
 .../process/computer/GraphComputerTest.java | 192 +++
 .../computer/util/ComputerSubmissionHelper.java |   2 +-
 .../spark/process/computer/SparkMessenger.java  |  12 +-
 .../process/computer/TinkerMessenger.java   |  11 +-
 .../tinkergraph/structure/TinkerFactory.java|   7 +
 7 files changed, 234 insertions(+), 5 deletions(-)
--


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

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

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1522 661607f90 -> abc11c872 (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-1522
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

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

[dkuppitz]

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


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

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

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


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

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

[02/50] 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-1522
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 

[04/50] 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-1522
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 

[11/50] 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-1522
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

[05/50] 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-1522
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

--

--

[38/50] tinkerpop git commit: TINKERPOP-1885 Add Gremlin.Net to Query Languages section CTR

[dkuppitz]

TINKERPOP-1885 Add Gremlin.Net to Query Languages section CTR


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

Branch: refs/heads/TINKERPOP-1522
Commit: 5914aa11bf85f8ed7d3d125af596bf15d812ad07
Parents: 512a4b8
Author: Florian Hockmann 
Authored: Tue Mar 6 19:46:57 2018 +0100
Committer: Florian Hockmann 
Committed: Tue Mar 6 19:46:57 2018 +0100

--
 .../site/home/images/logos/gremlin-dotnet-logo.png | Bin 0 -> 73325 bytes
 docs/site/home/providers.html  |  16 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5914aa11/docs/site/home/images/logos/gremlin-dotnet-logo.png
--
diff --git a/docs/site/home/images/logos/gremlin-dotnet-logo.png 
b/docs/site/home/images/logos/gremlin-dotnet-logo.png
new file mode 100644
index 000..967b36b
Binary files /dev/null and 
b/docs/site/home/images/logos/gremlin-dotnet-logo.png differ

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5914aa11/docs/site/home/providers.html
--
diff --git a/docs/site/home/providers.html b/docs/site/home/providers.html
index 8de28ff..269b07d 100644
--- a/docs/site/home/providers.html
+++ b/docs/site/home/providers.html
@@ -301,23 +301,27 @@ WHERE(Created.by(Friends.of("gremlin")))
 http://tinkerpop.apache.org/docs/current/reference/#gremlin-python;>Gremlin-Python
 represents Gremlin inside the Python language and can be used by any Python 
virtual machine such as CPython and Jython. Gremlin-Python traversals translate 
to Gremlin bytecode for RemoteConnection execution (e.g. Gremlin Server).
  
  
-https://github.com/mpollmeier/gremlin-scala;>
-https://github.com/mpollmeier/gremlin-scala;>Gremlin-Scala is a 
Gremlin language variant that uses standard Scala functions, provides a 
convenient DSL to create vertices and edges, ensures type safe traversals, and 
incurrs minimal runtime overhead by only allocating instances if absolutely 
necessary.
+http://tinkerpop.apache.org/docs/current/reference/#gremlin-DotNet;>
+http://tinkerpop.apache.org/docs/current/reference/#gremlin-DotNet;>Gremlin.Net
 represents Gremlin inside the C# language and can be used by any .NET-based 
project. Gremlin.Net traversals translate to Gremlin bytecode for 
RemoteConnection execution (e.g. Gremlin Server).
  
   
   
   
  
+https://github.com/mpollmeier/gremlin-scala;>
+https://github.com/mpollmeier/gremlin-scala;>Gremlin-Scala is a 
Gremlin language variant that uses standard Scala functions, provides a 
convenient DSL to create vertices and edges, ensures type safe traversals, and 
incurrs minimal runtime overhead by only allocating instances if absolutely 
necessary.
+ 
+ 
 https://github.com/clojurewerkz/ogre;>
 https://github.com/clojurewerkz/ogre;>Ogre is a 
Gremlin language variant for Clojure. It provides an API that enhances the 
expressivity of Gremlin within Clojure, it doesn't introduce any significant 
amount of performance overhead, and it can work with any TinkerPop-enabled 
graph database or analytic system.
- 
+  
+  
+  
+  
  
 https://github.com/dkuppitz/sparql-gremlin;>
 https://github.com/dkuppitz/sparql-gremlin;>SPARQL-Gremlin is a 
compiler used to transform SPARQL queries into Gremlin bytecode. It is based on 
the Apache Jena SPARQL processor ARQ, which provides access to a syntax tree of 
a SPARQL query.
  
-  
-  
-  
  
 https://github.com/twilmes/sql-gremlin;>
 https://github.com/twilmes/sql-gremlin;>SQL-Gremlin 
compiles ANSI SQL to Gremlin bytecode and is useful for connecting JDBC 
reporting/business

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

Branch: refs/heads/TINKERPOP-1522
Commit: 920a3d96e80531bfc3f252a3fca47c509c663a25
Parents: 27cc574 81e6ba6
Author: Stephen Mallette 
Authored: Mon Mar 5 07:01:51 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 5 07:01:51 2018 -0500

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


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

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

[dkuppitz]

Merge branch 'tp32' into tp33

Conflicts:
data/tinkerpop-sink-typed.json
data/tinkerpop-sink-v2d0-typed.json
data/tinkerpop-sink-v2d0.json
data/tinkerpop-sink.json
data/tinkerpop-sink.kryo

gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed.json

gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-v2d0-typed.json

gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-v2d0.json

gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink.json

gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/tinkerpop-sink.kryo


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

Branch: refs/heads/TINKERPOP-1522
Commit: 107960da9b367303585f2e18302eb930144067aa
Parents: 920a3d9 6fbf130
Author: Stephen Mallette 
Authored: Mon Mar 5 08:49:55 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 5 08:49:55 2018 -0500

--
 CHANGELOG.asciidoc  |   1 +
 .../process/computer/GiraphMessenger.java   |  14 +-
 .../process/computer/GraphComputerTest.java | 192 +++
 .../computer/util/ComputerSubmissionHelper.java |   2 +-
 .../spark/process/computer/SparkMessenger.java  |  12 +-
 .../process/computer/TinkerMessenger.java   |  11 +-
 .../tinkergraph/structure/TinkerFactory.java|   7 +
 7 files changed, 234 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/107960da/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index e6074e9,b9f22e1..cecf3de
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -280,8 -30,8 +280,9 @@@ image::https://raw.githubusercontent.co
  * 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.
 +* `ReferenceElement` avoids `UnsupportedOperationException` handling in 
construction thus improving performance.
  * 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.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/107960da/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
--

[10/50] 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-1522
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(-)
--

[4/4] tinkerpop git commit: Merge branch 'TINKERPOP-1777'

[dkuppitz]

Merge branch 'TINKERPOP-1777'


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

Branch: refs/heads/master
Commit: a35f009a043eac62f610ffaa28e43d7f6fbb86b6
Parents: 137f1e5 b6501ca
Author: Daniel Kuppitz 
Authored: Wed Mar 7 08:19:41 2018 -0700
Committer: Daniel Kuppitz 
Committed: Wed Mar 7 08:19:41 2018 -0700

--
 CHANGELOG.asciidoc  |  2 +
 docs/src/upgrade/release-3.4.x.asciidoc | 45 +++
 .../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 +--
 30 files changed, 440 insertions(+), 93 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a35f009a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
--

[1/4] 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]

Repository: tinkerpop
Updated Branches:
  refs/heads/master 137f1e593 -> a35f009a0


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

[2/4] tinkerpop git commit: Updated release docs

[dkuppitz]

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/master
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]
+

[3/4] tinkerpop git commit: added Jira link in upgrade docs.

[dkuppitz]

added Jira link in upgrade docs.


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

Branch: refs/heads/master
Commit: b6501ca0836548957501e21c817d7f07c5934fb3
Parents: 7149f8e
Author: Daniel Kuppitz 
Authored: Wed Mar 7 08:18:51 2018 -0700
Committer: Daniel Kuppitz 
Committed: Wed Mar 7 08:18:51 2018 -0700

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b6501ca0/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 5a355fa..6f7ef11 100644
--- a/docs/src/upgrade/release-3.4.x.asciidoc
+++ b/docs/src/upgrade/release-3.4.x.asciidoc
@@ -70,3 +70,6 @@ gremlin> g.V().group().
 ..2>   by(coalesce(outE().values("weight"), constant(0)).sum())
 ==>[software:0,person:3.5]
 
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1777[TINKERPOP-1777]
+

tinkerpop git commit: added Jira link in upgrade docs.

[dkuppitz]

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


added Jira link in upgrade docs.


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

Branch: refs/heads/TINKERPOP-1777
Commit: b6501ca0836548957501e21c817d7f07c5934fb3
Parents: 7149f8e
Author: Daniel Kuppitz 
Authored: Wed Mar 7 08:18:51 2018 -0700
Committer: Daniel Kuppitz 
Committed: Wed Mar 7 08:18:51 2018 -0700

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b6501ca0/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 5a355fa..6f7ef11 100644
--- a/docs/src/upgrade/release-3.4.x.asciidoc
+++ b/docs/src/upgrade/release-3.4.x.asciidoc
@@ -70,3 +70,6 @@ gremlin> g.V().group().
 ..2>   by(coalesce(outE().values("weight"), constant(0)).sum())
 ==>[software:0,person:3.5]
 
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1777[TINKERPOP-1777]
+

[tinkerpop] Git Push Summary

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1913 [created] 98ad2fd88