tinkerpop git commit: foo

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST c0bb93293 -> 0aa7aebe8


foo


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

Branch: refs/heads/TRAVIS-TEST
Commit: 0aa7aebe882b1337cfeb789a07748c40a1cff303
Parents: c0bb932
Author: Daniel Kuppitz 
Authored: Mon Mar 12 13:46:28 2018 -0700
Committer: Daniel Kuppitz 
Committed: Mon Mar 12 13:46:28 2018 -0700

--
 .../tinkerpop/gremlin/process/traversal/TraversalStrategies.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0aa7aebe/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
index 36c074d..7ace019 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
@@ -178,7 +178,7 @@ public interface TraversalStrategies extends Serializable, 
Cloneable {
 }
 }
 
-if (sortedStrategies.stream().anyMatch(s -> s instanceof 
SubgraphStrategy || s instanceof RequirementsStrategy))
+if (sortedStrategies.stream().anyMatch(s -> s instanceof 
SubgraphStrategy) && sortedStrategies.stream().anyMatch(s -> s instanceof 
RequirementsStrategy))
 logger.error("Sorted strategies: " + 
sortedStrategies.stream().map(TraversalStrategy::toString).collect(Collectors.toList()));
 
 return sortedStrategies;

tinkerpop git commit: TINKERPOP-1919 Merge classes P and TraversalPredicate [Forced Update!]

[florianhockmann]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1919 c7d434af4 -> 97c179d29 (forced update)


 TINKERPOP-1919 Merge classes P and TraversalPredicate

There is no good reason to keep those two classes separate anymore and
having P as the type for step parameters is probably easier to
understand for users than TraversalPredicate.


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

Branch: refs/heads/TINKERPOP-1919
Commit: 97c179d29d7440ac31be791dbeb39e41e54d9a22
Parents: b25b976
Author: Florian Hockmann 
Authored: Mon Mar 12 21:16:18 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Mar 12 21:16:18 2018 +0100

--
 CHANGELOG.asciidoc  |   1 +
 gremlin-dotnet/glv/P.template   |  60 ++-
 gremlin-dotnet/glv/generate.groovy  |   4 +-
 .../Process/Traversal/GraphTraversal.cs |  30 +++---
 .../src/Gremlin.Net/Process/Traversal/P.cs  | 104 ++-
 .../Process/Traversal/TraversalPredicate.cs |  85 ---
 .../src/Gremlin.Net/Process/Traversal/__.cs |  30 +++---
 .../Structure/IO/GraphSON/GraphSONWriter.cs |   2 +-
 .../Structure/IO/GraphSON/PSerializer.cs|  45 
 .../IO/GraphSON/TraversalPredicateSerializer.cs |  45 
 .../Gherkin/GherkinTestRunner.cs|  18 +---
 .../Gherkin/IgnoreException.cs  |   5 -
 .../Gherkin/TraversalEvaluation/PParameter.cs   |  97 +
 .../TraversalEvaluationTests.cs |   2 +-
 .../TraversalEvaluation/TraversalParser.cs  |   2 +-
 .../TraversalPredicateParameter.cs  |  93 -
 .../GraphSON/BytecodeGraphSONSerializerTests.cs |   2 +-
 .../IO/GraphSON/GraphSONWriterTests.cs  |   4 +-
 18 files changed, 320 insertions(+), 309 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/97c179d2/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a31bdf2..29930f9 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -42,6 +42,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Fixed a bug in Gremlin Console which prevented handling of `gremlin.sh` 
flags that had an "=" between the flag and its arguments.
 * Fixed bug where `SparkMessenger` was not applying the `edgeFunction` from 
`MessageScope`.
 * Fixed a bug in `ComputerAwareStep` that didn't handle `reset()` properly and 
thus occasionally produced some extra traversers.
+* Removed `TraversalPredicate` class in Gremlin.Net. It is now included in the 
`P` class instead.
 
 [[release-3-2-7]]
 === TinkerPop 3.2.7 (Release Date: December 17, 2017)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/97c179d2/gremlin-dotnet/glv/P.template
