tinkerpop git commit: Added some notes about certain Structure API bits for 4.x CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master 62299a1e3 -> 512a4b8b0


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

tinkerpop git commit: Moved some tests to the correct packages CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 6fbf13047 -> 2c6c151fc


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

[1/2] tinkerpop git commit: Moved some tests to the correct packages CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 875796372 -> eb6b1e547


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

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

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

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

[florianhockmann]

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


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

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

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


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

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

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

[florianhockmann]

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

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

[florianhockmann]

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


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

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

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


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

[36/39] tinkerpop git commit: Add docker images for console and server TINKERPOP-1897

[florianhockmann]

Add docker images for console and server TINKERPOP-1897


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

Branch: refs/heads/TINKERPOP-1897
Commit: e0d025c36ed33f10192d52d1ff5fff9eb07e21e9
Parents: 6fbf130
Author: Florian Hockmann 
Authored: Sun Feb 25 18:14:03 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Mar 5 19:53:58 2018 +0100

--
 .dockerignore   |  2 +
 .gitignore  |  1 +
 CHANGELOG.asciidoc  |  1 +
 .../developer/development-environment.asciidoc  | 16 +++-
 .../src/reference/gremlin-applications.asciidoc | 89 
 gremlin-console/Dockerfile  | 31 +++
 gremlin-console/pom.xml | 34 
 .../src/main/docker/docker-entrypoint.sh| 24 ++
 gremlin-server/Dockerfile   | 35 
 gremlin-server/pom.xml  | 34 
 .../src/main/docker/docker-entrypoint.sh| 31 +++
 pom.xml |  6 ++
 12 files changed, 303 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0d025c3/.dockerignore
--
diff --git a/.dockerignore b/.dockerignore
index afe0e54..50d6801 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,7 @@
 **/*.log
 **/target
