[25/50] tinkerpop git commit: TINKERPOP-1784 Removed duplicate entry from bad merge in changelog

[jorgebg]

TINKERPOP-1784 Removed duplicate entry from bad merge in changelog


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

Branch: refs/heads/TINKERPOP-1827
Commit: 33258993494225f61697fc8fe58d3b54d59766f8
Parents: 2b24f58
Author: Stephen Mallette 
Authored: Fri Nov 10 20:13:12 2017 -0500
Committer: Stephen Mallette 
Committed: Tue Nov 21 15:53:14 2017 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33258993/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index cb2779a..d722066 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -30,7 +30,6 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * `TraversalVertexProgram` `profile()` now accounts for worker iteration in 
`GraphComputer` OLAP.
 * Returned the `Builder` instance from the `DetachedEdge.Builder` methods of 
`setOutE` and `setOutV`.
 * Added test framework for GLVs.
-* `TraversalVertexProgram` ``profile()` now accounts for worker iteration in 
`GraphComputer` OLAP.
 * Added a test for self-edges and fixed `Neo4jVertex` to provided repeated 
self-edges on `BOTH`.
 * Better respected permissions on the `plugins.txt` file and prevented writing 
if marked as read-only.
 * Added getters for the lambdas held by `LambdaCollectingBarrierStep`, 
`LambdaFlatMapStep` and `LambdaSideEffectStep`.

[34/50] tinkerpop git commit: Get property information from modern graph

[jorgebg]

Get property information from modern graph


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

Branch: refs/heads/TINKERPOP-1827
Commit: 71c4a8fac1edb2a75ccbc6b74e348a26f8e9e551
Parents: d8adc29
Author: Jorge Bay Gondra 
Authored: Fri Oct 27 14:18:32 2017 +0200
Committer: Jorge Bay Gondra 
Committed: Thu Nov 23 09:08:06 2017 +0100

--
 .../ModernGraphTypeInformation.cs   | 70 
 .../TraversalEvaluationTests.cs | 10 ++-
 .../TraversalEvaluation/TraversalParser.cs  | 24 ---
 3 files changed, 92 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71c4a8fa/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
new file mode 100644
index 000..bce3449
--- /dev/null
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
@@ -0,0 +1,70 @@
+#region License
+
+/*
+ * 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.
+ */
+
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Gremlin.Net.Process.Traversal;
+
+namespace Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
+{
+internal class ModernGraphTypeInformation
+{
+private static readonly IDictionary PropertyInfos = new 
Dictionary
+{
+{"age", typeof(int)},
+{"name", typeof(string)},
+{"lang", typeof(string)},
+{"weight", typeof(float)}
+};
+
+/// 
+/// Gets the type argument information based on the modern graph.
+/// s
+public static Type GetTypeArguments(MethodInfo method, object[] 
parameterValues)
+{
+switch (method.Name)
+{
+case nameof(GraphTraversal.ValueMap):
+case nameof(GraphTraversal.Values) when 
parameterValues.Length == 1:
+// The parameter contains the element property names
+var properties = ((IEnumerable) 
parameterValues[parameterValues.Length - 1]).Cast();
+var types = 
properties.Select(GetElementPropertyType).ToArray();
+if (types.Distinct().Count() == 1)
+{
+return types[0];
+}
+return typeof(object);
+}
+return null;
+}
+
+private static Type GetElementPropertyType(string name)
+{
+PropertyInfos.TryGetValue(name, out var type);
+return type;
+}
+}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71c4a8fa/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalEvaluationTests.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalEvaluationTests.cs
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalEvaluationTests.cs
index 0949ad5..4e3ec42 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalEvaluationTests.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalEvaluationTests.cs
@@ -77,15 +77,19 @@ namespace 

[16/50] tinkerpop git commit: TINKERPOP-1784 Killed some whitespace in gremlin-python pom

[jorgebg]

TINKERPOP-1784 Killed some whitespace in gremlin-python pom


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

Branch: refs/heads/TINKERPOP-1827
Commit: 5286c2042690369c25bda8dd69692ae11b02841e
Parents: 50f8286
Author: Stephen Mallette 
Authored: Mon Nov 13 08:04:28 2017 -0500
Committer: Stephen Mallette 
Committed: Tue Nov 21 15:53:14 2017 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5286c204/gremlin-python/pom.xml
--
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index d1a4a76..a1aee4a 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -450,7 +450,7 @@ limitations under the License.
   failonerror="true">
 
  
-
  
+
 
 
 

[44/50] tinkerpop git commit: Ignore specific scenarios

[jorgebg]

Ignore specific scenarios


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

Branch: refs/heads/TINKERPOP-1827
Commit: 7980c780092457e946887b2db4b0650f336b9ee1
Parents: ed9cf5d
Author: Jorge Bay Gondra 
Authored: Fri Nov 17 13:59:42 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Thu Nov 23 09:08:08 2017 +0100

--
 .../Gherkin/GherkinTestRunner.cs| 33 
 .../Gherkin/IgnoreException.cs  | 11 ++-
 2 files changed, 43 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7980c780/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 b03211c..a3748ee 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -40,6 +40,31 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 public class GherkinTestRunner
 {
+private static readonly IDictionary 
IgnoredScenarios =
+new Dictionary
+{
+{ "g_V_hasLabelXpersonX_projectXa_bX_byXoutE_countX_byXageX", 
IgnoreReason.ScenarioDesignMapNumbers },
+{ "g_V_matchXa_knows_b__b_created_cX", 
IgnoreReason.MapCoersionIssue},
+{ "g_V_valueMap_matchXa_selectXnameX_bX", 
IgnoreReason.MapCoersionIssue},
+{ "g_V_matchXa_out_bX", IgnoreReason.MapCoersionIssue},
+{ 
"g_V_outXcreatedX_unionXasXprojectX_inXcreatedX_hasXname_markoX_selectXprojectX__asXprojectX_inXcreatedX_inXknowsX_hasXname_markoX_selectXprojectXX_groupCount_byXnameX",
+IgnoreReason.ScenarioDesignMapNumbers},
+{ 
"g_V_hasLabelXpersonX_asXpX_mapXbothE_label_groupCountX_asXrX_selectXp_rX",
+IgnoreReason.ScenarioDesignMapNumbers},
+{ "g_V_label_groupCount_asXxX_selectXxX", 
IgnoreReason.ScenarioDesignMapNumbers},
+{ 
"g_V_outXfollowedByX_group_byXsongTypeX_byXbothE_group_byXlabelX_byXweight_sumXX",
+IgnoreReason.ScenarioDesignMapNumbers},
+{ 
"g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byXcountX_capXaX",
+IgnoreReason.ScenarioDesignMapNumbers},
+{ 
"g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byXcountX",
+IgnoreReason.ScenarioDesignMapNumbers},
+{ 
"g_V_repeatXout_groupXaX_byXnameX_byXcountX_timesX2X_capXaX", 
IgnoreReason.ScenarioDesignMapNumbers},
+{ "g_V_hasXlangX_group_byXlangX_byXcountX", 
IgnoreReason.ScenarioDesignMapNumbers},
+{ 
"g_V_hasLabelXsongX_group_byXnameX_byXproperties_groupCount_byXlabelXX", 
IgnoreReason.MapCoersionIssue},
+{ 
"g_V_hasLabelXsongX_groupXaX_byXnameX_byXproperties_groupCount_byXlabelXX_out_capXaX",
+IgnoreReason.MapCoersionIssue},
+};
+
 private static class Keywords
 {
 public const string Given = "GIVEN";
@@ -84,6 +109,11 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 var failedSteps = new Dictionary();
 resultFeature.Scenarios[scenario] = failedSteps;
+if (IgnoredScenarios.TryGetValue(scenario.Name, out var 
reason))
+{
+failedSteps.Add(scenario.Steps.First(), new 
IgnoreException(reason));
+break;
+}
 StepBlock? currentStep = null;
 StepDefinition stepDefinition = null;
 foreach (var step in scenario.Steps)
@@ -361,6 +391,9 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/Mean.feature",
 
 
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/sideEffect/Sack.feature",
+
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/sideEffect/Group.feature",
+//
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/sideEffect/GroupCount.feature",
+//

[19/50] tinkerpop git commit: TINKERPOP-1784 Fixed data type in fold feature test

[jorgebg]

TINKERPOP-1784 Fixed data type in fold feature test


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

Branch: refs/heads/TINKERPOP-1827
Commit: 11a180f9ba4ed836270395901a553d57de8884fa
Parents: 7231b5a
Author: Stephen Mallette 
Authored: Mon Nov 20 11:52:12 2017 -0500
Committer: Stephen Mallette 
Committed: Tue Nov 21 15:53:14 2017 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11a180f9/gremlin-test/features/map/Fold.feature
--
diff --git a/gremlin-test/features/map/Fold.feature 
b/gremlin-test/features/map/Fold.feature
index 83f4be4..c711e1d 100644
--- a/gremlin-test/features/map/Fold.feature
+++ b/gremlin-test/features/map/Fold.feature
@@ -53,5 +53,5 @@ Feature: Step - fold()
 When iterated to list
 Then the result should be unordered
   | result |
-  | d[123].l |
+  | d[123].i |
 

[02/50] tinkerpop git commit: TINKERPOP-1784 Disabled coverage test for features

[jorgebg]

TINKERPOP-1784 Disabled coverage test for features

No point to enabling at this time since all tests aren't really targetted for 
migration with this initial body of work. It will be turned on later when all 
test are intended for migration.


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

Branch: refs/heads/TINKERPOP-1827
Commit: 7896264edf6a3ea94a2f7ae396da1f1db152311e
Parents: 3b54267
Author: Stephen Mallette 
Authored: Fri Nov 10 11:24:47 2017 -0500
Committer: Stephen Mallette 
Committed: Tue Nov 21 15:52:52 2017 -0500

--
 .../org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7896264e/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java
--
diff --git 
a/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java
 
b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java
index dba865b..cc6e9bd 100644
--- 
a/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java
+++ 
b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java
@@ -35,6 +35,7 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AggregateT
 import 
org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupCountTest;
 import 
org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectTest;
 import 
org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.StoreTest;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.BufferedReader;
@@ -65,6 +66,7 @@ public class FeatureCoverageTest {
 private static Pattern scenarioName = 
Pattern.compile("^\\s*Scenario:\\s*(.*)$");
 
 @Test
+@Ignore("As it stands we won't have all of these tests migrated initially 
so there is no point to running this in full - it can be flipped on later")
 public void shouldImplementAllProcessTestsAsFeatures() throws Exception {
 
 // TEMPORARY while test framework is under development - all tests 
should ultimately be included

[11/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' of https://git-wip-us.apache.org/repos/asf/tinkerpop into tp32

[jorgebg]

Merge branch 'tp32' of https://git-wip-us.apache.org/repos/asf/tinkerpop into 
tp32


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

Branch: refs/heads/TINKERPOP-1489
Commit: f2b4fb980559c8427fa946ad0d5acb42292a0b70
Parents: 65abea5 a451ca5
Author: florianhockmann 
Authored: Wed Nov 1 19:52:35 2017 +0100
Committer: florianhockmann 
Committed: Wed Nov 1 19:52:35 2017 +0100

--
 CHANGELOG.asciidoc|   2 +
 docs/preprocessor/preprocess-file.sh  |   2 +-
 docs/src/recipes/index.asciidoc   |   2 +
 docs/src/recipes/olap-spark-yarn.asciidoc | 157 +
 pom.xml   |   1 +
 spark-gremlin/pom.xml |   5 +-
 6 files changed, 166 insertions(+), 3 deletions(-)
--

[44/50] [abbrv] tinkerpop git commit: Update Javascript GLV

[jorgebg]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2434a649/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js
 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js
new file mode 100644
index 000..5ee734a1
--- /dev/null
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js
@@ -0,0 +1,2095 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+ 
+/**
+ * @author Jorge Bay Gondra
+ */
+'use strict';
+
+var t = require('./traversal.js');
+var remote = require('../driver/remote-connection');
+var utils = require('../utils');
+var Bytecode = require('./bytecode');
+var TraversalStrategies = require('./traversal-strategy').TraversalStrategies;
+var inherits = utils.inherits;
+var parseArgs = utils.parseArgs;
+
+/**
+ *
+ * @param {Graph} graph
+ * @param {TraversalStrategies} traversalStrategies
+ * @param {Bytecode} [bytecode]
+ * @constructor
+ */
+function GraphTraversalSource(graph, traversalStrategies, bytecode) {
+  this.graph = graph;
+  this.traversalStrategies = traversalStrategies;
+  this.bytecode = bytecode || new Bytecode();
+}
+
+/**
+ * @param remoteConnection
+ * @returns {GraphTraversalSource}
+ */
+GraphTraversalSource.prototype.withRemote = function (remoteConnection) {
+  var traversalStrategy = new TraversalStrategies(this.traversalStrategies);
+  traversalStrategy.addStrategy(new remote.RemoteStrategy(remoteConnection));
+  return new GraphTraversalSource(this.graph, traversalStrategy, new 
Bytecode(this.bytecode));
+};
+
+/**
+ * Returns the string representation of the GraphTraversalSource.
+ * @returns {string}
+ */
+GraphTraversalSource.prototype.toString = function () {
+  return 'graphtraversalsource[' + this.graph.toString() + ']';
+};
+
+/**
+ * Graph Traversal Source withBulk method.
+ * @param {...Object} args
+ * @returns {GraphTraversalSource}
+ */
+GraphTraversalSource.prototype.withBulk = function (args) {
+  var b = new Bytecode(this.bytecode).addSource('withBulk', 
parseArgs.apply(null, arguments));
+  return new GraphTraversalSource(this.graph, new 
TraversalStrategies(this.traversalStrategies), b);
+};
+
+/**
+ * Graph Traversal Source withComputer method.
+ * @param {...Object} args
+ * @returns {GraphTraversalSource}
+ */
+GraphTraversalSource.prototype.withComputer = function (args) {
+  var b = new Bytecode(this.bytecode).addSource('withComputer', 
parseArgs.apply(null, arguments));
+  return new GraphTraversalSource(this.graph, new 
TraversalStrategies(this.traversalStrategies), b);
+};
+
+/**
+ * Graph Traversal Source withPath method.
+ * @param {...Object} args
+ * @returns {GraphTraversalSource}
+ */
+GraphTraversalSource.prototype.withPath = function (args) {
+  var b = new Bytecode(this.bytecode).addSource('withPath', 
parseArgs.apply(null, arguments));
+  return new GraphTraversalSource(this.graph, new 
TraversalStrategies(this.traversalStrategies), b);
+};
+
+/**
+ * Graph Traversal Source withSack method.
+ * @param {...Object} args
+ * @returns {GraphTraversalSource}
+ */
+GraphTraversalSource.prototype.withSack = function (args) {
+  var b = new Bytecode(this.bytecode).addSource('withSack', 
parseArgs.apply(null, arguments));
+  return new GraphTraversalSource(this.graph, new 
TraversalStrategies(this.traversalStrategies), b);
+};
+
+/**
+ * Graph Traversal Source withSideEffect method.
+ * @param {...Object} args
+ * @returns {GraphTraversalSource}
+ */
+GraphTraversalSource.prototype.withSideEffect = function (args) {
+  var b = new Bytecode(this.bytecode).addSource('withSideEffect', 
parseArgs.apply(null, arguments));
+  return new GraphTraversalSource(this.graph, new 
TraversalStrategies(this.traversalStrategies), b);
+};
+
+/**
+ * Graph Traversal Source withStrategies method.
+ * @param {...Object} args
+ * @returns {GraphTraversalSource}
+ */
+GraphTraversalSource.prototype.withStrategies = function (args) {
+  var b = new Bytecode(this.bytecode).addSource('withStrategies', 

[07/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-1821' into tp32

[jorgebg]

Merge branch 'TINKERPOP-1821' into tp32


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

Branch: refs/heads/TINKERPOP-1489
Commit: bef43d6ca54284bf905883032ce168b91c910e36
Parents: f8c1307 5d68ca1
Author: Marko A. Rodriguez 
Authored: Wed Nov 1 08:37:31 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Wed Nov 1 08:37:31 2017 -0600

--
 CHANGELOG.asciidoc  |  1 +
 .../upgrade/release-3.2.x-incubating.asciidoc   | 10 ++
 .../traversal/step/map/GroovyVertexTest.groovy  | 10 ++
 .../process/traversal/step/map/VertexTest.java  | 38 
 .../gremlin/neo4j/structure/Neo4jVertex.java| 25 ++---
 5 files changed, 79 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bef43d6c/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 1d41ab9,78b8ac0..76bf96d
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -23,7 -23,7 +23,8 @@@ image::https://raw.githubusercontent.co
  [[release-3-2-7]]
  === TinkerPop 3.2.7 (Release Date: NOT OFFICIALLY RELEASED YET)
  
 +* `TraversalVertexProgram` ``profile()` now accounts for worker iteration in 
`GraphComputer` OLAP.
+ * Added a test for self-edges and fixed `Neo4jVertex` to provided repeated 
self-edges on `BOTH`.
  * Better respected permissions on the `plugins.txt` file and prevented 
writing if marked as read-only.
  * Added getters for the lambdas held by `LambdaCollectingBarrierStep`, 
`LambdaFlatMapStep` and `LambdaSideEffectStep`.
  * Fixed an old hack in `GroovyTranslator` and `PythonTranslator` where 
`Elements` were being mapped to their id only.

[26/50] [abbrv] tinkerpop git commit: TINKERPOP-1833 Returned Builder object in DetachedEdge.Builder

[jorgebg]

TINKERPOP-1833 Returned Builder object in DetachedEdge.Builder

For some reason a couple of methods were returning void. Didn't see a good 
reason for that. CTR


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

Branch: refs/heads/TINKERPOP-1489
Commit: ec1cbda2b70c8bf2628a853d151c2f5492460852
Parents: ca21532
Author: Stephen Mallette 
Authored: Fri Nov 17 18:46:35 2017 -0500
Committer: Stephen Mallette 
Committed: Fri Nov 17 18:46:35 2017 -0500

--
 CHANGELOG.asciidoc | 1 +
 .../gremlin/structure/util/detached/DetachedEdge.java  | 6 --
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec1cbda2/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index df00fa5..918bbd4 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Fixed an `ArrayOutOfBoundsException` in `hasId()` for the rare situation 
when the provided collection is empty.
 * Bump to Netty 4.0.52
 * `TraversalVertexProgram` `profile()` now accounts for worker iteration in 
`GraphComputer` OLAP.
+* Returned the `Builder` instance from the `DetachedEdge.Builder` methods of 
`setOutE` and `setOutV`.
 * Added a test for self-edges and fixed `Neo4jVertex` to provided repeated 
self-edges on `BOTH`.
 * Better respected permissions on the `plugins.txt` file and prevented writing 
if marked as read-only.
 * Added getters for the lambdas held by `LambdaCollectingBarrierStep`, 
`LambdaFlatMapStep` and `LambdaSideEffectStep`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec1cbda2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java
index 367dbc9..763dbb2 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java
@@ -184,12 +184,14 @@ public class DetachedEdge extends DetachedElement 
implements Edge {
 return this;
 }
 