--
diff --git a/gremlin-dotnet/glv/P.template b/gremlin-dotnet/glv/P.template
index f337127..61673cf 100644
--- a/gremlin-dotnet/glv/P.template
+++ b/gremlin-dotnet/glv/P.template
@@ -32,18 +32,70 @@ namespace Gremlin.Net.Process.Traversal
 /// 
 public class P
 {
+/// 
+/// Initializes a new instance of the  class.
+/// 
+/// The name of the predicate.
+/// The value of the predicate.
+/// An optional other predicate that is used as an 
argument for this predicate.
+public P(string operatorName, dynamic value, P other = null)
+{
+OperatorName = operatorName;
+Value = value;
+Other = other;
+}
+
+/// 
+/// Gets the name of the predicate.
+/// 
+public string OperatorName { get; }
+
+/// 
+/// Gets the value of the predicate.
+/// 
+public dynamic Value { get; }
+
+/// 
+/// Gets an optional other predicate that is used as an argument 
for this predicate.
+/// 
+public P Other { get; }
+
+/// 
+/// Returns a composed predicate that represents a logical AND of 
this predicate and another.
+/// 
+/// A predicate that will be 
logically-ANDed with this predicate.
+/// The composed predicate.
+public P And(P otherPredicate)
+{
+return new P("and", this, otherPredicate);
+}
+
+/// 
+/// Returns a composed predicate that represents a logical OR of 
this predicate and another.
+/// 
+/// A predicate that will 

tinkerpop git commit: foo

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST 029cdbb24 -> 04d6f5849


foo


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

Branch: refs/heads/TRAVIS-TEST
Commit: 04d6f5849ee55ad0a91ce7da723db11219c3a143
Parents: 029cdbb
Author: Daniel Kuppitz 
Authored: Mon Mar 12 13:03:26 2018 -0700
Committer: Daniel Kuppitz 
Committed: Mon Mar 12 13:03:26 2018 -0700

--
 .../tinkerpop/gremlin/process/traversal/TraversalStrategies.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/04d6f584/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
index 1d69173..6feb684 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
@@ -65,7 +65,7 @@ import java.util.stream.Collectors;
  */
 public interface TraversalStrategies extends Serializable, Cloneable {
 
-private static final Logger logger = 
LoggerFactory.getLogger(TraversalStrategies.class);
+static final Logger logger = 
LoggerFactory.getLogger(TraversalStrategies.class);
 
 static List STRATEGY_CATEGORIES = 
Collections.unmodifiableList(Arrays.asList(TraversalStrategy.DecorationStrategy.class,
 TraversalStrategy.OptimizationStrategy.class, 
TraversalStrategy.ProviderOptimizationStrategy.class, 
TraversalStrategy.FinalizationStrategy.class, 
TraversalStrategy.VerificationStrategy.class));
 

tinkerpop git commit: foo

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST fb93da657 -> 029cdbb24


foo


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

Branch: refs/heads/TRAVIS-TEST
Commit: 029cdbb244cbd99721a67bb7147d3660470ace43
Parents: fb93da6
Author: Daniel Kuppitz 
Authored: Mon Mar 12 12:58:04 2018 -0700
Committer: Daniel Kuppitz 
Committed: Mon Mar 12 12:58:04 2018 -0700

--
 .../gremlin/process/traversal/TraversalStrategies.java  | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/029cdbb2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
index 972384c..1d69173 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
@@ -41,6 +41,8 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrat
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
 import org.apache.tinkerpop.gremlin.util.tools.MultiMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -63,6 +65,8 @@ import java.util.stream.Collectors;
  */
 public interface TraversalStrategies extends Serializable, Cloneable {
 
+private static final Logger logger = 
LoggerFactory.getLogger(TraversalStrategies.class);
+
 static List STRATEGY_CATEGORIES = 
Collections.unmodifiableList(Arrays.asList(TraversalStrategy.DecorationStrategy.class,
 TraversalStrategy.OptimizationStrategy.class, 
TraversalStrategy.ProviderOptimizationStrategy.class, 
TraversalStrategy.FinalizationStrategy.class, 
TraversalStrategy.VerificationStrategy.class));
 
 /**
@@ -172,6 +176,7 @@ public interface TraversalStrategies extends Serializable, 
Cloneable {
 }
 }
 
+logger.error("Sorted strategies: " + 
sortedStrategies.stream().map(TraversalStrategy::toString).collect(Collectors.toList()));
 
 return sortedStrategies;
 }

tinkerpop git commit: TINKERPOP-1919 Merge classes P and TraversalPredicate

[florianhockmann]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1919 [created] c7d434af4


TINKERPOP-1919 Merge classes P and TraversalPredicate

There is no good reason to keep those two classes separate anymore and
having P as the type for step parameters is probably easier to
understand for users than TraversalPredicate.


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

Branch: refs/heads/TINKERPOP-1919
Commit: c7d434af40f4caaad3c6ae8bda3cdd3b120dfd29
Parents: b25b976
Author: Florian Hockmann 
Authored: Mon Mar 12 20:53:09 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Mar 12 20:53:09 2018 +0100

--
 gremlin-dotnet/glv/P.template   |  60 ++-
 gremlin-dotnet/glv/generate.groovy  |   4 +-
 .../Process/Traversal/GraphTraversal.cs |  30 +++---
 .../src/Gremlin.Net/Process/Traversal/P.cs  | 104 ++-
 .../Process/Traversal/TraversalPredicate.cs |  85 ---
 .../src/Gremlin.Net/Process/Traversal/__.cs |  30 +++---
 .../Structure/IO/GraphSON/GraphSONWriter.cs |   2 +-
 .../Structure/IO/GraphSON/PSerializer.cs|  45 
 .../IO/GraphSON/TraversalPredicateSerializer.cs |  45 
 .../Gherkin/GherkinTestRunner.cs|  18 +---
 .../Gherkin/IgnoreException.cs  |   5 -
 .../Gherkin/TraversalEvaluation/PParameter.cs   |  97 +
 .../TraversalEvaluationTests.cs |   2 +-
 .../TraversalEvaluation/TraversalParser.cs  |   2 +-
 .../TraversalPredicateParameter.cs  |  93 -
 .../GraphSON/BytecodeGraphSONSerializerTests.cs |   2 +-
 .../IO/GraphSON/GraphSONWriterTests.cs  |   4 +-
 17 files changed, 319 insertions(+), 309 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c7d434af/gremlin-dotnet/glv/P.template
--
diff --git a/gremlin-dotnet/glv/P.template b/gremlin-dotnet/glv/P.template
index f337127..61673cf 100644
--- a/gremlin-dotnet/glv/P.template
+++ b/gremlin-dotnet/glv/P.template
@@ -32,18 +32,70 @@ namespace Gremlin.Net.Process.Traversal
 /// 
 public class P
 {
+/// 
+/// Initializes a new instance of the  class.
+/// 
+/// The name of the predicate.
+/// The value of the predicate.
+/// An optional other predicate that is used as an 
argument for this predicate.
+public P(string operatorName, dynamic value, P other = null)
+{
+OperatorName = operatorName;
+Value = value;
+Other = other;
+}
+
+/// 
+/// Gets the name of the predicate.
+/// 
+public string OperatorName { get; }
+
+/// 
+/// Gets the value of the predicate.
+/// 
+public dynamic Value { get; }
+
+/// 
+/// Gets an optional other predicate that is used as an argument 
for this predicate.
+/// 
+public P Other { get; }
+
+/// 
+/// Returns a composed predicate that represents a logical AND of 
this predicate and another.
+/// 
+/// A predicate that will be 
logically-ANDed with this predicate.
+/// The composed predicate.
+public P And(P otherPredicate)
+{
+return new P("and", this, otherPredicate);
+}
+
+/// 
+/// Returns a composed predicate that represents a logical OR of 
this predicate and another.
+/// 
+/// A predicate that will be 
logically-ORed with this predicate.
+/// The composed predicate.
+public P Or(P otherPredicate)
+{
+return new P("or", this, otherPredicate);
+}
 <% pmethods.findAll{ !(it in ["within", "without"]) }.each { method -> %>
-public static TraversalPredicate <%= toCSharpMethodName.call(method) 
%>(params object[] args)
+public static P <%= toCSharpMethodName.call(method) %>(params object[] 
args)
 {
 var value = args.Length == 1 ? args[0] : args;
-return new TraversalPredicate("<%= method %>", value);
+return new P("<%= method %>", value);
 }
 <% } %><% pmethods.findAll{ it in ["within", "without"] }.each { method -> %>
-public static TraversalPredicate <%= toCSharpMethodName.call(method) 
%>(params object[] args)
+public static P <%= toCSharpMethodName.call(method) %>(params object[] 
args)
 {
-return new TraversalPredicate("<%= method 

tinkerpop git commit: foo

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST 22b1692c0 -> fb93da657


foo


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

Branch: refs/heads/TRAVIS-TEST
Commit: fb93da657ad732b1c184d2eceb3001d34427dd70
Parents: 22b1692
Author: Daniel Kuppitz 
Authored: Mon Mar 12 12:13:53 2018 -0700
Committer: Daniel Kuppitz 
Committed: Mon Mar 12 12:13:53 2018 -0700

--
 .../process/traversal/strategy/decoration/RequirementsStrategy.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb93da65/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java
index c99ad2b..efea348 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java
@@ -57,6 +57,7 @@ public final class RequirementsStrategy extends 
AbstractTraversalStrategy s instanceof 
RequirementsStrategy).findAny().orElse(null);
 if (null == strategy) {
 strategy = new RequirementsStrategy();
+logger.error("Applying requirements: " + 
strategy.requirements.stream().map(TraverserRequirement::toString).collect(Collectors.toList()));
 traversalStrategies.addStrategies(strategy);
 } else {
 final RequirementsStrategy cloneStrategy = new 
RequirementsStrategy();

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

[florianhockmann]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/tp33
Commit: 510231adbe77bf58d65f8f999e4a8b081e9d7894
Parents: 097ad01 b25b976
Author: Florian Hockmann 
Authored: Mon Mar 12 20:08:44 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Mar 12 20:08:44 2018 +0100

--
 .../Gherkin/GherkinTestRunner.cs  |  6 +-
 .../Gherkin/IgnoreException.cs| 10 +-
 2 files changed, 10 insertions(+), 6 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/510231ad/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 337a6c9,dae2ced..da455a8
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@@ -63,18 -60,9 +63,18 @@@ namespace Gremlin.Net.IntegrationTest.G
  
  public enum IgnoreReason
  {
 +/// 
 +/// Lambdas are not supported on Gremlin.NET yet.
 +/// 
  LambdaNotSupported,
 +
 +/// 
 +/// Deserialization of g:T on GraphSON3 is not supported.
 +/// 
 +TraversalTDeserializationNotSupported,
 +
  PNotCreatedCorrectlyByGherkinRunner,
- NumericalValuesHaveWrongTypes,
- PWithinWrapsArgumentsInArray
+ PWithinWrapsArgumentsInArray,
+ PNotDeserializationProblem
  }
  }

[3/6] tinkerpop git commit: TINKERPOP-1892 Fix ignoring of test scenarios in Gremlin.Net CTR

[florianhockmann]

TINKERPOP-1892 Fix ignoring of test scenarios in Gremlin.Net CTR

Without this fix, all following scenarios after one ignored scenario
in the same feature weren't parsed at all. This also revealed another
failing scenario that needed to be ignored for now.


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

Branch: refs/heads/tp32
Commit: b25b9767547b2956f224cbe6fb55c756d5df612e
Parents: d3be13b
Author: Florian Hockmann 
Authored: Mon Mar 12 20:08:21 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Mar 12 20:08:21 2018 +0100

--
 .../Gherkin/GherkinTestRunner.cs  |  6 +-
 .../Gherkin/IgnoreException.cs| 10 +-
 2 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b25b9767/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 9d0f15d..d906357 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -57,6 +57,10 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
 IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+},
+{
+
"g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0X_selectXa_bX",
+IgnoreReason.PNotDeserializationProblem
 }
 };
 
@@ -107,7 +111,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 if (IgnoredScenarios.TryGetValue(scenario.Name, out var 
reason))
 {
 failedSteps.Add(scenario.Steps.First(), new 
IgnoreException(reason));
-break;
+continue;
 }
 StepBlock? currentStep = null;
 StepDefinition stepDefinition = null;

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b25b9767/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index c8cb29a..dae2ced 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@ -47,12 +47,12 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 reasonSuffix =
 " because the Gherkin runner can't call methods in 
TraversalPredicate class (TINKERPOP-1919)";
 break;
-case IgnoreReason.NumericalValuesHaveWrongTypes:
-reasonSuffix = " because the asserts currently fail due to 
type mismatches (TINKERPOP-1918)";
-break;
 case IgnoreReason.PWithinWrapsArgumentsInArray:
 reasonSuffix = " because P.Within() arguments are 
incorrectly wrapped in an array (TINKERPOP-1920)";
 break;
+case IgnoreReason.PNotDeserializationProblem:
+reasonSuffix = " because P.Not() cannot be deserialized by 
Gremlin Server (TINKERPOP-1922)";
+break;
 }
 return $"Scenario ignored" + reasonSuffix;
 }
@@ -62,7 +62,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 LambdaNotSupported,
 PNotCreatedCorrectlyByGherkinRunner,
-NumericalValuesHaveWrongTypes,
-PWithinWrapsArgumentsInArray
+PWithinWrapsArgumentsInArray,
+PNotDeserializationProblem
 }
 }
\ No newline at end of file

[2/6] tinkerpop git commit: TINKERPOP-1892 Fix ignoring of test scenarios in Gremlin.Net CTR

[florianhockmann]

TINKERPOP-1892 Fix ignoring of test scenarios in Gremlin.Net CTR

Without this fix, all following scenarios after one ignored scenario
in the same feature weren't parsed at all. This also revealed another
failing scenario that needed to be ignored for now.


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

Branch: refs/heads/tp33
Commit: b25b9767547b2956f224cbe6fb55c756d5df612e
Parents: d3be13b
Author: Florian Hockmann 
Authored: Mon Mar 12 20:08:21 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Mar 12 20:08:21 2018 +0100

--
 .../Gherkin/GherkinTestRunner.cs  |  6 +-
 .../Gherkin/IgnoreException.cs| 10 +-
 2 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b25b9767/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 9d0f15d..d906357 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -57,6 +57,10 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
 IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+},
+{
+
"g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0X_selectXa_bX",
+IgnoreReason.PNotDeserializationProblem
 }
 };
 
@@ -107,7 +111,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 if (IgnoredScenarios.TryGetValue(scenario.Name, out var 
reason))
 {
 failedSteps.Add(scenario.Steps.First(), new 
IgnoreException(reason));
-break;
+continue;
 }
 StepBlock? currentStep = null;
 StepDefinition stepDefinition = null;

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b25b9767/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index c8cb29a..dae2ced 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@ -47,12 +47,12 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 reasonSuffix =
 " because the Gherkin runner can't call methods in 
TraversalPredicate class (TINKERPOP-1919)";
 break;
-case IgnoreReason.NumericalValuesHaveWrongTypes:
-reasonSuffix = " because the asserts currently fail due to 
type mismatches (TINKERPOP-1918)";
-break;
 case IgnoreReason.PWithinWrapsArgumentsInArray:
 reasonSuffix = " because P.Within() arguments are 
incorrectly wrapped in an array (TINKERPOP-1920)";
 break;
+case IgnoreReason.PNotDeserializationProblem:
+reasonSuffix = " because P.Not() cannot be deserialized by 
Gremlin Server (TINKERPOP-1922)";
+break;
 }
 return $"Scenario ignored" + reasonSuffix;
 }
@@ -62,7 +62,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 LambdaNotSupported,
 PNotCreatedCorrectlyByGherkinRunner,
-NumericalValuesHaveWrongTypes,
-PWithinWrapsArgumentsInArray
+PWithinWrapsArgumentsInArray,
+PNotDeserializationProblem
 }
 }
\ No newline at end of file

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

[florianhockmann]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/master
Commit: 510231adbe77bf58d65f8f999e4a8b081e9d7894
Parents: 097ad01 b25b976
Author: Florian Hockmann 
Authored: Mon Mar 12 20:08:44 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Mar 12 20:08:44 2018 +0100

--
 .../Gherkin/GherkinTestRunner.cs  |  6 +-
 .../Gherkin/IgnoreException.cs| 10 +-
 2 files changed, 10 insertions(+), 6 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/510231ad/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 337a6c9,dae2ced..da455a8
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@@ -63,18 -60,9 +63,18 @@@ namespace Gremlin.Net.IntegrationTest.G
  
  public enum IgnoreReason
  {
 +/// 
 +/// Lambdas are not supported on Gremlin.NET yet.
 +/// 
  LambdaNotSupported,
 +
 +/// 
 +/// Deserialization of g:T on GraphSON3 is not supported.
 +/// 
 +TraversalTDeserializationNotSupported,
 +
  PNotCreatedCorrectlyByGherkinRunner,
- NumericalValuesHaveWrongTypes,
- PWithinWrapsArgumentsInArray
+ PWithinWrapsArgumentsInArray,
+ PNotDeserializationProblem
  }
  }

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

[florianhockmann]

Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: 116d743f209292f675d8ded4907b39c629df1e03
Parents: bf58b63 510231a
Author: Florian Hockmann 
Authored: Mon Mar 12 20:09:10 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Mar 12 20:09:10 2018 +0100

--
 .../Gherkin/GherkinTestRunner.cs  |  6 +-
 .../Gherkin/IgnoreException.cs| 10 +-
 2 files changed, 10 insertions(+), 6 deletions(-)
--


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

[1/6] tinkerpop git commit: TINKERPOP-1892 Fix ignoring of test scenarios in Gremlin.Net CTR

[florianhockmann]

Repository: tinkerpop
Updated Branches:
  refs/heads/master bf58b63ea -> 116d743f2
  refs/heads/tp32 d3be13b4c -> b25b97675
  refs/heads/tp33 097ad015e -> 510231adb


TINKERPOP-1892 Fix ignoring of test scenarios in Gremlin.Net CTR

Without this fix, all following scenarios after one ignored scenario
in the same feature weren't parsed at all. This also revealed another
failing scenario that needed to be ignored for now.


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

Branch: refs/heads/master
Commit: b25b9767547b2956f224cbe6fb55c756d5df612e
Parents: d3be13b
Author: Florian Hockmann 
Authored: Mon Mar 12 20:08:21 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Mar 12 20:08:21 2018 +0100

--
 .../Gherkin/GherkinTestRunner.cs  |  6 +-
 .../Gherkin/IgnoreException.cs| 10 +-
 2 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b25b9767/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 9d0f15d..d906357 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -57,6 +57,10 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
 IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+},
+{
+
"g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0X_selectXa_bX",
+IgnoreReason.PNotDeserializationProblem
 }
 };
 
@@ -107,7 +111,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 if (IgnoredScenarios.TryGetValue(scenario.Name, out var 
reason))
 {
 failedSteps.Add(scenario.Steps.First(), new 
IgnoreException(reason));
-break;
+continue;
 }
 StepBlock? currentStep = null;
 StepDefinition stepDefinition = null;

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b25b9767/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index c8cb29a..dae2ced 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@ -47,12 +47,12 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 reasonSuffix =
 " because the Gherkin runner can't call methods in 
TraversalPredicate class (TINKERPOP-1919)";
 break;
-case IgnoreReason.NumericalValuesHaveWrongTypes:
-reasonSuffix = " because the asserts currently fail due to 
type mismatches (TINKERPOP-1918)";
-break;
 case IgnoreReason.PWithinWrapsArgumentsInArray:
 reasonSuffix = " because P.Within() arguments are 
incorrectly wrapped in an array (TINKERPOP-1920)";
 break;
+case IgnoreReason.PNotDeserializationProblem:
+reasonSuffix = " because P.Not() cannot be deserialized by 
Gremlin Server (TINKERPOP-1922)";
+break;
 }
 return $"Scenario ignored" + reasonSuffix;
 }
@@ -62,7 +62,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 LambdaNotSupported,
 PNotCreatedCorrectlyByGherkinRunner,
-NumericalValuesHaveWrongTypes,
-PWithinWrapsArgumentsInArray
+PWithinWrapsArgumentsInArray,
+PNotDeserializationProblem
 }
 }
\ No newline at end of file

tinkerpop git commit: foo

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST 15e3fcb81 -> 22b1692c0


foo


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

Branch: refs/heads/TRAVIS-TEST
Commit: 22b1692c09853217a09cb5855cac055e5230371f
Parents: 15e3fcb
Author: Daniel Kuppitz 
Authored: Mon Mar 12 12:04:40 2018 -0700
Committer: Daniel Kuppitz 
Committed: Mon Mar 12 12:04:40 2018 -0700

--
 .../traversal/strategy/decoration/RequirementsStrategy.java   | 3 ++-
 .../process/traversal/strategy/decoration/SubgraphStrategy.java   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/22b1692c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java
index aa3da3d..c99ad2b 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java
@@ -33,6 +33,7 @@ import org.slf4j.LoggerFactory;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -48,7 +49,6 @@ public final class RequirementsStrategy extends 
AbstractTraversalStrategy traversal) {
-logger.error("Applying RequirementsStrrategy.");
 if (traversal.getParent() instanceof EmptyStep && 
!this.requirements.isEmpty())
 traversal.addStep(new RequirementsStep<>(traversal, 
this.requirements));
 }
@@ -61,6 +61,7 @@ public final class RequirementsStrategy extends 
AbstractTraversalStrategyhttp://git-wip-us.apache.org/repos/asf/tinkerpop/blob/22b1692c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index f31c39e..85e9020 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -147,12 +147,12 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy traversal) {
-logger.error("Applying SubgraphStrategy.");
 // do not apply subgraph strategy to already created subgraph filter 
branches (or else you get infinite recursion)
 if (traversal.getStartStep().getLabels().contains(MARKER)) {
 traversal.getStartStep().removeLabel(MARKER);
 return;
 }
+logger.error("Applying SubgraphStrategy.");
 //
 final List graphSteps = 
TraversalHelper.getStepsOfAssignableClass(GraphStep.class, traversal);
 final List vertexSteps = 
TraversalHelper.getStepsOfAssignableClass(VertexStep.class, traversal);

tinkerpop git commit: foo

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST 2bb0b5075 -> 15e3fcb81


foo


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

Branch: refs/heads/TRAVIS-TEST
Commit: 15e3fcb8143d6f5cd761c03e9abaf927157d91e4
Parents: 2bb0b50
Author: Daniel Kuppitz 
Authored: Mon Mar 12 11:49:32 2018 -0700
Committer: Daniel Kuppitz 
Committed: Mon Mar 12 11:49:32 2018 -0700

--
 giraph-gremlin/src/test/resources/log4j-silent.properties  | 2 +-
 gremlin-console/src/test/resources/log4j-silent.properties | 2 +-
 gremlin-core/src/test/resources/log4j-silent.properties| 2 +-
 gremlin-driver/src/test/resources/log4j-silent.properties  | 2 +-
 gremlin-groovy/src/test/resources/log4j-silent.properties  | 2 +-
 gremlin-python/src/test/resources/log4j-silent.properties  | 2 +-
 gremlin-server/src/test/resources/log4j-silent.properties  | 2 +-
 .../gremlin-io-test/src/test/resources/log4j-silent.properties | 2 +-
 hadoop-gremlin/src/test/resources/log4j-silent.properties  | 2 +-
 neo4j-gremlin/src/test/resources/log4j-silent.properties   | 2 +-
 spark-gremlin/src/test/resources/log4j-silent.properties   | 2 +-
 tinkergraph-gremlin/src/test/resources/log4j-silent.properties | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/15e3fcb8/giraph-gremlin/src/test/resources/log4j-silent.properties
--
diff --git a/giraph-gremlin/src/test/resources/log4j-silent.properties 
b/giraph-gremlin/src/test/resources/log4j-silent.properties
index 1825bb0..d292fdf 100644
--- a/giraph-gremlin/src/test/resources/log4j-silent.properties
+++ b/giraph-gremlin/src/test/resources/log4j-silent.properties
@@ -17,7 +17,7 @@
 
 # this file should always have logging set to OFF.  it seems, however, that an 
appender of some sort is
 # required or else some logs throw error and use other log4j.properties files 
on the path.
-log4j.rootLogger=OFF, stdout
+log4j.rootLogger=ERROR, stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/15e3fcb8/gremlin-console/src/test/resources/log4j-silent.properties
--
diff --git a/gremlin-console/src/test/resources/log4j-silent.properties 
b/gremlin-console/src/test/resources/log4j-silent.properties
index 1825bb0..d292fdf 100644
--- a/gremlin-console/src/test/resources/log4j-silent.properties
+++ b/gremlin-console/src/test/resources/log4j-silent.properties
@@ -17,7 +17,7 @@
 
 # this file should always have logging set to OFF.  it seems, however, that an 
appender of some sort is
 # required or else some logs throw error and use other log4j.properties files 
on the path.
-log4j.rootLogger=OFF, stdout
+log4j.rootLogger=ERROR, stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/15e3fcb8/gremlin-core/src/test/resources/log4j-silent.properties
--
diff --git a/gremlin-core/src/test/resources/log4j-silent.properties 
b/gremlin-core/src/test/resources/log4j-silent.properties
index e43797f..21583a2 100644
--- a/gremlin-core/src/test/resources/log4j-silent.properties
+++ b/gremlin-core/src/test/resources/log4j-silent.properties
@@ -17,7 +17,7 @@
 
 # this file should always have logging set to OFF.  it seems, however, that an 
appender of some sort is
 # required or else some logs throw error and use other log4j.properties files 
on the path.
-log4j.rootLogger=OFF, stdout
+log4j.rootLogger=ERROR, stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/15e3fcb8/gremlin-driver/src/test/resources/log4j-silent.properties
--
diff --git a/gremlin-driver/src/test/resources/log4j-silent.properties 
b/gremlin-driver/src/test/resources/log4j-silent.properties
index 1825bb0..d292fdf 100644
--- 

tinkerpop git commit: foo

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST fa3ef4da2 -> 2bb0b5075


foo


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

Branch: refs/heads/TRAVIS-TEST
Commit: 2bb0b5075fca6a3999a6fc69f361828515aa3be9
Parents: fa3ef4d
Author: Daniel Kuppitz 
Authored: Mon Mar 12 11:33:40 2018 -0700
Committer: Daniel Kuppitz 
Committed: Mon Mar 12 11:33:40 2018 -0700

--
 .../traversal/strategy/decoration/RequirementsStrategy.java| 5 +
 .../traversal/strategy/decoration/SubgraphStrategy.java| 6 +-
 gremlin-test/src/test/resources/log4j-silent.properties| 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2bb0b507/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java
index fc3f181..aa3da3d 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java
@@ -27,6 +27,8 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
 import 
org.apache.tinkerpop.gremlin.process.traversal.step.util.RequirementsStep;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -37,6 +39,8 @@ import java.util.Set;
  */
 public final class RequirementsStrategy extends 
AbstractTraversalStrategy implements 
TraversalStrategy.DecorationStrategy {
 
+private static final Logger logger = 
LoggerFactory.getLogger(RequirementsStrategy.class);
+
 private final Set requirements = new HashSet<>();
 
 private RequirementsStrategy() {
@@ -44,6 +48,7 @@ public final class RequirementsStrategy extends 
AbstractTraversalStrategy traversal) {
+logger.error("Applying RequirementsStrrategy.");
 if (traversal.getParent() instanceof EmptyStep && 
!this.requirements.isEmpty())
 traversal.addStep(new RequirementsStep<>(traversal, 
this.requirements));
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2bb0b507/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index 9f4f75c..f31c39e 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -55,6 +55,8 @@ import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.PropertyType;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -72,6 +74,8 @@ import java.util.stream.Stream;
 public final class SubgraphStrategy extends 
AbstractTraversalStrategy
 implements TraversalStrategy.DecorationStrategy {
 
+private static final Logger logger = 
LoggerFactory.getLogger(SubgraphStrategy.class);
+
 private final Traversal.Admin vertexCriterion;
 private final Traversal.Admin edgeCriterion;
 private final Traversal.Admin vertexPropertyCriterion;
@@ -143,12 +147,12 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy traversal) {
+logger.error("Applying SubgraphStrategy.");
 // do not apply subgraph strategy to already created subgraph filter 
branches (or else you get infinite recursion)
 if 

tinkerpop git commit: foo

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST 0e8597d70 -> 4458bf33a


foo


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

Branch: refs/heads/TRAVIS-TEST
Commit: 4458bf33a69a243e55ab80278309833fa605ab39
Parents: 0e8597d
Author: Daniel Kuppitz 
Authored: Mon Mar 12 10:35:48 2018 -0700
Committer: Daniel Kuppitz 
Committed: Mon Mar 12 10:35:48 2018 -0700

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4458bf33/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index 9f4f75c..8f8f3ac 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -148,7 +148,6 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy graphSteps = 
TraversalHelper.getStepsOfAssignableClass(GraphStep.class, traversal);
 final List vertexSteps = 
TraversalHelper.getStepsOfAssignableClass(VertexStep.class, traversal);
@@ -266,6 +265,10 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy

tinkerpop git commit: foo

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST 3f5bd8d7d -> 3890bf111


foo


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

Branch: refs/heads/TRAVIS-TEST
Commit: 3890bf1118ea7c9a9fa69fbfaf0c7f7497e55248
Parents: 3f5bd8d
Author: Daniel Kuppitz 
Authored: Mon Mar 12 09:54:27 2018 -0700
Committer: Daniel Kuppitz 
Committed: Mon Mar 12 09:54:27 2018 -0700

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3890bf11/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index 241129b..cee0a56 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -20,6 +20,8 @@ package 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration;
 
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.MapConfiguration;
+import 
org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
+import 
org.apache.tinkerpop.gremlin.process.remote.traversal.strategy.decoration.RemoteStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.Step;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
@@ -53,12 +55,7 @@ import org.apache.tinkerpop.gremlin.structure.PropertyType;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -78,7 +75,9 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy edgeCriterion;
 private final Traversal.Admin vertexPropertyCriterion;
 
-private static final Set POSTS = 
Collections.singleton(ConnectiveStrategy.class);
+private static final Set POSTS = new 
HashSet<>(Arrays.asList(
+ConnectiveStrategy.class,
+RequirementsStrategy.class));
 
 private final String MARKER = 
Graph.Hidden.hide("gremlin.subgraphStrategy");
 

tinkerpop git commit: foo

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST a44500d39 -> 3f5bd8d7d


foo


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

Branch: refs/heads/TRAVIS-TEST
Commit: 3f5bd8d7d59ef77f8bb33ea5e384a1d07a625dff
Parents: a44500d
Author: Daniel Kuppitz 
Authored: Mon Mar 12 09:38:04 2018 -0700
Committer: Daniel Kuppitz 
Committed: Mon Mar 12 09:38:04 2018 -0700

--
 .../decoration/SubgraphStrategyProcessTest.java  | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3f5bd8d7/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index fe24ff0..927a54e 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -289,20 +289,21 @@ public class SubgraphStrategyProcessTest extends 
AbstractGremlinProcessTest {
 assertEquals(3, 
g.V(convertToVertexId("josh")).bothE().count().next().longValue());
 assertEquals(2, 
sg.V(convertToVertexId("josh")).bothE().count().next().longValue());
 assertEquals(3, 
g.V(convertToVertexId("josh")).both().count().next().longValue());
-/*
-final Traversal t = 
sg.V(convertToVertexId("josh")).both().count();
+
+final Traversal t = 
sg.withPath().V(convertToVertexId("josh")).both().count();
 try {
 assertEquals(2, t.next().longValue());
 } catch (IllegalStateException ex) {
   throw new IllegalStateException(t.toString(), ex);
 }
-*/
+/*
 final Traversal t = 
sg.withPath().V(convertToVertexId("josh")).union(__.outE().inV(), 
__.inE().outV());
 try {
 assertEquals(2, t.toList().size());
 } catch (Exception ex) {
   throw new IllegalStateException(t.toString(), ex);
 }
+*/
 // marko not present directly because of vertexCriterion - only 
accessible via vertices in the subgraph
 assertEquals(1, 
g.V(convertToVertexId("marko")).count().next().longValue());
 assertEquals(0, 
sg.V(convertToVertexId("marko")).count().next().longValue());
@@ -317,7 +318,7 @@ try {
 assertEquals(2, 
sg.V(convertToVertexId("josh")).bothE("created").count().next().longValue());
 assertEquals(2, 
g.V(convertToVertexId("josh")).both("created").count().next().longValue());
 assertEquals(2, 
sg.V(convertToVertexId("josh")).both("created").count().next().longValue());
-
+/*
 assertEquals(1, 
g.V(convertToVertexId("josh")).inE("knows").count().next().longValue());
 assertEquals(0, 
sg.V(convertToVertexId("josh")).inE("knows").count().next().longValue());
 assertEquals(1, 
g.V(convertToVertexId("josh")).in("knows").count().next().longValue());
@@ -342,10 +343,10 @@ try {
 
 // marko is not accessible from the edge
 assertEquals(2, g.E(convertToEdgeId("marko", "created", 
"lop")).bothV().count().next().longValue());
-assertEquals(1, sg.E(convertToEdgeId("marko", "created", 
"lop")).bothV().count().next().longValue());
+assertEquals(1, sg.E(convertToEdgeId("marko", "created", 
"lop")).bothV().count().next().longValue());*/
 }
 
-
+/*
 @Test
 @LoadGraphWith(MODERN)
 public void shouldFilterMixedCriteria() throws Exception {
@@ -513,6 +514,6 @@ try {
 checkResults(Arrays.asList(3, 3, 3, 4, 4, 5, 5, 5), 
sg.V().as("a").properties().select("a").dedup().outE().values("skill"));
 checkResults(Arrays.asList(3, 3, 3, 4, 4, 5, 5, 5), 
sg.V().as("a").properties().select("a").dedup().outE().properties("skill").as("b").identity().select("b").by(__.value()));
 }
-
+*/
 
 }

tinkerpop git commit: foo

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST cdaab2f92 -> a44500d39


foo


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

Branch: refs/heads/TRAVIS-TEST
Commit: a44500d39427e60668476ead1676f97a53522c7b
Parents: cdaab2f
Author: Daniel Kuppitz 
Authored: Mon Mar 12 09:30:18 2018 -0700
Committer: Daniel Kuppitz 
Committed: Mon Mar 12 09:30:18 2018 -0700

--
 .../traversal/strategy/decoration/SubgraphStrategyProcessTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a44500d3/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index 0eccc4f..fe24ff0 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -297,7 +297,7 @@ try {
   throw new IllegalStateException(t.toString(), ex);
 }
 */
-final Traversal t = 
sg.withPath().V(convertToVertexId("josh")).union(outE().inV(), inE().outV());
+final Traversal t = 
sg.withPath().V(convertToVertexId("josh")).union(__.outE().inV(), 
__.inE().outV());
 try {
 assertEquals(2, t.toList().size());
 } catch (Exception ex) {

tinkerpop git commit: foo

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST a179467fc -> cdaab2f92


foo


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

Branch: refs/heads/TRAVIS-TEST
Commit: cdaab2f92b8711902e7d94ab60778a4037d228f1
Parents: a179467
Author: Daniel Kuppitz 
Authored: Mon Mar 12 09:20:02 2018 -0700
Committer: Daniel Kuppitz 
Committed: Mon Mar 12 09:20:02 2018 -0700

--
 .../traversal/strategy/decoration/SubgraphStrategyProcessTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cdaab2f9/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index 0376540..0eccc4f 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -297,7 +297,7 @@ try {
   throw new IllegalStateException(t.toString(), ex);
 }
 */
-final Traversal t = 
sg.withPath().V(convertToVertexId("josh")).bothE().otherV();
+final Traversal t = 
sg.withPath().V(convertToVertexId("josh")).union(outE().inV(), inE().outV());
 try {
 assertEquals(2, t.toList().size());
 } catch (Exception ex) {

tinkerpop git commit: foo

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST f8b4e17e2 -> a179467fc


foo


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

Branch: refs/heads/TRAVIS-TEST
Commit: a179467fc9f94402e713ed689d6b133ac43e974b
Parents: f8b4e17
Author: Daniel Kuppitz 
Authored: Mon Mar 12 09:14:30 2018 -0700
Committer: Daniel Kuppitz 
Committed: Mon Mar 12 09:14:30 2018 -0700

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a179467f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index 23cecfe..0376540 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -267,7 +267,7 @@ public class SubgraphStrategyProcessTest extends 
AbstractGremlinProcessTest {
 final GraphTraversalSource sg = g.withStrategies(strategy);
 
 // three vertices are included in the subgraph
-/*assertEquals(6, g.V().count().next().longValue());
+assertEquals(6, g.V().count().next().longValue());
 assertEquals(3, sg.V().count().next().longValue());
 
 // three edges are explicitly included as we ignore checking of 
adjacent vertices
@@ -288,7 +288,7 @@ public class SubgraphStrategyProcessTest extends 
AbstractGremlinProcessTest {
 
 assertEquals(3, 
g.V(convertToVertexId("josh")).bothE().count().next().longValue());
 assertEquals(2, 
sg.V(convertToVertexId("josh")).bothE().count().next().longValue());
-assertEquals(3, 
g.V(convertToVertexId("josh")).both().count().next().longValue());*/
+assertEquals(3, 
g.V(convertToVertexId("josh")).both().count().next().longValue());
 /*
 final Traversal t = 
sg.V(convertToVertexId("josh")).both().count();
 try {
@@ -300,7 +300,7 @@ try {
 final Traversal t = 
sg.withPath().V(convertToVertexId("josh")).bothE().otherV();
 try {
 assertEquals(2, t.toList().size());
-} catch (IllegalStateException ex) {
+} catch (Exception ex) {
   throw new IllegalStateException(t.toString(), ex);
 }
 // marko not present directly because of vertexCriterion - only 
accessible via vertices in the subgraph

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

[spmallette]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/tp33
Commit: 097ad015ee0595b290824543ebded7558f623a8c
Parents: 7f06a18 d3be13b
Author: Stephen Mallette 
Authored: Mon Mar 12 12:13:10 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 12:13:10 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../jsr223/JavaTranslatorBenchmark.java | 76 
 .../gremlin/jsr223/JavaTranslator.java  | 58 ---
 3 files changed, 125 insertions(+), 10 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/097ad015/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
index 0806c6d,df12055..2df8db5
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
@@@ -50,10 -50,13 +50,11 @@@ import java.util.concurrent.ConcurrentH
   */
  public final class JavaTranslator> implements Translator.StepTranslator {
  
 -private static final boolean IS_TESTING = 
Boolean.valueOf(System.getProperty("is.testing", "false"));
 -
  private final S traversalSource;
- private final Class anonymousTraversal;
+ private final Class anonymousTraversal;
  private static final Map> 
GLOBAL_METHOD_CACHE = new ConcurrentHashMap<>();
- 
+ private final Map> localMethodCache = new 
ConcurrentHashMap<>();
+ private final Method anonymousTraversalStart;
  
  private JavaTranslator(final S traversalSource) {
  this.traversalSource = traversalSource;

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

[spmallette]

Merge branch 'TINKERPOP-1911' 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/d3be13b4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d3be13b4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d3be13b4

Branch: refs/heads/master
Commit: d3be13b4cbc463a652bf94c1b56fb7050abed20d
Parents: f80a542 d9db27f
Author: Stephen Mallette 
Authored: Mon Mar 12 12:12:59 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 12:12:59 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../jsr223/JavaTranslatorBenchmark.java | 76 
 .../gremlin/jsr223/JavaTranslator.java  | 58 ---
 3 files changed, 125 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d3be13b4/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 66fbbb2,54e5347..a31bdf2
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -28,7 -27,7 +28,8 @@@ image::https://raw.githubusercontent.co
  * Modified `GremlinDslProcessor` so that it generated the 
`getAnonymousTraversalClass()` method to return the DSL version of `__`.
  * Added the "Kitchen Sink" test data set.
  * Fixed deserialization of `P.not()` for GraphSON.
 +* Bumped to Jackson 2.9.4.
+ * Improved performance of `JavaTranslator` by caching reflected methods 
required for traversal construction.
  * Added `idleConnectionTimeout` and `keepAliveInterval` to Gremlin Server 
that enables a "ping" and auto-close for seemingly dead clients.
  * Fixed a bug in `NumberHelper` that led to wrong min/max results if numbers 
exceeded the Integer limits.
  * Delayed setting of the request identifier until `RequestMessage` 
construction by the builder.

[1/2] tinkerpop git commit: TINKERPOP-1911 Refactored JavaTranslator

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 f80a54277 -> d3be13b4c


TINKERPOP-1911 Refactored JavaTranslator

Cached methods that were being reflected on every translation which improved 
performance a bit.


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

Branch: refs/heads/tp32
Commit: d9db27f4aa7b8227a557cf5bbb31203612d7548f
Parents: 2c6c151
Author: Stephen Mallette 
Authored: Tue Mar 6 13:00:30 2018 -0500
Committer: Stephen Mallette 
Committed: Tue Mar 6 13:00:30 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../jsr223/JavaTranslatorBenchmark.java | 76 
 .../gremlin/jsr223/JavaTranslator.java  | 58 ---
 3 files changed, 125 insertions(+), 10 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9db27f4/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
--
diff --git 
a/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
 
b/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
new file mode 100644
index 000..d33b574
--- /dev/null
+++ 
b/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.jsr223;
+
+import org.apache.tinkerpop.benchmark.util.AbstractBenchmarkBase;
+import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+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.strategy.decoration.SubgraphStrategy;
+import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.as;
+import static 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.inE;
+import static 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.values;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+@State(Scope.Thread)
+public class 

[1/4] tinkerpop git commit: TINKERPOP-1911 Refactored JavaTranslator

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master c6c3f0f02 -> bf58b63ea


TINKERPOP-1911 Refactored JavaTranslator

Cached methods that were being reflected on every translation which improved 
performance a bit.


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

Branch: refs/heads/master
Commit: d9db27f4aa7b8227a557cf5bbb31203612d7548f
Parents: 2c6c151
Author: Stephen Mallette 
Authored: Tue Mar 6 13:00:30 2018 -0500
Committer: Stephen Mallette 
Committed: Tue Mar 6 13:00:30 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../jsr223/JavaTranslatorBenchmark.java | 76 
 .../gremlin/jsr223/JavaTranslator.java  | 58 ---
 3 files changed, 125 insertions(+), 10 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9db27f4/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
--
diff --git 
a/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
 
b/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
new file mode 100644
index 000..d33b574
--- /dev/null
+++ 
b/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.jsr223;
+
+import org.apache.tinkerpop.benchmark.util.AbstractBenchmarkBase;
+import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+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.strategy.decoration.SubgraphStrategy;
+import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.as;
+import static 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.inE;
+import static 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.values;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+@State(Scope.Thread)
+public class 

[1/3] tinkerpop git commit: TINKERPOP-1911 Refactored JavaTranslator

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 7f06a18ea -> 097ad015e


TINKERPOP-1911 Refactored JavaTranslator

Cached methods that were being reflected on every translation which improved 
performance a bit.


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

Branch: refs/heads/tp33
Commit: d9db27f4aa7b8227a557cf5bbb31203612d7548f
Parents: 2c6c151
Author: Stephen Mallette 
Authored: Tue Mar 6 13:00:30 2018 -0500
Committer: Stephen Mallette 
Committed: Tue Mar 6 13:00:30 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../jsr223/JavaTranslatorBenchmark.java | 76 
 .../gremlin/jsr223/JavaTranslator.java  | 58 ---
 3 files changed, 125 insertions(+), 10 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9db27f4/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
--
diff --git 
a/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
 
b/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
new file mode 100644
index 000..d33b574
--- /dev/null
+++ 
b/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.jsr223;
+
+import org.apache.tinkerpop.benchmark.util.AbstractBenchmarkBase;
+import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+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.strategy.decoration.SubgraphStrategy;
+import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.as;
+import static 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.inE;
+import static 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.values;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+@State(Scope.Thread)
+public class 

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

[spmallette]

Merge branch 'TINKERPOP-1911' 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/d3be13b4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d3be13b4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d3be13b4

Branch: refs/heads/tp32
Commit: d3be13b4cbc463a652bf94c1b56fb7050abed20d
Parents: f80a542 d9db27f
Author: Stephen Mallette 
Authored: Mon Mar 12 12:12:59 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 12:12:59 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../jsr223/JavaTranslatorBenchmark.java | 76 
 .../gremlin/jsr223/JavaTranslator.java  | 58 ---
 3 files changed, 125 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d3be13b4/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 66fbbb2,54e5347..a31bdf2
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -28,7 -27,7 +28,8 @@@ image::https://raw.githubusercontent.co
  * Modified `GremlinDslProcessor` so that it generated the 
`getAnonymousTraversalClass()` method to return the DSL version of `__`.
  * Added the "Kitchen Sink" test data set.
  * Fixed deserialization of `P.not()` for GraphSON.
 +* Bumped to Jackson 2.9.4.
+ * Improved performance of `JavaTranslator` by caching reflected methods 
required for traversal construction.
  * Added `idleConnectionTimeout` and `keepAliveInterval` to Gremlin Server 
that enables a "ping" and auto-close for seemingly dead clients.
  * Fixed a bug in `NumberHelper` that led to wrong min/max results if numbers 
exceeded the Integer limits.
  * Delayed setting of the request identifier until `RequestMessage` 
construction by the builder.

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

[spmallette]

Merge branch 'TINKERPOP-1911' 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/d3be13b4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d3be13b4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d3be13b4

Branch: refs/heads/tp33
Commit: d3be13b4cbc463a652bf94c1b56fb7050abed20d
Parents: f80a542 d9db27f
Author: Stephen Mallette 
Authored: Mon Mar 12 12:12:59 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 12:12:59 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../jsr223/JavaTranslatorBenchmark.java | 76 
 .../gremlin/jsr223/JavaTranslator.java  | 58 ---
 3 files changed, 125 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d3be13b4/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 66fbbb2,54e5347..a31bdf2
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -28,7 -27,7 +28,8 @@@ image::https://raw.githubusercontent.co
  * Modified `GremlinDslProcessor` so that it generated the 
`getAnonymousTraversalClass()` method to return the DSL version of `__`.
  * Added the "Kitchen Sink" test data set.
  * Fixed deserialization of `P.not()` for GraphSON.
 +* Bumped to Jackson 2.9.4.
+ * Improved performance of `JavaTranslator` by caching reflected methods 
required for traversal construction.
  * Added `idleConnectionTimeout` and `keepAliveInterval` to Gremlin Server 
that enables a "ping" and auto-close for seemingly dead clients.
  * Fixed a bug in `NumberHelper` that led to wrong min/max results if numbers 
exceeded the Integer limits.
  * Delayed setting of the request identifier until `RequestMessage` 
construction by the builder.

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

[spmallette]

Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: bf58b63ea7855bf59121c6bea862776149057a6a
Parents: c6c3f0f 097ad01
Author: Stephen Mallette 
Authored: Mon Mar 12 12:13:17 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 12:13:17 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../jsr223/JavaTranslatorBenchmark.java | 76 
 .../gremlin/jsr223/JavaTranslator.java  | 58 ---
 3 files changed, 125 insertions(+), 10 deletions(-)
--


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

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

[spmallette]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/master
Commit: 097ad015ee0595b290824543ebded7558f623a8c
Parents: 7f06a18 d3be13b
Author: Stephen Mallette 
Authored: Mon Mar 12 12:13:10 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 12:13:10 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../jsr223/JavaTranslatorBenchmark.java | 76 
 .../gremlin/jsr223/JavaTranslator.java  | 58 ---
 3 files changed, 125 insertions(+), 10 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/097ad015/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
index 0806c6d,df12055..2df8db5
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
@@@ -50,10 -50,13 +50,11 @@@ import java.util.concurrent.ConcurrentH
   */
  public final class JavaTranslator> implements Translator.StepTranslator {
  
 -private static final boolean IS_TESTING = 
Boolean.valueOf(System.getProperty("is.testing", "false"));
 -
  private final S traversalSource;
- private final Class anonymousTraversal;
+ private final Class anonymousTraversal;
  private static final Map> 
GLOBAL_METHOD_CACHE = new ConcurrentHashMap<>();
- 
+ private final Map> localMethodCache = new 
ConcurrentHashMap<>();
+ private final Method anonymousTraversalStart;
  
  private JavaTranslator(final S traversalSource) {
  this.traversalSource = traversalSource;

[08/13] tinkerpop git commit: TINKERPOP-1918 Fixed some return types in the gherkin tests CTR

[spmallette]

TINKERPOP-1918 Fixed some return types in the gherkin tests CTR


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

Branch: refs/heads/TINKERPOP-1896
Commit: f38c2bbf15c456f5067c0b65873e33756329269e
Parents: bbb1377
Author: Stephen Mallette 
Authored: Mon Mar 12 08:23:05 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 08:23:05 2018 -0400

--
 .../Gherkin/GherkinTestRunner.cs|  5 -
 gremlin-test/features/sideEffect/Sack.feature   | 12 ++--
 2 files changed, 6 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f38c2bbf/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 4a1d646..9d0f15d 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -40,11 +40,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 private static readonly IDictionary 
IgnoredScenarios =
 new Dictionary
 {
-{
-
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
-IgnoreReason.NumericalValuesHaveWrongTypes
-},
-{"g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NumericalValuesHaveWrongTypes},
 {"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
 {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray},
 {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f38c2bbf/gremlin-test/features/sideEffect/Sack.feature
--
diff --git a/gremlin-test/features/sideEffect/Sack.feature 
b/gremlin-test/features/sideEffect/Sack.feature
index 89e3946..8d97c0c 100644
--- a/gremlin-test/features/sideEffect/Sack.feature
+++ b/gremlin-test/features/sideEffect/Sack.feature
@@ -92,10 +92,10 @@ Feature: Step - sack()
 When iterated to list
 Then the result should be unordered
   | result |
-  | d[3].l |
-  | d[1].l |
-  | d[1].l |
-  | d[1].l |
+  | d[3].i |
+  | d[1].i |
+  | d[1].i |
+  | d[1].i |
 
   Scenario: 
g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack
 Given the modern graph
@@ -107,5 +107,5 @@ Feature: Step - sack()
 When iterated to list
 Then the result should be unordered
   | result |
-  | d[1.0].d |
-  | d[1.0].d |
\ No newline at end of file
+  | d[1.0].m |
+  | d[1.0].m |
\ No newline at end of file

tinkerpop git commit: foo

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TRAVIS-TEST d490540ea -> f8b4e17e2


foo


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

Branch: refs/heads/TRAVIS-TEST
Commit: f8b4e17e29cfc6f3a3c944c23a1f7ef8e871ef41
Parents: d490540
Author: Daniel Kuppitz 
Authored: Mon Mar 12 09:00:13 2018 -0700
Committer: Daniel Kuppitz 
Committed: Mon Mar 12 09:00:13 2018 -0700

--
 .../traversal/strategy/decoration/SubgraphStrategyProcessTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f8b4e17e/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index a225890..23cecfe 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -297,7 +297,7 @@ try {
   throw new IllegalStateException(t.toString(), ex);
 }
 */
-final Traversal t = 
sg.withPath().V(convertToVertexId("josh")).both();
+final Traversal t = 
sg.withPath().V(convertToVertexId("josh")).bothE().otherV();
 try {
 assertEquals(2, t.toList().size());
 } catch (IllegalStateException ex) {

[09/13] tinkerpop git commit: Merge branch 'TINKERPOP-1884' into tp32

[spmallette]

Merge branch 'TINKERPOP-1884' into tp32


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

Branch: refs/heads/TINKERPOP-1896
Commit: f80a54277d488bae49d4e08032d26b50199189a0
Parents: f38c2bb eefc4db
Author: Stephen Mallette 
Authored: Mon Mar 12 10:04:17 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 10:04:17 2018 -0400

--
 CHANGELOG.asciidoc | 1 +
 pom.xml| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


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

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

[06/13] tinkerpop git commit: Make decimal serialization in Gremlin.Net culture independent CTR

[spmallette]

Make decimal serialization in Gremlin.Net culture independent CTR

This led tests fail on my system and probably leads to broken
serialization of gx:BigDecimal on systems with ',' as the decimal
separator.


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

Branch: refs/heads/TINKERPOP-1896
Commit: ab66ed384b8c95475755dff1c558e392e0cc7e8c
Parents: 552820a
Author: Florian Hockmann 
Authored: Sat Mar 10 16:29:42 2018 +0100
Committer: Florian Hockmann 
Committed: Sat Mar 10 16:29:42 2018 +0100

--
 .../src/Gremlin.Net/Structure/IO/GraphSON/NumberConverter.cs  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ab66ed38/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/NumberConverter.cs
--
diff --git 
a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/NumberConverter.cs 
b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/NumberConverter.cs
index 53dad94..8127415 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/NumberConverter.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/NumberConverter.cs
@@ -23,6 +23,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using Newtonsoft.Json.Linq;
 
 namespace Gremlin.Net.Structure.IO.GraphSON
@@ -44,7 +45,7 @@ namespace Gremlin.Net.Structure.IO.GraphSON
 object value = objectData;
 if (StringifyValue)
 {
-value = value?.ToString();
+value = string.Format(CultureInfo.InvariantCulture, "{0}", 
value);
 }
 return GraphSONUtil.ToTypedValue(GraphSONTypeName, value, Prefix);
 }

[11/13] tinkerpop git commit: TINKERPOP-1898 Can't seem to fix this in a consistent way given jython evaluation

[spmallette]

TINKERPOP-1898 Can't seem to fix this in a consistent way given jython 
evaluation

Jython seems to have problems with varargs that are not easily resolved. 
Nothing I've tried works consistently. Sometimes it works and other times not.


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

Branch: refs/heads/TINKERPOP-1896
Commit: c82d06e05cfcc05607dd2d84c0c2d1475f0a0ddf
Parents: c677a21
Author: Stephen Mallette 
Authored: Mon Mar 12 11:53:57 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 11:56:16 2018 -0400

--
 .../tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c82d06e0/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
--
diff --git 
a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
 
b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
index 343819c..3165df3 100644
--- 
a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
+++ 
b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
@@ -29,6 +29,7 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.Read
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
 import org.apache.tinkerpop.gremlin.util.function.Lambda;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -108,6 +109,7 @@ public class JythonTranslatorTest {
 }
 
 @Test
+@Ignore("TINKERPOP-1898 - ultimately seems to be a problem with jython and 
varargs - doesn't act consistently")
 public void shouldTranslateToJythonWhenUsingLambdasAndStrategies() throws 
Exception {
 // the jython translation kicks in when you add a lambda so ensure 
that it translates when strategies are
 // present

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

[spmallette]

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


TINKERPOP-1908 Bump to Groovy 2.4.14


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

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

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


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

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

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

[13/13] tinkerpop git commit: TINKERPOP-1896 Fixed bug in lambda processing for python

[spmallette]

TINKERPOP-1896 Fixed bug in lambda processing for python

When a lambda is in a traversal, the bytecode gets pushed to a scriptengine for 
evaluation. For python that means, using the JythonTranslator. Prior to this 
change the JythonTranslator largely relied on the PythonTranslator to convert 
bytecode to Jython-syntaxed Gremlin. The problem there is that in the 
JythonScriptEngine, the Traversal bindings are Java objects and so if 
translated to pure Python syntax, traversal steps like as() become as_() and 
thus not part of the Java API that is expected - and then errors. Not sure why 
this didn't come up sooner, but it really only ends up being an issue if you 
are using bytecode, use gremlin server, use jython in gremlin server and then 
submit a traversal with a lambda - so perhaps that hasn't been a common 
combination.


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

Branch: refs/heads/TINKERPOP-1896
Commit: 5feadbddba308a6999649dffb193cf7d31b4645c
Parents: f80a542
Author: Stephen Mallette 
Authored: Thu Mar 8 17:15:34 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 12 11:56:16 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../jsr223/GremlinJythonScriptEngine.java   |  7 +--
 .../gremlin/python/jsr223/JythonTranslator.java |  9 
 .../gremlin/python/jsr223/PythonTranslator.java | 19 +---
 .../python/jsr223/JythonTranslatorTest.java | 47 +---
 5 files changed, 44 insertions(+), 39 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5feadbdd/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngine.java
--
diff --git 
a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngine.java
 
b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngine.java
index 10f4790..a28a58f 100644
--- 
a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngine.java
+++ 
b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngine.java
@@ -41,11 +41,11 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
  * @author Marko A. Rodriguez (http://markorodriguez.com)
+ * @author Stephen Mallette (http://stephen.genoprime.com)
  */
 public class GremlinJythonScriptEngine implements GremlinScriptEngine {
 
@@ -123,10 +123,7 @@ public class GremlinJythonScriptEngine implements 
GremlinScriptEngine {
 // extract the named traversalsource prior to that happening so that 
bytecode bindings can share the same
 // namespace as global bindings (e.g. traversalsources and graphs).
 if (traversalSource.equals(HIDDEN_G))
-throw new IllegalArgumentException("The traversalSource cannot 
have the name " + HIDDEN_G+ " - it is reserved");
-
-if (bindings.containsKey(HIDDEN_G))
-throw new IllegalArgumentException("Bindings cannot include " + 
HIDDEN_G + " - it is reserved");
+throw new IllegalArgumentException("The traversalSource cannot 
have the name " + HIDDEN_G + " - it is reserved");
 
 if (!bindings.containsKey(traversalSource))
 throw new IllegalArgumentException("The bindings available to the 
ScriptEngine do not contain a traversalSource 

[03/13] tinkerpop git commit: fix build docs error - CTR

[spmallette]

fix build docs error - CTR


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

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

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


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

[02/13] tinkerpop git commit: TINKERPOP-1884 Bump to Netty 4.0.56.Final

[spmallette]

TINKERPOP-1884 Bump to Netty 4.0.56.Final


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

Branch: refs/heads/TINKERPOP-1896
Commit: eefc4dbf04396b57e1ff1d66292e5bedaf5ee1da
Parents: 4db0991
Author: Stephen Mallette 
Authored: Sat Mar 3 09:41:34 2018 -0500
Committer: Stephen Mallette 
Committed: Sat Mar 3 10:47:00 2018 -0500

--
 CHANGELOG.asciidoc | 1 +
 pom.xml| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eefc4dbf/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a24b1fb..9544e2a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -34,6 +34,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Removed hardcoded expectation in metrics serialization test suite as 
different providers may have different outputs.
 * Added `IndexedTraverserSet` which indexes on the value of a `Traverser` thus 
improving performance when used.
 * Utilized `IndexedTraverserSet` in `TraversalVertexProgram` to avoid extra 
iteration when doing `Vertex` lookups.
+* Bumped to Netty 4.0.56.Final.
 * Fixed a bug in Gremlin Console which prevented handling of `gremlin.sh` 
flags that had an "=" between the flag and its arguments.
 * Fixed bug where `SparkMessenger` was not applying the `edgeFunction` from 
`MessageScope`.
 * Fixed a bug in `ComputerAwareStep` that didn't handle `reset()` properly and 
thus occasionally produced some extra traversers.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eefc4dbf/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f6ff536..90e8215 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@ limitations under the License.
 2.10.4
 1.1
 3.0.2
-4.0.53.Final
+4.0.56.Final
 1.7.21
 1.15
 1.6.1

[12/13] tinkerpop git commit: TINKERPOP-1898 Specifically tested SubgraphStrategy for jython evaluation

[spmallette]

TINKERPOP-1898 Specifically tested SubgraphStrategy for jython evaluation


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

Branch: refs/heads/TINKERPOP-1896
Commit: c677a21d3fde73c496145915c66e7963c5290f69
Parents: f3172bc
Author: Stephen Mallette 
Authored: Fri Mar 9 10:17:09 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 12 11:56:16 2018 -0400

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


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

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

[05/13] tinkerpop git commit: Merge branch 'TINKERPOP-1908' into tp32

[spmallette]

Merge branch 'TINKERPOP-1908' into tp32


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

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

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


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

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

[10/13] tinkerpop git commit: TINKERPOP-1895 Fixed jython based evaluations of withStrategies

[spmallette]

TINKERPOP-1895 Fixed jython based evaluations of withStrategies

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


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

Branch: refs/heads/TINKERPOP-1896
Commit: f3172bc55ef3e8f298dccfeb18c9fe6b4c27767c
Parents: 5feadbd
Author: Stephen Mallette 
Authored: Fri Mar 9 09:38:35 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 12 11:56:16 2018 -0400

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


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

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

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

tinkerpop git commit: TINKERPOP-1901 Use spaces to indent enum values

[florianhockmann]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1901 d012171e9 -> 4d5768b0a


TINKERPOP-1901 Use spaces to indent enum values

Previously, the first enum value used spaces, whereas all following
values used tabs. Now, spaces are used consistently.


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

Branch: refs/heads/TINKERPOP-1901
Commit: 4d5768b0aa53e06e95738f3faf904d3290a91794
Parents: d012171
Author: Florian Hockmann 
Authored: Mon Mar 12 16:37:30 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Mar 12 16:37:30 2018 +0100

--
 gremlin-dotnet/glv/Enum.template|  4 ++--
 gremlin-dotnet/glv/generate.groovy  |  2 +-
 .../Gremlin.Net/Process/Traversal/Barrier.cs|  2 +-
 .../Process/Traversal/Cardinality.cs|  8 +++
 .../src/Gremlin.Net/Process/Traversal/Column.cs |  6 ++---
 .../Gremlin.Net/Process/Traversal/Direction.cs  |  8 +++
 .../Process/Traversal/GraphSONVersion.cs|  6 ++---
 .../Process/Traversal/GryoVersion.cs|  2 +-
 .../Gremlin.Net/Process/Traversal/Operator.cs   | 24 ++--
 .../src/Gremlin.Net/Process/Traversal/Order.cs  | 16 ++---
 .../src/Gremlin.Net/Process/Traversal/Pick.cs   |  6 ++---
 .../src/Gremlin.Net/Process/Traversal/Pop.cs|  8 +++
 .../src/Gremlin.Net/Process/Traversal/Scope.cs  |  6 ++---
 .../src/Gremlin.Net/Process/Traversal/T.cs  | 10 
 14 files changed, 54 insertions(+), 54 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4d5768b0/gremlin-dotnet/glv/Enum.template
--
diff --git a/gremlin-dotnet/glv/Enum.template b/gremlin-dotnet/glv/Enum.template
index 0be23c7..1f11076 100644
--- a/gremlin-dotnet/glv/Enum.template
+++ b/gremlin-dotnet/glv/Enum.template
@@ -32,8 +32,8 @@ namespace Gremlin.Net.Process.Traversal
 : base("<%= enumClass.simpleName %>", enumValue)
 {
 }
-
-<%= constants %>
+<% constants.each { constant -> %> 
+<%= constant %><%}%>
 }
 
 #pragma warning restore 1591

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4d5768b0/gremlin-dotnet/glv/generate.groovy
--
diff --git a/gremlin-dotnet/glv/generate.groovy 
b/gremlin-dotnet/glv/generate.groovy
index 6d89b2f..0404307 100644
--- a/gremlin-dotnet/glv/generate.groovy
+++ b/gremlin-dotnet/glv/generate.groovy
@@ -354,7 +354,7 @@ def createEnum = { enumClass ->
 collect { value ->
 def csharpName = toCSharpName(enumClass, value.name())
 return "public static ${enumClass.simpleName} 
${csharpName} => new ${enumClass.simpleName}(\"${value.name()}\");"
-}.join("\n\t\t")]
+}]
 
 def enumTemplate = engine.createTemplate(new 
File("${projectBaseDir}/glv/Enum.template")).make(b)
 def enumFile = new 
File("${projectBaseDir}/src/Gremlin.Net/Process/Traversal/" + 
enumClass.getSimpleName() + ".cs")

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4d5768b0/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Barrier.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Barrier.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Barrier.cs
index 0ae4fa2..df6d349 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Barrier.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Barrier.cs
@@ -32,7 +32,7 @@ namespace Gremlin.Net.Process.Traversal
 : base("Barrier", enumValue)
 {
 }
-
+ 
 public static Barrier NormSack => new Barrier("normSack");
 }
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4d5768b0/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Cardinality.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Cardinality.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Cardinality.cs
index f158153..d2cbcf2 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Cardinality.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Cardinality.cs
@@ -32,10 +32,10 @@ namespace Gremlin.Net.Process.Traversal
 : base("Cardinality", enumValue)
 {
 }
-
-public static Cardinality List => new Cardinality("list");
-   public static Cardinality Set => new 

[1/2] tinkerpop git commit: TINKERPOP-1446 Added standard string representation for Path objects

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master 98ed8757d -> c6c3f0f02


TINKERPOP-1446 Added standard string representation for Path objects


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

Branch: refs/heads/master
Commit: c7bf69d98c229dcc5c2f23a17c88d317ae73be6e
Parents: 4113f0e
Author: Stephen Mallette 
Authored: Sat Mar 3 12:25:00 2018 -0500
Committer: Stephen Mallette 
Committed: Sat Mar 3 12:25:00 2018 -0500

--
 CHANGELOG.asciidoc  | 1 +
 .../gremlin/process/traversal/step/util/EmptyPath.java  | 6 ++
 .../gremlin/process/traversal/step/util/ImmutablePath.java  | 3 ++-
 .../gremlin/process/traversal/step/util/MutablePath.java| 3 ++-
 .../tinkerpop/gremlin/structure/util/StringFactory.java | 9 +++--
 gremlin-dotnet/src/Gremlin.Net/Structure/Path.cs| 2 +-
 .../Structure/IO/GraphSON/GraphSONReaderTests.cs| 4 ++--
 .../test/Gremlin.Net.UnitTest/Structure/PathTests.cs| 2 +-
 .../javascript/gremlin-javascript/lib/structure/graph.js| 4 
 .../src/main/jython/gremlin_python/structure/graph.py   | 2 +-
 .../src/main/jython/tests/structure/io/test_graphsonV2d0.py | 5 +
 .../src/main/jython/tests/structure/io/test_graphsonV3d0.py | 5 +
 .../src/main/jython/tests/structure/test_graph.py   | 2 +-
 13 files changed, 30 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c7bf69d9/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 46b0e5b..9ecb5a2 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,7 @@ NEED AND IMAGE
 
 This release also includes changes from <>.
 
+* Change the `toString()` of `Path` to be standardized as other graph elements 
are.
 
 == TinkerPop 3.3.0 (Gremlin Symphony #40 in G Minor)
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c7bf69d9/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/EmptyPath.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/EmptyPath.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/EmptyPath.java
index 0c6827e..69111ee 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/EmptyPath.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/EmptyPath.java
@@ -19,6 +19,7 @@
 package org.apache.tinkerpop.gremlin.process.traversal.step.util;
 
 import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -103,4 +104,9 @@ public final class EmptyPath implements Path, Serializable {
 public boolean equals(final Object object) {
 return object instanceof EmptyPath;
 }
+
+@Override
+public String toString() {
+return StringFactory.pathString(this);
+}
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c7bf69d9/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ImmutablePath.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ImmutablePath.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ImmutablePath.java
index 7a6b9a8..623b810 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ImmutablePath.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ImmutablePath.java
@@ -20,6 +20,7 @@ package 
org.apache.tinkerpop.gremlin.process.traversal.step.util;
 
 import org.apache.tinkerpop.gremlin.process.traversal.Path;
 import org.apache.tinkerpop.gremlin.process.traversal.Pop;
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -217,7 +218,7 @@ public class ImmutablePath implements Path, Serializable, 
Cloneable {
 
 @Override
 public String toString() {
-return this.objects().toString();
+return StringFactory.pathString(this);
 }
 
 @Override

[2/2] tinkerpop git commit: Merge branch 'TINKERPOP-1446'

[spmallette]

Merge branch 'TINKERPOP-1446'

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

Branch: refs/heads/master
Commit: c6c3f0f026c6d6e6c9c324c6e48835773a870ba0
Parents: 98ed875 c7bf69d
Author: Stephen Mallette 
Authored: Mon Mar 12 10:11:44 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 10:11:44 2018 -0400

--
 CHANGELOG.asciidoc  | 1 +
 .../gremlin/process/traversal/step/util/EmptyPath.java  | 6 ++
 .../gremlin/process/traversal/step/util/ImmutablePath.java  | 3 ++-
 .../gremlin/process/traversal/step/util/MutablePath.java| 3 ++-
 .../tinkerpop/gremlin/structure/util/StringFactory.java | 9 +++--
 gremlin-dotnet/src/Gremlin.Net/Structure/Path.cs| 2 +-
 .../Structure/IO/GraphSON/GraphSONReaderTests.cs| 4 ++--
 .../test/Gremlin.Net.UnitTest/Structure/PathTests.cs| 2 +-
 .../javascript/gremlin-javascript/lib/structure/graph.js| 4 
 .../src/main/jython/gremlin_python/structure/graph.py   | 2 +-
 .../src/main/jython/tests/structure/io/test_graphsonV2d0.py | 5 +
 .../src/main/jython/tests/structure/io/test_graphsonV3d0.py | 5 +
 .../src/main/jython/tests/structure/test_graph.py   | 2 +-
 13 files changed, 30 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c6c3f0f0/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 5a986c6,9ecb5a2..9afe904
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -25,8 -25,7 +25,9 @@@ NEED AND IMAG
  
  This release also includes changes from <>.
  
+ * Change the `toString()` of `Path` to be standardized as other graph 
elements are.
 +* Fixed a bug in `ReducingBarrierStep`, that returned the provided seed value 
despite no elements being available.
 +* Changed the order of `select()` scopes. The order is now: maps, 
side-effects, paths.
  
  == TinkerPop 3.3.0 (Gremlin Symphony #40 in G Minor)
  

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

[spmallette]

Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: 98ed8757ddfd21427b95bf0ac7c8ce3a8892ecf3
Parents: 0ac6ccf 7f06a18
Author: Stephen Mallette 
Authored: Mon Mar 12 10:05:47 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 10:05:47 2018 -0400

--
 CHANGELOG.asciidoc | 3 ++-
 pom.xml| 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
--


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

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

[2/4] tinkerpop git commit: TINKERPOP-1884 Bump to Netty 4.1.21.Final

[spmallette]

TINKERPOP-1884 Bump to Netty 4.1.21.Final


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

Branch: refs/heads/master
Commit: ed57980cb34e2b60fc5a1a1570c7aa2252ee3c5a
Parents: 09bb990
Author: Stephen Mallette 
Authored: Sat Mar 3 10:30:48 2018 -0500
Committer: Stephen Mallette 
Committed: Sat Mar 3 10:49:18 2018 -0500

--
 CHANGELOG.asciidoc | 3 ++-
 pom.xml| 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ed57980c/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 7f0496d..27bfa54 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,7 +25,8 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 
 This release also includes changes from <>.
 
-* Fixed regression issue where the HTTPChannelizer doesn't instantiate the 
specified AuthenticationHandler
+* Fixed regression issue where the HTTPChannelizer doesn't instantiate the 
specified AuthenticationHandler.
+* Bumped to Netty 4.1.21.Final.
 * Defaulted GLV tests for gremlin-python to run for GraphSON 3.0.
 * Fixed a bug with `Tree` serialization in GraphSON 3.0.
 * In gremlin-python, the GraphSON 3.0 `g:Set` type is now deserialized to 
`List`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ed57980c/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 1c7a04b..10dde57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@ limitations under the License.
 2.10.4
 1.1
 3.0.2
-4.0.56.Final
+4.1.21.Final
 1.7.21
 1.15
 2.2.0

[3/3] tinkerpop git commit: Merge branch 'TINKERPOP-1884-tp33' into tp33

[spmallette]

Merge branch 'TINKERPOP-1884-tp33' into tp33


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

Branch: refs/heads/tp33
Commit: 7f06a18eafbbfd10ac4ea978afa3fbb2b7fdf658
Parents: d62e50e ed57980
Author: Stephen Mallette 
Authored: Mon Mar 12 10:05:38 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 10:05:38 2018 -0400

--
 CHANGELOG.asciidoc | 3 ++-
 pom.xml| 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
--


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

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

[2/3] tinkerpop git commit: TINKERPOP-1884 Bump to Netty 4.1.21.Final

[spmallette]

TINKERPOP-1884 Bump to Netty 4.1.21.Final


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

Branch: refs/heads/tp33
Commit: ed57980cb34e2b60fc5a1a1570c7aa2252ee3c5a
Parents: 09bb990
Author: Stephen Mallette 
Authored: Sat Mar 3 10:30:48 2018 -0500
Committer: Stephen Mallette 
Committed: Sat Mar 3 10:49:18 2018 -0500

--
 CHANGELOG.asciidoc | 3 ++-
 pom.xml| 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ed57980c/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 7f0496d..27bfa54 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,7 +25,8 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 
 This release also includes changes from <>.
 
-* Fixed regression issue where the HTTPChannelizer doesn't instantiate the 
specified AuthenticationHandler
+* Fixed regression issue where the HTTPChannelizer doesn't instantiate the 
specified AuthenticationHandler.
+* Bumped to Netty 4.1.21.Final.
 * Defaulted GLV tests for gremlin-python to run for GraphSON 3.0.
 * Fixed a bug with `Tree` serialization in GraphSON 3.0.
 * In gremlin-python, the GraphSON 3.0 `g:Set` type is now deserialized to 
`List`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ed57980c/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 1c7a04b..10dde57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@ limitations under the License.
 2.10.4
 1.1
 3.0.2
-4.0.56.Final
+4.1.21.Final
 1.7.21
 1.15
 2.2.0

[3/4] tinkerpop git commit: Merge branch 'TINKERPOP-1884-tp33' into tp33

[spmallette]

Merge branch 'TINKERPOP-1884-tp33' into tp33


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

Branch: refs/heads/master
Commit: 7f06a18eafbbfd10ac4ea978afa3fbb2b7fdf658
Parents: d62e50e ed57980
Author: Stephen Mallette 
Authored: Mon Mar 12 10:05:38 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 10:05:38 2018 -0400

--
 CHANGELOG.asciidoc | 3 ++-
 pom.xml| 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
--


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

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

[1/3] tinkerpop git commit: TINKERPOP-1884 Bump to Netty 4.0.56.Final

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 3797c7d6d -> d62e50e5c


TINKERPOP-1884 Bump to Netty 4.0.56.Final


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

Branch: refs/heads/tp33
Commit: eefc4dbf04396b57e1ff1d66292e5bedaf5ee1da
Parents: 4db0991
Author: Stephen Mallette 
Authored: Sat Mar 3 09:41:34 2018 -0500
Committer: Stephen Mallette 
Committed: Sat Mar 3 10:47:00 2018 -0500

--
 CHANGELOG.asciidoc | 1 +
 pom.xml| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eefc4dbf/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a24b1fb..9544e2a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -34,6 +34,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Removed hardcoded expectation in metrics serialization test suite as 
different providers may have different outputs.
 * Added `IndexedTraverserSet` which indexes on the value of a `Traverser` thus 
improving performance when used.
 * Utilized `IndexedTraverserSet` in `TraversalVertexProgram` to avoid extra 
iteration when doing `Vertex` lookups.
+* Bumped to Netty 4.0.56.Final.
 * Fixed a bug in Gremlin Console which prevented handling of `gremlin.sh` 
flags that had an "=" between the flag and its arguments.
 * Fixed bug where `SparkMessenger` was not applying the `edgeFunction` from 
`MessageScope`.
 * Fixed a bug in `ComputerAwareStep` that didn't handle `reset()` properly and 
thus occasionally produced some extra traversers.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eefc4dbf/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f6ff536..90e8215 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@ limitations under the License.
 2.10.4
 1.1
 3.0.2
-4.0.53.Final
+4.0.56.Final
 1.7.21
 1.15
 1.6.1

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

[spmallette]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/master
Commit: d62e50e5c13fcfe6fcd7958727500816c382a200
Parents: 3797c7d f80a542
Author: Stephen Mallette 
Authored: Mon Mar 12 10:04:28 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 10:04:28 2018 -0400

--
 CHANGELOG.asciidoc | 1 +
 pom.xml| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d62e50e5/pom.xml
--
diff --cc pom.xml
index a29ccf0,da50996..cf1e039
--- a/pom.xml
+++ b/pom.xml
@@@ -146,10 -147,10 +146,10 @@@ limitations under the License
  2.10.4
  1.1
  3.0.2
- 4.0.53.Final
+ 4.0.56.Final
  1.7.21
  1.15
 -1.6.1
 +2.2.0
  
  UTF-8
  
UTF-8

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

[spmallette]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/tp33
Commit: d62e50e5c13fcfe6fcd7958727500816c382a200
Parents: 3797c7d f80a542
Author: Stephen Mallette 
Authored: Mon Mar 12 10:04:28 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 10:04:28 2018 -0400

--
 CHANGELOG.asciidoc | 1 +
 pom.xml| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d62e50e5/pom.xml
--
diff --cc pom.xml
index a29ccf0,da50996..cf1e039
--- a/pom.xml
+++ b/pom.xml
@@@ -146,10 -147,10 +146,10 @@@ limitations under the License
  2.10.4
  1.1
  3.0.2
- 4.0.53.Final
+ 4.0.56.Final
  1.7.21
  1.15
 -1.6.1
 +2.2.0
  
  UTF-8
  
UTF-8

[1/4] tinkerpop git commit: TINKERPOP-1884 Bump to Netty 4.0.56.Final

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master 3bbdbded2 -> 0ac6ccfa8


TINKERPOP-1884 Bump to Netty 4.0.56.Final


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

Branch: refs/heads/master
Commit: eefc4dbf04396b57e1ff1d66292e5bedaf5ee1da
Parents: 4db0991
Author: Stephen Mallette 
Authored: Sat Mar 3 09:41:34 2018 -0500
Committer: Stephen Mallette 
Committed: Sat Mar 3 10:47:00 2018 -0500

--
 CHANGELOG.asciidoc | 1 +
 pom.xml| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eefc4dbf/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a24b1fb..9544e2a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -34,6 +34,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Removed hardcoded expectation in metrics serialization test suite as 
different providers may have different outputs.
 * Added `IndexedTraverserSet` which indexes on the value of a `Traverser` thus 
improving performance when used.
 * Utilized `IndexedTraverserSet` in `TraversalVertexProgram` to avoid extra 
iteration when doing `Vertex` lookups.
+* Bumped to Netty 4.0.56.Final.
 * Fixed a bug in Gremlin Console which prevented handling of `gremlin.sh` 
flags that had an "=" between the flag and its arguments.
 * Fixed bug where `SparkMessenger` was not applying the `edgeFunction` from 
`MessageScope`.
 * Fixed a bug in `ComputerAwareStep` that didn't handle `reset()` properly and 
thus occasionally produced some extra traversers.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eefc4dbf/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f6ff536..90e8215 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@ limitations under the License.
 2.10.4
 1.1
 3.0.2
-4.0.53.Final
+4.0.56.Final
 1.7.21
 1.15
 1.6.1

[1/2] tinkerpop git commit: TINKERPOP-1884 Bump to Netty 4.0.56.Final

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 f38c2bbf1 -> f80a54277


TINKERPOP-1884 Bump to Netty 4.0.56.Final


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

Branch: refs/heads/tp32
Commit: eefc4dbf04396b57e1ff1d66292e5bedaf5ee1da
Parents: 4db0991
Author: Stephen Mallette 
Authored: Sat Mar 3 09:41:34 2018 -0500
Committer: Stephen Mallette 
Committed: Sat Mar 3 10:47:00 2018 -0500

--
 CHANGELOG.asciidoc | 1 +
 pom.xml| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eefc4dbf/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a24b1fb..9544e2a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -34,6 +34,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Removed hardcoded expectation in metrics serialization test suite as 
different providers may have different outputs.
 * Added `IndexedTraverserSet` which indexes on the value of a `Traverser` thus 
improving performance when used.
 * Utilized `IndexedTraverserSet` in `TraversalVertexProgram` to avoid extra 
iteration when doing `Vertex` lookups.
+* Bumped to Netty 4.0.56.Final.
 * Fixed a bug in Gremlin Console which prevented handling of `gremlin.sh` 
flags that had an "=" between the flag and its arguments.
 * Fixed bug where `SparkMessenger` was not applying the `edgeFunction` from 
`MessageScope`.
 * Fixed a bug in `ComputerAwareStep` that didn't handle `reset()` properly and 
thus occasionally produced some extra traversers.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eefc4dbf/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f6ff536..90e8215 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@ limitations under the License.
 2.10.4
 1.1
 3.0.2
-4.0.53.Final
+4.0.56.Final
 1.7.21
 1.15
 1.6.1

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

[spmallette]

Merge branch 'TINKERPOP-1884' into tp32


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

Branch: refs/heads/tp32
Commit: f80a54277d488bae49d4e08032d26b50199189a0
Parents: f38c2bb eefc4db
Author: Stephen Mallette 
Authored: Mon Mar 12 10:04:17 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 10:04:17 2018 -0400

--
 CHANGELOG.asciidoc | 1 +
 pom.xml| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


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

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

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

[spmallette]

Merge branch 'TINKERPOP-1884' into tp32


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

Branch: refs/heads/tp33
Commit: f80a54277d488bae49d4e08032d26b50199189a0
Parents: f38c2bb eefc4db
Author: Stephen Mallette 
Authored: Mon Mar 12 10:04:17 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 10:04:17 2018 -0400

--
 CHANGELOG.asciidoc | 1 +
 pom.xml| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


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

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

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

[spmallette]

Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: 0ac6ccfa8e0885f5ffc11795e6af61bc45184239
Parents: 3bbdbde d62e50e
Author: Stephen Mallette 
Authored: Mon Mar 12 10:04:41 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 10:04:41 2018 -0400

--
 CHANGELOG.asciidoc | 1 +
 pom.xml| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


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

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

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

[spmallette]

Merge branch 'TINKERPOP-1884' into tp32


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

Branch: refs/heads/master
Commit: f80a54277d488bae49d4e08032d26b50199189a0
Parents: f38c2bb eefc4db
Author: Stephen Mallette 
Authored: Mon Mar 12 10:04:17 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 10:04:17 2018 -0400

--
 CHANGELOG.asciidoc | 1 +
 pom.xml| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


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

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

tinkerpop git commit: TINKERPOP-1918 Fixed some return types in the gherkin tests CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 bbb13772a -> f38c2bbf1


TINKERPOP-1918 Fixed some return types in the gherkin tests CTR


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

Branch: refs/heads/tp32
Commit: f38c2bbf15c456f5067c0b65873e33756329269e
Parents: bbb1377
Author: Stephen Mallette 
Authored: Mon Mar 12 08:23:05 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 08:23:05 2018 -0400

--
 .../Gherkin/GherkinTestRunner.cs|  5 -
 gremlin-test/features/sideEffect/Sack.feature   | 12 ++--
 2 files changed, 6 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f38c2bbf/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 4a1d646..9d0f15d 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -40,11 +40,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 private static readonly IDictionary 
IgnoredScenarios =
 new Dictionary
 {
-{
-
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
-IgnoreReason.NumericalValuesHaveWrongTypes
-},
-{"g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NumericalValuesHaveWrongTypes},
 {"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
 {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray},
 {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f38c2bbf/gremlin-test/features/sideEffect/Sack.feature
--
diff --git a/gremlin-test/features/sideEffect/Sack.feature 
b/gremlin-test/features/sideEffect/Sack.feature
index 89e3946..8d97c0c 100644
--- a/gremlin-test/features/sideEffect/Sack.feature
+++ b/gremlin-test/features/sideEffect/Sack.feature
@@ -92,10 +92,10 @@ Feature: Step - sack()
 When iterated to list
 Then the result should be unordered
   | result |
-  | d[3].l |
-  | d[1].l |
-  | d[1].l |
-  | d[1].l |
+  | d[3].i |
+  | d[1].i |
+  | d[1].i |
+  | d[1].i |
 
   Scenario: 
g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack
 Given the modern graph
@@ -107,5 +107,5 @@ Feature: Step - sack()
 When iterated to list
 Then the result should be unordered
   | result |
-  | d[1.0].d |
-  | d[1.0].d |
\ No newline at end of file
+  | d[1.0].m |
+  | d[1.0].m |
\ No newline at end of file

[1/2] tinkerpop git commit: TINKERPOP-1918 Fixed some return types in the gherkin tests CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 53c84bdb4 -> 3797c7d6d


TINKERPOP-1918 Fixed some return types in the gherkin tests CTR


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

Branch: refs/heads/tp33
Commit: f38c2bbf15c456f5067c0b65873e33756329269e
Parents: bbb1377
Author: Stephen Mallette 
Authored: Mon Mar 12 08:23:05 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 08:23:05 2018 -0400

--
 .../Gherkin/GherkinTestRunner.cs|  5 -
 gremlin-test/features/sideEffect/Sack.feature   | 12 ++--
 2 files changed, 6 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f38c2bbf/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 4a1d646..9d0f15d 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -40,11 +40,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 private static readonly IDictionary 
IgnoredScenarios =
 new Dictionary
 {
-{
-
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
-IgnoreReason.NumericalValuesHaveWrongTypes
-},
-{"g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NumericalValuesHaveWrongTypes},
 {"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
 {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray},
 {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f38c2bbf/gremlin-test/features/sideEffect/Sack.feature
--
diff --git a/gremlin-test/features/sideEffect/Sack.feature 
b/gremlin-test/features/sideEffect/Sack.feature
index 89e3946..8d97c0c 100644
--- a/gremlin-test/features/sideEffect/Sack.feature
+++ b/gremlin-test/features/sideEffect/Sack.feature
@@ -92,10 +92,10 @@ Feature: Step - sack()
 When iterated to list
 Then the result should be unordered
   | result |
-  | d[3].l |
-  | d[1].l |
-  | d[1].l |
-  | d[1].l |
+  | d[3].i |
+  | d[1].i |
+  | d[1].i |
+  | d[1].i |
 
   Scenario: 
g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack
 Given the modern graph
@@ -107,5 +107,5 @@ Feature: Step - sack()
 When iterated to list
 Then the result should be unordered
   | result |
-  | d[1.0].d |
-  | d[1.0].d |
\ No newline at end of file
+  | d[1.0].m |
+  | d[1.0].m |
\ No newline at end of file

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

[spmallette]

Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: 3bbdbded24dd2f6072873acbfe4c7311b0cc2aa7
Parents: 22000e4 3797c7d
Author: Stephen Mallette 
Authored: Mon Mar 12 08:30:53 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 08:30:53 2018 -0400

--
 .../Gherkin/GherkinTestRunner.cs|  5 -
 gremlin-test/features/sideEffect/Sack.feature   | 12 ++--
 2 files changed, 6 insertions(+), 11 deletions(-)
--


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

[1/3] tinkerpop git commit: TINKERPOP-1918 Fixed some return types in the gherkin tests CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master 22000e449 -> 3bbdbded2


TINKERPOP-1918 Fixed some return types in the gherkin tests CTR


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

Branch: refs/heads/master
Commit: f38c2bbf15c456f5067c0b65873e33756329269e
Parents: bbb1377
Author: Stephen Mallette 
Authored: Mon Mar 12 08:23:05 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 08:23:05 2018 -0400

--
 .../Gherkin/GherkinTestRunner.cs|  5 -
 gremlin-test/features/sideEffect/Sack.feature   | 12 ++--
 2 files changed, 6 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f38c2bbf/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 4a1d646..9d0f15d 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -40,11 +40,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 private static readonly IDictionary 
IgnoredScenarios =
 new Dictionary
 {
-{
-
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
-IgnoreReason.NumericalValuesHaveWrongTypes
-},
-{"g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NumericalValuesHaveWrongTypes},
 {"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
 {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray},
 {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f38c2bbf/gremlin-test/features/sideEffect/Sack.feature
--
diff --git a/gremlin-test/features/sideEffect/Sack.feature 
b/gremlin-test/features/sideEffect/Sack.feature
index 89e3946..8d97c0c 100644
--- a/gremlin-test/features/sideEffect/Sack.feature
+++ b/gremlin-test/features/sideEffect/Sack.feature
@@ -92,10 +92,10 @@ Feature: Step - sack()
 When iterated to list
 Then the result should be unordered
   | result |
-  | d[3].l |
-  | d[1].l |
-  | d[1].l |
-  | d[1].l |
+  | d[3].i |
+  | d[1].i |
+  | d[1].i |
+  | d[1].i |
 
   Scenario: 
g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack
 Given the modern graph
@@ -107,5 +107,5 @@ Feature: Step - sack()
 When iterated to list
 Then the result should be unordered
   | result |
-  | d[1.0].d |
-  | d[1.0].d |
\ No newline at end of file
+  | d[1.0].m |
+  | d[1.0].m |
\ No newline at end of file

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

[spmallette]

Merge branch 'tp32' into tp33

Conflicts:

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


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

Branch: refs/heads/master
Commit: 3797c7d6dac97d94f27faa8cbda31540b74d2539
Parents: 53c84bd f38c2bb
Author: Stephen Mallette 
Authored: Mon Mar 12 08:30:41 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 08:30:41 2018 -0400

--
 .../Gherkin/GherkinTestRunner.cs|  5 -
 gremlin-test/features/sideEffect/Sack.feature   | 12 ++--
 2 files changed, 6 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3797c7d6/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 08693b2,9d0f15d..cff0858
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -40,13 -40,6 +40,8 @@@ namespace Gremlin.Net.IntegrationTest.G
  private static readonly IDictionary 
IgnoredScenarios =
  new Dictionary
  {
 +{ "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
 +{ "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
- {
- 
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
- IgnoreReason.NumericalValuesHaveWrongTypes
- },
- {"g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NumericalValuesHaveWrongTypes},
  {"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
  {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray},
  {