+!gremlin-server/target/apache-tinkerpop-gremlin-server-*
+!gremlin-console/target/apache-tinkerpop-gremlin-console-*
 *.iml
 .idea
 **/*.DS_Store

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0d025c3/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 0109f82..10e5b4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ __pycache__/
 *.py[cdo]
 __version__.py
 .glv
+.docker
 settings.xml
 tools/
 [Dd]ebug/

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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0d025c3/docs/src/dev/developer/development-environment.asciidoc
--
diff --git a/docs/src/dev/developer/development-environment.asciidoc 
b/docs/src/dev/developer/development-environment.asciidoc
index f2b286f..c0d5389 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -104,7 +104,7 @@ The build optionally requires 
link:https://www.microsoft.com/net/core[.NET Core
 `gremlin-dotnet` module. If .NET Core SDK is not installed, TinkerPop will 
still build with Maven, but .NET projects
 will be skipped.
 
-`gremlin-dotnet` can be build and tested from the command line with:
+`gremlin-dotnet` can be built and tested from the command line with:
 
 [source,text]
 mvn clean install -Pgremlin-dotnet
@@ -142,6 +142,20 @@ The release manager should have the authentication token 
set, for more informati
 section below.
 
 
+[[docker-environment]]
+=== Docker Environment
+The build optionally requires Docker to build Docker images of Gremlin Server 
and Gremlin Console.
+
+The Docker images can be built from the command line with:
+[source,text]
+
+mvn clean install -Pdocker-images
+
+which enables the "docker-images" Maven profile or in a more automated fashion 
simply add a `.docker` file to the
+directories of the `gremlin-server` and/or `gremlin-console` modules which 
will signify to Maven that Docker is present
+in the environment.
+
+
 [[release-environment]]
 === Release Environment
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0d025c3/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 

[24/39] tinkerpop git commit: Added friendWeight to type info in .NET

[florianhockmann]

Added friendWeight to type info in .NET

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


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

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

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


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

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

[34/39] tinkerpop git commit: Merge branch 'TINKERPOP-1862' into tp32

[florianhockmann]

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

[37/39] tinkerpop git commit: Increase test timeout for slow systems TINKERPOP-1897

[florianhockmann]

Increase test timeout for slow systems TINKERPOP-1897


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

Branch: refs/heads/TINKERPOP-1897
Commit: c9390d9a5479a032b03fbed92497681b626213e4
Parents: 653fb3c
Author: Florian Hockmann 
Authored: Thu Mar 1 17:17:11 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Mar 5 19:53:59 2018 +0100

--
 .../java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c9390d9a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
--
diff --git 
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
 
b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
index a7e6066..43442be 100644
--- 
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
+++ 
b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
@@ -281,7 +281,7 @@ public class ResultQueueTest extends 
AbstractResultQueueTest {
 latch.countDown();
 });
 
-assertThat(latch.await(3000, TimeUnit.MILLISECONDS), is(true));
+assertThat(latch.await(1, TimeUnit.MILLISECONDS), is(true));
 
 assertEquals(500, count1.get());
 assertEquals(150, count2.get());

[35/39] tinkerpop git commit: Don't build docker images in docker build TINKERPOP-1897

[florianhockmann]

Don't build docker images in docker build TINKERPOP-1897


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

Branch: refs/heads/TINKERPOP-1897
Commit: 653fb3c0b743bbdfe1d209f2e6889305a6612cd2
Parents: e0d025c
Author: Florian Hockmann 
Authored: Mon Feb 26 21:17:46 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Mar 5 19:53:58 2018 +0100

--
 docker/scripts/build.sh | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/653fb3c0/docker/scripts/build.sh
--
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 5ef74fc..3d8f0d3 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -67,6 +67,9 @@ touch gremlin-python/.glv
 touch gremlin-dotnet/src/.glv
 touch gremlin-dotnet/test/.glv
 
+rm gremlin-console/.docker
+rm gremlin-server/.docker
+
 # use a custom maven settings.xml
 if [ -r "settings.xml" ]; then
   echo "Copying settings.xml"

[15/39] tinkerpop git commit: Added Gremlin's Anatomy tutorial

[florianhockmann]

Added Gremlin's Anatomy tutorial

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


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

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

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


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa9e70e/docs/src/tutorials/gremlins-anatomy/index.asciidoc
--
diff --git a/docs/src/tutorials/gremlins-anatomy/index.asciidoc 
b/docs/src/tutorials/gremlins-anatomy/index.asciidoc
new file mode 100644
index 000..b36d881
--- /dev/null
+++ b/docs/src/tutorials/gremlins-anatomy/index.asciidoc
@@ -0,0 +1,189 @@
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+

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

[florianhockmann]

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


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

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

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


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

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

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

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

[florianhockmann]

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-1897
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
-//

[21/39] tinkerpop git commit: Fixed up failing .NET GLV test

[florianhockmann]

Fixed up failing .NET GLV test

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


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

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

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


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

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

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

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

[florianhockmann]

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-1897
Commit: 2350cbe04b5a4ed3fdca389b8a345017a4bc7d0a
Parents: aaf5146
Author: Stephen Mallette 
Authored: Thu Mar 1 12:04:42 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 12:06:43 2018 -0500

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


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

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

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

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

[16/39] tinkerpop git commit: Merge branch 'TINKERPOP-1586' into tp32

[florianhockmann]

Merge branch 'TINKERPOP-1586' into tp32


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

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

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d5205161/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 60e0ef4,1701342..92e1d9e
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -23,9 -23,9 +23,10 @@@ image::https://raw.githubusercontent.co
  [[release-3-2-8]]
  === TinkerPop 3.2.8 (Release Date: NOT OFFICIALLY RELEASED YET)
  
+ * Added `checkAdjacentVertices` option to `SubgraphStrategy`.
  * Modified `GremlinDslProcessor` so that it generated the 
`getAnonymousTraversalClass()` method to return the DSL version of `__`.
  * Added the "Kitchen Sink" test data set.
 +* Added `idleConnectionTimeout` and `keepAliveInterval` to Gremlin Server 
that enables a "ping" and auto-close for seemingly dead clients.
  * Fixed a bug in `NumberHelper` that led to wrong min/max results if numbers 
exceeded the Integer limits.
  * Delayed setting of the request identifier until `RequestMessage` 
construction by the builder.
  * Improved error messaging for failed serialization and deserialization of 
request/response messages.

[14/39] tinkerpop git commit: Using "name" instead of "propertyin"

[florianhockmann]

Using "name" instead of "propertyin"


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

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

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


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

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

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

[florianhockmann]

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

[09/39] tinkerpop git commit: Updating kitchen sink graph

[florianhockmann]

Updating kitchen sink graph


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

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

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


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

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

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

[39/39] tinkerpop git commit: Add description about Docker credentials TINKERPOP-1897

[florianhockmann]

Add description about Docker credentials TINKERPOP-1897


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

Branch: refs/heads/TINKERPOP-1897
Commit: a7cb12b6ec12d1c0b7f2db6ed356c65e5f4c7921
Parents: 77bf060
Author: Florian Hockmann 
Authored: Mon Mar 5 19:52:28 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Mar 5 19:53:59 2018 +0100

--
 docs/src/dev/developer/development-environment.asciidoc | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a7cb12b6/docs/src/dev/developer/development-environment.asciidoc
--
diff --git a/docs/src/dev/developer/development-environment.asciidoc 
b/docs/src/dev/developer/development-environment.asciidoc
index c0d5389..2bd39e0 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -195,6 +195,11 @@ To deploy `gremlin-javascript` on the 
link:https://www.npmjs.com[npm registry],
 authentication information on the ~/.npmrc file. The easiest way to do that is 
to use the `npm adduser` command. This
 must be done only once, as the auth token doesn't have an expiration date and 
it's stored on your file system.
 
+Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires 
authentication information in the
+`~/.docker/config.json` file. This information can simply be added with the 
`docker login` command which will ask for
+credentials. This must be done only once. Afterwards, `docker push` can be 
used to push images to Docker Hub which will
+be done automatically on `mvn deploy` or it can be triggered manually with 
`mvn dockerfile:push`.
+
 [[building-testing]]
 == Building and Testing
 

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

[florianhockmann]

Proper update of kitchen sink through TinkerFactory


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

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

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


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

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

[03/39] tinkerpop git commit: Updated dev docs for release candidates CTR

[florianhockmann]

Updated dev docs for release candidates CTR


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

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

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


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

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

[florianhockmann]

Created issue for ignored GLV test in .NET CTR


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

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

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


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

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

[florianhockmann]

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


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

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

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


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

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

[florianhockmann]

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

[33/39] tinkerpop git commit: Update to apache pom version 19 CTR

[florianhockmann]

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

[17/39] tinkerpop git commit: Fixed a GLV test definition.

[florianhockmann]

Fixed a GLV test definition.

This allowed some ignored tests to pass CTR


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

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

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cfdfa93/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 69af86f..627570c 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -39,7 +39,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 private static readonly IDictionary 
IgnoredScenarios = new Dictionary {
 { 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation },
-{ "g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.NeedsFurtherInvestigation },
 { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation },
 { 
"g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0X_selectXa_bX",
 IgnoreReason.NeedsFurtherInvestigation },
 { 
"g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXd_selectXa_b_c_dX",
 IgnoreReason.NeedsFurtherInvestigation },
@@ -53,7 +52,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 { "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
 { "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
 { "g_V_asXaX_out_asXbX_matchXa_out_count_c__b_in_count_cX", 
IgnoreReason.NeedsFurtherInvestigation },
-{ 
"g_V_matchXa_knows_b__andXa_created_c__b_created_c__andXb_created_count_d__a_knows_count_dXXX",
 IgnoreReason.NeedsFurtherInvestigation },
 { "g_V_foo_injectX99X_min", 
IgnoreReason.NeedsFurtherInvestigation },
 { 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX",
 IgnoreReason.NeedsFurtherInvestigation },
 { "g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX", 
IgnoreReason.NeedsFurtherInvestigation },

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

[38/39] tinkerpop git commit: Remove verbose log output TINKERPOP-1897

[florianhockmann]

Remove verbose log output TINKERPOP-1897


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

Branch: refs/heads/TINKERPOP-1897
Commit: 77bf0605e947d6701ac6f53bc36167c9f3c02cf1
Parents: c9390d9
Author: Florian Hockmann 
Authored: Thu Mar 1 17:19:39 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Mar 5 19:53:59 2018 +0100

--
 .../src/reference/gremlin-applications.asciidoc | 26 +---
 1 file changed, 1 insertion(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/77bf0605/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 
b/docs/src/reference/gremlin-applications.asciidoc
index 0486827..be777a9 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1875,31 +1875,7 @@ $ docker run tinkerpop/gremlin-server:x.y.z
 -oOOo-(3)-oOOo-
 
 [INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server.yaml
-[INFO] MetricManager - Configured Metrics ConsoleReporter configured with 
report interval=18ms
-[INFO] MetricManager - Configured Metrics CsvReporter configured with report 
interval=18ms to fileName=/tmp/gremlin-server-metrics.csv
-[INFO] MetricManager - Configured Metrics JmxReporter configured with domain= 
and agentId=
-[INFO] MetricManager - Configured Metrics Slf4jReporter configured with 
interval=18ms and 
loggerName=org.apache.tinkerpop.gremlin.server.Settings$Slf4jReporterMetrics
-[INFO] DefaultGraphManager - Graph [graph] was successfully configured via 
[conf/tinkergraph-empty.properties].
-[INFO] ServerGremlinExecutor - Initialized Gremlin thread pool.  Threads in 
pool named with pattern gremlin-*
-[INFO] ScriptEngines - Loaded gremlin-groovy ScriptEngine
-[INFO] GremlinExecutor - Initialized gremlin-groovy ScriptEngine with 
scripts/empty-sample.groovy
-[INFO] ServerGremlinExecutor - Initialized GremlinExecutor and preparing 
GremlinScriptEngines instances.
-[INFO] ServerGremlinExecutor - Initialized gremlin-groovy GremlinScriptEngine 
and registered metrics
-[INFO] ServerGremlinExecutor - A GraphTraversalSource is now bound to [g] with 
graphtraversalsource[tinkergraph[vertices:0 edges:0], standard]
-[INFO] OpLoader - Adding the standard OpProcessor.
-[INFO] OpLoader - Adding the control OpProcessor.
-[INFO] OpLoader - Adding the session OpProcessor.
-[INFO] OpLoader - Adding the traversal OpProcessor.
-[INFO] TraversalOpProcessor - Initialized cache for TraversalOpProcessor with 
size 1000 and expiration time of 60 ms
-[INFO] GremlinServer - Executing start up LifeCycleHook
-[INFO] Logger$info - Executed once at startup of Gremlin Server.
-[INFO] GremlinServer - idleConnectionTimeout was set to 0 which resolves to 0 
seconds when configuring this value - this feature will be disabled
-[INFO] GremlinServer - keepAliveInterval was set to 0 which resolves to 0 
seconds when configuring this value - this feature will be disabled
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+gryo with 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
-[INFO] AbstractChannelizer - Configured 
application/vnd.gremlin-v1.0+gryo-stringd with 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+json with 
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v2.0+json with 
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0
-[INFO] AbstractChannelizer - Configured application/json with 
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0
+...
 [INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 
1, gremlin pool of 4 and boss thread pool of 1.
 [INFO] GremlinServer$1 - Channel started at port 8182.
 

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

[florianhockmann]

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


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

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

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


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

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

[02/39] tinkerpop git commit: Added some docs about Gherkin tests CTR

[florianhockmann]

Added some docs about Gherkin tests CTR


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

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

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


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

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

[florianhockmann]

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


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

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

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


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

[10/39] tinkerpop git commit: Updating message passing tests to use kitchen sink

[florianhockmann]

Updating message passing tests to use kitchen sink


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

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

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


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

[06/39] tinkerpop git commit: Test cleanup - hopefully can run now

[florianhockmann]

Test cleanup - hopefully can run now


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

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

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


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

[19/39] tinkerpop git commit: Removed more ignored GLV tests for .NET

[florianhockmann]

Removed more ignored GLV tests for .NET

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


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

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

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


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

[04/39] tinkerpop git commit: TinkerMessenger proper handling of Direction.BOTH

[florianhockmann]

TinkerMessenger proper handling of Direction.BOTH


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

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

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


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

[08/39] tinkerpop git commit: Test bug fix and refactoring repeated code

[florianhockmann]

Test bug fix and refactoring repeated code


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

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

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


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

[11/39] tinkerpop git commit: Revert "Updating kitchen sink graph"

[florianhockmann]

Revert "Updating kitchen sink graph"

This reverts commit febe0ac8ecdf1828233017864b629a644c7260a8.


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

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

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


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

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

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

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

[florianhockmann]

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

tinkerpop git commit: Add description about Docker credentials TINKERPOP-1897

[florianhockmann]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1897 a64f04ec3 -> fd4829070


Add description about Docker credentials TINKERPOP-1897


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

Branch: refs/heads/TINKERPOP-1897
Commit: fd482907052d86775ceebc5d439eb3f0a615c53d
Parents: a64f04e
Author: Florian Hockmann 
Authored: Mon Mar 5 19:52:28 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Mar 5 19:52:28 2018 +0100

--
 docs/src/dev/developer/development-environment.asciidoc | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd482907/docs/src/dev/developer/development-environment.asciidoc
--
diff --git a/docs/src/dev/developer/development-environment.asciidoc 
b/docs/src/dev/developer/development-environment.asciidoc
index c0d5389..2bd39e0 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -195,6 +195,11 @@ To deploy `gremlin-javascript` on the 
link:https://www.npmjs.com[npm registry],
 authentication information on the ~/.npmrc file. The easiest way to do that is 
to use the `npm adduser` command. This
 must be done only once, as the auth token doesn't have an expiration date and 
it's stored on your file system.
 
+Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires 
authentication information in the
+`~/.docker/config.json` file. This information can simply be added with the 
`docker login` command which will ask for
+credentials. This must be done only once. Afterwards, `docker push` can be 
used to push images to Docker Hub which will
+be done automatically on `mvn deploy` or it can be triggered manually with 
`mvn dockerfile:push`.
+
 [[building-testing]]
 == Building and Testing
 

tinkerpop git commit: TINKERPOP-1758 Apply RemoteStrategy before all DecorationStrategy instances

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1758 [created] 528851411


TINKERPOP-1758 Apply RemoteStrategy before all DecorationStrategy instances

Played around with a few ways to test this, but none seemed especially good. 
Everything I try to do seems fairly contrived or redundant. In the end, I ended 
up feeling like it was safe to just rely on the TraversalStrategies sorting 
system with posts/priors. Perhaps that is enough...


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

Branch: refs/heads/TINKERPOP-1758
Commit: 528851411c6494bf92f2f929324a79ba28a941b2
Parents: 6fbf130
Author: Stephen Mallette 
Authored: Mon Mar 5 13:18:35 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 5 13:18:35 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../strategy/decoration/RemoteStrategy.java | 27 +++-
 .../process/traversal/TraversalStrategies.java  | 22 
 3 files changed, 38 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/52885141/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index b9f22e1..037d94c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -27,6 +27,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Modified `GremlinDslProcessor` so that it generated the 
`getAnonymousTraversalClass()` method to return the DSL version of `__`.
 * Added the "Kitchen Sink" test data set.
 * Fixed deserialization of `P.not()` for GraphSON.
+* Ensure that `RemoteStrategy` is applied before all other 
`DecorationStrategy` instances.
 * 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/52885141/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/strategy/decoration/RemoteStrategy.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/strategy/decoration/RemoteStrategy.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/strategy/decoration/RemoteStrategy.java
index d1b14d5..f6e3ed6 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/strategy/decoration/RemoteStrategy.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/strategy/decoration/RemoteStrategy.java
@@ -27,11 +27,22 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.ProfileSideEffectStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
+import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ConnectiveStrategy;
+import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ElementIdStrategy;
+import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.EventStrategy;
+import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.HaltedTraverserStrategy;
+import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategy;
+import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.RequirementsStrategy;
+import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SackStrategy;
+import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SideEffectStrategy;
+import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.VerificationException;
 import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
 import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
 
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
 
@@ -49,7 +60,21 @@ public final class RemoteStrategy extends 
AbstractTraversalStrategy remoteConnection;
 
-private static final 

tinkerpop git commit: Added GraphSON/Gryo 3.0 versions of "sink" data CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 f3f85b2aa -> 875796372


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/tp33
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 

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

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master 92ec0abe6 -> 51f4771f8


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

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

[spmallette]

Merge branch 'tp33'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/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/master
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/14] tinkerpop git commit: TINKERPOP-1862 Added back computer tests accidentally commented out

[spmallette]

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/tp32
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
-//

tinkerpop git commit: Update "sink" data on 3.3.x CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 107960da9 -> f3f85b2aa


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/tp33
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"}]}}
 

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

[spmallette]

Revert "Updating kitchen sink graph"

This reverts commit febe0ac8ecdf1828233017864b629a644c7260a8.


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

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

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


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

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

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

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

[spmallette]

Merge branch 'tp33'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/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/master
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(+)
--

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

[spmallette]

Using "name" instead of "propertyin"


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

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

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


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

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

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

[spmallette]

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

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


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

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

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

[spmallette]

Proper update of kitchen sink through TinkerFactory


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

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

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


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

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

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

[spmallette]

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/tp32
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
--

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

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master 44253e6da -> 92ec0abe6


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/master
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"}]}}
 

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

[spmallette]

Revert "Updating kitchen sink graph"

This reverts commit febe0ac8ecdf1828233017864b629a644c7260a8.


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

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

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


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

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

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

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

[spmallette]

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


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

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

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


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

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

[spmallette]

TINKERPOP-1862 Updated changelog


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

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

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

[spmallette]

Updating kitchen sink graph


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

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

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


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

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

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

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

[spmallette]

Using "name" instead of "propertyin"


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

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

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


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

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

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

[spmallette]

Revert "Updating kitchen sink graph"

This reverts commit febe0ac8ecdf1828233017864b629a644c7260a8.


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

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

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


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

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

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

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

[spmallette]

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


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

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

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


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

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

[spmallette]

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


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

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

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


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

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

[spmallette]

Proper update of kitchen sink through TinkerFactory


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

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

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


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

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

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

[spmallette]

Test bug fix and refactoring repeated code


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

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

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


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

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

[spmallette]

Updating message passing tests to use kitchen sink


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

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

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


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

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

[spmallette]

TINKERPOP-1862 Updated changelog


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

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

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

[spmallette]

Test cleanup - hopefully can run now


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

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

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


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

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

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 81e6ba6fc -> 6fbf13047


TinkerMessenger proper handling of Direction.BOTH


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

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

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


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

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

[spmallette]

Updating kitchen sink graph


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

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

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


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

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

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

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

[spmallette]

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

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

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

[spmallette]

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/tp33
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
-//

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

[spmallette]

Test bug fix and refactoring repeated code


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

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

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


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

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

[spmallette]

Proper update of kitchen sink through TinkerFactory


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

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

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


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

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

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

[spmallette]

Test cleanup - hopefully can run now


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

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

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


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

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

[spmallette]

Updating message passing tests to use kitchen sink


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

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

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


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

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

[spmallette]

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


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

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

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


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

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

[spmallette]

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


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

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

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


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

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

[spmallette]

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/tp33
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/15] tinkerpop git commit: Using "name" instead of "propertyin"

[spmallette]

Using "name" instead of "propertyin"


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

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

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


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

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

[14/15] tinkerpop git commit: Merge branch 'TINKERPOP-1862' into tp32

[spmallette]

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/tp33
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
--

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

[spmallette]

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

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


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

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

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

[spmallette]

TINKERPOP-1862 Updated changelog


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

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

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

[spmallette]

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


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

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

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


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

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

[spmallette]

Updating kitchen sink graph


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

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

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


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

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

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

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

[spmallette]

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

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


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

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

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

[spmallette]

Updating message passing tests to use kitchen sink


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

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

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


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

[14/16] tinkerpop git commit: Merge branch 'TINKERPOP-1862' into tp32

[spmallette]

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

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

[spmallette]

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

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

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master cb1de6020 -> 44253e6da


TinkerMessenger proper handling of Direction.BOTH


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

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

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


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

[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/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/tp33
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
--

[1/2] tinkerpop git commit: Update to apache pom version 19 CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 27cc57469 -> 920a3d96e


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/tp33
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

[1/3] tinkerpop git commit: Update to apache pom version 19 CTR

[spmallette]

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


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

[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/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/master
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
--

[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/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/master
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
--