-public void setOutV(final DetachedVertex v) {
+public Builder setOutV(final DetachedVertex v) {
 e.outVertex = v;
+return this;
 }
 
-public void setInV(final DetachedVertex v) {
+public Builder setInV(final DetachedVertex v) {
 e.inVertex = v;
+return this;
 }
 
 public DetachedEdge create() {

[27/50] [abbrv] tinkerpop git commit: TravisCI: Gremlin.Net as job

[jorgebg]

TravisCI: Gremlin.Net as job


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

Branch: refs/heads/TINKERPOP-1489
Commit: 2b92f65d9cdd6be8062c2b216ef520c3c94ab1f7
Parents: ec1cbda
Author: Jorge Bay Gondra 
Authored: Mon Oct 30 10:11:51 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Mon Nov 20 10:36:29 2017 +0100

--
 .travis.yml | 19 ++-
 1 file changed, 6 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b92f65d/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index f0c88db..b626b17 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,21 +5,14 @@ jdk:
   - oraclejdk8
 sudo: required
 dist: trusty
-addons:
-  apt:
-packages:
-  - oracle-java8-installer
+
 before_install:
   - sudo sh -c 'echo "deb [arch=amd64] 
https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > 
/etc/apt/sources.list.d/dotnetdev.list'
   - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 
417A0893
   - sudo apt-get update
   - sudo apt-get install dotnet-dev-1.0.4
-script: 
-  - "mvn clean install -Dci"
-#notifications:
-#  email:
-#recipients:
-#  - m...@gremlin.guru
-#  - robd...@gmail.com
-#on_success: change # default: change
-#on_failure: always # default: always
+
+jobs:
+  include:
+- script: "mvn clean install -Dci"
+- script: "touch gremlin-dotnet/src/.glv && touch gremlin-dotnet/test/.glv 
&& mvn clean install -pl :gremlin-dotnet-tests -P gremlin-dotnet 
-DskipIntegrationTests=false"
\ No newline at end of file

[01/50] [abbrv] tinkerpop git commit: TINKERPOP-1801: fix profile() timing in OLAP by adding worker iteration timings to step metrics this is a simple fix that do not change any API [Forced Update!]

[jorgebg]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1489 468bba639 -> 6a0193f1d (forced update)


TINKERPOP-1801: fix profile() timing in OLAP by adding worker iteration timings 
to step metrics
this is a simple fix that do not change any API


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

Branch: refs/heads/TINKERPOP-1489
Commit: a9ca781f8c44c74a30ca475d6b6f0579ae4abb00
Parents: 909cd91
Author: artemaliev 
Authored: Tue Oct 17 21:00:31 2017 +0300
Committer: artemaliev 
Committed: Mon Oct 30 16:18:15 2017 +0300

--
 .../traversal/TraversalVertexProgram.java   | 39 
 1 file changed, 39 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9ca781f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
index f72f49b..7472b85 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
@@ -55,10 +55,12 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.Halted
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ComputerVerificationStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSet;
 import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
 import org.apache.tinkerpop.gremlin.process.traversal.util.PureTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.util.ScriptTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
 import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMatrix;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
 import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.apache.tinkerpop.gremlin.structure.Element;
 import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -75,6 +77,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
@@ -111,6 +114,10 @@ public final class TraversalVertexProgram implements 
VertexProgram

[35/50] [abbrv] tinkerpop git commit: Graph, traversalStrategies and graph as Traversal properties

[jorgebg]

Graph, traversalStrategies and graph as Traversal properties

Expose those properties as in the Python GLV and the Java implementation. 
Previously, those properties where exposed using the private notation (ie: 
_graph).


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

Branch: refs/heads/TINKERPOP-1489
Commit: 2bb9a693ff714eebf1cf2f20c8f8faaedb2d7eaf
Parents: 4db606b
Author: Jorge Bay Gondra 
Authored: Tue Oct 18 16:22:23 2016 +0200
Committer: Jorge Bay Gondra 
Committed: Wed Nov 22 15:07:35 2017 +0100

--
 .../GraphTraversalSourceGenerator.groovy|  23 +-
 .../javascript/TraversalSourceGenerator.groovy  |  12 +-
 .../process/graph-traversal.js  | 253 ++-
 .../gremlin-javascript/process/traversal.js |  12 +-
 4 files changed, 151 insertions(+), 149 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2bb9a693/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
--
diff --git 
a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
 
b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
index b569292..a8217e2 100644
--- 
a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
+++ 
b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
@@ -80,9 +80,9 @@ class GraphTraversalSourceGenerator {
* @constructor
*/
   function GraphTraversalSource(graph, traversalStrategies, bytecode) {
-this._graph = graph;
-this._traversalStrategies = traversalStrategies;
-this._bytecode = bytecode || new Bytecode();
+this.graph = graph;
+this.traversalStrategies = traversalStrategies;
+this.bytecode = bytecode || new Bytecode();
   }
 
   /**
@@ -90,9 +90,9 @@ class GraphTraversalSourceGenerator {
* @returns {GraphTraversalSource}
*/
   GraphTraversalSource.prototype.withRemote = function (remoteConnection) {
-var traversalStrategy = new 
t.TraversalStrategies(this._traversalStrategies);
+var traversalStrategy = new 
t.TraversalStrategies(this.traversalStrategies);
 traversalStrategy.addStrategy(new remote.RemoteStrategy(remoteConnection));
-return new GraphTraversalSource(this._graph, traversalStrategy, new 
Bytecode(this._bytecode));
+return new GraphTraversalSource(this.graph, traversalStrategy, new 
Bytecode(this.bytecode));
   };
 
   /**
@@ -100,7 +100,7 @@ class GraphTraversalSourceGenerator {
* @returns {string}
*/
   GraphTraversalSource.prototype.toString = function () {
-return 'graphtraversalsource[' + this._graph.toString() + ']';
+return 'graphtraversalsource[' + this.graph.toString() + ']';
   };
 """)
 GraphTraversalSource.getMethods(). // SOURCE STEPS
@@ -122,8 +122,8 @@ class GraphTraversalSourceGenerator {
* @returns {GraphTraversalSource}
*/
   GraphTraversalSource.prototype.${method} = function (args) {
-var b = new 
Bytecode(this._bytecode).addSource('${SymbolHelper.toJava(method)}', 
parseArgs.apply(null, arguments));
-return new GraphTraversalSource(this._graph, new 
t.TraversalStrategies(this._traversalStrategies), b);
+var b = new 
Bytecode(this.bytecode).addSource('${SymbolHelper.toJava(method)}', 
parseArgs.apply(null, arguments));
+return new GraphTraversalSource(this.graph, new 
t.TraversalStrategies(this.traversalStrategies), b);
   };
 """)
 }
@@ -141,8 +141,8 @@ class GraphTraversalSourceGenerator {
* @returns {GraphTraversal}
*/
   GraphTraversalSource.prototype.${method} = function (args) {
-var b = new 
Bytecode(this._bytecode).addStep('${SymbolHelper.toJava(method)}', 
parseArgs.apply(null, arguments));
-return new GraphTraversal(this._graph, new 
t.TraversalStrategies(this._traversalStrategies), b);
+var b = new 
Bytecode(this.bytecode).addStep('${SymbolHelper.toJava(method)}', 
parseArgs.apply(null, arguments));
+return new GraphTraversal(this.graph, new 
t.TraversalStrategies(this.traversalStrategies), b);
   };
 """)
 }
@@ -153,6 +153,7 @@ class GraphTraversalSourceGenerator {
 """
   /**
* Represents a graph traversal.
+   * @extends Traversal
* @constructor
*/
   function GraphTraversal(graph, traversalStrategies, bytecode) {
@@ -175,7 +176,7 @@ class 

[19/50] [abbrv] tinkerpop git commit: minor fix in CHANGELOG.

[jorgebg]

minor fix in CHANGELOG.


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

Branch: refs/heads/TINKERPOP-1489
Commit: e1e7632cfa92cae2b54f03fc497afb440bfc9f55
Parents: 74ca03d
Author: Marko A. Rodriguez 
Authored: Mon Nov 6 16:21:51 2017 -0700
Committer: Marko A. Rodriguez 
Committed: Mon Nov 6 16:21:51 2017 -0700

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e1e7632c/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 128d13d..ffd9de5 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,7 +25,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 
 * Fixed an `ArrayOutOfBoundsException` in `hasId()` for the rare situation 
when the provided collection is empty.
 * Bump to Netty 4.0.52
-* `TraversalVertexProgram` ``profile()` now accounts for worker iteration in 
`GraphComputer` OLAP.
+* `TraversalVertexProgram` `profile()` now accounts for worker iteration in 
`GraphComputer` OLAP.
 * Added a test for self-edges and fixed `Neo4jVertex` to provided repeated 
self-edges on `BOTH`.
 * Better respected permissions on the `plugins.txt` file and prevented writing 
if marked as read-only.
 * Added getters for the lambdas held by `LambdaCollectingBarrierStep`, 
`LambdaFlatMapStep` and `LambdaSideEffectStep`.

[50/50] [abbrv] tinkerpop git commit: Add travis support

[jorgebg]

Add travis support


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

Branch: refs/heads/TINKERPOP-1489
Commit: 6a0193f1d71b3df53be15b736b2071c3c92043d4
Parents: 16d8a8f
Author: Jorge Bay Gondra 
Authored: Wed Nov 22 15:46:14 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Wed Nov 22 15:46:14 2017 +0100

--
 .travis.yml| 3 ++-
 gremlin-javascript/pom.xml | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6a0193f1/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index b626b17..4f3304a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,4 +15,5 @@ before_install:
 jobs:
   include:
 - script: "mvn clean install -Dci"
-- script: "touch gremlin-dotnet/src/.glv && touch gremlin-dotnet/test/.glv 
&& mvn clean install -pl :gremlin-dotnet-tests -P gremlin-dotnet 
-DskipIntegrationTests=false"
\ No newline at end of file
+- script: "touch gremlin-dotnet/src/.glv && touch gremlin-dotnet/test/.glv 
&& mvn clean install -pl :gremlin-dotnet-tests -P gremlin-dotnet 
-DskipIntegrationTests=false"
+- script: "mvn clean install -pl :gremlin-javascript 
-DskipIntegrationTests=false"
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6a0193f1/gremlin-javascript/pom.xml
--
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
index 919c87e..c08b59b 100644
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@ -31,7 +31,6 @@ limitations under the License.
 gremlin-core
 ${project.version}
 
-
 
 org.apache.tinkerpop
 tinkergraph-gremlin

[04/50] [abbrv] tinkerpop git commit: TINKERPOP-1821 Added tests for consistent traversal behavior around self-referencing edges

[jorgebg]

TINKERPOP-1821 Added tests for consistent traversal behavior around 
self-referencing edges


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

Branch: refs/heads/TINKERPOP-1489
Commit: 7f640f7e6d863cde1858d6bfa3ff502fd93a8663
Parents: 909cd91
Author: Stephen Mallette 
Authored: Mon Oct 30 11:06:02 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Oct 30 11:06:02 2017 -0400

--
 .../traversal/step/map/GroovyVertexTest.groovy  | 10 ++
 .../process/traversal/step/map/VertexTest.java  | 36 
 2 files changed, 46 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7f640f7e/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy
--
diff --git 
a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy
 
b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy
index ce5fe6f..ff6275d 100644
--- 
a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy
+++ 
b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy
@@ -183,5 +183,15 @@ public abstract class GroovyVertexTest {
 public Traversal 
get_g_V_hasLabelXpersonX_V_hasLabelXsoftwareX_name() {
 new ScriptTraversal<>(g, "gremlin-groovy", 
"g.V.hasLabel('person').V.hasLabel('software').name")
 }
+
+@Override
+public Traversal get_g_V_bothEXselfX() {
+new ScriptTraversal<>(g, "gremlin-groovy", "g.V().bothE('self')")
+}
+
+@Override
+public Traversal get_g_V_bothXselfX() {
+new ScriptTraversal<>(g, "gremlin-groovy", "g.V().both('self')")
+}
 }
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7f640f7e/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
index 7f27338..cb39884 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
@@ -113,6 +113,10 @@ public abstract class VertexTest extends 
AbstractGremlinProcessTest {
 
 public abstract Traversal 
get_g_V_hasLabelXpersonX_V_hasLabelXsoftwareX_name();
 
+public abstract Traversal get_g_V_bothEXselfX();
+
+public abstract Traversal get_g_V_bothXselfX();
+
 // GRAPH VERTEX/EDGE
 
 @Test
@@ -570,6 +574,28 @@ public abstract class VertexTest extends 
AbstractGremlinProcessTest {
 checkResults(Arrays.asList("lop", "lop", "lop", "lop", "ripple", 
"ripple", "ripple", "ripple"), traversal);
 }
 
+@Test
+public void g_V_bothEXselfX() {
+g.addV().as("a").addE("self").to("a").iterate();
+final Traversal traversal = get_g_V_bothEXselfX();
+printTraversalForm(traversal);
+
+List edges = traversal.toList();
+assertEquals(2, edges.size());
+assertEquals(edges.get(0), edges.get(1));
+}
+
+@Test
+public void g_V_bothXselfX() {
+g.addV().as("a").addE("self").to("a").iterate();
+final Traversal traversal = get_g_V_bothXselfX();
+printTraversalForm(traversal);
+
+List vertices = traversal.toList();
+assertEquals(2, vertices.size());
+assertEquals(vertices.get(0), vertices.get(1));
+}
+
 public static class Traversals extends VertexTest {
 
 @Override
@@ -721,5 +747,15 @@ public abstract class VertexTest extends 
AbstractGremlinProcessTest {
 public Traversal 
get_g_V_hasLabelXpersonX_V_hasLabelXsoftwareX_name() {
 return 
g.V().hasLabel("person").V().hasLabel("software").values("name");
 }
+
+@Override
+public Traversal get_g_V_bothEXselfX() {
+return g.V().bothE("self");
+}
+
+@Override
+public Traversal get_g_V_bothXselfX() 

[42/50] [abbrv] tinkerpop git commit: Update Javascript GLV

[jorgebg]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2434a649/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js
 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js
new file mode 100644
index 000..3864a4a
--- /dev/null
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js
@@ -0,0 +1,73 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+/**
+ * @author Jorge Bay Gondra
+ */
+'use strict';
+
+var assert = require('assert');
+var glvModule = require('../../');
+
+describe('API', function () {
+  it('should export fields under process', function () {
+assert.ok(glvModule);
+assert.ok(glvModule.process);
+assert.strictEqual(typeof glvModule.process.Bytecode, 'function');
+assert.strictEqual(typeof glvModule.process.EnumValue, 'function');
+assert.strictEqual(typeof glvModule.process.P, 'function');
+assert.strictEqual(typeof glvModule.process.Traversal, 'function');
+assert.strictEqual(typeof glvModule.process.TraversalSideEffects, 
'function');
+assert.strictEqual(typeof glvModule.process.TraversalStrategies, 
'function');
+assert.strictEqual(typeof glvModule.process.TraversalStrategy, 'function');
+assert.strictEqual(typeof glvModule.process.Traverser, 'function');
+assert.strictEqual(typeof glvModule.process.GraphTraversal, 'function');
+assert.strictEqual(typeof glvModule.process.GraphTraversalSource, 
'function');
+assert.strictEqual(typeof glvModule.process.barrier, 'object');
+assert.strictEqual(typeof glvModule.process.cardinality, 'object');
+assert.strictEqual(typeof glvModule.process.column, 'object');
+assert.strictEqual(typeof glvModule.process.direction, 'object');
+assert.strictEqual(typeof glvModule.process.direction.both, 'object');
+assert.strictEqual(glvModule.process.direction.both.elementName, 'BOTH');
+assert.strictEqual(typeof glvModule.process.operator, 'object');
+assert.strictEqual(typeof glvModule.process.order, 'object');
+assert.strictEqual(typeof glvModule.process.pop, 'object');
+assert.strictEqual(typeof glvModule.process.scope, 'object');
+assert.strictEqual(typeof glvModule.process.t, 'object');
+assert.ok(glvModule.process.statics);
+  });
+  it('should expose fields under structure', function () {
+assert.ok(glvModule.structure);
+assert.ok(glvModule.structure.io);
+assert.strictEqual(typeof glvModule.structure.io.GraphSONReader, 
'function');
+assert.strictEqual(typeof glvModule.structure.io.GraphSONWriter, 
'function');
+assert.strictEqual(typeof glvModule.structure.Edge, 'function');
+assert.strictEqual(typeof glvModule.structure.Graph, 'function');
+assert.strictEqual(typeof glvModule.structure.Path, 'function');
+assert.strictEqual(typeof glvModule.structure.Property, 'function');
+assert.strictEqual(typeof glvModule.structure.Vertex, 'function');
+assert.strictEqual(typeof glvModule.structure.VertexProperty, 'function');
+  });
+  it('should expose fields under driver', function () {
+assert.ok(glvModule.driver);
+assert.strictEqual(typeof glvModule.driver.RemoteConnection, 'function');
+assert.strictEqual(typeof glvModule.driver.RemoteStrategy, 'function');
+assert.strictEqual(typeof glvModule.driver.RemoteTraversal, 'function');
+  });
+});
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2434a649/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
new file mode 100644
index 000..ed5beb3
--- /dev/null
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
@@ -0,0 +1,112 @@
+/*
+ *  Licensed to the Apache 

[22/50] [abbrv] tinkerpop git commit: fix race condition in TinkerIndex

[jorgebg]

fix race condition in TinkerIndex

My colleage @fabsx00 discovered a race condition in tinkergraph's index 
creation. He fixed it by simply replacing parallelStream with stream. Quoting 
his analysis:
So, reading the code, you see that this.put is called in parallel, but that 
method seems to contain a race as get is called on the index, checked for null, 
and a subsequent write is performed. It still seems like using stream here 
fixes the problem we've been seeing, and the performance hit is not significant.

Ticket: https://issues.apache.org/jira/browse/TINKERPOP-1830


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

Branch: refs/heads/TINKERPOP-1489
Commit: 7be8a0f25672e20fb0fef58075c2a201501f0578
Parents: ac99e3c
Author: Michael Pollmeier 
Authored: Sun Nov 12 12:32:37 2017 +1300
Committer: Michael Pollmeier 
Committed: Tue Nov 14 14:22:40 2017 +1300

--
 CHANGELOG.asciidoc   |  1 +
 .../gremlin/tinkergraph/structure/TinkerIndex.java   | 11 +--
 2 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7be8a0f2/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index ffd9de5..cd5dc38 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-7]]
 === TinkerPop 3.2.7 (Release Date: NOT OFFICIALLY RELEASED YET)
 
+* Fixed a race condition in `TinkerIndex`.
 * Fixed an `ArrayOutOfBoundsException` in `hasId()` for the rare situation 
when the provided collection is empty.
 * Bump to Netty 4.0.52
 * `TraversalVertexProgram` `profile()` now accounts for worker iteration in 
`GraphComputer` OLAP.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7be8a0f2/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIndex.java
--
diff --git 
a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIndex.java
 
b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIndex.java
index 69afb39..f5872cf 100644
--- 
a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIndex.java
+++ 
b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIndex.java
@@ -48,17 +48,16 @@ final class TinkerIndex {
 
 protected void put(final String key, final Object value, final T element) {
 Map keyMap = this.index.get(key);
-if (keyMap == null) {
-keyMap = new ConcurrentHashMap<>();
-this.index.put(key, keyMap);
+if (null == keyMap) {
+this.index.putIfAbsent(key, new ConcurrentHashMap());
+keyMap = this.index.get(key);
 }
 Set objects = keyMap.get(value);
 if (null == objects) {
-objects = new HashSet<>();
-keyMap.put(value, objects);
+keyMap.putIfAbsent(value, ConcurrentHashMap.newKeySet());
+objects = keyMap.get(value);
 }
 objects.add(element);
-
 }
 
 public List get(final String key, final Object value) {

[37/50] [abbrv] tinkerpop git commit: Filter out __() static method

[jorgebg]

Filter out __() static method


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

Branch: refs/heads/TINKERPOP-1489
Commit: d552fc7b96a1609da9951451a64e940215bd669c
Parents: 2bb9a69
Author: Jorge Bay Gondra 
Authored: Wed Oct 19 16:03:45 2016 +0200
Committer: Jorge Bay Gondra 
Committed: Wed Nov 22 15:07:35 2017 +0100

--
 .../javascript/GraphTraversalSourceGenerator.groovy   |  1 +
 .../gremlin-javascript/process/graph-traversal.js | 10 --
 2 files changed, 1 insertion(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d552fc7b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
--
diff --git 
a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
 
b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
index a8217e2..0ae6079 100644
--- 
a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
+++ 
b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
@@ -195,6 +195,7 @@ class GraphTraversalSourceGenerator {
 __.class.getMethods().
 findAll { GraphTraversal.class.equals(it.returnType) }.
 findAll { Modifier.isStatic(it.getModifiers()) }.
+findAll { !it.name.equals("__") }.
 collect { SymbolHelper.toJs(it.name) }.
 unique().
 sort { a, b -> a <=> b }.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d552fc7b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
index 663a24d..7f36e59 100644
--- 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
@@ -1080,16 +1080,6 @@
   };
 
   /**
-   * __() static method
-   * @param {...Object} args
-   * @returns {GraphTraversal}
-   */
-  statics.__ = function (args) {
-var g = new GraphTraversal(null, null, new Bytecode());
-return g.__.apply(g, arguments);
-  };
-
-  /**
* addE() static method
* @param {...Object} args
* @returns {GraphTraversal}

[41/50] [abbrv] tinkerpop git commit: TINKERPOP-1489 Regenerated traversal.js

[jorgebg]

TINKERPOP-1489 Regenerated traversal.js

which added Pick.


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

Branch: refs/heads/TINKERPOP-1489
Commit: 3e4cb186bd8776eecc7baca3d313e3bd177d142c
Parents: 747ca73
Author: Stephen Mallette 
Authored: Thu May 18 12:48:27 2017 -0400
Committer: Jorge Bay Gondra 
Committed: Wed Nov 22 15:07:36 2017 +0100

--
 .../src/main/javascript/gremlin-javascript/process/traversal.js | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3e4cb186/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js
 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js
index f585161..9709a4f 100644
--- 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js
@@ -377,6 +377,7 @@
 direction: toEnum('Direction', 'BOTH IN OUT'),
 operator: toEnum('Operator', 'addAll and assign div max min minus mult or 
sum sumLong'),
 order: toEnum('Order', 'decr incr keyDecr keyIncr shuffle valueDecr 
valueIncr'),
+pick: toEnum('Pick', 'any none'),
 pop: toEnum('Pop', 'all first last'),
 scope: toEnum('Scope', 'global local'),
 t: toEnum('T', 'id key label value')

[20/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-1814' into tp32

[jorgebg]

Merge branch 'TINKERPOP-1814' into tp32


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

Branch: refs/heads/TINKERPOP-1489
Commit: ac99e3cf2a60e672d69b2fad6aedfc8d6edaedc5
Parents: e1e7632 608f786
Author: Marko A. Rodriguez 
Authored: Thu Nov 9 10:32:34 2017 -0700
Committer: Marko A. Rodriguez 
Committed: Thu Nov 9 10:32:34 2017 -0700

--
 .../process/traversal/CoreTraversalTest.java| 41 --
 .../process/traversal/step/map/AddEdgeTest.java | 85 ++--
 .../PartitionStrategyProcessTest.java   | 66 ---
 3 files changed, 74 insertions(+), 118 deletions(-)
--

[38/50] [abbrv] tinkerpop git commit: Use null as empty result

[jorgebg]

Use null as empty result


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

Branch: refs/heads/TINKERPOP-1489
Commit: fdb343b1a7625a621f6a278a5795594f337884db
Parents: d552fc7
Author: Jorge Bay Gondra 
Authored: Thu Nov 3 14:34:28 2016 +0100
Committer: Jorge Bay Gondra 
Committed: Wed Nov 22 15:07:36 2017 +0100

--
 .../tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy   | 2 +-
 .../src/main/javascript/gremlin-javascript/process/traversal.js| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fdb343b1/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy
--
diff --git 
a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy
 
b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy
index 46f65a4..d5899f0 100644
--- 
a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy
+++ 
b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy
@@ -87,7 +87,7 @@ class TraversalSourceGenerator {
   /** @param {Function} callback */
   Traversal.prototype.one = function (callback) {
 this.list(function (err, result) {
-  callback(err, result ? result[0] : null);
+  callback(err, result && result.length > 0 ? result[0] : null);
 });
   };
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fdb343b1/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js
 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js
index a7a9bb7..f585161 100644
--- 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/traversal.js
@@ -50,7 +50,7 @@
   /** @param {Function} callback */
   Traversal.prototype.one = function (callback) {
 this.list(function (err, result) {
-  callback(err, result ? result[0] : null);
+  callback(err, result && result.length > 0 ? result[0] : null);
 });
   };
 

[34/50] [abbrv] tinkerpop git commit: Javascript GLV

[jorgebg]

Javascript GLV


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

Branch: refs/heads/TINKERPOP-1489
Commit: 9cbf83197300d973154d3327deaf3ee277577579
Parents: 76c42fa
Author: Jorge Bay Gondra 
Authored: Wed Oct 5 16:14:46 2016 +0200
Committer: Jorge Bay Gondra 
Committed: Wed Nov 22 15:07:35 2017 +0100

--
 gremlin-javascript/pom.xml  |  132 ++
 .../GraphTraversalSourceGenerator.groovy|  247 +++
 .../javascript/TraversalSourceGenerator.groovy  |  398 
 .../javascript/GenerateGremlinJavascript.java   |   32 +
 .../gremlin/javascript/jsr223/SymbolHelper.java |   59 +
 .../driver/remote-connection.js |  107 +
 .../main/javascript/gremlin-javascript/index.js |   85 +
 .../process/graph-traversal.js  | 2025 ++
 .../gremlin-javascript/process/traversal.js |  395 
 .../gremlin-javascript/structure/graph.js   |  146 ++
 .../structure/io/graph-serializer.js|  406 
 .../javascript/gremlin-javascript/helper.js |   84 +
 .../gremlin-javascript/test-exports.js  |   78 +
 .../gremlin-javascript/test-graphson.js |  108 +
 .../gremlin-javascript/test-traversal.js|   54 +
 pom.xml |1 +
 16 files changed, 4357 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9cbf8319/gremlin-javascript/pom.xml
--
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
new file mode 100644
index 000..387e628
--- /dev/null
+++ b/gremlin-javascript/pom.xml
@@ -0,0 +1,132 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.tinkerpop
+tinkerpop
+3.2.3-SNAPSHOT
+
+gremlin-javascript
+Apache TinkerPop :: Gremlin Javascript
+
+
+org.apache.tinkerpop
+gremlin-core
+${project.version}
+
+
+org.codehaus.groovy
+groovy
+${groovy.version}
+indy
+
+
+org.apache.tinkerpop
+tinkergraph-gremlin
+${project.version}
+test
+
+
+org.apache.tinkerpop
+gremlin-test
+${project.version}
+test
+
+
+org.apache.tinkerpop
+gremlin-server
+${project.version}
+test
+
+
+org.slf4j
+slf4j-log4j12
+${slf4j.version}
+test
+
+
+
+
+false
+${maven.test.skip}
+
${project.parent.basedir}/gremlin-server
+
+
+${basedir}/target
+${project.artifactId}-${project.version}
+
+
+org.codehaus.mojo
+exec-maven-plugin
+1.2.1
+
+
+generate-javascript
+generate-test-resources
+
+java
+
+
+
org.apache.tinkerpop.gremlin.javascript.GenerateGremlinJavascript
+
+
${basedir}/src/main/javascript/gremlin-javascript/process/traversal.js
+
${basedir}/src/main/javascript/gremlin-javascript/process/graph-traversal.js
+
+
+
+
+js-tests
+test
+
+exec
+
+
+jjs
+
+
${basedir}/src/test/javascript/gremlin-javascript/test-exports.js
+
${basedir}/src/test/javascript/gremlin-javascript/test-graphson.js
+
${basedir}/src/test/javascript/gremlin-javascript/test-traversal.js
+
+
+
+
+
+
+org.codehaus.gmavenplus
+gmavenplus-plugin
+
+
+

[49/50] [abbrv] tinkerpop git commit: TINKERPOP-1489 Added Nashorn ScriptEngine to gremlin-javascript

[jorgebg]

TINKERPOP-1489 Added Nashorn ScriptEngine to gremlin-javascript


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

Branch: refs/heads/TINKERPOP-1489
Commit: 16d8a8fd1ec5e37aba6350e648422382df30536e
Parents: b561a53
Author: Stephen Mallette 
Authored: Tue Sep 5 12:36:12 2017 -0400
Committer: Jorge Bay Gondra 
Committed: Wed Nov 22 15:34:37 2017 +0100

--
 docs/src/reference/gremlin-variants.asciidoc   | 2 +-
 .../src/main/javascript/gremlin-javascript/package.json| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/16d8a8fd/docs/src/reference/gremlin-variants.asciidoc
--
diff --git a/docs/src/reference/gremlin-variants.asciidoc 
b/docs/src/reference/gremlin-variants.asciidoc
index dabf3c2..6f11719 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -447,7 +447,7 @@ very similar to that of Java, it should be very easy to 
switch between Gremlin-J
 [source,bash]
 npm install gremlin-javascript
 
-In Gremlin-JavaScript there exists `GraphTraversalSource`, `GraphTraversal`, 
and `__` which mirror the respective classes
+The Gremlin-JavaScript provides `GraphTraversalSource`, `GraphTraversal`, and 
`__` which mirror the respective classes
 in Gremlin-Java. The `GraphTraversalSource` requires a RemoteConnection 
implementation in order to communicate with
 <>.
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/16d8a8fd/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
index 514663b..1228dd4 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gremlin-javascript",
-  "version": "3.2.6-alpha1",
+  "version": "3.2.7-alpha1",
   "description": "JavaScript Gremlin Language Variant",
   "author": "Apache TinkerPop team",
   "keywords": [

[28/50] [abbrv] tinkerpop git commit: Excluded the slf4j-noop from neo4j as it causes conflicts CTR

[jorgebg]

Excluded the slf4j-noop from neo4j as it causes conflicts CTR


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

Branch: refs/heads/TINKERPOP-1489
Commit: ed9ca8151495648a9ae48f20bf8f6123bce64223
Parents: ec1cbda
Author: Stephen Mallette 
Authored: Mon Nov 20 08:38:07 2017 -0500
Committer: Stephen Mallette 
Committed: Mon Nov 20 08:38:07 2017 -0500

--
 neo4j-gremlin/pom.xml | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ed9ca815/neo4j-gremlin/pom.xml
--
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index d2c61cd..420d8a8 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -147,6 +147,10 @@ limitations under the License.
 org.slf4j
 slf4j-api
 
+
+org.slf4j
+slf4j-nop
+
 
 
 

[02/50] [abbrv] tinkerpop git commit: TINKERPOP-1801: fix test failures. TinkerPopComputer does not call ComputerPorgram.execute methods if spit has no vertices. For example: modern graph has 6 vertic

[jorgebg]

TINKERPOP-1801: fix test failures.
TinkerPopComputer does not call ComputerPorgram.execute methods if spit has no 
vertices.
For example: modern graph has 6 vertices but computer has 8 cores, there will 
be two empty splits.
TraversalVertexProgram use execute step to setup next profiling step, so it is 
not setup side effects properly for empty splits.
So tests did not filed in docker but failed on computer with more then 6 cores.
The fix add check that profile side effects were regester properly before using


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

Branch: refs/heads/TINKERPOP-1489
Commit: b49f751ec4755fa026d6705511a2448e543cb430
Parents: a9ca781
Author: artemaliev 
Authored: Mon Oct 30 16:10:20 2017 +0300
Committer: artemaliev 
Committed: Mon Oct 30 16:20:12 2017 +0300

--
 .../process/computer/traversal/MemoryTraversalSideEffects.java  | 5 +
 .../process/computer/traversal/TraversalVertexProgram.java  | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b49f751e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MemoryTraversalSideEffects.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MemoryTraversalSideEffects.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MemoryTraversalSideEffects.java
index bf9f8c0..deea2a5 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MemoryTraversalSideEffects.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/MemoryTraversalSideEffects.java
@@ -169,6 +169,11 @@ public final class MemoryTraversalSideEffects implements 
TraversalSideEffects {
 memoryTraversalSideEffects.phase = phase;
 }
 
+public static ProgramPhase getMemorySideEffectsPhase(final 
Traversal.Admin traversal) {
+return traversal.getSideEffects() instanceof 
MemoryTraversalSideEffects ?
+
((MemoryTraversalSideEffects)traversal.getSideEffects()).phase:null;
+}
+
 public static Set getMemoryComputeKeys(final 
Traversal.Admin traversal) {
 final Set keys = new HashSet<>();
 final TraversalSideEffects sideEffects =

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b49f751e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
index 7472b85..f9a1e34 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
@@ -376,7 +376,9 @@ public final class TraversalVertexProgram implements 
VertexProgram

[45/50] [abbrv] tinkerpop git commit: Update Javascript GLV

[jorgebg]

Update Javascript GLV

Address feedback and provide maven integration:
- Reorganize gremlin-javascript into node.js project
- Simplify javascript code generators
- Generate package.json to match project version
- Introduce Promise factory for third-party promise library integration (ie: 
bluebird)
- Use toList() and next() traversal methods
- Include Remote connection implementation
- Fix enum casing
- Use Maven nodejs plugin
- .gitignore and .npmignore at gremlin-javascript level
- Run integration tests using a gremlin-server instance
- Add gremlin-javascript doc in gremlin-variants.asciidoc


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

Branch: refs/heads/TINKERPOP-1489
Commit: 2434a64937d8936da6e2f0e51c0ae77c9ead0917
Parents: 3e4cb18
Author: Jorge Bay Gondra 
Authored: Tue Jun 6 15:05:14 2017 +0200
Committer: Jorge Bay Gondra 
Committed: Wed Nov 22 15:13:18 2017 +0100

--
 docs/src/reference/gremlin-variants.asciidoc|   79 +-
 gremlin-javascript/pom.xml  |  171 +-
 .../javascript/GenerateGremlinJavascript.groovy |   36 +
 .../GraphTraversalSourceGenerator.groovy|  226 +-
 .../javascript/PackageJsonGenerator.groovy  |   72 +
 .../gremlin/javascript/SymbolHelper.groovy  |   50 +
 .../javascript/TraversalSourceGenerator.groovy  |  437 ++--
 .../javascript/GenerateGremlinJavascript.java   |   32 -
 .../gremlin/javascript/jsr223/SymbolHelper.java |   59 -
 .../javascript/gremlin-javascript/.gitignore|5 +
 .../javascript/gremlin-javascript/.npmignore|   26 +
 .../javascript/gremlin-javascript/README.md |   39 +
 .../driver/remote-connection.js |  107 -
 .../main/javascript/gremlin-javascript/index.js |  113 +-
 .../lib/driver/driver-remote-connection.js  |  200 ++
 .../lib/driver/remote-connection.js |   84 +
 .../gremlin-javascript/lib/process/bytecode.js  |   99 +
 .../lib/process/graph-traversal.js  | 2095 ++
 .../lib/process/traversal-strategy.js   |   88 +
 .../gremlin-javascript/lib/process/traversal.js |  236 ++
 .../gremlin-javascript/lib/structure/graph.js   |  138 ++
 .../lib/structure/io/graph-serializer.js|  398 
 .../javascript/gremlin-javascript/lib/utils.js  |   62 +
 .../javascript/gremlin-javascript/package.json  |   36 +
 .../process/graph-traversal.js  | 2016 -
 .../gremlin-javascript/process/traversal.js |  392 
 .../gremlin-javascript/structure/graph.js   |  157 --
 .../structure/io/graph-serializer.js|  415 
 .../test/integration/remote-connection-tests.js |   64 +
 .../test/integration/traversal-test.js  |   71 +
 .../test/unit/exports-test.js   |   73 +
 .../test/unit/graphson-test.js  |  112 +
 .../test/unit/traversal-test.js |  119 +
 .../javascript/gremlin-javascript/helper.js |   84 -
 .../gremlin-javascript/test-exports.js  |   87 -
 .../gremlin-javascript/test-graphson.js |  108 -
 .../gremlin-javascript/test-traversal.js|   69 -
 pom.xml |4 +
 38 files changed, 4626 insertions(+), 4033 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2434a649/docs/src/reference/gremlin-variants.asciidoc
--
diff --git a/docs/src/reference/gremlin-variants.asciidoc 
b/docs/src/reference/gremlin-variants.asciidoc
index c9ba893..dabf3c2 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -392,12 +392,12 @@ 
g.V().Repeat(Out()).Times(2).Values("name").Fold().ToList()
 
 === Bindings
 
-When a traversal bytecode is sent over a `IRemoteConnection` (e.g. Gremlin 
Server), it will be translated, compiled, 
-and then executed. If the same traversal is sent again, translation and 
compilation can be skipped as the previously 
+When a traversal bytecode is sent over a `IRemoteConnection` (e.g. Gremlin 
Server), it will be translated, compiled,
+and then executed. If the same traversal is sent again, translation and 
compilation can be skipped as the previously
 compiled version should be cached. Many traversals are unique up to some 
parameterization. For instance,
 `g.V(1).Out("created").Values("name")` is considered different from 
`g.V(4).Out("created").Values("Name")`
-as they have different script "string" representations. However, 
`g.V(x).Out("created").Values("name")` with bindings of 
-`{x : 1}` and `{x : 4}` are 

[33/50] [abbrv] tinkerpop git commit: Javascript GLV

[jorgebg]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9cbf8319/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
new file mode 100644
index 000..d9803ba
--- /dev/null
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
@@ -0,0 +1,2025 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+ 
+/**
+ * @author Jorge Bay Gondra
+ */
+(function defineGraphTraversalModule() {
+  "use strict";
+
+  var t = loadModule.call(this, './traversal.js');
+  var remote = loadModule.call(this, '../driver/remote-connection.js');
+  var Bytecode = t.Bytecode;
+  var inherits = t.inherits;
+  var parseArgs = t.parseArgs;
+
+  /**
+   *
+   * @param {Graph} graph
+   * @param {TraversalStrategies} traversalStrategies
+   * @param {Bytecode} [bytecode]
+   * @constructor
+   */
+  function GraphTraversalSource(graph, traversalStrategies, bytecode) {
+this._graph = graph;
+this._traversalStrategies = traversalStrategies;
+this._bytecode = bytecode || new Bytecode();
+  }
+
+  /**
+   * @param remoteConnection
+   * @returns {GraphTraversal}
+   */
+  GraphTraversalSource.prototype.withRemote = function (remoteConnection) {
+var traversalStrategy = new 
t.TraversalStrategies(this._traversalStrategies);
+traversalStrategy.addStrategy(new remote.RemoteStrategy(remoteConnection));
+return new GraphTraversal(this._graph, traversalStrategy, new 
Bytecode(this._bytecode));
+  };
+
+  /**
+   * Returns the string representation of the GraphTraversalSource.
+   * @returns {string}
+   */
+  GraphTraversalSource.prototype.toString = function () {
+return 'graphtraversalsource[' + this._graph.toString() + ']';
+  };
+
+  /**
+   * withBulk GraphTraversalSource method.
+   * @param {...Object} args
+   * @returns {GraphTraversalSource}
+   */
+  GraphTraversalSource.prototype.withBulk = function (args) {
+var b = new Bytecode(this._bytecode).addSource('withBulk', 
parseArgs.apply(null, arguments));
+return new GraphTraversalSource(this._graph, new 
t.TraversalStrategies(this._traversalStrategies), b);
+  };
+
+  /**
+   * withComputer GraphTraversalSource method.
+   * @param {...Object} args
+   * @returns {GraphTraversalSource}
+   */
+  GraphTraversalSource.prototype.withComputer = function (args) {
+var b = new Bytecode(this._bytecode).addSource('withComputer', 
parseArgs.apply(null, arguments));
+return new GraphTraversalSource(this._graph, new 
t.TraversalStrategies(this._traversalStrategies), b);
+  };
+
+  /**
+   * withPath GraphTraversalSource method.
+   * @param {...Object} args
+   * @returns {GraphTraversalSource}
+   */
+  GraphTraversalSource.prototype.withPath = function (args) {
+var b = new Bytecode(this._bytecode).addSource('withPath', 
parseArgs.apply(null, arguments));
+return new GraphTraversalSource(this._graph, new 
t.TraversalStrategies(this._traversalStrategies), b);
+  };
+
+  /**
+   * withSack GraphTraversalSource method.
+   * @param {...Object} args
+   * @returns {GraphTraversalSource}
+   */
+  GraphTraversalSource.prototype.withSack = function (args) {
+var b = new Bytecode(this._bytecode).addSource('withSack', 
parseArgs.apply(null, arguments));
+return new GraphTraversalSource(this._graph, new 
t.TraversalStrategies(this._traversalStrategies), b);
+  };
+
+  /**
+   * withSideEffect GraphTraversalSource method.
+   * @param {...Object} args
+   * @returns {GraphTraversalSource}
+   */
+  GraphTraversalSource.prototype.withSideEffect = function (args) {
+var b = new Bytecode(this._bytecode).addSource('withSideEffect', 
parseArgs.apply(null, arguments));
+return new GraphTraversalSource(this._graph, new 
t.TraversalStrategies(this._traversalStrategies), b);
+  };
+
+  /**
+   * withStrategies GraphTraversalSource method.
+   * @param {...Object} args
+   * @returns {GraphTraversalSource}
+   */
+  

[31/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-1820' into tp32

[jorgebg]

Merge branch 'TINKERPOP-1820' into tp32


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

Branch: refs/heads/TINKERPOP-1489
Commit: 76c42faf30fc9138fe50087e1b9569674bf4ab2b
Parents: 5a478ae 2b92f65
Author: Jorge Bay Gondra 
Authored: Wed Nov 22 09:52:24 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Wed Nov 22 09:52:24 2017 +0100

--
 .travis.yml | 19 ++-
 1 file changed, 6 insertions(+), 13 deletions(-)
--

[06/50] [abbrv] tinkerpop git commit: tweaked up CHANGELOG and this. TraversalVertexProgram variables.

[jorgebg]

tweaked up CHANGELOG and this. TraversalVertexProgram variables.


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

Branch: refs/heads/TINKERPOP-1489
Commit: f8c130767689c09179bc7d37fbf204e37e24e0c6
Parents: 4e44953
Author: Marko A. Rodriguez 
Authored: Tue Oct 31 09:05:01 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Oct 31 09:05:01 2017 -0600

--
 CHANGELOG.asciidoc |  2 +-
 .../computer/traversal/TraversalVertexProgram.java | 13 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f8c13076/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index e8505ad..1d41ab9 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,7 +23,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 [[release-3-2-7]]
 === TinkerPop 3.2.7 (Release Date: NOT OFFICIALLY RELEASED YET)
 
-* profile() timing is fixed for OLAP by adding worker iteration timings to 
step metrics
+* `TraversalVertexProgram` ``profile()` now accounts for worker iteration in 
`GraphComputer` OLAP.
 * Better respected permissions on the `plugins.txt` file and prevented writing 
if marked as read-only.
 * Added getters for the lambdas held by `LambdaCollectingBarrierStep`, 
`LambdaFlatMapStep` and `LambdaSideEffectStep`.
 * Fixed an old hack in `GroovyTranslator` and `PythonTranslator` where 
`Elements` were being mapped to their id only.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f8c13076/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
index f9a1e34..6f36306 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
@@ -358,9 +358,8 @@ public final class TraversalVertexProgram implements 
VertexProgram= profileSteps.size() ? 
profileSteps.size() - 1 : profileStepIndex;
-iterationMetrics.finish(0);
+this.iterationMetrics.finish(0);
 // reset counts
-iterationMetrics.setCount(TraversalMetrics.TRAVERSER_COUNT_ID,0);
+
this.iterationMetrics.setCount(TraversalMetrics.TRAVERSER_COUNT_ID,0);
 if (null != 
MemoryTraversalSideEffects.getMemorySideEffectsPhase(this.traversal.get())) {
-
this.traversal.get().getSideEffects().add(profileSteps.get(profileStepIndex).getId(),
 iterationMetrics);
+
this.traversal.get().getSideEffects().add(profileSteps.get(profileStepIndex).getId(),
 this.iterationMetrics);
 }
-iterationMetrics = null;
+this.iterationMetrics = null;
 }
 }
 

[24/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-1813' into tp32

[jorgebg]

Merge branch 'TINKERPOP-1813' into tp32


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

Branch: refs/heads/TINKERPOP-1489
Commit: f3458ee7d997c5a52bbb4600b658f1c5219d7e44
Parents: fd6f6b4 797937e
Author: Marko A. Rodriguez 
Authored: Tue Nov 14 10:09:59 2017 -0700
Committer: Marko A. Rodriguez 
Committed: Tue Nov 14 10:09:59 2017 -0700

--
 .../process/traversal/step/sideEffect/SubgraphTest.java | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--

[39/50] [abbrv] tinkerpop git commit: TINKERPOP-1489 Cleaned up pom

[jorgebg]

TINKERPOP-1489 Cleaned up pom

Removed some weird characters in license and bumped version to 3.2.5-SNAPSHOT


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

Branch: refs/heads/TINKERPOP-1489
Commit: 747ca7316050e5b4119d8598552937f7db022950
Parents: 385c6de
Author: Stephen Mallette 
Authored: Thu May 18 12:47:48 2017 -0400
Committer: Jorge Bay Gondra 
Committed: Wed Nov 22 15:07:36 2017 +0100

--
 gremlin-javascript/pom.xml | 35 ---
 1 file changed, 16 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/747ca731/gremlin-javascript/pom.xml
--
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
index 387e628..b9b78cc 100644
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@ -1,22 +1,19 @@
-
 
+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.
+-->
 http://maven.apache.org/POM/4.0.0;
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
@@ -24,7 +21,7 @@
 
 org.apache.tinkerpop
 tinkerpop
-3.2.3-SNAPSHOT
+3.2.5-SNAPSHOT
 
 gremlin-javascript
 Apache TinkerPop :: Gremlin Javascript

[18/50] [abbrv] tinkerpop git commit: fixed a hasId([]) ArrayOutOfBoundsException bug that occurs in the rare situation where a user provides an empty collection of ids. Test cases developed by @dkupp

[jorgebg]

fixed a hasId([]) ArrayOutOfBoundsException bug that occurs in the rare 
situation where a user provides an empty collection of ids. Test cases 
developed by @dkuppitz.


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

Branch: refs/heads/TINKERPOP-1489
Commit: 74ca03dea1a7db7b2af39f46020cf8a75a2ea5c4
Parents: e20b8ae
Author: Marko A. Rodriguez 
Authored: Mon Nov 6 14:36:22 2017 -0700
Committer: Marko A. Rodriguez 
Committed: Mon Nov 6 14:36:22 2017 -0700

--
 CHANGELOG.asciidoc  |  1 +
 .../process/traversal/step/map/GraphStep.java   | 15 +++--
 .../traversal/step/util/HasContainer.java   | 17 --
 .../traversal/step/filter/GroovyHasTest.groovy  | 24 +++-
 .../process/traversal/step/filter/HasTest.java  | 63 +++-
 .../step/sideEffect/Neo4jGraphStep.java |  4 ++
 .../step/sideEffect/TinkerGraphStep.java|  8 ++-
 7 files changed, 117 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/74ca03de/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 52ba2a3..128d13d 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-7]]
 === TinkerPop 3.2.7 (Release Date: NOT OFFICIALLY RELEASED YET)
 
+* Fixed an `ArrayOutOfBoundsException` in `hasId()` for the rare situation 
when the provided collection is empty.
 * Bump to Netty 4.0.52
 * `TraversalVertexProgram` ``profile()` now accounts for worker iteration in 
`GraphComputer` OLAP.
 * Added a test for self-edges and fixed `Neo4jVertex` to provided repeated 
self-edges on `BOTH`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/74ca03de/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
index 7ab7d13..e40271c 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GraphStep.java
@@ -36,8 +36,6 @@ import 
org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
 import org.apache.tinkerpop.gremlin.util.iterator.EmptyIterator;
 
-import java.io.Closeable;
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -102,10 +100,15 @@ public class GraphStep extends 
AbstractStep implemen
 }
 
 public void addIds(final Object... newIds) {
-this.ids = ArrayUtils.addAll(this.ids,
-(newIds.length == 1 && newIds[0] instanceof Collection) ?
-((Collection) newIds[0]).toArray(new 
Object[((Collection) newIds[0]).size()]) :
-newIds);
+if (this.ids.length == 0 &&
+newIds.length == 1 &&
+newIds[0] instanceof Collection && ((Collection) 
newIds[0]).isEmpty())
+this.ids = null;
+else
+this.ids = ArrayUtils.addAll(this.ids,
+(newIds.length == 1 && newIds[0] instanceof Collection) ?
+((Collection) newIds[0]).toArray(new 
Object[((Collection) newIds[0]).size()]) :
+newIds);
 }
 
 public void clearIds() {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/74ca03de/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java
index 3a3d9cc..08ab389 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/HasContainer.java
@@ -59,14 +59,19 @@ public class HasContainer implements Serializable, 
Cloneable, Predicate
 
 // 

[15/50] [abbrv] tinkerpop git commit: Missed a netty version bump in NOTICE CTR

[jorgebg]

Missed a netty version bump in NOTICE CTR


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

Branch: refs/heads/TINKERPOP-1489
Commit: 4780f298294f268e0fc7a96854b6cacb92e5651d
Parents: 79685f1
Author: Stephen Mallette 
Authored: Thu Nov 2 13:32:11 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Nov 2 13:32:11 2017 -0400

--
 gremlin-server/src/main/static/NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4780f298/gremlin-server/src/main/static/NOTICE
--
diff --git a/gremlin-server/src/main/static/NOTICE 
b/gremlin-server/src/main/static/NOTICE
index a1c2056..5db3e96 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -55,6 +55,6 @@ LongAdder), which was released with the following comments:
 http://creativecommons.org/publicdomain/zero/1.0/
 
 
-Netty 4.0.34
+Netty 4.0.50
 
 Copyright 2014 The Netty Project

[46/50] [abbrv] tinkerpop git commit: TINKERPOP-1489 Bump to 3.2.7-SNAPSHOT for gremlin-javascript

[jorgebg]

TINKERPOP-1489 Bump to 3.2.7-SNAPSHOT for gremlin-javascript


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

Branch: refs/heads/TINKERPOP-1489
Commit: b561a531259285cecc32a059843a517b41772361
Parents: 7491f9d
Author: Stephen Mallette 
Authored: Tue Sep 5 10:15:11 2017 -0400
Committer: Jorge Bay Gondra 
Committed: Wed Nov 22 15:13:18 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b561a531/gremlin-javascript/pom.xml
--
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
index 203e59e..919c87e 100644
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
 
 org.apache.tinkerpop
 tinkerpop
-3.2.6-SNAPSHOT
+3.2.7-SNAPSHOT
 
 gremlin-javascript
 Apache TinkerPop :: Gremlin Javascript

[36/50] [abbrv] tinkerpop git commit: Export enums and fix TraversalStrategies#applyStrategies()

[jorgebg]

Export enums and fix TraversalStrategies#applyStrategies()


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

Branch: refs/heads/TINKERPOP-1489
Commit: 4db606b5792d19ceda3fcec89b2b7f32fe925aa3
Parents: 9cbf831
Author: Jorge Bay Gondra 
Authored: Fri Oct 7 12:01:30 2016 +0200
Committer: Jorge Bay Gondra 
Committed: Wed Nov 22 15:07:35 2017 +0100

--
 .../GraphTraversalSourceGenerator.groovy|  4 +-
 .../javascript/TraversalSourceGenerator.groovy  | 52 +---
 .../driver/remote-connection.js |  2 +-
 .../main/javascript/gremlin-javascript/index.js | 11 -
 .../process/graph-traversal.js  |  4 +-
 .../gremlin-javascript/process/traversal.js | 44 -
 .../gremlin-javascript/test-exports.js  | 15 --
 .../gremlin-javascript/test-graphson.js |  2 +-
 .../gremlin-javascript/test-traversal.js| 17 ++-
 9 files changed, 87 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4db606b5/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
--
diff --git 
a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
 
b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
index 81c38dc..b569292 100644
--- 
a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
+++ 
b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/GraphTraversalSourceGenerator.groovy
@@ -87,12 +87,12 @@ class GraphTraversalSourceGenerator {
 
   /**
* @param remoteConnection
-   * @returns {GraphTraversal}
+   * @returns {GraphTraversalSource}
*/
   GraphTraversalSource.prototype.withRemote = function (remoteConnection) {
 var traversalStrategy = new 
t.TraversalStrategies(this._traversalStrategies);
 traversalStrategy.addStrategy(new remote.RemoteStrategy(remoteConnection));
-return new GraphTraversal(this._graph, traversalStrategy, new 
Bytecode(this._bytecode));
+return new GraphTraversalSource(this._graph, traversalStrategy, new 
Bytecode(this._bytecode));
   };
 
   /**

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4db606b5/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy
--
diff --git 
a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy
 
b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy
index efcb826..5b07a32 100644
--- 
a/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy
+++ 
b/gremlin-javascript/src/main/groovy/org/apache/tinkerpop/gremlin/javascript/TraversalSourceGenerator.groovy
@@ -177,11 +177,14 @@ class TraversalSourceGenerator {
 this.strategies.push(strategy);
   };
 
-  /** @param {Traversal} traversal */
-  TraversalStrategies.prototype.applyStrategies = function (traversal) {
-this.strategies.forEach(function eachStrategy(s) {
-  s.apply(traversal);
-});
+  /**
+   * @param {Traversal} traversal
+   * @param {Function} callback
+   */
+  TraversalStrategies.prototype.applyStrategies = function (traversal, 
callback) {
+eachSeries(this.strategies, function eachStrategy(s, next) {
+  s.apply(traversal, next);
+}, callback);
   };
 
   /**
@@ -195,8 +198,9 @@ class TraversalSourceGenerator {
   /**
* @abstract
* @param {Traversal} traversal
+   * @param {Function} callback
*/
-  TraversalStrategy.prototype.apply = function (traversal) {
+  TraversalStrategy.prototype.apply = function (traversal, callback) {
 
   };
 
@@ -290,24 +294,6 @@ class TraversalSourceGenerator {
 this.elementName = elementName;
   }
 
-  /**
-   * @type {{barrier, cardinality, column, direction, operator, order, pop, 
scope, t}}
-   */
-  var enums = {};\n""")
-
-for (final Class enumClass : 
CoreImports.getClassImports()
-.findAll { Enum.class.isAssignableFrom(it) }
-.sort { a, b -> a.getSimpleName() <=> b.getSimpleName() }
-.collect()) {
-moduleOutput.append("  
enums.${SymbolHelper.decapitalize(enumClass.getSimpleName())} = " +
-

[12/50] [abbrv] tinkerpop git commit: changed the SubgraphTest to use process API in assertions instead of structure API. This is in line with the current refactor trend to make sure the process API (

[jorgebg]

changed the SubgraphTest to use process API in assertions instead of structure 
API. This is in line with the current refactor trend to make sure the process 
API (and test suite) does not leak into the structure API. We need clear 
boundaries between the two APIs.


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

Branch: refs/heads/TINKERPOP-1489
Commit: 797937eb0c0b0fa3bc177925f4e584dfd53d8f13
Parents: f2b4fb9
Author: Marko A. Rodriguez 
Authored: Thu Nov 2 10:07:10 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Thu Nov 2 10:07:10 2017 -0600

--
 .../process/traversal/step/sideEffect/SubgraphTest.java | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/797937eb/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
index 9f2a662..51d8870 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
@@ -71,15 +71,15 @@ public abstract class SubgraphTest extends 
AbstractGremlinProcessTest {
 assertVertexEdgeCounts(subgraph, 3, 2);
 subgraph.edges().forEachRemaining(e -> {
 assertEquals("knows", e.label());
-assertEquals("marko", e.outVertex().values("name").next());
-assertEquals(new Integer(29), 
e.outVertex().values("age").next());
-assertEquals("person", e.outVertex().label());
+assertEquals("marko", g.E(e).outV().values("name").next());
+assertEquals(new Integer(29), 
g.E(e).outV().values("age").next());
+assertEquals("person", g.E(e).outV().label().next());
 
-final String name = e.inVertex().values("name").next();
+final String name = g.E(e).inV().values("name").next();
 if (name.equals("vadas"))
-assertEquals(0.5d, e.value("weight"), 0.0001d);
+assertEquals(0.5d, g.E(e).values("weight").next(), 
0.0001d);
 else if (name.equals("josh"))
-assertEquals(1.0d, e.value("weight"), 0.0001d);
+assertEquals(1.0d, g.E(e).values("weight").next(), 
0.0001d);
 else
 fail("There's a vertex present that should not be in the 
subgraph");
 });

[09/50] [abbrv] tinkerpop git commit: fixed up various ProcessTestSuite tests that were using Strucure API in assertions. Converted to be traversals for analysis.

[jorgebg]

fixed up various ProcessTestSuite tests that were using Strucure API in 
assertions. Converted to be traversals for analysis.


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

Branch: refs/heads/TINKERPOP-1489
Commit: 608f786d354fe419a30d1453452aa9f34308f0b4
Parents: bef43d6
Author: Marko A. Rodriguez 
Authored: Wed Nov 1 10:19:16 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Wed Nov 1 10:19:16 2017 -0600

--
 .../process/traversal/CoreTraversalTest.java| 41 --
 .../process/traversal/step/map/AddEdgeTest.java | 85 ++--
 .../PartitionStrategyProcessTest.java   | 66 ---
 3 files changed, 74 insertions(+), 118 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/608f786d/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
index 6cffe2c..13165e4 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
@@ -207,47 +207,6 @@ public class CoreTraversalTest extends 
AbstractGremlinProcessTest {
 
 @Test
 @LoadGraphWith(MODERN)
-public void shouldAddStartsProperly() {
-final Traversal traversal = out().out();
-assertFalse(traversal.hasNext());
-
traversal.asAdmin().addStarts(traversal.asAdmin().getTraverserGenerator().generateIterator(g.V(),
 traversal.asAdmin().getSteps().get(0), 1l));
-assertTrue(traversal.hasNext());
-assertEquals(2, IteratorUtils.count(traversal));
-
-
traversal.asAdmin().addStarts(traversal.asAdmin().getTraverserGenerator().generateIterator(g.V(),
 traversal.asAdmin().getSteps().get(0), 1l));
-
traversal.asAdmin().addStarts(traversal.asAdmin().getTraverserGenerator().generateIterator(g.V(),
 traversal.asAdmin().getSteps().get(0), 1l));
-assertEquals(4, IteratorUtils.count(traversal));
-assertFalse(traversal.hasNext());
-}
-
-@Test
-@LoadGraphWith(MODERN)
-public void shouldTraversalResetProperly() {
-final Traversal traversal = 
as("a").out().out().has("name", P.within("ripple", "lop")).as("b");
-if (new Random().nextBoolean()) traversal.asAdmin().reset();
-assertFalse(traversal.hasNext());
-
traversal.asAdmin().addStarts(traversal.asAdmin().getTraverserGenerator().generateIterator(g.V(),
 traversal.asAdmin().getSteps().get(0), 1l));
-assertTrue(traversal.hasNext());
-assertEquals(2, IteratorUtils.count(traversal));
-
-if (new Random().nextBoolean()) traversal.asAdmin().reset();
-
traversal.asAdmin().addStarts(traversal.asAdmin().getTraverserGenerator().generateIterator(g.V(),
 traversal.asAdmin().getSteps().get(0), 1l));
-assertTrue(traversal.hasNext());
-traversal.next();
-assertTrue(traversal.hasNext());
-traversal.asAdmin().reset();
-assertFalse(traversal.hasNext());
-
-
traversal.asAdmin().addStarts(traversal.asAdmin().getTraverserGenerator().generateIterator(g.V(),
 traversal.asAdmin().getSteps().get(0), 1l));
-assertEquals(2, IteratorUtils.count(traversal));
-
-assertFalse(traversal.hasNext());
-if (new Random().nextBoolean()) traversal.asAdmin().reset();
-assertFalse(traversal.hasNext());
-}
-
-@Test
-@LoadGraphWith(MODERN)
 @FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, 
feature = FEATURE_TRANSACTIONS)
 public void shouldTraverseIfAutoTxEnabledAndOriginalTxIsClosed() {
 // this should be the default, but manually set in just in case the 
implementation has other ideas

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/608f786d/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
index 2f4658f..f61ae47 100644
--- 

[21/50] [abbrv] tinkerpop git commit: TINKERPOP-1829 Made detachment configurable in EventStrategy

[jorgebg]

TINKERPOP-1829 Made detachment configurable in EventStrategy

The default behavior is representative of how EventStrategy currently works so 
there is no breaking change here. In the interest of avoiding breaking changes, 
I didn't want to shift the API to make the change cleaner and thus created 
TINKERPOP-1831 for future consideration.


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

Branch: refs/heads/TINKERPOP-1489
Commit: a5f48d91069d10fe8abdcbb0559315bae10ead5f
Parents: ac99e3c
Author: Stephen Mallette 
Authored: Fri Nov 10 06:46:10 2017 -0500
Committer: Stephen Mallette 
Committed: Fri Nov 10 06:46:10 2017 -0500

--
 CHANGELOG.asciidoc  |1 +
 docs/src/reference/the-traversal.asciidoc   |   12 +
 .../upgrade/release-3.2.x-incubating.asciidoc   |   10 +
 .../process/traversal/step/filter/DropStep.java |   13 +-
 .../process/traversal/step/map/AddEdgeStep.java |4 +-
 .../traversal/step/map/AddVertexStartStep.java  |4 +-
 .../traversal/step/map/AddVertexStep.java   |4 +-
 .../step/sideEffect/AddPropertyStep.java|   21 +-
 .../strategy/decoration/EventStrategy.java  |   68 ++
 .../util/reference/ReferenceProperty.java   |2 +-
 .../util/reference/ReferenceVertexProperty.java |2 +-
 .../decoration/EventStrategyProcessTest.java| 1046 +-
 12 files changed, 1165 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a5f48d91/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index ffd9de5..3a2b5b5 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-7]]
 === TinkerPop 3.2.7 (Release Date: NOT OFFICIALLY RELEASED YET)
 
+* Provided a method to configure detachment options with `EventStrategy`.
 * Fixed an `ArrayOutOfBoundsException` in `hasId()` for the rare situation 
when the provided collection is empty.
 * Bump to Netty 4.0.52
 * `TraversalVertexProgram` `profile()` now accounts for worker iteration in 
`GraphComputer` OLAP.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a5f48d91/docs/src/reference/the-traversal.asciidoc
--
diff --git a/docs/src/reference/the-traversal.asciidoc 
b/docs/src/reference/the-traversal.asciidoc
index 68773f5..a37a8bc 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -2853,6 +2853,18 @@ WARNING: `EventStrategy` is not meant for usage in 
tracking global mutations acr
 words, a mutation in one JVM process is not raised as an event in a different 
JVM process.  In addition, events are
 not raised when mutations occur outside of the `Traversal` context.
 
+Another default configuration for `EventStrategy` revolves around the concept 
of "detachment". Graph elements are
+detached from the graph as copies when passed to referring mutation events. 
Therefore, when adding a new `Vertex` in
+TinkerGraph, the event will not contain a `TinkerVertex` but will instead 
include a `DetachedVertex`. This behavior
+can be modified with the `detach()` method on the `EventStrategy.Builder` 
which accepts the following inputs: `null`
+meaning no detachment and the return of the original element, 
`DetachedFactory` which is the same as the default
+behavior, and `ReferenceFactory` which will return "reference" elements only 
with no properties.
+
+IMPORTANT: If setting the `detach()` configuration to `null`, be aware that 
transactional graphs will likely create a
+new transaction immediately following the `commit()` that raises the events. 
The graph elements raised in the events
+may also not behave as "snapshots" at the time of their creation as they are 
"live" references to actual database
+elements.
+
 === PartitionStrategy
 
 image::partition-graph.png[width=325]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a5f48d91/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc 
b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index c09f9c6..1589069 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -29,6 +29,16 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 
 Please see the 

[14/50] [abbrv] tinkerpop git commit: Bump netty version to current in the NOTICE CTR

[jorgebg]

Bump netty version to current in the NOTICE CTR


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

Branch: refs/heads/TINKERPOP-1489
Commit: 79685f16a24a3d0685280eaef89e45036cf7f5cd
Parents: 44f0a33
Author: Stephen Mallette 
Authored: Thu Nov 2 13:30:27 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Nov 2 13:30:27 2017 -0400

--
 gremlin-console/src/main/static/NOTICE | 4 ++--
 gremlin-server/src/main/static/NOTICE  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/79685f16/gremlin-console/src/main/static/NOTICE
--
diff --git a/gremlin-console/src/main/static/NOTICE 
b/gremlin-console/src/main/static/NOTICE
index 5bb0d9e..bae8e13 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -18,7 +18,7 @@ This product includes software from the Spring Framework,
 under the Apache License 2.0 (see: StringUtils.containsWhitespace())
 
 
-Apache Groovy 2.4.7 (AL ASF)
+Apache Groovy 2.4.11 (AL ASF)
 
 This product includes/uses ANTLR (http://www.antlr2.org/)
 developed by Terence Parr 1989-2006
@@ -54,7 +54,7 @@ JavaTuples 1.2
 Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
 
 
-Netty 4.0.34
+Netty 4.0.50
 
 Copyright 2014 The Netty Project
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/79685f16/gremlin-server/src/main/static/NOTICE
--
diff --git a/gremlin-server/src/main/static/NOTICE 
b/gremlin-server/src/main/static/NOTICE
index 86a453d..a1c2056 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -11,7 +11,7 @@ This product includes software from the Spring Framework,
 under the Apache License 2.0 (see: StringUtils.containsWhitespace())
 
 
-Apache Groovy 2.4.7 (AL ASF)
+Apache Groovy 2.4.11 (AL ASF)
 
 This product includes/uses ANTLR (http://www.antlr2.org/)
 developed by Terence Parr 1989-2006

[13/50] [abbrv] tinkerpop git commit: Removed references to "incubating"

[jorgebg]

Removed references to "incubating"

How can those still be hanging around?! CTR


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

Branch: refs/heads/TINKERPOP-1489
Commit: 44f0a336b3c8e63c5fda9b11f3c4d0ce7bb9b673
Parents: f2b4fb9
Author: Stephen Mallette 
Authored: Thu Nov 2 13:11:58 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Nov 2 13:11:58 2017 -0400

--
 NOTICE | 2 +-
 gremlin-console/src/main/static/NOTICE | 2 +-
 gremlin-server/src/main/static/NOTICE  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/44f0a336/NOTICE
--
diff --git a/NOTICE b/NOTICE
index 4285c37..ef49abf 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache TinkerPop (incubating)
+Apache TinkerPop
 Copyright 2015-2017 The Apache Software Foundation.
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/44f0a336/gremlin-console/src/main/static/NOTICE
--
diff --git a/gremlin-console/src/main/static/NOTICE 
b/gremlin-console/src/main/static/NOTICE
index e1a1a43..5bb0d9e 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -1,4 +1,4 @@
-Apache TinkerPop (incubating)
+Apache TinkerPop
 Copyright 2015-2017 The Apache Software Foundation.
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/44f0a336/gremlin-server/src/main/static/NOTICE
--
diff --git a/gremlin-server/src/main/static/NOTICE 
b/gremlin-server/src/main/static/NOTICE
index f86b996..86a453d 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -1,4 +1,4 @@
-Apache TinkerPop (incubating)
+Apache TinkerPop
 Copyright 2015-2017 The Apache Software Foundation.
 
 This product includes software developed at

[43/50] [abbrv] tinkerpop git commit: Update Javascript GLV

[jorgebg]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2434a649/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
deleted file mode 100644
index 7f36e59..000
--- 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/process/graph-traversal.js
+++ /dev/null
@@ -1,2016 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
- 
-/**
- * @author Jorge Bay Gondra
- */
-(function defineGraphTraversalModule() {
-  "use strict";
-
-  var t = loadModule.call(this, './traversal.js');
-  var remote = loadModule.call(this, '../driver/remote-connection.js');
-  var Bytecode = t.Bytecode;
-  var inherits = t.inherits;
-  var parseArgs = t.parseArgs;
-
-  /**
-   *
-   * @param {Graph} graph
-   * @param {TraversalStrategies} traversalStrategies
-   * @param {Bytecode} [bytecode]
-   * @constructor
-   */
-  function GraphTraversalSource(graph, traversalStrategies, bytecode) {
-this.graph = graph;
-this.traversalStrategies = traversalStrategies;
-this.bytecode = bytecode || new Bytecode();
-  }
-
-  /**
-   * @param remoteConnection
-   * @returns {GraphTraversalSource}
-   */
-  GraphTraversalSource.prototype.withRemote = function (remoteConnection) {
-var traversalStrategy = new 
t.TraversalStrategies(this.traversalStrategies);
-traversalStrategy.addStrategy(new remote.RemoteStrategy(remoteConnection));
-return new GraphTraversalSource(this.graph, traversalStrategy, new 
Bytecode(this.bytecode));
-  };
-
-  /**
-   * Returns the string representation of the GraphTraversalSource.
-   * @returns {string}
-   */
-  GraphTraversalSource.prototype.toString = function () {
-return 'graphtraversalsource[' + this.graph.toString() + ']';
-  };
-
-  /**
-   * withBulk GraphTraversalSource method.
-   * @param {...Object} args
-   * @returns {GraphTraversalSource}
-   */
-  GraphTraversalSource.prototype.withBulk = function (args) {
-var b = new Bytecode(this.bytecode).addSource('withBulk', 
parseArgs.apply(null, arguments));
-return new GraphTraversalSource(this.graph, new 
t.TraversalStrategies(this.traversalStrategies), b);
-  };
-
-  /**
-   * withComputer GraphTraversalSource method.
-   * @param {...Object} args
-   * @returns {GraphTraversalSource}
-   */
-  GraphTraversalSource.prototype.withComputer = function (args) {
-var b = new Bytecode(this.bytecode).addSource('withComputer', 
parseArgs.apply(null, arguments));
-return new GraphTraversalSource(this.graph, new 
t.TraversalStrategies(this.traversalStrategies), b);
-  };
-
-  /**
-   * withPath GraphTraversalSource method.
-   * @param {...Object} args
-   * @returns {GraphTraversalSource}
-   */
-  GraphTraversalSource.prototype.withPath = function (args) {
-var b = new Bytecode(this.bytecode).addSource('withPath', 
parseArgs.apply(null, arguments));
-return new GraphTraversalSource(this.graph, new 
t.TraversalStrategies(this.traversalStrategies), b);
-  };
-
-  /**
-   * withSack GraphTraversalSource method.
-   * @param {...Object} args
-   * @returns {GraphTraversalSource}
-   */
-  GraphTraversalSource.prototype.withSack = function (args) {
-var b = new Bytecode(this.bytecode).addSource('withSack', 
parseArgs.apply(null, arguments));
-return new GraphTraversalSource(this.graph, new 
t.TraversalStrategies(this.traversalStrategies), b);
-  };
-
-  /**
-   * withSideEffect GraphTraversalSource method.
-   * @param {...Object} args
-   * @returns {GraphTraversalSource}
-   */
-  GraphTraversalSource.prototype.withSideEffect = function (args) {
-var b = new Bytecode(this.bytecode).addSource('withSideEffect', 
parseArgs.apply(null, arguments));
-return new GraphTraversalSource(this.graph, new 
t.TraversalStrategies(this.traversalStrategies), b);
-  };
-
-  /**
-   * withStrategies GraphTraversalSource method.
-   * @param {...Object} args
-   * @returns {GraphTraversalSource}
-   */
-  

[05/50] [abbrv] tinkerpop git commit: fixed up a self-edge test and Neo4jVertex to support repeat edges on BOTH.

[jorgebg]

fixed up a self-edge test and Neo4jVertex to support repeat edges on BOTH.


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

Branch: refs/heads/TINKERPOP-1489
Commit: 5d68ca17160e4977eddfdb688f93d37440897957
Parents: 7f640f7
Author: Marko A. Rodriguez 
Authored: Mon Oct 30 15:28:37 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Mon Oct 30 15:28:37 2017 -0600

--
 CHANGELOG.asciidoc  |  1 +
 .../upgrade/release-3.2.x-incubating.asciidoc   | 10 
 .../process/traversal/step/map/VertexTest.java  |  2 ++
 .../gremlin/neo4j/structure/Neo4jVertex.java| 25 
 4 files changed, 33 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d68ca17/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8e7657c..78b8ac0 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-7]]
 === TinkerPop 3.2.7 (Release Date: NOT OFFICIALLY RELEASED YET)
 
+* Added a test for self-edges and fixed `Neo4jVertex` to provided repeated 
self-edges on `BOTH`.
 * Better respected permissions on the `plugins.txt` file and prevented writing 
if marked as read-only.
 * Added getters for the lambdas held by `LambdaCollectingBarrierStep`, 
`LambdaFlatMapStep` and `LambdaSideEffectStep`.
 * Fixed an old hack in `GroovyTranslator` and `PythonTranslator` where 
`Elements` were being mapped to their id only.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d68ca17/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc 
b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index 41cff47..60fd320 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -167,6 +167,16 @@ implementations can simply add the new method and override 
its behavior. The old
 
 See: link:https://issues.apache.org/jira/browse/TINKERPOP-1798[TINKERPOP-1798]
 
+=== Upgrading for Providers
+
+ Direction.BOTH Requires Duplication of Self-Edges
+
+Prior to this release, there was no semantic check to determine whether a 
self-edge (e.g. `e[1][2-self->2]`) would be returned
+twice on a `BOTH`. The semantics have been specified now in the test suite 
where the edge should be returned twice as it
+is both an incoming edge and an outgoing edge.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1821[TINKERPOP-1821]
+
 == TinkerPop 3.2.6
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d68ca17/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
index cb39884..8a57535 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
@@ -575,6 +575,7 @@ public abstract class VertexTest extends 
AbstractGremlinProcessTest {
 }
 
 @Test
+@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, 
feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
 public void g_V_bothEXselfX() {
 g.addV().as("a").addE("self").to("a").iterate();
 final Traversal traversal = get_g_V_bothEXselfX();
@@ -586,6 +587,7 @@ public abstract class VertexTest extends 
AbstractGremlinProcessTest {
 }
 
 @Test
+@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, 
feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
 public void g_V_bothXselfX() {
 g.addV().as("a").addE("self").to("a").iterate();
 final Traversal traversal = get_g_V_bothXselfX();

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d68ca17/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jVertex.java
--
diff --git 
a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jVertex.java
 

[29/50] [abbrv] tinkerpop git commit: Added a configuration option to Neo4j tests

[jorgebg]

Added a configuration option to Neo4j tests

This fixed a problem on master EventStrategy tests going OOME. Never saw that 
problem on tp32, but it seemed to have no hurting effect on that branch and 
thus opted to add it here as well. CTR


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

Branch: refs/heads/TINKERPOP-1489
Commit: 2c9bc465e4a68c1d1b23d936eaf940dbd9a204c6
Parents: ed9ca81
Author: Stephen Mallette 
Authored: Tue Nov 21 15:44:11 2017 -0500
Committer: Stephen Mallette 
Committed: Tue Nov 21 15:44:11 2017 -0500

--
 .../apache/tinkerpop/gremlin/neo4j/MultiMetaNeo4jGraphProvider.java | 1 +
 .../tinkerpop/gremlin/neo4j/NoMultiNoMetaNeo4jGraphProvider.java| 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c9bc465/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/MultiMetaNeo4jGraphProvider.java
--
diff --git 
a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/MultiMetaNeo4jGraphProvider.java
 
b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/MultiMetaNeo4jGraphProvider.java
index 8bd89d2..c3ba918 100644
--- 
a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/MultiMetaNeo4jGraphProvider.java
+++ 
b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/MultiMetaNeo4jGraphProvider.java
@@ -38,6 +38,7 @@ public class MultiMetaNeo4jGraphProvider extends 
AbstractNeo4jGraphProvider {
 put(Neo4jGraph.CONFIG_DIRECTORY, directory);
 put(Neo4jGraph.CONFIG_META_PROPERTIES, true);
 put(Neo4jGraph.CONFIG_MULTI_PROPERTIES, true);
+put(Neo4jGraph.CONFIG_CONF + ".dbms.memory.pagecache.size", 
"1024m");
 }};
 }
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c9bc465/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMultiNoMetaNeo4jGraphProvider.java
--
diff --git 
a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMultiNoMetaNeo4jGraphProvider.java
 
b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMultiNoMetaNeo4jGraphProvider.java
index 22ae0ce..cc72c64 100644
--- 
a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMultiNoMetaNeo4jGraphProvider.java
+++ 
b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMultiNoMetaNeo4jGraphProvider.java
@@ -38,6 +38,7 @@ public class NoMultiNoMetaNeo4jGraphProvider extends 
AbstractNeo4jGraphProvider
 put(Neo4jGraph.CONFIG_DIRECTORY, directory);
 put(Neo4jGraph.CONFIG_META_PROPERTIES, false);
 put(Neo4jGraph.CONFIG_MULTI_PROPERTIES, false);
+put(Neo4jGraph.CONFIG_CONF + ".dbms.memory.pagecache.size", 
"1024m");
 }};
 }
 }

[30/50] [abbrv] tinkerpop git commit: Reduced neo4j pagecache size - CTR

[jorgebg]

Reduced neo4j pagecache size - CTR


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

Branch: refs/heads/TINKERPOP-1489
Commit: 5a478ae2c1e4d31bb802ec0fbb5fc8b49972ef68
Parents: 2c9bc46
Author: Robert Dale 
Authored: Tue Nov 21 20:19:25 2017 -0500
Committer: Robert Dale 
Committed: Tue Nov 21 20:19:25 2017 -0500

--
 .../tinkerpop/gremlin/neo4j/MultiMetaNeo4jGraphProvider.java   | 2 +-
 .../tinkerpop/gremlin/neo4j/NoMultiNoMetaNeo4jGraphProvider.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5a478ae2/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/MultiMetaNeo4jGraphProvider.java
--
diff --git 
a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/MultiMetaNeo4jGraphProvider.java
 
b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/MultiMetaNeo4jGraphProvider.java
index c3ba918..c7f082c 100644
--- 
a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/MultiMetaNeo4jGraphProvider.java
+++ 
b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/MultiMetaNeo4jGraphProvider.java
@@ -38,7 +38,7 @@ public class MultiMetaNeo4jGraphProvider extends 
AbstractNeo4jGraphProvider {
 put(Neo4jGraph.CONFIG_DIRECTORY, directory);
 put(Neo4jGraph.CONFIG_META_PROPERTIES, true);
 put(Neo4jGraph.CONFIG_MULTI_PROPERTIES, true);
-put(Neo4jGraph.CONFIG_CONF + ".dbms.memory.pagecache.size", 
"1024m");
+put(Neo4jGraph.CONFIG_CONF + ".dbms.memory.pagecache.size", "1m");
 }};
 }
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5a478ae2/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMultiNoMetaNeo4jGraphProvider.java
--
diff --git 
a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMultiNoMetaNeo4jGraphProvider.java
 
b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMultiNoMetaNeo4jGraphProvider.java
index cc72c64..d0b015e 100644
--- 
a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMultiNoMetaNeo4jGraphProvider.java
+++ 
b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMultiNoMetaNeo4jGraphProvider.java
@@ -38,7 +38,7 @@ public class NoMultiNoMetaNeo4jGraphProvider extends 
AbstractNeo4jGraphProvider
 put(Neo4jGraph.CONFIG_DIRECTORY, directory);
 put(Neo4jGraph.CONFIG_META_PROPERTIES, false);
 put(Neo4jGraph.CONFIG_MULTI_PROPERTIES, false);
-put(Neo4jGraph.CONFIG_CONF + ".dbms.memory.pagecache.size", 
"1024m");
+put(Neo4jGraph.CONFIG_CONF + ".dbms.memory.pagecache.size", "1m");
 }};
 }
 }

[10/50] [abbrv] tinkerpop git commit: Merge branch 'spark-yarn-recipe-tp32' of https://github.com/vtslab/incubator-tinkerpop into tp32

[jorgebg]

Merge branch 'spark-yarn-recipe-tp32' of 
https://github.com/vtslab/incubator-tinkerpop into tp32


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

Branch: refs/heads/TINKERPOP-1489
Commit: a451ca56a9c75ab9c1d4d2b9c2523a4004193aa0
Parents: bef43d6 6110354
Author: Marko A. Rodriguez 
Authored: Wed Nov 1 12:02:41 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Wed Nov 1 12:02:41 2017 -0600

--
 CHANGELOG.asciidoc|   2 +
 docs/preprocessor/preprocess-file.sh  |   2 +-
 docs/src/recipes/index.asciidoc   |   2 +
 docs/src/recipes/olap-spark-yarn.asciidoc | 157 +
 pom.xml   |   1 +
 spark-gremlin/pom.xml |   5 +-
 6 files changed, 166 insertions(+), 3 deletions(-)
--


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

[48/50] [abbrv] tinkerpop git commit: Js GLV: Use Groovy templates for generation

[jorgebg]

Js GLV: Use Groovy templates for generation


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

Branch: refs/heads/TINKERPOP-1489
Commit: 7491f9d4909ccfd81417e2a50f520fd06901b34f
Parents: 396fbde
Author: Jorge Bay Gondra 
Authored: Thu Aug 17 17:28:32 2017 +0200
Committer: Jorge Bay Gondra 
Committed: Wed Nov 22 15:13:18 2017 +0100

--
 .../glv/GraphTraversalSource.template   | 127 ++
 gremlin-javascript/glv/PackageJson.template |  55 +
 gremlin-javascript/glv/TraversalSource.template | 171 +
 gremlin-javascript/pom.xml  | 131 --
 .../javascript/GenerateGremlinJavascript.groovy |  36 ---
 .../GraphTraversalSourceGenerator.groovy| 231 --
 .../javascript/PackageJsonGenerator.groovy  |  72 --
 .../gremlin/javascript/SymbolHelper.groovy  |  50 
 .../javascript/TraversalSourceGenerator.groovy  | 237 ---
 .../lib/process/graph-traversal.js  |  42 +---
 .../gremlin-javascript/lib/process/traversal.js |   6 +-
 .../javascript/gremlin-javascript/package.json  |   2 +-
 12 files changed, 475 insertions(+), 685 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7491f9d4/gremlin-javascript/glv/GraphTraversalSource.template
--
diff --git a/gremlin-javascript/glv/GraphTraversalSource.template 
b/gremlin-javascript/glv/GraphTraversalSource.template
new file mode 100644
index 000..e0fb453
--- /dev/null
+++ b/gremlin-javascript/glv/GraphTraversalSource.template
@@ -0,0 +1,127 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+/**
+ * @author Jorge Bay Gondra
+ */
+'use strict';
+
+var t = require('./traversal.js');
+var remote = require('../driver/remote-connection');
+var utils = require('../utils');
+var Bytecode = require('./bytecode');
+var TraversalStrategies = require('./traversal-strategy').TraversalStrategies;
+var inherits = utils.inherits;
+var parseArgs = utils.parseArgs;
+
+/**
+ *
+ * @param {Graph} graph
+ * @param {TraversalStrategies} traversalStrategies
+ * @param {Bytecode} [bytecode]
+ * @constructor
+ */
+function GraphTraversalSource(graph, traversalStrategies, bytecode) {
+  this.graph = graph;
+  this.traversalStrategies = traversalStrategies;
+  this.bytecode = bytecode || new Bytecode();
+}
+
+/**
+ * @param remoteConnection
+ * @returns {GraphTraversalSource}
+ */
+GraphTraversalSource.prototype.withRemote = function (remoteConnection) {
+  var traversalStrategy = new TraversalStrategies(this.traversalStrategies);
+  traversalStrategy.addStrategy(new remote.RemoteStrategy(remoteConnection));
+  return new GraphTraversalSource(this.graph, traversalStrategy, new 
Bytecode(this.bytecode));
+};
+
+/**
+ * Returns the string representation of the GraphTraversalSource.
+ * @returns {string}
+ */
+GraphTraversalSource.prototype.toString = function () {
+  return 'graphtraversalsource[' + this.graph.toString() + ']';
+};
+<% sourceStepMethods.each{ method -> %>
+/**
+ * Graph Traversal Source <%= method %> method.
+ * @param {...Object} args
+ * @returns {GraphTraversalSource}
+ */
+GraphTraversalSource.prototype.<%= toJs.call(method) %> = function (args) {
+  var b = new Bytecode(this.bytecode).addSource('<%= method %>', 
parseArgs.apply(null, arguments));
+  return new GraphTraversalSource(this.graph, new 
TraversalStrategies(this.traversalStrategies), b);
+};
+<%
+}
+sourceSpawnMethods.each{ method -> %>
+/**
+ * <%= method %> GraphTraversalSource step method.
+ * @param {...Object} args
+ * @returns {GraphTraversal}
+ */
+GraphTraversalSource.prototype.<%= toJs.call(method) %> = function (args) {
+  var b = new Bytecode(this.bytecode).addStep('<%= method %>', 
parseArgs.apply(null, arguments));
+  

tinkerpop git commit: Gremlin .NET: Provide type coercion between IDictionary<K, V> instances

[jorgebg]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1837 [created] a895a6847


Gremlin .NET: Provide type coercion between IDictionary instances


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

Branch: refs/heads/TINKERPOP-1837
Commit: a895a6847521a8aa30a83344cf3262aaa1d8c22f
Parents: 76c42fa
Author: Jorge Bay Gondra 
Authored: Wed Nov 22 11:44:00 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Wed Nov 22 11:55:29 2017 +0100

--
 .../Process/Traversal/DefaultTraversal.cs   | 57 +++-
 .../GraphTraversalTests.cs  | 46 
 2 files changed, 101 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a895a684/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs
--
diff --git 
a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs
index d9dfe10..180054e 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs
@@ -24,6 +24,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace Gremlin.Net.Process.Traversal
@@ -86,9 +87,61 @@ namespace Gremlin.Net.Process.Traversal
 }
 
 /// 
-public E Current => (E)TraverserEnumerator.Current?.Object;
+public E Current => GetCurrent();
 
-object IEnumerator.Current => Current;
+object IEnumerator.Current => GetCurrent();
+
+private TReturn GetCurrent()
+{
+var value = GetCurrent();
+var returnType = typeof(TReturn);
+if (value == null || value.GetType() == returnType)
+{
+// Avoid evaluating type comparisons
+return (TReturn) value;
+}
+return (TReturn) GetValue(returnType, value);
+}
+
+private object GetCurrent()
+{
+// Use dynamic to object to prevent runtime dynamic conversion 
evaluation
+return TraverserEnumerator.Current?.Object;
+}
+
+/// 
+/// Gets the value, converting to the expected type when necessary and 
supported. 
+/// 
+private static object GetValue(Type type, object value)
+{
+var genericType = type.GetTypeInfo().IsGenericType
+? type.GetTypeInfo().GetGenericTypeDefinition()
+: null;
+if (value is IDictionary dictValue && genericType == 
typeof(IDictionary<,>))
+{
+var keyType = type.GenericTypeArguments[0];
+var valueType = type.GenericTypeArguments[1];
+var mapType = typeof(Dictionary<,>).MakeGenericType(keyType, 
valueType);
+var result = (IDictionary) Activator.CreateInstance(mapType);
+foreach (DictionaryEntry kv in dictValue)
+{
+result.Add(GetValue(keyType, kv.Key), GetValue(valueType, 
kv.Value));
+}
+return result;
+}
+if (value is IEnumerable enumerableValue && genericType == 
typeof(IList<>))
+{
+var childType = type.GenericTypeArguments[0];
+var listType = typeof(List<>).MakeGenericType(childType);
+var result = (IList) Activator.CreateInstance(listType);
+foreach (var itemValue in enumerableValue)
+{
+result.Add(itemValue);
+}
+return result;
+}
+return value;
+}
 
 private IEnumerator GetTraverserEnumerator()
 {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a895a684/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
index 84a44a7..abd2e51 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
+++ 

tinkerpop git commit: Workaround gherkin parser quote issue

[jorgebg]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1827 f0120cbb9 -> 7f40ec84f


Workaround gherkin parser quote issue


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

Branch: refs/heads/TINKERPOP-1827
Commit: 7f40ec84fc1ac22c8407ac05a0a1121909402c99
Parents: f0120cb
Author: Jorge Bay Gondra 
Authored: Wed Nov 22 11:45:54 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Wed Nov 22 11:45:54 2017 +0100

--
 .../test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs| 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7f40ec84/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
index fda44b8..0011eda 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
@@ -296,6 +296,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 
 private static object ParseValue(string stringValue, string graphName)
 {
+// Parser issue: quotes are not normalized
+stringValue = stringValue.Replace("\\\"", "\"");
 Func parser = null;
 string extractedValue = null;
 foreach (var kv in Parsers)

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

[jorgebg]

Merge branch 'TINKERPOP-1820' into tp32


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

Branch: refs/heads/master
Commit: 76c42faf30fc9138fe50087e1b9569674bf4ab2b
Parents: 5a478ae 2b92f65
Author: Jorge Bay Gondra 
Authored: Wed Nov 22 09:52:24 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Wed Nov 22 09:52:24 2017 +0100

--
 .travis.yml | 19 ++-
 1 file changed, 6 insertions(+), 13 deletions(-)
--

[tinkerpop] Git Push Summary

[jorgebg]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1820 [deleted] 2b92f65d9

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

[jorgebg]

Merge branch 'tp32'

Conflicts:
.travis.yml


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

Branch: refs/heads/master
Commit: 7ded72b2bba83c886c6d19fa1f60051dcc646c0d
Parents: 875e665 76c42fa
Author: Jorge Bay Gondra 
Authored: Wed Nov 22 09:55:52 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Wed Nov 22 09:55:52 2017 +0100

--
 .travis.yml | 29 +
 1 file changed, 5 insertions(+), 24 deletions(-)
--

[1/2] tinkerpop git commit: TravisCI: Gremlin.Net as job

[jorgebg]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 5a478ae2c -> 76c42faf3


TravisCI: Gremlin.Net as job


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

Branch: refs/heads/tp32
Commit: 2b92f65d9cdd6be8062c2b216ef520c3c94ab1f7
Parents: ec1cbda
Author: Jorge Bay Gondra 
Authored: Mon Oct 30 10:11:51 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Mon Nov 20 10:36:29 2017 +0100

--
 .travis.yml | 19 ++-
 1 file changed, 6 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b92f65d/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index f0c88db..b626b17 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,21 +5,14 @@ jdk:
   - oraclejdk8
 sudo: required
 dist: trusty
-addons:
-  apt:
-packages:
-  - oracle-java8-installer
+
 before_install:
   - sudo sh -c 'echo "deb [arch=amd64] 
https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > 
/etc/apt/sources.list.d/dotnetdev.list'
   - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 
417A0893
   - sudo apt-get update
   - sudo apt-get install dotnet-dev-1.0.4
-script: 
-  - "mvn clean install -Dci"
-#notifications:
-#  email:
-#recipients:
-#  - m...@gremlin.guru
-#  - robd...@gmail.com
-#on_success: change # default: change
-#on_failure: always # default: always
+
+jobs:
+  include:
+- script: "mvn clean install -Dci"
+- script: "touch gremlin-dotnet/src/.glv && touch gremlin-dotnet/test/.glv 
&& mvn clean install -pl :gremlin-dotnet-tests -P gremlin-dotnet 
-DskipIntegrationTests=false"
\ No newline at end of file

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

[jorgebg]

Merge branch 'TINKERPOP-1820' into tp32


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

Branch: refs/heads/tp32
Commit: 76c42faf30fc9138fe50087e1b9569674bf4ab2b
Parents: 5a478ae 2b92f65
Author: Jorge Bay Gondra 
Authored: Wed Nov 22 09:52:24 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Wed Nov 22 09:52:24 2017 +0100

--
 .travis.yml | 19 ++-
 1 file changed, 6 insertions(+), 13 deletions(-)
--

[05/18] tinkerpop git commit: Invoke predicates and enums

[jorgebg]

Invoke predicates and enums


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

Branch: refs/heads/TINKERPOP-1827
Commit: 72174e3b63c7fc46a73bbf6eb64f55177dc5cc90
Parents: 7db8cb6
Author: Jorge Bay Gondra 
Authored: Mon Oct 30 15:14:38 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Tue Nov 21 11:46:18 2017 +0100

--
 .../StaticTraversalParameter.cs | 15 +--
 .../TraversalEnumParameter.cs   | 98 
 .../TraversalEvaluationTests.cs | 16 +++-
 .../TraversalEvaluation/TraversalParser.cs  | 79 ++--
 .../TraversalPredicateParameter.cs  | 26 --
 .../TraversalTokenParameter.cs  | 71 --
 6 files changed, 188 insertions(+), 117 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/72174e3b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/StaticTraversalParameter.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/StaticTraversalParameter.cs
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/StaticTraversalParameter.cs
index 8e0fbf9..dca691b 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/StaticTraversalParameter.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/StaticTraversalParameter.cs
@@ -30,9 +30,11 @@ namespace 
Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
 {
 internal class StaticTraversalParameter : ITokenParameter, 
IEquatable
 {
+private readonly string _traversalText;
+
 public bool Equals(StaticTraversalParameter other)
 {
-return Parts.SequenceEqual(other.Parts);
+return Tokens.SequenceEqual(other.Tokens);
 }
 
 public override bool Equals(object obj)
@@ -45,12 +47,12 @@ namespace 
Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
 
 public override int GetHashCode()
 {
-return Parts != null ? Parts.GetHashCode() : 0;
+return Tokens != null ? Tokens.GetHashCode() : 0;
 }
 
 public object GetValue()
 {
-throw new NotImplementedException();
+return TraversalParser.GetTraversalFromTokens(Tokens, null, 
_traversalText);
 }
 
 public Type GetParameterType()
@@ -58,11 +60,12 @@ namespace 
Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
 return typeof(ITraversal);
 }
 
-public IList Parts { get; }
+public IList Tokens { get; }
 
-public StaticTraversalParameter(IList parts)
+public StaticTraversalParameter(IList tokens, string 
traversalText)
 {
-Parts = parts;
+_traversalText = traversalText;
+Tokens = tokens;
 }
 }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/72174e3b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalEnumParameter.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalEnumParameter.cs
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalEnumParameter.cs
new file mode 100644
index 000..663928a
--- /dev/null
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalEnumParameter.cs
@@ -0,0 +1,98 @@
+#region License
+
+/*
+ * 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.
+ */
+
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using 

[09/18] tinkerpop git commit: Improved method overload matching

[jorgebg]

Improved method overload matching


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

Branch: refs/heads/TINKERPOP-1827
Commit: 281e80beea7526b585c3388b94ac44a969c3abf5
Parents: 3cdf9fe
Author: Jorge Bay Gondra 
Authored: Thu Nov 2 18:05:04 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Tue Nov 21 11:46:18 2017 +0100

--
 .../Process/Traversal/Instruction.cs|   6 +-
 .../ContextBasedParameter.cs|   5 +-
 .../TraversalEvaluation/ITokenParameter.cs  |   8 +-
 .../TraversalEvaluation/LiteralParameter.cs |  87 
 .../ModernGraphTypeInformation.cs   |   4 +-
 .../TraversalEvaluation/NumericParameter.cs |  84 
 .../StaticTraversalParameter.cs |  20 ++-
 .../TraversalEvaluation/StringParameter.cs  |   7 +-
 .../Gherkin/TraversalEvaluation/Token.cs|  11 ++
 .../TraversalEnumParameter.cs   |   7 +-
 .../TraversalEvaluationTests.cs |  15 ++-
 .../TraversalEvaluation/TraversalParser.cs  | 135 +--
 .../TraversalPredicateParameter.cs  |  19 ++-
 13 files changed, 279 insertions(+), 129 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/281e80be/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Instruction.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Instruction.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Instruction.cs
index a9163be..65847c5 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Instruction.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Instruction.cs
@@ -27,9 +27,7 @@ namespace Gremlin.Net.Process.Traversal
 /// Represents a  instruction by an operator 
name and its arguments.
 /// 
 public class Instruction
-{
-private static readonly object[] EmptyArgs = new object[0];
-
+{   
 /// 
 /// Initializes a new instance of the  
class.
 /// 
@@ -38,7 +36,7 @@ namespace Gremlin.Net.Process.Traversal
 public Instruction(string operatorName, params dynamic[] arguments)
 {
 OperatorName = operatorName;
-Arguments = arguments ??  EmptyArgs;
+Arguments = arguments;
 }
 
 /// 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/281e80be/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ContextBasedParameter.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ContextBasedParameter.cs
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ContextBasedParameter.cs
index 4f837d4..fa8f3f1 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ContextBasedParameter.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ContextBasedParameter.cs
@@ -57,7 +57,7 @@ namespace 
Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
 _name = name;
 }
 
-private void SetValue(IDictionary parameterValues)
+public void SetContextParameterValues(IDictionary 
parameterValues)
 {
 if (parameterValues == null || !parameterValues.TryGetValue(_name, 
out var value))
 {
@@ -66,9 +66,8 @@ namespace 
Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
 _value = value;
 }
 
-public object GetValue(IDictionary 
contextParameterValues)
+public object GetValue()
 {
-SetValue(contextParameterValues);
 return _value;
 }
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/281e80be/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ITokenParameter.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ITokenParameter.cs
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ITokenParameter.cs
index 9b06e80..357e35b 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ITokenParameter.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ITokenParameter.cs
@@ -31,12 +31,16 @@ namespace 
Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation

[07/18] tinkerpop git commit: Context parameters support

[jorgebg]

Context parameters support


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

Branch: refs/heads/TINKERPOP-1827
Commit: 649316ddd82bde0a800a08dc98e81f6b000e2dcc
Parents: 72174e3
Author: Jorge Bay Gondra 
Authored: Tue Oct 31 17:33:03 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Tue Nov 21 11:46:18 2017 +0100

--
 .../Process/Traversal/Instruction.cs|   4 +-
 .../Gherkin/CommonSteps.cs  | 113 ++-
 .../Gherkin/GherkinTestRunner.cs|  32 +
 .../Gherkin/ScenarioData.cs |  59 
 .../ContextBasedParameter.cs|  84 +++
 .../TraversalEvaluation/ITokenParameter.cs  |   3 +-
 .../TraversalEvaluation/NumericParameter.cs |   8 +-
 .../StaticTraversalParameter.cs |   4 +-
 .../TraversalEvaluation/StringParameter.cs  |   3 +-
 .../TraversalEnumParameter.cs   |   2 +-
 .../TraversalEvaluationTests.cs |  46 +++---
 .../TraversalEvaluation/TraversalParser.cs  | 143 +--
 .../TraversalPredicateParameter.cs  |   5 +-
 13 files changed, 330 insertions(+), 176 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/649316dd/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Instruction.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Instruction.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Instruction.cs
index 195b7bf..a9163be 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Instruction.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Instruction.cs
@@ -28,6 +28,8 @@ namespace Gremlin.Net.Process.Traversal
 /// 
 public class Instruction
 {
+private static readonly object[] EmptyArgs = new object[0];
+
 /// 
 /// Initializes a new instance of the  
class.
 /// 
@@ -36,7 +38,7 @@ namespace Gremlin.Net.Process.Traversal
 public Instruction(string operatorName, params dynamic[] arguments)
 {
 OperatorName = operatorName;
-Arguments = arguments;
+Arguments = arguments ??  EmptyArgs;
 }
 
 /// 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/649316dd/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
index 16aef9d..235f1ba 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
@@ -25,15 +25,12 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.Http.Headers;
-using System.Runtime.CompilerServices;
+using System.Text.RegularExpressions;
 using Gherkin.Ast;
 using Gremlin.Net.IntegrationTest.Gherkin.Attributes;
 using Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation;
 using Gremlin.Net.Process.Traversal;
 using Gremlin.Net.Structure;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using Xunit;
 
 namespace Gremlin.Net.IntegrationTest.Gherkin
@@ -41,14 +38,26 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 internal class GeneralDefinitions : StepDefinition
 {
 private GraphTraversalSource _g;
+private readonly IDictionary _parameters = new 
Dictionary();
 private dynamic _traversal;
 private object[] _result;
 
-private static readonly IDictionary> FixedTranslations = 
-new Dictionary>
+private static readonly IDictionary> 
Parsers =
+new Dictionary>
 {
-{ "g.V().has(\"no\").count()", g => g.V().Has("no").Count() }
-};
+{@"d\[(\d+)\]", x => Convert.ToInt64(x)},
+{@"d\[(\d+(?:\.\d+)?)\]", x => Convert.ToDouble(x)},
+{@"v\[(.+)\]", ToVertex},
+{@"v\[(.+)\]\.id", x => ToVertex(x).Id},
+{@"v\[(.+)\]\.sid", x => ToVertex(x).Id.ToString()},
+{@"e\[(.+)\]", ToEdge},
+{@"e\[(.+)\].id", s => ToEdge(s).Id},
+

[12/18] tinkerpop git commit: Parser fixes and unordered comparison

[jorgebg]

Parser fixes and unordered comparison


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

Branch: refs/heads/TINKERPOP-1827
Commit: 670ec462a7d4e00ae736f085134f1698db5ba016
Parents: 51a614b
Author: Jorge Bay Gondra 
Authored: Thu Nov 16 18:20:54 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Tue Nov 21 11:46:19 2017 +0100

--
 .../Gherkin/CommonSteps.cs  | 32 +---
 .../Gherkin/GherkinTestRunner.cs|  6 ++--
 .../ModernGraphTypeInformation.cs   | 18 ++-
 .../TraversalEvaluationTests.cs | 14 +++--
 .../TraversalEvaluation/TraversalParser.cs  |  1 +
 5 files changed, 54 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/670ec462/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
index 1ccf01d..1c2c8fa 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
@@ -151,9 +151,12 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 }
 else
 {
-var expectedArray = expected.OrderBy(x => x).ToArray();
-var resultArray = _result.OrderBy(x => x).ToArray();
-Assert.Equal(expectedArray, resultArray);
+var expectedArray = expected.ToArray();
+foreach (var resultItem in _result)
+{
+Assert.Contains(resultItem, expectedArray);
+}
+Assert.Equal(expectedArray.Length, _result.Length);
 }
 break;
 default:
@@ -191,8 +194,27 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 
 private static IDictionary ToMap(string stringMap, string graphName)
 {
-var jsonMap = JObject.Parse(stringMap);
-return (IDictionary) jsonMap.ToObject>();
+IDictionary jsonMap = JObject.Parse(stringMap);
+return jsonMap.ToDictionary(kv => kv.Key, kv => 
ParseMapValue(kv.Value, graphName));
+}
+
+private static object ParseMapValue(JToken value, string graphName)
+{
+if (value.Type == JTokenType.Array)
+{
+return value.Select(v => ParseMapValue(v, 
graphName)).ToArray();
+}
+var objValue = value.ToObject();
+if (objValue is long longValue)
+{
+// JSON Numeric values converted to int64 by default
+return Convert.ToInt32(longValue);
+}
+if (objValue is string stringValue)
+{
+return ParseValue(stringValue, graphName);
+}
+return objValue;
 }
 
 private static ISet ToSet(string stringSet, string graphName)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/670ec462/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 fdee536..5527705 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -22,7 +22,6 @@
 #endregion
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -329,7 +328,10 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/Sum.feature",
 //
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/Coalesce.feature",
-
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/AddEdge.feature"
+
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/AddEdge.feature",
+
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/AddVertex.feature",
+

[16/18] tinkerpop git commit: Ignore specific scenarios

[jorgebg]

Ignore specific scenarios


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

Branch: refs/heads/TINKERPOP-1827
Commit: 4a12044f9c13d37526eaed0f967ce2cba4790ad3
Parents: 2d58945
Author: Jorge Bay Gondra 
Authored: Fri Nov 17 13:59:42 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Tue Nov 21 11:46:19 2017 +0100

--
 .../Gherkin/GherkinTestRunner.cs| 33 
 .../Gherkin/IgnoreException.cs  | 11 ++-
 2 files changed, 43 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4a12044f/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 b03211c..a3748ee 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -40,6 +40,31 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 public class GherkinTestRunner
 {
+private static readonly IDictionary 
IgnoredScenarios =
+new Dictionary
+{
+{ "g_V_hasLabelXpersonX_projectXa_bX_byXoutE_countX_byXageX", 
IgnoreReason.ScenarioDesignMapNumbers },
+{ "g_V_matchXa_knows_b__b_created_cX", 
IgnoreReason.MapCoersionIssue},
+{ "g_V_valueMap_matchXa_selectXnameX_bX", 
IgnoreReason.MapCoersionIssue},
+{ "g_V_matchXa_out_bX", IgnoreReason.MapCoersionIssue},
+{ 
"g_V_outXcreatedX_unionXasXprojectX_inXcreatedX_hasXname_markoX_selectXprojectX__asXprojectX_inXcreatedX_inXknowsX_hasXname_markoX_selectXprojectXX_groupCount_byXnameX",
+IgnoreReason.ScenarioDesignMapNumbers},
+{ 
"g_V_hasLabelXpersonX_asXpX_mapXbothE_label_groupCountX_asXrX_selectXp_rX",
+IgnoreReason.ScenarioDesignMapNumbers},
+{ "g_V_label_groupCount_asXxX_selectXxX", 
IgnoreReason.ScenarioDesignMapNumbers},
+{ 
"g_V_outXfollowedByX_group_byXsongTypeX_byXbothE_group_byXlabelX_byXweight_sumXX",
+IgnoreReason.ScenarioDesignMapNumbers},
+{ 
"g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byXcountX_capXaX",
+IgnoreReason.ScenarioDesignMapNumbers},
+{ 
"g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byXcountX",
+IgnoreReason.ScenarioDesignMapNumbers},
+{ 
"g_V_repeatXout_groupXaX_byXnameX_byXcountX_timesX2X_capXaX", 
IgnoreReason.ScenarioDesignMapNumbers},
+{ "g_V_hasXlangX_group_byXlangX_byXcountX", 
IgnoreReason.ScenarioDesignMapNumbers},
+{ 
"g_V_hasLabelXsongX_group_byXnameX_byXproperties_groupCount_byXlabelXX", 
IgnoreReason.MapCoersionIssue},
+{ 
"g_V_hasLabelXsongX_groupXaX_byXnameX_byXproperties_groupCount_byXlabelXX_out_capXaX",
+IgnoreReason.MapCoersionIssue},
+};
+
 private static class Keywords
 {
 public const string Given = "GIVEN";
@@ -84,6 +109,11 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 var failedSteps = new Dictionary();
 resultFeature.Scenarios[scenario] = failedSteps;
+if (IgnoredScenarios.TryGetValue(scenario.Name, out var 
reason))
+{
+failedSteps.Add(scenario.Steps.First(), new 
IgnoreException(reason));
+break;
+}
 StepBlock? currentStep = null;
 StepDefinition stepDefinition = null;
 foreach (var step in scenario.Steps)
@@ -361,6 +391,9 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/Mean.feature",
 
 
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/sideEffect/Sack.feature",
+
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/sideEffect/Group.feature",
+//
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/sideEffect/GroupCount.feature",
+//

[11/18] tinkerpop git commit: Parse maps, lists and sets

[jorgebg]

Parse maps, lists and sets


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

Branch: refs/heads/TINKERPOP-1827
Commit: 8fb711b5fadcf387f2785f7a82226bc2bad45d24
Parents: caacaa3
Author: Jorge Bay Gondra 
Authored: Tue Nov 7 10:51:25 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Tue Nov 21 11:46:18 2017 +0100

--
 .../Gherkin/CommonSteps.cs  | 15 ++-
 .../ModernGraphTypeInformation.cs   |  1 +
 .../Gherkin/TraversalEvaluation/Token.cs|  2 +-
 .../TraversalEvaluationTests.cs |  8 --
 .../TraversalEvaluation/TraversalParser.cs  | 27 
 5 files changed, 33 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8fb711b5/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
index 8b27567..4a4d18e 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
@@ -31,6 +31,8 @@ using Gremlin.Net.IntegrationTest.Gherkin.Attributes;
 using Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation;
 using Gremlin.Net.Process.Traversal;
 using Gremlin.Net.Structure;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Xunit;
 
 namespace Gremlin.Net.IntegrationTest.Gherkin
@@ -162,19 +164,20 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 return result;
 }
 
-private static IDictionary ToMap(string arg)
+private static IDictionary ToMap(string stringMap)
 {
-throw new NotImplementedException();
+var jsonMap = JObject.Parse(stringMap);
+return (IDictionary) jsonMap.ToObject>();
 }
 
-private static ICollection ToSet(string arg)
+private static ISet ToSet(string stringSet)
 {
-throw new NotImplementedException();
+return new HashSet(ToList(stringSet));
 }
 
-private static IList ToList(string arg)
+private static IList ToList(string stringList)
 {
-throw new NotImplementedException();
+return stringList.Split(',').Select(ParseValue).ToArray();
 }
 
 private static Vertex ToVertex(string name)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8fb711b5/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 7e2bee1..10d316d 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
@@ -57,6 +57,7 @@ namespace 
Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
 }
 return typeof(object);
 case nameof(GraphTraversal.ValueMap):
+case nameof(GraphTraversal.Select):
 // Use IDictionary for value maps
 return typeof(object);
 case nameof(GraphTraversal.Limit):

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8fb711b5/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/Token.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/Token.cs
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/Token.cs
index e0acf4b..67c2af1 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/Token.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/Token.cs
@@ -68,7 +68,7 @@ namespace 
Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
 
 public Token(string name, IList parameters = null)
 {
-Name = name;
+Name = name.Trim();
 

[15/18] tinkerpop git commit: Support Ignore exceptions

[jorgebg]

Support Ignore exceptions


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

Branch: refs/heads/TINKERPOP-1827
Commit: 2d58945d7624214e8beab18ed5cc9e586ff83504
Parents: 670ec46
Author: Jorge Bay Gondra 
Authored: Fri Nov 17 12:59:46 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Tue Nov 21 11:46:19 2017 +0100

--
 .../Gherkin/CommonSteps.cs  |  8 +-
 .../Gherkin/GherkinTestRunner.cs| 83 +---
 .../Gherkin/IgnoreException.cs  | 55 +
 .../ModernGraphTypeInformation.cs   |  9 +++
 4 files changed, 127 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d58945d/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
index 1c2c8fa..4b99fd8 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
@@ -58,7 +58,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {@"p\[(.+)\]", ToPath},
 {@"l\[(.+)\]", ToList},
 {@"s\[(.+)\]", ToSet},
-{@"m\[(.+)\]", ToMap}
+{@"m\[(.+)\]", ToMap},
+{@"c\[(.+)\]", ToLambda}
 }.ToDictionary(kv => new Regex("^" + kv.Key + "$", 
RegexOptions.Compiled), kv => kv.Value);
 
 [Given("the (\\w+) graph")]
@@ -198,6 +199,11 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 return jsonMap.ToDictionary(kv => kv.Key, kv => 
ParseMapValue(kv.Value, graphName));
 }
 
+private static object ToLambda(string stringLambda, string graphName)
+{
+throw new IgnoreException(IgnoreReason.LambdaNotSupported);
+}
+
 private static object ParseMapValue(JToken value, string graphName)
 {
 if (value.Type == JTokenType.Array)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d58945d/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 5527705..b03211c 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -40,8 +40,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 public class GherkinTestRunner
 {
-private readonly ITestOutputHelper _output;
-
 private static class Keywords
 {
 public const string Given = "GIVEN";
@@ -64,6 +62,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 { StepBlock.When, typeof(WhenAttribute) },
 { StepBlock.Then, typeof(ThenAttribute) }
 };
+
+private readonly ITestOutputHelper _output;
 
 public GherkinTestRunner(ITestOutputHelper output)
 {
@@ -73,7 +73,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 [Fact]
 public void RunGherkinBasedTests()
 {
-Console.WriteLine("Starting Gherkin-based tests");
+WriteOutput("Starting Gherkin-based tests");
 var stepDefinitionTypes = GetStepDefinitionTypes();
 var results = new List();
 foreach (var feature in GetFeatures())
@@ -104,6 +104,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 if (result != null)
 {
 failedSteps.Add(step, result);
+// Stop processing scenario
+break;
 }
 }
 }
@@ -115,35 +117,26 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 
 private void WriteOutput(string line)
 {
+#if DEBUG
 _output.WriteLine(line);
+#else
+Console.WriteLine(line);
+#endif
 }
 
 private void OutputResults(List results)
 {
-var totalScenarios = results.Sum(f => f.Scenarios.Count);
-var totalFailedScenarios = results.Sum(f => f.Scenarios.Count(s => 
s.Value.Count > 0));
-

[02/18] tinkerpop git commit: Traversal parser for tests

[jorgebg]

Traversal parser for tests


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

Branch: refs/heads/TINKERPOP-1827
Commit: b1f98fcdd0bc085e7352162a0f2111411a7a20f6
Parents: d000fce
Author: Jorge Bay Gondra 
Authored: Thu Oct 26 13:06:04 2017 +0200
Committer: Jorge Bay Gondra 
Committed: Tue Nov 21 11:46:17 2017 +0100

--
 .../Gherkin/CommonSteps.cs  |  13 +-
 .../Gherkin/GherkinTestRunner.cs|  45 +++-
 .../TraversalEvaluation/ITokenParameter.cs  |  30 +++
 .../TraversalEvaluation/NumericParameter.cs |  68 +
 .../StaticTraversalParameter.cs |  57 
 .../TraversalEvaluation/StringParameter.cs  |  69 +
 .../Gherkin/TraversalEvaluation/Token.cs|  76 ++
 .../TraversalEvaluationTests.cs |  79 ++
 .../TraversalEvaluation/TraversalParser.cs  | 261 +++
 .../TraversalPredicateParameter.cs  |  60 +
 .../TraversalTokenParameter.cs  |  60 +
 .../Gherkin/TraversalTranslations.cs| 102 
 12 files changed, 810 insertions(+), 110 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b1f98fcd/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
index 50ea9b8..16aef9d 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
@@ -29,6 +29,7 @@ using System.Net.Http.Headers;
 using System.Runtime.CompilerServices;
 using Gherkin.Ast;
 using Gremlin.Net.IntegrationTest.Gherkin.Attributes;
+using Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation;
 using Gremlin.Net.Process.Traversal;
 using Gremlin.Net.Structure;
 using Newtonsoft.Json;
@@ -67,6 +68,16 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 _result = enumerable.Cast().ToArray();
 }
 
+[When("iterated next")]
+public void IterateNext()
+{
+if (!(_traversal is ITraversal))
+{
+throw new InvalidOperationException("Traversal should be set 
before iterating");
+}
+_result = _traversal.Next();
+}
+
 [Given("the traversal of")]
 public void TranslateTraversal(string traversalText)
 {
@@ -74,7 +85,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 throw new InvalidOperationException("g should be a traversal 
source");
 }
-_traversal = TraversalTranslations.GetTraversal(traversalText, _g);
+_traversal = TraversalParser.GetTraversal(traversalText, _g);
 }
 
 [Then("the result should be (\\w+)")]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b1f98fcd/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 e1df3a8..7523b0b 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -24,6 +24,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
@@ -146,8 +147,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 WriteOutput($"  Scenario: {resultScenario.Key.Name}");
 foreach (var step in resultScenario.Key.Steps)
 {
-Exception failure;
-resultScenario.Value.TryGetValue(step, out failure);
+resultScenario.Value.TryGetValue(step, out var 
failure);
 if (failure == null)
 {
 WriteOutput($"{step.Keyword} {step.Text}");
@@ -295,11 +295,42 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 
 private IEnumerable GetFeatures()
 {
-// TODO: go through all the .feature files
-const string gherkinFile = 
"/Users/jorge/workspace/temp/count.feature";
-   

[06/18] tinkerpop git commit: Get property information from modern graph

[jorgebg]

Get property information from modern graph


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

Branch: refs/heads/TINKERPOP-1827
Commit: 7db8cb6ac4d4342bef2dae56cee226fa544dd655
Parents: 74a4f8a
Author: Jorge Bay Gondra 
Authored: Fri Oct 27 14:18:32 2017 +0200
Committer: Jorge Bay Gondra 
Committed: Tue Nov 21 11:46:18 2017 +0100

--
 .../ModernGraphTypeInformation.cs   | 70 
 .../TraversalEvaluationTests.cs | 10 ++-
 .../TraversalEvaluation/TraversalParser.cs  | 24 ---
 3 files changed, 92 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7db8cb6a/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
new file mode 100644
index 000..bce3449
--- /dev/null
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
@@ -0,0 +1,70 @@
+#region License
+
+/*
+ * 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.
+ */
+
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Gremlin.Net.Process.Traversal;
+
+namespace Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
+{
+internal class ModernGraphTypeInformation
+{
+private static readonly IDictionary PropertyInfos = new 
Dictionary
+{
+{"age", typeof(int)},
+{"name", typeof(string)},
+{"lang", typeof(string)},
+{"weight", typeof(float)}
+};
+
+/// 
+/// Gets the type argument information based on the modern graph.
+/// s
+public static Type GetTypeArguments(MethodInfo method, object[] 
parameterValues)
+{
+switch (method.Name)
+{
+case nameof(GraphTraversal.ValueMap):
+case nameof(GraphTraversal.Values) when 
parameterValues.Length == 1:
+// The parameter contains the element property names
+var properties = ((IEnumerable) 
parameterValues[parameterValues.Length - 1]).Cast();
+var types = 
properties.Select(GetElementPropertyType).ToArray();
+if (types.Distinct().Count() == 1)
+{
+return types[0];
+}
+return typeof(object);
+}
+return null;
+}
+
+private static Type GetElementPropertyType(string name)
+{
+PropertyInfos.TryGetValue(name, out var type);
+return type;
+}
+}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7db8cb6a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalEvaluationTests.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalEvaluationTests.cs
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalEvaluationTests.cs
index 0949ad5..4e3ec42 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalEvaluationTests.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalEvaluationTests.cs
@@ -77,15 +77,19 @@ namespace 

[17/18] tinkerpop git commit: Use non-dynamic traversal evaluation and support numeric conversion

[jorgebg]

Use non-dynamic traversal evaluation and support numeric conversion


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

Branch: refs/heads/TINKERPOP-1827
Commit: f0120cbb93fa2a7876ff249e8ece4005eeb0001f
Parents: 0279f28
Author: Jorge Bay Gondra 
Authored: Tue Nov 21 11:44:03 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Tue Nov 21 11:46:19 2017 +0100

--
 .../Gherkin/CommonSteps.cs  | 52 +++-
 .../Gherkin/GherkinTestRunner.cs| 33 +
 .../Gherkin/ScenarioData.cs | 40 ---
 .../ModernGraphTypeInformation.cs   | 29 +++
 .../TraversalEvaluationTests.cs | 10 ++--
 .../TraversalEvaluation/TraversalParser.cs  | 13 +++--
 6 files changed, 98 insertions(+), 79 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0120cbb/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
index 9bc36a6..fda44b8 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
@@ -41,13 +41,13 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 private GraphTraversalSource _g;
 private string _graphName;
 private readonly IDictionary _parameters = new 
Dictionary();
-private dynamic _traversal;
+private ITraversal _traversal;
 private object[] _result;
 
 private static readonly IDictionary> Parsers =
 new Dictionary>
 {
-{@"d\[([\d.]+)\]\.([ilfd])", ToNumber},
+{@"d\[([\d.]+)\]\.([ilfdm])", ToNumber},
 {@"v\[(.+)\]", ToVertex},
 {@"v\[(.+)\]\.id", (x, graphName) => ToVertex(x, 
graphName).Id},
 {@"v\[(.+)\]\.sid", (x, graphName) => ToVertex(x, 
graphName).Id.ToString()},
@@ -55,8 +55,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {@"e\[(.+)\].id", (x, graphName) => ToEdge(x, graphName).Id},
 {@"e\[(.+)\].sid", (x, graphName) => ToEdge(x, 
graphName).Id.ToString()},
 {@"p\[(.+)\]", ToPath},
-{@"l\[(.+)\]", ToList},
-{@"s\[(.+)\]", ToSet},
+{@"l\[(.*)\]", ToList},
+{@"s\[(.*)\]", ToSet},
 {@"m\[(.+)\]", ToMap},
 {@"c\[(.+)\]", ToLambda}
 }.ToDictionary(kv => new Regex("^" + kv.Key + "$", 
RegexOptions.Compiled), kv => kv.Value);
@@ -67,7 +67,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 { 'i', s => Convert.ToInt32(s) },
 { 'l', s => Convert.ToInt64(s) },
 { 'f', s => Convert.ToSingle(s) },
-{ 'd', s => Convert.ToDouble(s) }
+{ 'd', s => Convert.ToDouble(s) },
+{ 'm', s => Convert.ToDecimal(s)}
 };
 
 [Given("the (\\w+) graph")]
@@ -121,22 +122,41 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 [When("iterated to list")]
 public void IterateToList()
 {
-if (!(_traversal is ITraversal))
+if (_traversal == null)
 {
 throw new InvalidOperationException("Traversal should be set 
before iterating");
 }
-IEnumerable enumerable = _traversal.ToList();
-_result = enumerable.Cast().ToArray();
+ITraversal t = _traversal;
+var list = new List();
+while (t.MoveNext())
+{
+list.Add(t.Current);
+}
+_result = list.ToArray();
 }
 
 [When("iterated next")]
 public void IterateNext()
 {
-if (!(_traversal is ITraversal))
+if (_traversal == null)
 {
 throw new InvalidOperationException("Traversal should be set 
before iterating");
 }
-_result = _traversal.Next();
+_traversal.MoveNext();
+var result = _traversal.Current;
+switch (result)
+{
+case null:
+_result = null;
+return;
+case object[] 

[03/18] tinkerpop git commit: Gherkin-based test runner

[jorgebg]

Gherkin-based test runner


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

Branch: refs/heads/TINKERPOP-1827
Commit: d000fce0006552f537cb3e580f4c70c60c895e88
Parents: e03cbd2
Author: Jorge Bay Gondra 
Authored: Mon Sep 25 17:27:13 2017 +0200
Committer: Jorge Bay Gondra 
Committed: Tue Nov 21 11:46:17 2017 +0100

--
 .../Gherkin/Attributes/BddAttribute.cs  |  37 ++
 .../Gherkin/Attributes/GivenAttribute.cs|  33 ++
 .../Gherkin/Attributes/ThenAttribute.cs |  33 ++
 .../Gherkin/Attributes/WhenAttribute.cs |  33 ++
 .../Gherkin/CommonSteps.cs  | 156 +
 .../Gherkin/GherkinTestRunner.cs| 335 +++
 .../Gherkin/StepDefinition.cs   |  39 +++
 .../Gherkin/TraversalTranslations.cs| 102 ++
 .../Gremlin.Net.IntegrationTest.csproj  |  13 +-
 .../RemoteConnectionFactory.cs  |  18 +-
 10 files changed, 790 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d000fce0/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Attributes/BddAttribute.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Attributes/BddAttribute.cs
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Attributes/BddAttribute.cs
new file mode 100644
index 000..1e9a242
--- /dev/null
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Attributes/BddAttribute.cs
@@ -0,0 +1,37 @@
+#region License
+
+/*
+ * 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.
+ */
+
+#endregion
+
+using System;
+
+namespace Gremlin.Net.IntegrationTest.Gherkin.Attributes
+{
+internal class BddAttribute : Attribute
+{
+public string Message { get; }
+
+internal BddAttribute(string message)
+{
+Message = message;
+}
+}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d000fce0/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Attributes/GivenAttribute.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Attributes/GivenAttribute.cs
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Attributes/GivenAttribute.cs
new file mode 100644
index 000..7266145
--- /dev/null
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Attributes/GivenAttribute.cs
@@ -0,0 +1,33 @@
+#region License
+
+/*
+ * 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.
+ */
+
+#endregion
+
+namespace Gremlin.Net.IntegrationTest.Gherkin.Attributes
+{
+internal class GivenAttribute : BddAttribute
+{
+public GivenAttribute(string message) : base(message)
+{
+
+}
+}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d000fce0/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Attributes/ThenAttribute.cs

[14/18] tinkerpop git commit: Ignore tests for mapping coersion issue

[jorgebg]

Ignore tests for mapping coersion issue


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

Branch: refs/heads/TINKERPOP-1827
Commit: a5f1e17a6051034a236e02aa9b216d839d28ce77
Parents: b37018f
Author: Jorge Bay Gondra 
Authored: Mon Nov 20 09:24:49 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Tue Nov 21 11:46:19 2017 +0100

--
 .../Gherkin/GherkinTestRunner.cs| 48 +++-
 .../ModernGraphTypeInformation.cs   |  6 +++
 2 files changed, 33 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a5f1e17a/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 c5d8631..cd03eca 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -49,6 +49,12 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 IgnoreReason.MapCoersionIssue},
 { 
"g_V_outXcreatedX_unionXasXprojectX_inXcreatedX_hasXname_markoX_selectXprojectX__asXprojectX_inXcreatedX_inXknowsX_hasXname_markoX_selectXprojectXX_groupCount_byXnameX",
 IgnoreReason.MapCoersionIssue},
+{ "g_V_outXcreatedX_name_groupCount", 
IgnoreReason.MapCoersionIssue},
+{ "g_V_outXcreatedX_groupCount_byXnameX", 
IgnoreReason.MapCoersionIssue},
+{ 
"g_V_chooseXlabel_is_person__unionX__out_lang__out_nameX__in_labelX_groupCount",
 IgnoreReason
+.MapCoersionIssue},
+{ 
"g_V_coalesceXoutXlikesX_outXknowsX_inXcreatedXX_groupCount_byXnameX", 
IgnoreReason.MapCoersionIssue},
+
 { "g_withSackX0X_V_outE_sackXsumX_byXweightX_inV_sack_sum", 
IgnoreReason.ScenarioDesignMapNumbers},
 { 
"g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_weight_meanX", 
IgnoreReason.ScenarioDesignMapNumbers},
 { "g_V_groupXaX_byXlabelX_byXoutE_weight_sumX_capXaX", 
IgnoreReason.ScenarioDesignMapNumbers}
@@ -364,28 +370,28 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 WriteOutput(path);
 WriteOutput("--");
 
-var files = new []
-{
-
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/Sum.feature",
-//
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/Coalesce.feature",
-
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/AddEdge.feature",
-
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/AddVertex.feature",
-
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/ValueMap.feature",
-
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/Select.feature",
-
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/Project.feature",
-
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/Path.feature",
-
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/Map.feature",
-
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/Match.feature",
-
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/Max.feature",
-
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/Mean.feature",
-
-
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/sideEffect/Sack.feature",
-
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/sideEffect/Group.feature",
-//
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/sideEffect/GroupCount.feature",
-//
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/sideEffect/Inject.feature",
-};
+//var files = new []
+//{
+//
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/Sum.feature",
+
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/Coalesce.feature",
+//
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/AddEdge.feature",
+//
"/Users/jorge/workspace/tinkerpop/gremlin-test/features/map/AddVertex.feature",
+//

[13/18] tinkerpop git commit: Parse numeric values with suffix

[jorgebg]

Parse numeric values with suffix


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

Branch: refs/heads/TINKERPOP-1827
Commit: b37018f84c99f0ca0f29ff5dd1cc1492d596054f
Parents: 4a12044
Author: Jorge Bay Gondra 
Authored: Fri Nov 17 15:48:16 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Tue Nov 21 11:46:19 2017 +0100

--
 .../Gherkin/CommonSteps.cs  | 32 +---
 .../Gherkin/GherkinTestRunner.cs| 25 +--
 .../ModernGraphTypeInformation.cs   |  3 +-
 3 files changed, 36 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b37018f8/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
index 4b99fd8..9bc36a6 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
@@ -47,8 +47,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 private static readonly IDictionary> Parsers =
 new Dictionary>
 {
-{@"d\[(\d+)\]", (x, _) => Convert.ToInt32(x)},
-{@"d\[(\d+(?:\.\d+)?)\]", (x, _) => Convert.ToDouble(x)},
+{@"d\[([\d.]+)\]\.([ilfd])", ToNumber},
 {@"v\[(.+)\]", ToVertex},
 {@"v\[(.+)\]\.id", (x, graphName) => ToVertex(x, 
graphName).Id},
 {@"v\[(.+)\]\.sid", (x, graphName) => ToVertex(x, 
graphName).Id.ToString()},
@@ -62,6 +61,15 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {@"c\[(.+)\]", ToLambda}
 }.ToDictionary(kv => new Regex("^" + kv.Key + "$", 
RegexOptions.Compiled), kv => kv.Value);
 
+private static readonly IDictionary> 
NumericParsers =
+new Dictionary>
+{
+{ 'i', s => Convert.ToInt32(s) },
+{ 'l', s => Convert.ToInt64(s) },
+{ 'f', s => Convert.ToSingle(s) },
+{ 'd', s => Convert.ToDouble(s) }
+};
+
 [Given("the (\\w+) graph")]
 public void ChooseModernGraph(string graphName)
 {
@@ -193,10 +201,9 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 
 }
 
-private static IDictionary ToMap(string stringMap, string graphName)
+private static object ToMap(string stringMap, string graphName)
 {
-IDictionary jsonMap = JObject.Parse(stringMap);
-return jsonMap.ToDictionary(kv => kv.Key, kv => 
ParseMapValue(kv.Value, graphName));
+return ParseMapValue(JObject.Parse(stringMap), graphName);
 }
 
 private static object ToLambda(string stringLambda, string graphName)
@@ -204,8 +211,19 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 throw new IgnoreException(IgnoreReason.LambdaNotSupported);
 }
 
+private static object ToNumber(string stringNumber, string graphName)
+{
+return NumericParsers[stringNumber[stringNumber.Length - 1]](
+stringNumber.Substring(0, stringNumber.Length - 1));
+}
+
 private static object ParseMapValue(JToken value, string graphName)
 {
+if (value.Type == JTokenType.Object)
+{
+IDictionary jsonMap = (JObject)value; 
+return jsonMap.ToDictionary(kv => kv.Key, kv => 
ParseMapValue(kv.Value, graphName));
+}
 if (value.Type == JTokenType.Array)
 {
 return value.Select(v => ParseMapValue(v, 
graphName)).ToArray();
@@ -259,6 +277,10 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 parser = kv.Value;
 extractedValue = match.Groups[1].Value;
+if (match.Groups.Count > 2)
+{
+extractedValue += match.Groups[2].Value;
+}
 break;
 }
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b37018f8/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs

[04/18] tinkerpop git commit: Gremlin.Net.IntegrationTest project as an unsigned assembly

[jorgebg]

Gremlin.Net.IntegrationTest project as an unsigned assembly


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

Branch: refs/heads/TINKERPOP-1827
Commit: 3cdf9fea33e3c2a3a762925e5280a50a227e6d6a
Parents: 649316d
Author: Jorge Bay Gondra 
Authored: Thu Nov 2 12:27:55 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Tue Nov 21 11:46:18 2017 +0100

--
 .../Gherkin/TraversalEvaluation/TraversalParser.cs| 2 +-
 .../Gremlin.Net.IntegrationTest.csproj| 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3cdf9fea/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalParser.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalParser.cs
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalParser.cs
index 4cf7b4a..2bd92bc 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalParser.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalParser.cs
@@ -34,7 +34,7 @@ namespace 
Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
 private static readonly IDictionary> FixedTranslations = 
 new Dictionary>
 {
-{ "g.V().fold().count(Scope.local)", g => 
g.V().Fold().Count(Scope.Local)}
+{ "g.V().fold().count(Scope.local)", g => 
g.V().Fold().Count(Scope.Local)}
 };
 
 private static readonly Regex RegexNumeric =

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3cdf9fea/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
index c929575..82727fd 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
@@ -5,9 +5,6 @@
 Gremlin.Net.IntegrationTest
 Gremlin.Net.IntegrationTest
 1.0.4
-
../../build/tinkerpop.snk
-true
-true
   
   
 

[01/18] tinkerpop git commit: Invoke traversal methods with generic parameters

[jorgebg]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1827 [created] f0120cbb9


Invoke traversal methods with generic parameters


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

Branch: refs/heads/TINKERPOP-1827
Commit: 74a4f8af2f0e155f0b436dfc44a1e7eef794b1c6
Parents: b1f98fc
Author: Jorge Bay Gondra 
Authored: Fri Oct 27 10:55:20 2017 +0200
Committer: Jorge Bay Gondra 
Committed: Tue Nov 21 11:46:17 2017 +0100

--
 .../TraversalEvaluation/ITokenParameter.cs  | 13 ++-
 .../TraversalEvaluation/NumericParameter.cs | 10 +++
 .../StaticTraversalParameter.cs | 11 +++
 .../TraversalEvaluation/StringParameter.cs  | 10 +++
 .../Gherkin/TraversalEvaluation/Token.cs| 15 ++--
 .../TraversalEvaluationTests.cs | 23 --
 .../TraversalEvaluation/TraversalParser.cs  | 86 
 .../TraversalPredicateParameter.cs  | 11 +++
 .../TraversalTokenParameter.cs  | 11 +++
 .../Gremlin.Net.IntegrationTest.csproj  |  6 +-
 10 files changed, 164 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/74a4f8af/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ITokenParameter.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ITokenParameter.cs
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ITokenParameter.cs
index 1c940db..5c8197f 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ITokenParameter.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ITokenParameter.cs
@@ -21,10 +21,21 @@
 
 #endregion
 
+using System;
+
 namespace Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
 {
 public interface ITokenParameter
 {
-
+/// 
+/// Gets the value of the parameter 
+/// 
+object GetValue();
+
+/// 
+/// Gets the type of the parameter
+/// 
+/// 
+Type GetParameterType();
 }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/74a4f8af/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/NumericParameter.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/NumericParameter.cs
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/NumericParameter.cs
index 9effc17..378680c 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/NumericParameter.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/NumericParameter.cs
@@ -56,6 +56,16 @@ namespace 
Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
 {
 return $"NumericParameter<{typeof(T).Name}>({Value})";
 }
+
+public object GetValue()
+{
+return Value;
+}
+
+public Type GetParameterType()
+{
+return typeof(T);
+}
 }
 
 internal static class NumericParameter

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/74a4f8af/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/StaticTraversalParameter.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/StaticTraversalParameter.cs
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/StaticTraversalParameter.cs
index b054cbc..8e0fbf9 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/StaticTraversalParameter.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/StaticTraversalParameter.cs
@@ -24,6 +24,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Gremlin.Net.Process.Traversal;
 
 namespace Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
 {
@@ -47,6 +48,16 @@ namespace 
Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
 return Parts != null ? Parts.GetHashCode() : 0;
 }
 
+public object GetValue()
+{
+throw new NotImplementedException();
+}
+
+public Type GetParameterType()
+{
+return typeof(ITraversal);
+}
+
 

[08/18] tinkerpop git commit: Edge and Path result parsing

[jorgebg]

Edge and Path result parsing


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

Branch: refs/heads/TINKERPOP-1827
Commit: caacaa3780adbb69dbe25d000f536f663cbf35dc
Parents: 281e80b
Author: Jorge Bay Gondra 
Authored: Fri Nov 3 16:00:50 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Tue Nov 21 11:46:18 2017 +0100

--
 .../Gherkin/CommonSteps.cs  |  8 +++
 .../Gherkin/ScenarioData.cs | 25 +---
 .../ModernGraphTypeInformation.cs   |  4 
 .../TraversalEvaluationTests.cs |  3 ++-
 .../TraversalEvaluation/TraversalParser.cs  | 17 +++--
 5 files changed, 47 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/caacaa37/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
index 235f1ba..8b27567 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
@@ -182,14 +182,14 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 return ScenarioData.Instance.ModernVertices[name];
 }
 
-private static Edge ToEdge(string s)
+private static Edge ToEdge(string name)
 {
-throw new NotImplementedException();
+return ScenarioData.Instance.ModernEdges[name];
 }
 
-private static Path ToPath(string arg)
+private static Path ToPath(string value)
 {
-throw new NotImplementedException();
+return new Path(new List(0), 
value.Split(',').Select(ParseValue).ToList());
 }
 
 private static object ParseValue(string stringValue)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/caacaa37/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
index c45ed12..d9f66ff 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
@@ -24,6 +24,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 using Gremlin.Net.IntegrationTest.Process.Traversal.DriverRemoteConnection;
 using Gremlin.Net.Process.Traversal;
 using Gremlin.Net.Structure;
@@ -35,6 +36,10 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 private static readonly Lazy Lazy = new 
Lazy(Load);
 
 public static ScenarioData Instance => Lazy.Value;
+
+private static readonly Regex EdgeORegex = new Regex("o=(.+?)[,}]", 
RegexOptions.Compiled);
+private static readonly Regex EdgeLRegex = new Regex("l=(.+?)[,}]", 
RegexOptions.Compiled);
+private static readonly Regex EdgeIRegex = new Regex("i=(.+?)[,}]", 
RegexOptions.Compiled);
 
 public IDictionary ModernVertices { get; }
 
@@ -50,10 +55,24 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 var connectionFactory = new RemoteConnectionFactory();
 var g = new 
Graph().Traversal().WithRemote(connectionFactory.CreateRemoteConnection());
-//TODO: Remove workaround once Group() is fixed TINKERPOP-1752
-var vertices = g.V().ToList().ToDictionary(v => 
g.V(v.Id).Values("name").Next(), v => v);
+var vertices = g.V().Group().By("name").By(__.Tail()).Next()
+.ToDictionary(kv => kv.Key, kv => (Vertex)kv.Value);
+var edges = g.E().Group()
+.By(__.Project("o", "l", "i")
+
.By(__.OutV().Values("name")).By(__.Label()).By(__.InV().Values("name")))
+.By(__.Tail())
+.Next()
+.ToDictionary(kv => GetEdgeKey(kv.Key), kv => (Edge)kv.Value);
 connectionFactory.Dispose();
-return new ScenarioData(vertices, null);
+return new ScenarioData(vertices, edges);
+}
+
+private static string GetEdgeKey(string key)
+{
+var o = EdgeORegex.Match(key).Groups[1].Value;

[18/18] tinkerpop git commit: Decimal serialization support and avoid dynamic conversion

[jorgebg]

Decimal serialization support and avoid dynamic conversion


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

Branch: refs/heads/TINKERPOP-1827
Commit: 0279f2823b2ad7029dab7c7ccf5fd02d25f90fd0
Parents: a5f1e17
Author: Jorge Bay Gondra 
Authored: Tue Nov 21 11:39:38 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Tue Nov 21 11:46:19 2017 +0100

--
 .../Process/Traversal/DefaultTraversal.cs   | 11 +--
 .../Structure/IO/GraphSON/DecimalConverter.cs   | 34 
 .../Structure/IO/GraphSON/GraphSONReader.cs | 15 +++--
 .../Structure/IO/GraphSON/GraphSONWriter.cs |  1 +
 .../Structure/IO/GraphSON/NumberConverter.cs|  3 +-
 5 files changed, 58 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0279f282/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs
--
diff --git 
a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs
index 7e0f37b..052c33a 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs
@@ -91,9 +91,16 @@ namespace Gremlin.Net.Process.Traversal
 }
 
 /// 
-public E Current => (E)TraverserEnumerator.Current?.Object;
+public E Current => (E) GetCurrent();
 
-object IEnumerator.Current => Current;
+/// 
+object IEnumerator.Current => GetCurrent();
+
+private object GetCurrent()
+{
+// Use the object (not dynamic) result
+return TraverserEnumerator.Current?.Object;
+}
 
 private IEnumerator GetTraverserEnumerator()
 {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0279f282/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DecimalConverter.cs
--
diff --git 
a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DecimalConverter.cs 
b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DecimalConverter.cs
new file mode 100644
index 000..82cc646
--- /dev/null
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DecimalConverter.cs
@@ -0,0 +1,34 @@
+#region License
+
+/*
+ * 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.
+ */
+
+#endregion
+
+using System;
+
+namespace Gremlin.Net.Structure.IO.GraphSON
+{
+internal class DecimalConverter : NumberConverter
+{
+protected override string GraphSONTypeName => "BigDecimal";
+protected override Type HandledType => typeof(decimal);
+protected override string Prefix => "gx";
+}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0279f282/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
--
diff --git 
a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs 
b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
index aa1fc48..60bafed 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
@@ -48,7 +48,8 @@ namespace Gremlin.Net.Structure.IO.GraphSON
 {"g:Edge", new EdgeDeserializer()},
 {"g:Property", new PropertyDeserializer()},
 {"g:VertexProperty", new VertexPropertyDeserializer()},
-{"g:Path", new PathDeserializer()}
+{"g:Path", new PathDeserializer()},
+{"gx:BigDecimal", new DecimalConverter()}
 };
 
 /// 
@@ -89,9 +90,17 @@ namespace 

[10/18] tinkerpop git commit: Add support for more steps

[jorgebg]

Add support for more steps


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

Branch: refs/heads/TINKERPOP-1827
Commit: 51a614bb89fbc55a855033f455bb3a1e63b8117e
Parents: 8fb711b
Author: Jorge Bay Gondra 
Authored: Thu Nov 16 09:26:38 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Tue Nov 21 11:46:18 2017 +0100

--
 .../Process/Traversal/DefaultTraversal.cs   |   5 +
 .../Gremlin.Net/Process/Traversal/ITraversal.cs |  11 +-
 .../Gherkin/CommonSteps.cs  | 153 +++
 .../Gherkin/GherkinTestRunner.cs|  43 +-
 .../Gherkin/ScenarioData.cs |  96 ++--
 .../ModernGraphTypeInformation.cs   |  11 +-
 .../TraversalEvaluation/StringParameter.cs  |   4 +-
 .../TraversalEvaluationTests.cs |   4 +-
 .../TraversalEvaluation/TraversalParser.cs  |   8 +-
 .../GraphTraversalTests.cs  |  17 ---
 10 files changed, 240 insertions(+), 112 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/51a614bb/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs
--
diff --git 
a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs
index d9dfe10..7e0f37b 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs
@@ -50,6 +50,11 @@ namespace Gremlin.Net.Process.Traversal
 /// 
 public IEnumerable Traversers { get; set; }
 
+ITraversal ITraversal.Iterate()
+{
+return Iterate();
+}
+
 /// 
 /// Gets or sets the  strategies 
of this traversal.
 /// 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/51a614bb/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversal.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversal.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversal.cs
index c519ee6..498ef7f 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversal.cs
@@ -22,6 +22,7 @@
 #endregion
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
@@ -31,7 +32,7 @@ namespace Gremlin.Net.Process.Traversal
 /// Represents the basic information for a walk over a graph.
 /// 
 /// 
-public interface ITraversal
+public interface ITraversal: IEnumerator
 {
 /// 
 /// Gets the  representation of this 
traversal.
@@ -47,6 +48,12 @@ namespace Gremlin.Net.Process.Traversal
 /// Gets or sets the 's of this traversal 
that hold the results of the traversal.
 /// 
 IEnumerable Traversers { get; set; }
+
+/// 
+/// Iterates all  instances in the 
traversal.
+/// 
+/// The fully drained traversal.
+ITraversal Iterate();
 }
 
 /// 
@@ -71,7 +78,7 @@ namespace Gremlin.Net.Process.Traversal
 /// Iterates all  instances in the 
traversal.
 /// 
 /// The fully drained traversal.
-ITraversal Iterate();
+new ITraversal Iterate();
 
 /// 
 /// Gets the next .

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/51a614bb/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
index 4a4d18e..1ccf01d 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
@@ -31,47 +31,53 @@ using Gremlin.Net.IntegrationTest.Gherkin.Attributes;
 using Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation;
 using Gremlin.Net.Process.Traversal;
 using Gremlin.Net.Structure;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Xunit;
 
 namespace Gremlin.Net.IntegrationTest.Gherkin
 {
-internal class GeneralDefinitions : StepDefinition
+internal class CommonSteps : StepDefinition
 {
 private GraphTraversalSource _g;
+private string _graphName;
 private 

tinkerpop git commit: TravisCI: Gremlin.Net as job

[jorgebg]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1820 [created] 2b92f65d9


TravisCI: Gremlin.Net as job


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

Branch: refs/heads/TINKERPOP-1820
Commit: 2b92f65d9cdd6be8062c2b216ef520c3c94ab1f7
Parents: ec1cbda
Author: Jorge Bay Gondra 
Authored: Mon Oct 30 10:11:51 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Mon Nov 20 10:36:29 2017 +0100

--
 .travis.yml | 19 ++-
 1 file changed, 6 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b92f65d/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index f0c88db..b626b17 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,21 +5,14 @@ jdk:
   - oraclejdk8
 sudo: required
 dist: trusty
-addons:
-  apt:
-packages:
-  - oracle-java8-installer
+
 before_install:
   - sudo sh -c 'echo "deb [arch=amd64] 
https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > 
/etc/apt/sources.list.d/dotnetdev.list'
   - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 
417A0893
   - sudo apt-get update
   - sudo apt-get install dotnet-dev-1.0.4
-script: 
-  - "mvn clean install -Dci"
-#notifications:
-#  email:
-#recipients:
-#  - m...@gremlin.guru
-#  - robd...@gmail.com
-#on_success: change # default: change
-#on_failure: always # default: always
+
+jobs:
+  include:
+- script: "mvn clean install -Dci"
+- script: "touch gremlin-dotnet/src/.glv && touch gremlin-dotnet/test/.glv 
&& mvn clean install -pl :gremlin-dotnet-tests -P gremlin-dotnet 
-DskipIntegrationTests=false"
\ No newline at end of file

[tinkerpop] Git Push Summary

[jorgebg]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1730 [deleted] 80f3dd3f8

[1/3] tinkerpop git commit: Gremlin .NET Support GraphSON3

[jorgebg]

Repository: tinkerpop
Updated Branches:
  refs/heads/master cb7cdd28c -> fc48b046c


Gremlin .NET Support GraphSON3


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

Branch: refs/heads/master
Commit: a60e7d3fe64bab26e48640a05f2b914f7443e4bf
Parents: b8d1c04
Author: Jorge Bay Gondra 
Authored: Fri Sep 8 17:32:29 2017 +0200
Committer: Jorge Bay Gondra 
Committed: Wed Sep 20 12:19:23 2017 +0200

--
 .../src/Gremlin.Net/Driver/GremlinClient.cs |   6 +-
 .../Driver/Messages/ResponseResult.cs   |   3 +-
 .../Remote/DriverRemoteTraversalSideEffects.cs  |   2 +-
 .../Structure/IO/GraphSON/GraphSON3Reader.cs|   3 +-
 .../Structure/IO/GraphSON/Path3Deserializer.cs  |  45 +
 .../Structure/IO/GraphSON/PathDeserializer.cs   |   5 +-
 .../src/Gremlin.Net/Structure/Path.cs   |  24 ++-
 .../GraphTraversalTests.cs  |   4 +-
 .../DriverRemoteConnection/SideEffectTests.cs   |  24 ++-
 .../IO/GraphSON/GraphSONReaderTests.cs  |  22 ++-
 .../Gremlin.Net.UnitTest/Structure/PathTests.cs | 190 +--
 11 files changed, 205 insertions(+), 123 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a60e7d3f/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs 
b/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs
index 064770f..a251ab7 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs
@@ -37,7 +37,7 @@ namespace Gremlin.Net.Driver
 /// 
 /// Defines the default mime type to use.
 /// 
-public const string DefaultMimeType = 
"application/vnd.gremlin-v2.0+json";
+public const string DefaultMimeType = 
"application/vnd.gremlin-v3.0+json";
 
 private readonly ConnectionPool _connectionPool;
 
@@ -51,8 +51,8 @@ namespace Gremlin.Net.Driver
 public GremlinClient(GremlinServer gremlinServer, GraphSONReader 
graphSONReader = null,
  GraphSONWriter graphSONWriter = null, string 
mimeType = null)
 {
-var reader = graphSONReader ?? new GraphSON2Reader();
-var writer = graphSONWriter ?? new GraphSON2Writer();
+var reader = graphSONReader ?? new GraphSON3Reader();
+var writer = graphSONWriter ?? new GraphSON3Writer();
 var connectionFactory = new ConnectionFactory(gremlinServer, 
reader, writer, mimeType ?? DefaultMimeType);
 _connectionPool = new ConnectionPool(connectionFactory);
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a60e7d3f/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs 
b/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs
index 643fbe8..1fc8f7a 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs
@@ -23,13 +23,14 @@
 
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace Gremlin.Net.Driver.Messages
 {
 internal class ResponseResult
 {
 [JsonProperty(PropertyName = "data")]
-public List Data { get; set; }
+public JToken Data { get; set; }
 
 [JsonProperty(PropertyName = "meta")]
 public Dictionary Meta { get; set; }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a60e7d3f/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversalSideEffects.cs
--
diff --git 
a/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversalSideEffects.cs
 
b/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversalSideEffects.cs
index 8f2b3e6..20dd9ee 100644
--- 
a/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversalSideEffects.cs
+++ 
b/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversalSideEffects.cs
@@ -91,7 +91,7 @@ namespace Gremlin.Net.Driver.Remote
 
 private object RetrieveSideEffectsForKey(string key)
 {
-return 
_gremlinClient.SubmitWithSingleResultAsync(SideEffectGatherMessage(key)).Result;
+return 
_gremlinClient.SubmitAsync(SideEffectGatherMessage(key)).Result;
 }
 
 private 

[3/3] tinkerpop git commit: Merge branch 'TINKERPOP-1730'

[jorgebg]

Merge branch 'TINKERPOP-1730'


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

Branch: refs/heads/master
Commit: fc48b046c0b1007430a1cc546abb8fecfa94cfe0
Parents: cb7cdd2 80f3dd3
Author: Jorge Bay Gondra 
Authored: Wed Sep 20 19:26:23 2017 +0200
Committer: Jorge Bay Gondra 
Committed: Wed Sep 20 19:26:23 2017 +0200

--
 .../src/Gremlin.Net/Driver/GremlinClient.cs |   6 +-
 .../Driver/Messages/ResponseMessage.cs  |   2 +-
 .../Driver/Messages/ResponseResult.cs   |   5 +-
 .../Remote/DriverRemoteTraversalSideEffects.cs  |   2 +-
 .../Structure/IO/GraphSON/GraphSON3Reader.cs|   3 +-
 .../Structure/IO/GraphSON/Path3Deserializer.cs  |  44 +
 .../Structure/IO/GraphSON/PathDeserializer.cs   |   5 +-
 .../src/Gremlin.Net/Structure/Path.cs   |  24 ++-
 .../GraphTraversalTests.cs  |   4 +-
 .../DriverRemoteConnection/SideEffectTests.cs   |  24 ++-
 .../IO/GraphSON/GraphSONReaderTests.cs  |  22 ++-
 .../Gremlin.Net.UnitTest/Structure/PathTests.cs | 190 +--
 12 files changed, 206 insertions(+), 125 deletions(-)
--

[2/3] tinkerpop git commit: Fixes

[jorgebg]

Fixes


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

Branch: refs/heads/master
Commit: 80f3dd3f8374e46a07a7fa49da420647f9c6cf08
Parents: a60e7d3
Author: Jorge Bay Gondra 
Authored: Tue Sep 12 12:16:26 2017 +0200
Committer: Jorge Bay Gondra 
Committed: Wed Sep 20 12:19:30 2017 +0200

--
 gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseMessage.cs | 2 +-
 gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs  | 2 +-
 .../src/Gremlin.Net/Structure/IO/GraphSON/Path3Deserializer.cs| 3 +--
 .../Process/Traversal/DriverRemoteConnection/SideEffectTests.cs   | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80f3dd3f/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseMessage.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseMessage.cs 
b/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseMessage.cs
index 602b013..f1cb3ad 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseMessage.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseMessage.cs
@@ -35,6 +35,6 @@ namespace Gremlin.Net.Driver.Messages
 public ResponseStatus Status { get; set; }
 
 [JsonProperty(PropertyName = "result")]
-public ResponseResult Result { get; set; }
+public ResponseResult Result { get; set; }
 }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80f3dd3f/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs 
b/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs
index 1fc8f7a..848473b 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs
@@ -27,7 +27,7 @@ using Newtonsoft.Json.Linq;
 
 namespace Gremlin.Net.Driver.Messages
 {
-internal class ResponseResult
+internal class ResponseResult
 {
 [JsonProperty(PropertyName = "data")]
 public JToken Data { get; set; }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80f3dd3f/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/Path3Deserializer.cs
--
diff --git 
a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/Path3Deserializer.cs 
b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/Path3Deserializer.cs
index 8a0ed5e..4754135 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/Path3Deserializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/Path3Deserializer.cs
@@ -37,8 +37,7 @@ namespace Gremlin.Net.Structure.IO.GraphSON
 .Select(x => new 
HashSet(((ISet)x).Cast()))
 .ToList();
 // "objects" is an object[]
-object[] objectsProperty = 
reader.ToObject(graphsonObject["objects"]);
-var objects = objectsProperty.ToArray();
+object[] objects = reader.ToObject(graphsonObject["objects"]);
 return new Path(labels, objects);
 }
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80f3dd3f/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/SideEffectTests.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/SideEffectTests.cs
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/SideEffectTests.cs
index ca1c8d5..1ffb924 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/SideEffectTests.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/SideEffectTests.cs
@@ -140,7 +140,7 @@ namespace 
Gremlin.Net.IntegrationTest.Process.Traversal.DriverRemoteConnection
 Assert.Contains("m", keys);
 Assert.Contains("n", keys);
 var n = (IList) t.SideEffects.Get("n");
-Assert.Equal(n.Select(tr => ((Traverser)tr).Object), new[] {"lop", 
"ripple"});
+Assert.Equal(new[] {"lop", "ripple"}, n.Select(tr => 
((Traverser)tr).Object));
 }
 
 [Fact]

[17/50] [abbrv] tinkerpop git commit: The tp31 branch is no longer maintained CTR

[jorgebg]

The tp31 branch is no longer maintained CTR


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

Branch: refs/heads/TINKERPOP-1730
Commit: f96017ba9116b79dee283ef0d6dd960665364000
Parents: 63191ae
Author: Stephen Mallette 
Authored: Wed Sep 13 09:06:21 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Sep 13 09:06:21 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f96017ba/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 3593056..b812a01 100644
--- a/docs/src/dev/developer/for-committers.asciidoc
+++ b/docs/src/dev/developer/for-committers.asciidoc
@@ -67,12 +67,12 @@ Branches
 TinkerPop has several release branches:
 
 * `tp30` - 3.0.x (no longer maintained)
-* `tp31` - 3.1.x (bug fixes and documentation updates only)
+* `tp31` - 3.1.x (no longer maintained)
 * `tp32` - 3.2.x (bug fixes and documentation updates only)
 * `master` - 3.3.x
 
-Changes to `tp31` should merge to `tp32`, and changes to `tp32` should merge 
to `master`. Please read more about this
-process in the <> section.
+Changes to `tp32` should merge to `master`. Please read more about this 
process in the <>
+section.
 
 Other branches may be created for collaborating on features or for RFC's that 
other developers may want to inspect.
 It is suggested that the JIRA issue ID be used as the prefix, since that 
triggers certain automation, and it provides a

[09/50] [abbrv] tinkerpop git commit: TINKERPOP-1756 Added an EmbeddedRemoteConnection.

[jorgebg]

TINKERPOP-1756 Added an EmbeddedRemoteConnection.

This enables a "remote" to be mocked to actually run locally in the same JVM.


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

Branch: refs/heads/TINKERPOP-1730
Commit: c59393ff46b17d55cf438635a30830c24d6773e6
Parents: 60a34d1
Author: Stephen Mallette 
Authored: Fri Sep 1 15:42:20 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Sep 11 13:29:17 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../upgrade/release-3.2.x-incubating.asciidoc   | 17 -
 .../remote/EmbeddedRemoteConnection.java| 75 
 .../traversal/EmbeddedRemoteTraversal.java  | 56 +++
 .../EmbeddedRemoteTraversalSideEffects.java | 47 
 .../process/traversal/CoreTraversalTest.java| 18 -
 6 files changed, 209 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c59393ff/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index ff0948a..c15835c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -27,6 +27,7 @@ TinkerPop 3.2.7 (Release Date: NOT OFFICIALLY RELEASED YET)
 ~~~
 
 * Bump to Jackson 2.8.10.
+* Added an `EmbeddedRemoteConnection` so that it's possible to mimic a remote 
connection within the same JVM.
 * The Console's `plugin.txt` file is only updated if there were manually 
uninstalled plugins.
 * Fixed a bug in `MatchStep` where mid-traversal `where()` variables were not 
being considered in start-scope.
 * Generalized `MatchStep` to locally compute all clauses with barriers (not 
just reducing barriers).

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c59393ff/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc 
b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index 25d776a..407cc89 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -25,11 +25,25 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 TinkerPop 3.2.7
 ---
 
-*NOT OFFICIALLY RELEASED YET*
+*Release Date: NOT OFFICIALLY RELEASED YET*
 
 Upgrading for Users
 ~~~
 
+Please see the 
link:https://github.com/apache/tinkerpop/blob/3.2.7/CHANGELOG.asciidoc#release-3-2-7[changelog]
 for a complete list of all the modifications that are part of this release.
+
+Embedded Remote Connection
+~~
+
+As Gremlin Language Variants (GLVs) expand their usage and use of 
`withRemote()` becomes more common, the need to mock
+the "remote" in unit tests increases. To simplify mocking in Java, the new 
`EmbeddedRemoteConnection` provides a
+simple way to provide a "remote" that is actually local to the same JVM.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1756[TINKERPOP-1756]
+
+Changes to match()
+~~
+
 The `match()`-step has been generalized to suppor the local scoping of all 
barrier steps, not just reducing barrier steps.
 Previously, the `order().limit()` clause would have worked globally yielding:
 
@@ -60,7 +74,6 @@ This includes steps like `count()`, `min()`, `max()`, 
`sum()`, `group()`, `group
 generalized this behavior to all barriers and thus, adds `aggregate()`, 
`dedup()`, `range()`, `limit()`, `tail()`, and `order()`
 to the list of locally computed clauses.
 
-
 TinkerPop 3.2.6
 ---
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c59393ff/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/EmbeddedRemoteConnection.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/EmbeddedRemoteConnection.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/EmbeddedRemoteConnection.java
new file mode 100644
index 000..da1a03a
--- /dev/null
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/EmbeddedRemoteConnection.java
@@ -0,0 +1,75 @@
+/*
+ * 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 

[33/50] [abbrv] tinkerpop git commit: Minor doc change: improved the neo4j upgrade properties header - CTR

[jorgebg]

Minor doc change: improved the neo4j upgrade properties header - CTR


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

Branch: refs/heads/TINKERPOP-1730
Commit: 681cd225cd63c8cfba4edf84f044f74dd0928103
Parents: 90a89ea
Author: Robert Dale 
Authored: Fri Sep 15 18:28:19 2017 -0400
Committer: Robert Dale 
Committed: Fri Sep 15 18:28:19 2017 -0400

--
 docs/src/upgrade/release-3.3.x.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/681cd225/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc 
b/docs/src/upgrade/release-3.3.x.asciidoc
index 1b2aa17..f8d35f9 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -48,7 +48,7 @@ In particular, these properties referenced in TinkerPop 
documentation and config
 
 [width="50%",cols="2",options="header"]
 |=
-|old (2.3) |new (3.3)
+|Neo4j 2.3 (TinkerPop <= 3.3.0) |Neo4j 3.2 (TinkerPop 3.3.1)
 |node_auto_indexing |dbms.auto_index.nodes.enabled
 |relationship_auto_indexing |dbms.auto_index.relationships.enabled
 |ha.cluster_server |ha.host.coordination

[22/50] [abbrv] tinkerpop git commit: Add sum coefficients appendix item to recipes CTR

[jorgebg]

Add sum coefficients appendix item to recipes CTR


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

Branch: refs/heads/TINKERPOP-1730
Commit: e9b364af5d1c9c6c3bcfcacee59b1af06d47865d
Parents: 214fb07
Author: Stephen Mallette 
Authored: Wed Sep 13 11:12:15 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Sep 13 11:12:15 2017 -0400

--
 docs/src/recipes/appendix.asciidoc | 34 +
 1 file changed, 34 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e9b364af/docs/src/recipes/appendix.asciidoc
--
diff --git a/docs/src/recipes/appendix.asciidoc 
b/docs/src/recipes/appendix.asciidoc
index eccb6df..22ce1a7 100644
--- a/docs/src/recipes/appendix.asciidoc
+++ b/docs/src/recipes/appendix.asciidoc
@@ -260,3 +260,37 @@ g.V().as("a").
   by(select(keys).unfold()).
   by(select(values).unfold().unfold().fold()))
 
+
+[[appendix-j]]
+_Sum edge weight with a coefficient._
+
+[gremlin-groovy]
+
+g.addV('person').property('name','alice').as('alice').
+  addV('person').property('name','bobby').as('bobby').
+  addV('person').property('name','cindy').as('cindy').
+  addV('person').property('name','david').as('david').
+  addV('person').property('name','eliza').as('eliza').
+  
addE('rates').from('alice').to('bobby').property('tag','ruby').property('value',9).
+  
addE('rates').from('bobby').to('cindy').property('tag','ruby').property('value',8).
+  
addE('rates').from('cindy').to('david').property('tag','ruby').property('value',7).
+  
addE('rates').from('david').to('eliza').property('tag','ruby').property('value',6).
+  
addE('rates').from('alice').to('eliza').property('tag','java').property('value',9).iterate()
+ g.withSack(1.0).V().has("name","alice").
+   repeat(outE("rates").has("tag","ruby").
+  project("a","b","c").
+by(inV()).
+by(sack()).
+by("value").as("x").
+  select("a").
+  sack(mult).by(constant(0.5))).
+  times(3).emit().
+select(all, "x").
+project("name","score").
+  by(tail(local, 1).select("a").values("name")).
+  by(unfold().
+ sack(assign).by(select("b")).
+ sack(mult).by(select("c")).
+ sack().sum())
+
+

[42/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-1779' into tp32

[jorgebg]

Merge branch 'TINKERPOP-1779' into tp32

Conflicts:
CHANGELOG.asciidoc


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

Branch: refs/heads/TINKERPOP-1730
Commit: cb99ddb3cec02820e6500dd4ab7f38250826673a
Parents: 05f4f59 e9801e6
Author: Stephen Mallette 
Authored: Tue Sep 19 06:49:34 2017 -0400
Committer: Stephen Mallette 
Committed: Tue Sep 19 06:49:34 2017 -0400

--
 CHANGELOG.asciidoc  |   1 +
 giraph-gremlin/pom.xml  |  14 +
 gremlin-console/pom.xml |  14 +
 gremlin-dotnet/glv/generate.groovy  | 220 +++
 gremlin-dotnet/pom.xml  | 216 +-
 .../appsettings.json|   4 +-
 gremlin-dotnet/test/pom.xml |  79 ++
 gremlin-groovy-test/pom.xml |  14 +
 gremlin-groovy/pom.xml  |  14 +
 .../glv/GraphTraversalSource.template   | 102 +++
 gremlin-python/glv/TraversalSource.template | 282 +++
 gremlin-python/glv/generate.groovy  |  94 +++
 gremlin-python/pom.xml  | 166 +++
 .../resources/GraphTraversalSource.template | 102 ---
 .../src/main/resources/TraversalSource.template | 282 ---
 .../gremlin/python/driver/credentials.kryo  | Bin 138 -> 0 bytes
 .../python/driver/generate-modern.groovy|  33 ---
 .../driver/gremlin-server-modern-secure-py.yaml |  63 -
 .../driver/tinkergraph-credentials.properties   |  22 --
 .../python/driver/tinkergraph-empty.properties  |  18 --
 .../tinkerpop/gremlin/server/Settings.java  |   3 +-
 .../gremlin/server/util/MetricManager.java  |   5 +-
 .../src/test/scripts/test-server-start.groovy   |  49 
 .../src/test/scripts/test-server-stop.groovy|  32 +++
 hadoop-gremlin/pom.xml  |  14 +
 pom.xml |  16 +-
 spark-gremlin/pom.xml   |  14 +
 27 files changed, 946 insertions(+), 927 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cb99ddb3/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 2b526df,4e64fd6..453552a
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,10 -26,9 +26,11 @@@ image::https://raw.githubusercontent.co
  TinkerPop 3.2.7 (Release Date: NOT OFFICIALLY RELEASED YET)
  ~~~
  
+ * Bump to GMavenPlus 1.6.
 +* Added better error message for illegal use of `repeat()`-step.
  * Bump to Jackson 2.8.10.
  * Added an `EmbeddedRemoteConnection` so that it's possible to mimic a remote 
connection within the same JVM.
 +* Supported interruption for remote traversals.
  * The Console's `plugin.txt` file is only updated if there were manually 
uninstalled plugins.
  * Fixed a bug in `MatchStep` where mid-traversal `where()` variables were not 
being considered in start-scope.
  * Generalized `MatchStep` to locally compute all clauses with barriers (not 
just reducing barriers).

[12/50] [abbrv] tinkerpop git commit: Finalize some parameters CTR

[jorgebg]

Finalize some parameters CTR


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

Branch: refs/heads/TINKERPOP-1730
Commit: 175eae4bfc9bd3d82b01e38f08837290983bc76a
Parents: cd9cf9d
Author: Stephen Mallette 
Authored: Mon Sep 11 15:07:04 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Sep 11 15:07:04 2017 -0400

--
 .../gremlin/process/traversal/step/branch/OptionalTest.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/175eae4b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/OptionalTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/OptionalTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/OptionalTest.java
index bc2ce53..3f8c85a 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/OptionalTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/OptionalTest.java
@@ -139,12 +139,12 @@ public abstract class OptionalTest extends 
AbstractGremlinProcessTest {
 public static class Traversals extends OptionalTest {
 
 @Override
-public Traversal 
get_g_VX2X_optionalXoutXknowsXX(Object v2Id) {
+public Traversal get_g_VX2X_optionalXoutXknowsXX(final 
Object v2Id) {
 return g.V(v2Id).optional(out("knows"));
 }
 
 @Override
-public Traversal get_g_VX2X_optionalXinXknowsXX(Object 
v2Id) {
+public Traversal get_g_VX2X_optionalXinXknowsXX(final 
Object v2Id) {
 return g.V(v2Id).optional(in("knows"));
 }
 
@@ -159,7 +159,7 @@ public abstract class OptionalTest extends 
AbstractGremlinProcessTest {
 }
 
 @Override
-public Traversal 
get_g_VX1X_optionalXaddVXdogXX_label(Object v1Id) {
+public Traversal 
get_g_VX1X_optionalXaddVXdogXX_label(final Object v1Id) {
 return g.V(v1Id).optional(addV("dog")).label();
 }
 }

[43/50] [abbrv] tinkerpop git commit: Merge branch 'tp32'

[jorgebg]

Merge branch 'tp32'

Conflicts:
gremlin-dotnet/pom.xml
gremlin-dotnet/test/pom.xml
gremlin-groovy-test/pom.xml
gremlin-python/pom.xml

gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml


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

Branch: refs/heads/TINKERPOP-1730
Commit: 0f6a32ca2274f9a60e110f19c8500dbca6114ae4
Parents: aad6d39 cb99ddb
Author: Stephen Mallette 
Authored: Tue Sep 19 08:26:31 2017 -0400
Committer: Stephen Mallette 
Committed: Tue Sep 19 08:26:31 2017 -0400

--
 CHANGELOG.asciidoc  |   1 +
 giraph-gremlin/pom.xml  |  14 +
 gremlin-console/pom.xml |  14 +
 gremlin-dotnet/glv/generate.groovy  | 228 +++
 gremlin-dotnet/pom.xml  | 224 +--
 .../appsettings.json|   4 +-
 gremlin-dotnet/test/pom.xml |  96 ++-
 gremlin-groovy-test/pom.xml |   0
 gremlin-groovy/pom.xml  |  14 +
 .../glv/GraphTraversalSource.template   | 107 +++
 gremlin-python/glv/TraversalSource.template | 282 +++
 gremlin-python/glv/generate.groovy  |  90 ++
 gremlin-python/pom.xml  | 172 +++
 .../resources/GraphTraversalSource.template | 107 ---
 .../src/main/resources/TraversalSource.template | 282 ---
 .../gremlin/python/driver/credentials.kryo  | Bin 138 -> 0 bytes
 .../python/driver/generate-modern.groovy|  33 ---
 .../driver/gremlin-server-modern-secure-py.yaml |  60 
 .../driver/tinkergraph-credentials.properties   |  22 --
 .../python/driver/tinkergraph-empty.properties  |  18 --
 .../gremlin/server/util/MetricManager.java  |   5 +-
 .../src/test/scripts/test-server-start.groovy   |  60 
 .../src/test/scripts/test-server-stop.groovy|  32 +++
 hadoop-gremlin/pom.xml  |  14 +
 pom.xml |  16 +-
 spark-gremlin/pom.xml   |  14 +
 26 files changed, 958 insertions(+), 951 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0f6a32ca/giraph-gremlin/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0f6a32ca/gremlin-console/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0f6a32ca/gremlin-dotnet/glv/generate.groovy
--
diff --cc gremlin-dotnet/glv/generate.groovy
index 000,8f66c26..95ee969
mode 00,100644..100644
--- a/gremlin-dotnet/glv/generate.groovy
+++ b/gremlin-dotnet/glv/generate.groovy
@@@ -1,0 -1,220 +1,228 @@@
+ /*
+  * 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.
+  */
+ 
+ import org.apache.tinkerpop.gremlin.jsr223.CoreImports
+ import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource
+ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal
+ import 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource
+ import org.apache.tinkerpop.gremlin.process.traversal.P
+ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
+ import org.apache.tinkerpop.gremlin.structure.Direction
+ import java.lang.reflect.Modifier
+ 
+ def toCSharpTypeMap = ["Long": "long",
+"Integer": "int",
+"String": 

[45/50] [abbrv] tinkerpop git commit: Make the start script for test server a bit more flexible

[jorgebg]

Make the start script for test server a bit more flexible

By passing the settings file itself as an argument python can use the 
"python-specific" configuration file. CTR


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

Branch: refs/heads/TINKERPOP-1730
Commit: 97aef32982d52c9b1f8ebc538f2770b92d290b1c
Parents: 217a44f
Author: Stephen Mallette 
Authored: Tue Sep 19 11:22:59 2017 -0400
Committer: Stephen Mallette 
Committed: Tue Sep 19 11:22:59 2017 -0400

--
 gremlin-dotnet/test/pom.xml|  4 
 gremlin-python/pom.xml |  4 
 gremlin-server/src/test/scripts/README.asciidoc| 17 +
 .../src/test/scripts/test-server-start.groovy  |  4 ++--
 4 files changed, 27 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/97aef329/gremlin-dotnet/test/pom.xml
--
diff --git a/gremlin-dotnet/test/pom.xml b/gremlin-dotnet/test/pom.xml
index 7b82a2e..db585f4 100644
--- a/gremlin-dotnet/test/pom.xml
+++ b/gremlin-dotnet/test/pom.xml
@@ -138,6 +138,10 @@ limitations under the License.
 
${gremlin.server.dir}
 
 
+settingsFile
+
${gremlin.server.dir}/conf/gremlin-server-modern.yaml
+
+
 executionName
 ${project.name}
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/97aef329/gremlin-python/pom.xml
--
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index b60b867..379a114 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -514,6 +514,10 @@ limitations under the License.
 
${gremlin.server.dir}
 
 
+settingsFile
+
${gremlin.server.dir}/conf/gremlin-server-modern-py.yaml
+
+
 executionName
 ${project.name}
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/97aef329/gremlin-server/src/test/scripts/README.asciidoc
--
diff --git a/gremlin-server/src/test/scripts/README.asciidoc 
b/gremlin-server/src/test/scripts/README.asciidoc
new file mode 100644
index 000..f6ea434
--- /dev/null
+++ b/gremlin-server/src/test/scripts/README.asciidoc
@@ -0,0 +1,17 @@
+
+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.
+
+This directory holds scripts used by other projects (e.g. GLVs) to start and 
stop instances of Gremlin Server.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/97aef329/gremlin-server/src/test/scripts/test-server-start.groovy
--
diff --git a/gremlin-server/src/test/scripts/test-server-start.groovy 
b/gremlin-server/src/test/scripts/test-server-start.groovy
index 83efcd5..8ea08a9 100644
--- a/gremlin-server/src/test/scripts/test-server-start.groovy
+++ b/gremlin-server/src/test/scripts/test-server-start.groovy
@@ -24,7 +24,7 @@ import 
org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator
 if (Boolean.parseBoolean(skipTests)) return
 

[24/50] [abbrv] tinkerpop git commit: Merge branch 'tp32'

[jorgebg]

Merge branch 'tp32'


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

Branch: refs/heads/TINKERPOP-1730
Commit: e8230c68ff88221cbddca0b8f542c6fc1dfc2e57
Parents: cc964e0 736cb26
Author: Stephen Mallette 
Authored: Wed Sep 13 11:16:46 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Sep 13 11:16:46 2017 -0400

--
 docs/src/recipes/appendix.asciidoc | 59 +
 1 file changed, 59 insertions(+)
--

[19/50] [abbrv] tinkerpop git commit: Moved traversal arguments out of the traversal "maker" method. CTR

[jorgebg]

Moved traversal arguments out of the traversal "maker" method. CTR


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

Branch: refs/heads/TINKERPOP-1730
Commit: 214fb073b004d57c52f1f93ca6f3fe852732dc98
Parents: f96017b
Author: Stephen Mallette 
Authored: Wed Sep 13 10:01:16 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Sep 13 10:01:16 2017 -0400

--
 .../process/traversal/step/map/GroovyAddEdgeTest.groovy  |  4 +---
 .../gremlin/process/traversal/step/map/AddEdgeTest.java  | 11 ++-
 2 files changed, 7 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/214fb073/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy
--
diff --git 
a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy
 
b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy
index 35823a1..3ccbe5d 100644
--- 
a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy
+++ 
b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy
@@ -88,9 +88,7 @@ public abstract class GroovyAddEdgeTest {
 }
 
 @Override
-public Traversal 
get_g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X() {
-final Vertex a = g.V().has("name", "marko").next();
-final Vertex b = g.V().has("name", "peter").next();
+public Traversal 
get_g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X(final 
Vertex a, final Vertex b) {
 return new ScriptTraversal<>(g, "gremlin-groovy", 
"g.withSideEffect('b', b).V(a).addE('knows').to('b').property('weight', 0.5d)", 
"a", a, "b", b)
 }
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/214fb073/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
index 0e5fca2..2f4658f 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
@@ -63,7 +63,7 @@ public abstract class AddEdgeTest extends 
AbstractGremlinProcessTest {
 
 public abstract Traversal 
get_g_addV_asXfirstX_repeatXaddEXnextX_toXaddVX_inVX_timesX5X_addEXnextX_toXselectXfirstXX();
 
-public abstract Traversal 
get_g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X();
+public abstract Traversal 
get_g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X(final 
Vertex a, final Vertex v2);
 
 ///
 
@@ -266,7 +266,10 @@ public abstract class AddEdgeTest extends 
AbstractGremlinProcessTest {
 @LoadGraphWith(MODERN)
 @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, 
feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
 public void 
g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X() {
-final Traversal traversal = 
get_g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X();
+final Vertex a = g.V().has("name", "marko").next();
+final Vertex b = g.V().has("name", "peter").next();
+
+final Traversal traversal = 
get_g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X(a, b);
 final Edge edge = traversal.next();
 assertFalse(traversal.hasNext());
 assertEquals(edge.outVertex(), convertToVertex(graph, "marko"));
@@ -373,9 +376,7 @@ public abstract class AddEdgeTest extends 
AbstractGremlinProcessTest {
 }
 
 @Override
-public Traversal 
get_g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X() {
-final Vertex a = g.V().has("name", "marko").next();
-final Vertex b = g.V().has("name", "peter").next();
+public Traversal 
get_g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X(final 
Vertex a, 

[49/50] [abbrv] tinkerpop git commit: Gremlin .NET Support GraphSON3

[jorgebg]

Gremlin .NET Support GraphSON3


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

Branch: refs/heads/TINKERPOP-1730
Commit: a60e7d3fe64bab26e48640a05f2b914f7443e4bf
Parents: b8d1c04
Author: Jorge Bay Gondra 
Authored: Fri Sep 8 17:32:29 2017 +0200
Committer: Jorge Bay Gondra 
Committed: Wed Sep 20 12:19:23 2017 +0200

--
 .../src/Gremlin.Net/Driver/GremlinClient.cs |   6 +-
 .../Driver/Messages/ResponseResult.cs   |   3 +-
 .../Remote/DriverRemoteTraversalSideEffects.cs  |   2 +-
 .../Structure/IO/GraphSON/GraphSON3Reader.cs|   3 +-
 .../Structure/IO/GraphSON/Path3Deserializer.cs  |  45 +
 .../Structure/IO/GraphSON/PathDeserializer.cs   |   5 +-
 .../src/Gremlin.Net/Structure/Path.cs   |  24 ++-
 .../GraphTraversalTests.cs  |   4 +-
 .../DriverRemoteConnection/SideEffectTests.cs   |  24 ++-
 .../IO/GraphSON/GraphSONReaderTests.cs  |  22 ++-
 .../Gremlin.Net.UnitTest/Structure/PathTests.cs | 190 +--
 11 files changed, 205 insertions(+), 123 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a60e7d3f/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs 
b/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs
index 064770f..a251ab7 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs
@@ -37,7 +37,7 @@ namespace Gremlin.Net.Driver
 /// 
 /// Defines the default mime type to use.
 /// 
-public const string DefaultMimeType = 
"application/vnd.gremlin-v2.0+json";
+public const string DefaultMimeType = 
"application/vnd.gremlin-v3.0+json";
 
 private readonly ConnectionPool _connectionPool;
 
@@ -51,8 +51,8 @@ namespace Gremlin.Net.Driver
 public GremlinClient(GremlinServer gremlinServer, GraphSONReader 
graphSONReader = null,
  GraphSONWriter graphSONWriter = null, string 
mimeType = null)
 {
-var reader = graphSONReader ?? new GraphSON2Reader();
-var writer = graphSONWriter ?? new GraphSON2Writer();
+var reader = graphSONReader ?? new GraphSON3Reader();
+var writer = graphSONWriter ?? new GraphSON3Writer();
 var connectionFactory = new ConnectionFactory(gremlinServer, 
reader, writer, mimeType ?? DefaultMimeType);
 _connectionPool = new ConnectionPool(connectionFactory);
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a60e7d3f/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs 
b/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs
index 643fbe8..1fc8f7a 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs
@@ -23,13 +23,14 @@
 
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace Gremlin.Net.Driver.Messages
 {
 internal class ResponseResult
 {
 [JsonProperty(PropertyName = "data")]
-public List Data { get; set; }
+public JToken Data { get; set; }
 
 [JsonProperty(PropertyName = "meta")]
 public Dictionary Meta { get; set; }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a60e7d3f/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversalSideEffects.cs
--
diff --git 
a/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversalSideEffects.cs
 
b/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversalSideEffects.cs
index 8f2b3e6..20dd9ee 100644
--- 
a/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversalSideEffects.cs
+++ 
b/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversalSideEffects.cs
@@ -91,7 +91,7 @@ namespace Gremlin.Net.Driver.Remote
 
 private object RetrieveSideEffectsForKey(string key)
 {
-return 
_gremlinClient.SubmitWithSingleResultAsync(SideEffectGatherMessage(key)).Result;
+return 
_gremlinClient.SubmitAsync(SideEffectGatherMessage(key)).Result;
 }
 
 private RequestMessage SideEffectGatherMessage(string key)

[32/50] [abbrv] tinkerpop git commit: Moved neo4j upgrade under user section - CTR

[jorgebg]

Moved neo4j upgrade under user section - CTR


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

Branch: refs/heads/TINKERPOP-1730
Commit: 90a89ea773cf5813d51549debe18fa1d12bcc0d5
Parents: 518ab1c
Author: Robert Dale 
Authored: Fri Sep 15 12:38:01 2017 -0400
Committer: Robert Dale 
Committed: Fri Sep 15 12:38:01 2017 -0400

--
 docs/src/upgrade/release-3.3.x.asciidoc | 32 +++-
 1 file changed, 17 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/90a89ea7/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc 
b/docs/src/upgrade/release-3.3.x.asciidoc
index 5bcbbf8..1b2aa17 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -39,6 +39,23 @@ While 3.3.0 released Gryo 3.0 and GraphSON 3.0 and these 
versions were defaulted
 some key defaults were missed. Specifically, calls to `Graph.io(graphson())` 
and `Graph.io(gryo())` were still using
 the old versions. The defaults have now been changed to ensure 3.0 is properly 
referenced in those cases.
 
+Upgrade Neo4j
+^
+
+See Neo4j's link:https://neo4j.com/guides/upgrade/[3.2 Upgrade FAQ] for a 
complete guide on how to upgrade from the previous 2.3.3 version. Also note 
that many of the configuration settings have 
link:https://neo4j.com/developer/kb/manually-migrating-configuration-settings-from-neo4j-2x-to-neo4j-3x/[changed
 from neo4j 2x to 3x]
+
+In particular, these properties referenced in TinkerPop documentation and 
configuration were renamed:
+
+[width="50%",cols="2",options="header"]
+|=
+|old (2.3) |new (3.3)
+|node_auto_indexing |dbms.auto_index.nodes.enabled
+|relationship_auto_indexing |dbms.auto_index.relationships.enabled
+|ha.cluster_server |ha.host.coordination
+|ha.server |ha.host.data
+|=
+
+
 Upgrading for Providers
 ~~~
 
@@ -69,21 +86,6 @@ information, the provider could then assign the right 
`IoRegistry` to match that
 
 See: link:https://issues.apache.org/jira/browse/TINKERPOP-1767[TINKERPOP-1767]
 
-Upgrade Neo4j
-^
-
-See Neo4j's link:https://neo4j.com/guides/upgrade/[3.2 Upgrade FAQ] for a 
complete guide on how to upgrade from the previous 2.3.3 version. Also note 
that many of the configuration settings have 
link:https://neo4j.com/developer/kb/manually-migrating-configuration-settings-from-neo4j-2x-to-neo4j-3x/[changed
 from neo4j 2x to 3x]
-
-In particular, these properties referenced in TinkerPop documentation and 
configuration were renamed:
-
-|=
-|old (2.3) |new (3.3)
-|node_auto_indexing |dbms.auto_index.nodes.enabled
-|relationship_auto_indexing |dbms.auto_index.relationships.enabled
-|ha.cluster_server |ha.host.coordination
-|ha.server |ha.host.data
-|=
-
 
 TinkerPop 3.3.0
 ---

[38/50] [abbrv] tinkerpop git commit: Merge branch 'tp32'

[jorgebg]

Merge branch 'tp32'


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

Branch: refs/heads/TINKERPOP-1730
Commit: 4105bcc3a78d6c93147aaa9b8dcd13b248d275d1
Parents: 36830f4 b2850f3
Author: Stephen Mallette 
Authored: Mon Sep 18 15:37:57 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Sep 18 15:37:57 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4105bcc3/docker/scripts/build.sh
--
diff --cc docker/scripts/build.sh
index 30544ac,5e6e6cd..36d9edf
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@@ -57,19 -57,15 +57,19 @@@ TINKERPOP_BUILD_OPTIONS="
  [ -z "${BUILD_JAVA_DOCS}" ] && 
TINKERPOP_BUILD_OPTIONS="${TINKERPOP_BUILD_OPTIONS} -Dmaven.javadoc.skip=true"
  
  # If the tmpfs (in-memory filesystem exists, use it)
 -if [ -d "/usr/src/tinkermem" ]; then
 -  echo Copying source to in-memory tmpfs
 -  rsync -a . /usr/src/tinkermem
 -  cd /usr/src/tinkermem
 +TINKERMEM_PATH=$(cd .. ; echo `pwd`/tinkermem)
 +if [ -d "${TINKERMEM_PATH}" ]; then
 +  echo "Moving source to in-memory tmpfs"
 +  rsync --remove-source-files -a . ${TINKERMEM_PATH}
 +  cd ..
 +  rm -rf ${OLDPWD}
 +  ln -s ${TINKERMEM_PATH} ${OLDPWD}
 +  cd ${TINKERMEM_PATH}
  fi
  
- touch gremlin-python/.glv
- touch gremlin-dotnet/src/.glv
- touch gremlin-dotnet/test/.glv
+ # touch gremlin-python/.glv
+ # touch gremlin-dotnet/src/.glv
+ # touch gremlin-dotnet/test/.glv
  
  # use a custom maven settings.xml
  if [ -r "settings.xml" ]; then

[37/50] [abbrv] tinkerpop git commit: There are some problems with Docker.

[jorgebg]

There are some problems with Docker.

Turning off all the non-JVM stuff for now until it is resolved CTR


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

Branch: refs/heads/TINKERPOP-1730
Commit: b2850f3f1049800e6284a2a67df4e9c382dee4b8
Parents: 3bf128a
Author: Stephen Mallette 
Authored: Mon Sep 18 15:35:23 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Sep 18 15:37:35 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b2850f3f/docker/scripts/build.sh
--
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index bc22de9..5e6e6cd 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -63,9 +63,9 @@ if [ -d "/usr/src/tinkermem" ]; then
   cd /usr/src/tinkermem
 fi
 
-touch gremlin-python/.glv
-touch gremlin-dotnet/src/.glv
-touch gremlin-dotnet/test/.glv
+# touch gremlin-python/.glv
+# touch gremlin-dotnet/src/.glv
+# touch gremlin-dotnet/test/.glv
 
 # use a custom maven settings.xml
 if [ -r "settings.xml" ]; then

[02/50] [abbrv] tinkerpop git commit: Added S2Graph to provider index CTR

[jorgebg]

Added S2Graph to provider index CTR


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

Branch: refs/heads/TINKERPOP-1730
Commit: 95f2d56a58e70074ef5231e66a05943fc8692c5e
Parents: db24e28
Author: Stephen Mallette 
Authored: Fri Sep 8 07:06:25 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Sep 8 07:06:25 2017 -0400

--
 docs/site/home/index.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/95f2d56a/docs/site/home/index.html
--
diff --git a/docs/site/home/index.html b/docs/site/home/index.html
index 8f6723d..5e4714c 100644
--- a/docs/site/home/index.html
+++ b/docs/site/home/index.html
@@ -224,14 +224,15 @@ limitations under the License.
 http://tinkerpop.apache.org/docs/current/reference/#sparkgraphcomputer;>Hadoop
 (Spark) - OLAP graph processor using Spark.
 https://github.com/rayokota/hgraphdb;>HGraphDB - 
OLTP graph database running on Apache HBase.
 https://console.ng.bluemix.net/catalog/services/ibm-graph/;>IBM Graph 
- OLTP graph database as a service.
-http://janusgraph.org/;>JanusGraph - Distributed 
OLTP and OLAP graph database with BerkeleyDB, Cassandra and HBase support.
+http://janusgraph.org/;>JanusGraph - Distributed 
OLTP and OLAP graph database with BerkeleyDB, Apache Cassandra and Apache HBase 
support.
 http://tinkerpop.apache.org/docs/current/reference/#neo4j-gremlin;>Neo4j
 - OLTP graph database (embedded and high availability).
 https://github.com/SteelBridgeLabs/neo4j-gremlin-bolt;>neo4j-gremlin-bolt
 - OLTP graph database (using Bolt Protocol).
 https://github.com/orientechnologies/orientdb-gremlin;>OrientDB - 
OLTP graph database
+http://s2graph.apache.org/;>Apache S2Graph - OLTP 
graph database running on Apache HBase.
 https://github.com/pietermartin/sqlg;>Sqlg - 
RDBMS OLTP implementation with HSQLDB and Postresql support.
 http://stardog.com/;>Stardog - RDF graph database 
with OLTP and OLAP support.
 http://tinkerpop.apache.org/docs/current/reference/#tinkergraph-gremlin;>TinkerGraph
 - In-memory OLTP and OLAP reference implementation.
-http://thinkaurelius.github.io/titan/;>Titan - 
Distributed OLTP and OLAP graph database with BerkeleyDB, Cassandra and HBase 
support.
+http://thinkaurelius.github.io/titan/;>Titan - 
Distributed OLTP and OLAP graph database with BerkeleyDB, Apache Cassandra and 
Apache HBase support.
 https://github.com/awslabs/dynamodb-titan-storage-backend;>Titan 
(Amazon) - The Amazon DynamoDB storage backend for Titan.
 https://github.com/classmethod/tupl-titan-storage-backend;>Titan 
(Tupl) - The Tupl storage backend for Titan.
 https://github.com/rmagen/unipop;>Unipop - OLTP 
Elasticsearch and JDBC backed graph.

[15/50] [abbrv] tinkerpop git commit: TINKERPOP-1770 Enable timeouts for remote traversals

[jorgebg]

TINKERPOP-1770 Enable timeouts for remote traversals


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

Branch: refs/heads/TINKERPOP-1730
Commit: 63191aef22e6cce2f052cb1c8fa898d18a07615b
Parents: c59393f
Author: Stephen Mallette 
Authored: Thu Sep 7 09:15:37 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Sep 13 06:54:10 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../upgrade/release-3.2.x-incubating.asciidoc   | 20 -
 .../op/traversal/TraversalOpProcessor.java  | 84 ++--
 .../server/GremlinServerIntegrateTest.java  | 34 
 4 files changed, 93 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/63191aef/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index c15835c..70d6134 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,7 @@ TinkerPop 3.2.7 (Release Date: NOT OFFICIALLY RELEASED YET)
 
 * Bump to Jackson 2.8.10.
 * Added an `EmbeddedRemoteConnection` so that it's possible to mimic a remote 
connection within the same JVM.
+* Supported interruption for remote traversals.
 * The Console's `plugin.txt` file is only updated if there were manually 
uninstalled plugins.
 * Fixed a bug in `MatchStep` where mid-traversal `where()` variables were not 
being considered in start-scope.
 * Generalized `MatchStep` to locally compute all clauses with barriers (not 
just reducing barriers).

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/63191aef/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc 
b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index 407cc89..ae504d4 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -41,10 +41,22 @@ simple way to provide a "remote" that is actually local to 
the same JVM.
 
 See: link:https://issues.apache.org/jira/browse/TINKERPOP-1756[TINKERPOP-1756]
 
-Changes to match()
-~~
 
-The `match()`-step has been generalized to suppor the local scoping of all 
barrier steps, not just reducing barrier steps.
+Remote Traversal Timeout
+
+
+There was limited support for "timeouts" with remote traversals (i.e. those 
traversals executed using the `withRemote()`
+option) prior to 3.2.7. Remote traversals will now interrupt on the server 
using the `scriptEvaluationTimeout`
+setting in the same way that normal script evaluations would. As a reminder, 
interruptions for traversals are always
+considered "attempts to interrupt" and may not always succeed (a graph 
database implementation might not respect the
+interruption, for example).
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1770[TINKERPOP-1770]
+
+Modifications to match()
+
+
+The `match()`-step has been generalized to support the local scoping of all 
barrier steps, not just reducing barrier steps.
 Previously, the `order().limit()` clause would have worked globally yielding:
 
 [source,groovy]
@@ -74,6 +86,8 @@ This includes steps like `count()`, `min()`, `max()`, 
`sum()`, `group()`, `group
 generalized this behavior to all barriers and thus, adds `aggregate()`, 
`dedup()`, `range()`, `limit()`, `tail()`, and `order()`
 to the list of locally computed clauses.
 
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1764[TINKERPOP-1764]
+
 TinkerPop 3.2.6
 ---
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/63191aef/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
--
diff --git 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
index 4e35a85..fc3066a 100644
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
@@ -35,6 +35,7 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
 import 

[26/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-1766' into tp32

[jorgebg]

Merge branch 'TINKERPOP-1766' into tp32


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

Branch: refs/heads/TINKERPOP-1730
Commit: 9402e4e4384d7062f87f143a6ffbfddaa13781df
Parents: 736cb26 ef65875
Author: Florian Hockmann 
Authored: Thu Sep 14 12:35:59 2017 +0200
Committer: Florian Hockmann 
Committed: Thu Sep 14 12:35:59 2017 +0200

--
 .../src/Gremlin.Net/Driver/Connection.cs|  2 +
 .../src/Gremlin.Net/Driver/ConnectionPool.cs| 59 +---
 .../Gremlin.Net/Driver/WebSocketConnection.cs   |  2 +
 .../Gremlin.Net.IntegrationTest.csproj  |  2 +-
 .../Gremlin.Net.UnitTest.csproj |  4 +-
 5 files changed, 47 insertions(+), 22 deletions(-)
--

[07/50] [abbrv] tinkerpop git commit: Fixes TINKERPOP-1771

[jorgebg]

Fixes TINKERPOP-1771


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

Branch: refs/heads/TINKERPOP-1730
Commit: 60a34d1cc4343c5d0fdcf009a315409402b10a8f
Parents: 0d494c0
Author: Robert Dale 
Authored: Sun Sep 10 14:42:50 2017 -0400
Committer: Robert Dale 
Committed: Sun Sep 10 14:42:50 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/60a34d1c/gremlin-console/src/main/bin/gremlin.bat
--
diff --git a/gremlin-console/src/main/bin/gremlin.bat 
b/gremlin-console/src/main/bin/gremlin.bat
index 1d5e9bd..021e37b 100644
--- a/gremlin-console/src/main/bin/gremlin.bat
+++ b/gremlin-console/src/main/bin/gremlin.bat
@@ -39,6 +39,6 @@ set JAVA_OPTIONS=-Xms32m -Xmx512m -Djline.terminal=none
 
 :: Launch the application
 
-java %JAVA_OPTIONS% %JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%; 
org.apache.tinkerpop.gremlin.console.Console %*
+java %JAVA_OPTIONS% %JAVA_ARGS% -cp "%LIBDIR%\*;%EXTDIR%;" 
org.apache.tinkerpop.gremlin.console.Console %*
 
 set CLASSPATH=%OLD_CLASSPATH%
\ No newline at end of file

[44/50] [abbrv] tinkerpop git commit: Added Lambda to the list of imports CTR

[jorgebg]

Added Lambda to the list of imports CTR


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

Branch: refs/heads/TINKERPOP-1730
Commit: 217a44f6212c42296d363ab1bb56e2f1eead53b7
Parents: cb99ddb
Author: Stephen Mallette 
Authored: Tue Sep 19 11:22:32 2017 -0400
Committer: Stephen Mallette 
Committed: Tue Sep 19 11:22:32 2017 -0400

--
 .../java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/217a44f6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
index fef2e0f..e6665e9 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
@@ -123,6 +123,7 @@ import 
org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
 import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
 import org.apache.tinkerpop.gremlin.util.Gremlin;
 import org.apache.tinkerpop.gremlin.util.TimeUtil;
+import org.apache.tinkerpop.gremlin.util.function.Lambda;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 import org.javatuples.Pair;
 
@@ -263,6 +264,7 @@ public final class CoreImports {
 CLASS_IMPORTS.add(Gremlin.class);
 CLASS_IMPORTS.add(IteratorUtils.class);
 CLASS_IMPORTS.add(TimeUtil.class);
+CLASS_IMPORTS.add(Lambda.class);
 
 /
 // METHODS //
@@ -273,6 +275,7 @@ public final class CoreImports {
 uniqueMethods(__.class).filter(m -> 
!m.getName().equals("__")).forEach(METHOD_IMPORTS::add);
 uniqueMethods(Computer.class).forEach(METHOD_IMPORTS::add);
 uniqueMethods(TimeUtil.class).forEach(METHOD_IMPORTS::add);
+uniqueMethods(Lambda.class).forEach(METHOD_IMPORTS::add);
 
 ///
 // ENUMS //

[14/50] [abbrv] tinkerpop git commit: TINKERPOP-1779 Bump to GMavenPlus 1.6

[jorgebg]

TINKERPOP-1779 Bump to GMavenPlus 1.6

Moved embedded groovy scripts that were in the pom to their own files. They are 
more manageable that way as you get some syntax highlighting/intellisense in 
the IDE when they have the right file extension. It also makes the pom a bit 
easier to follow. Removed a bunch of python test resources that were no longer 
in use. Centralized the scripts that start/stop Gremlin Server for GLV tests so 
that we don't have them copy/pasted everywhere.


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

Branch: refs/heads/TINKERPOP-1730
Commit: e9801e6af60dbfbaa83a1f8b5b947451dd27092c
Parents: c59393f
Author: Stephen Mallette 
Authored: Tue Sep 12 11:18:41 2017 -0400
Committer: Stephen Mallette 
Committed: Tue Sep 12 19:05:26 2017 -0400

--
 CHANGELOG.asciidoc  |   1 +
 giraph-gremlin/pom.xml  |  14 +
 gremlin-console/pom.xml |  14 +
 gremlin-dotnet/glv/generate.groovy  | 220 +++
 gremlin-dotnet/pom.xml  | 216 +-
 .../appsettings.json|   4 +-
 gremlin-dotnet/test/pom.xml |  79 ++
 gremlin-groovy-test/pom.xml |  14 +
 gremlin-groovy/pom.xml  |  14 +
 .../glv/GraphTraversalSource.template   | 102 +++
 gremlin-python/glv/TraversalSource.template | 282 +++
 gremlin-python/glv/generate.groovy  |  94 +++
 gremlin-python/pom.xml  | 166 +++
 .../resources/GraphTraversalSource.template | 102 ---
 .../src/main/resources/TraversalSource.template | 282 ---
 .../gremlin/python/driver/credentials.kryo  | Bin 138 -> 0 bytes
 .../python/driver/generate-modern.groovy|  33 ---
 .../driver/gremlin-server-modern-secure-py.yaml |  63 -
 .../driver/tinkergraph-credentials.properties   |  22 --
 .../python/driver/tinkergraph-empty.properties  |  18 --
 .../tinkerpop/gremlin/server/Settings.java  |   3 +-
 .../gremlin/server/util/MetricManager.java  |   5 +-
 .../src/test/scripts/test-server-start.groovy   |  49 
 .../src/test/scripts/test-server-stop.groovy|  32 +++
 hadoop-gremlin/pom.xml  |  14 +
 pom.xml |  16 +-
 spark-gremlin/pom.xml   |  14 +
 27 files changed, 946 insertions(+), 927 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e9801e6a/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index c15835c..4e64fd6 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 TinkerPop 3.2.7 (Release Date: NOT OFFICIALLY RELEASED YET)
 ~~~
 
+* Bump to GMavenPlus 1.6.
 * Bump to Jackson 2.8.10.
 * Added an `EmbeddedRemoteConnection` so that it's possible to mimic a remote 
connection within the same JVM.
 * The Console's `plugin.txt` file is only updated if there were manually 
uninstalled plugins.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e9801e6a/giraph-gremlin/pom.xml
--
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index cacf54c..f55a6a4 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -227,6 +227,20 @@ limitations under the License.
 
 org.codehaus.gmavenplus
 gmavenplus-plugin
+
+
+
+addSources
+addTestSources
+generateStubs
+compile
+generateTestStubs
+compileTests
+removeStubs
+removeTestStubs
+
+
+
 
 
 org.apache.maven.plugins

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e9801e6a/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 0531af3..50d7b0e 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -203,6 +203,20 

[35/50] [abbrv] tinkerpop git commit: TINKERPOP-1731 Fix encoding of template CTR

[jorgebg]

TINKERPOP-1731 Fix encoding of template CTR

The template file included BOM bytes which resulted in an invalid csproj file 
when docker was used for the build. The template engine still has problems with 
special characters with docker, but at least the build works now.


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

Branch: refs/heads/TINKERPOP-1730
Commit: 3bf128ae9f9d6f73675705a958b7b4102572eaaa
Parents: 9402e4e
Author: florianhockmann 
Authored: Sun Sep 17 16:26:53 2017 +0200
Committer: florianhockmann 
Committed: Sun Sep 17 16:26:53 2017 +0200

--
 docker/scripts/build.sh   | 6 ++
 gremlin-dotnet/glv/Gremlin.Net.csproj.template| 2 +-
 gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3bf128ae/docker/scripts/build.sh
--
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index dff60b5..bc22de9 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -64,10 +64,8 @@ if [ -d "/usr/src/tinkermem" ]; then
 fi
 
 touch gremlin-python/.glv
-
-# remove these until TINKERPOP-1731 is settled
-rm gremlin-dotnet/src/.glv
-rm gremlin-dotnet/test/.glv
+touch gremlin-dotnet/src/.glv
+touch gremlin-dotnet/test/.glv
 
 # use a custom maven settings.xml
 if [ -r "settings.xml" ]; then

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3bf128ae/gremlin-dotnet/glv/Gremlin.Net.csproj.template
--
diff --git a/gremlin-dotnet/glv/Gremlin.Net.csproj.template 
b/gremlin-dotnet/glv/Gremlin.Net.csproj.template
index b55eecb..58fad18 100644
--- a/gremlin-dotnet/glv/Gremlin.Net.csproj.template
+++ b/gremlin-dotnet/glv/Gremlin.Net.csproj.template
@@ -1,4 +1,4 @@

[13/50] [abbrv] tinkerpop git commit: TINKERPOP-1779 Bump to GMavenPlus 1.6

[jorgebg]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e9801e6a/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/generate-modern.groovy
--
diff --git 
a/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/generate-modern.groovy
 
b/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/generate-modern.groovy
deleted file mode 100644
index 23b4a61..000
--- 
a/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/generate-modern.groovy
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-
-// an init script that returns a Map allows explicit setting of global 
bindings.
-def globals = [:]
-
-// Generates the modern graph into an "empty" TinkerGraph via LifeCycleHook.
-// Note that the name of the key in the "global" map is unimportant.
-globals << [hook : [
-  onStartUp: { ctx ->
-ctx.logger.info("Loading 'modern' graph data.")
-TinkerFactory.generateModern(graph)
-  }
-] as LifeCycleHook]
-
-// define the default TraversalSource to bind queries to - this one will be 
named "g".
-globals << [g : graph.traversal()]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e9801e6a/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
--
diff --git 
a/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
 
b/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
deleted file mode 100644
index a1b595f..000
--- 
a/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.
-
-# Note that TinkerPop does not include gremlin-python dependencies in
-# its distributions. This file cannot be used as a configuration file
-# to Gremlin Server unless those dependencies are installed on the
-# Gremlin Server path with:
-#
-# bin/gremlin-server.sh -i org.apache.tinkerpop gremlin-python x.y.z
-#
-# The primary change in this file to enable the GremlinJythonScriptEngine
-# is the addition of "gremlin-jython" to the "scriptEngines" field.
-
-host: localhost
-port: 45940
-scriptEvaluationTimeout: 3
-graphs: {
-  graph: 
src/test/resources/org/apache/tinkerpop/gremlin/python/driver/tinkergraph-empty.properties}
-plugins:
-  - tinkerpop.tinkergraph
-scriptEngines: {
-  gremlin-groovy: {
-imports: [java.lang.Math],
-staticImports: [java.lang.Math.PI],
-scripts: 
[src/test/resources/org/apache/tinkerpop/gremlin/python/driver/generate-modern.groovy]},
-  gremlin-jython: {},
-  gremlin-python: {}
-}
-serializers:
-  - { className: 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { 
ioRegistries: 
[org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
# application/vnd.gremlin-v1.0+gryo
-  - { className: 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { 
serializeResultToString: true }}# 
application/vnd.gremlin-v1.0+gryo-stringd
-  - { className: 

[31/50] [abbrv] tinkerpop git commit: Update the provider index to include janusgraph/dynamo

[jorgebg]

Update the provider index to include janusgraph/dynamo

This provider already existed as a titan implementation, but was released under 
JanusGraph CTR


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

Branch: refs/heads/TINKERPOP-1730
Commit: 518ab1c05c3c7c4579b93d809d263863249a30d0
Parents: 1fc2ad7
Author: Stephen Mallette 
Authored: Fri Sep 15 11:55:40 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Sep 15 11:55:40 2017 -0400

--
 docs/site/home/index.html | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/518ab1c0/docs/site/home/index.html
--
diff --git a/docs/site/home/index.html b/docs/site/home/index.html
index 5e4714c..edff77e 100644
--- a/docs/site/home/index.html
+++ b/docs/site/home/index.html
@@ -225,6 +225,7 @@ limitations under the License.
 https://github.com/rayokota/hgraphdb;>HGraphDB - 
OLTP graph database running on Apache HBase.
 https://console.ng.bluemix.net/catalog/services/ibm-graph/;>IBM Graph 
- OLTP graph database as a service.
 http://janusgraph.org/;>JanusGraph - Distributed 
OLTP and OLAP graph database with BerkeleyDB, Apache Cassandra and Apache HBase 
support.
+https://github.com/awslabs/dynamodb-janusgraph-storage-backend//;>JanusGraph
 (Amazon) - The Amazon DynamoDB Storage Backend for JanusGraph.
 http://tinkerpop.apache.org/docs/current/reference/#neo4j-gremlin;>Neo4j
 - OLTP graph database (embedded and high availability).
 https://github.com/SteelBridgeLabs/neo4j-gremlin-bolt;>neo4j-gremlin-bolt
 - OLTP graph database (using Bolt Protocol).
 https://github.com/orientechnologies/orientdb-gremlin;>OrientDB - 
OLTP graph database