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

[spmallette]

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


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


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

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

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


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

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

[spmallette]

Merge branch 'tp33'


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

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

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

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

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master a8bfabd27 -> 18ba893fb


Added TINKERPOP-1417 to the future dev doc CTR


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

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

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


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

tinkerpop git commit: Added TINKERPOP-1417 to the future dev doc CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 e56823b67 -> fb8facfd3


Added TINKERPOP-1417 to the future dev doc CTR


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

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

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


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

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

[spmallette]

Merge branch 'tp33'


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

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

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

tinkerpop git commit: Updated test class for loading "sink" data to spark CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 2350cbe04 -> a61dd58ee


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


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

Branch: refs/heads/tp32
Commit: a61dd58eea353637d74086426e4258de5927a8d9
Parents: 2350cbe
Author: Stephen Mallette 
Authored: Thu Mar 1 13:45:22 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 13:45:22 2018 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a61dd58e/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
--
diff --git 
a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
 
b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
index 4cd8cea..72b5b9a 100644
--- 
a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
+++ 
b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
@@ -55,6 +55,8 @@ public final class ToyGraphInputRDD implements InputRDD {
 vertices = 
IteratorUtils.list(IteratorUtils.map(TinkerFactory.createClassic().vertices(), 
VertexWritable::new));
 else if 
(configuration.getString(Constants.GREMLIN_HADOOP_INPUT_LOCATION).contains("crew"))
 vertices = 
IteratorUtils.list(IteratorUtils.map(TinkerFactory.createTheCrew().vertices(), 
VertexWritable::new));
+else if 
(configuration.getString(Constants.GREMLIN_HADOOP_INPUT_LOCATION).contains("sink"))
+vertices = 
IteratorUtils.list(IteratorUtils.map(TinkerFactory.createKitchenSink().vertices(),
 VertexWritable::new));
 else if 
(configuration.getString(Constants.GREMLIN_HADOOP_INPUT_LOCATION).contains("grateful"))
 {
 try {
 final Graph graph = TinkerGraph.open();

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

[spmallette]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/tp33
Commit: e56823b673262ba05267785aa82b45e893a77557
Parents: 92e899f a61dd58
Author: Stephen Mallette 
Authored: Thu Mar 1 13:45:47 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 13:45:47 2018 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e56823b6/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
--

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

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

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

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

[spmallette]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/master
Commit: e56823b673262ba05267785aa82b45e893a77557
Parents: 92e899f a61dd58
Author: Stephen Mallette 
Authored: Thu Mar 1 13:45:47 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 13:45:47 2018 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e56823b6/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
--

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

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master 4e8d63c4a -> a8bfabd27


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


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

Branch: refs/heads/master
Commit: a61dd58eea353637d74086426e4258de5927a8d9
Parents: 2350cbe
Author: Stephen Mallette 
Authored: Thu Mar 1 13:45:22 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 13:45:22 2018 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a61dd58e/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
--
diff --git 
a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
 
b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
index 4cd8cea..72b5b9a 100644
--- 
a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
+++ 
b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
@@ -55,6 +55,8 @@ public final class ToyGraphInputRDD implements InputRDD {
 vertices = 
IteratorUtils.list(IteratorUtils.map(TinkerFactory.createClassic().vertices(), 
VertexWritable::new));
 else if 
(configuration.getString(Constants.GREMLIN_HADOOP_INPUT_LOCATION).contains("crew"))
 vertices = 
IteratorUtils.list(IteratorUtils.map(TinkerFactory.createTheCrew().vertices(), 
VertexWritable::new));
+else if 
(configuration.getString(Constants.GREMLIN_HADOOP_INPUT_LOCATION).contains("sink"))
+vertices = 
IteratorUtils.list(IteratorUtils.map(TinkerFactory.createKitchenSink().vertices(),
 VertexWritable::new));
 else if 
(configuration.getString(Constants.GREMLIN_HADOOP_INPUT_LOCATION).contains("grateful"))
 {
 try {
 final Graph graph = TinkerGraph.open();

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

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 92e899f4c -> e56823b67


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


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

Branch: refs/heads/tp33
Commit: a61dd58eea353637d74086426e4258de5927a8d9
Parents: 2350cbe
Author: Stephen Mallette 
Authored: Thu Mar 1 13:45:22 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 13:45:22 2018 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a61dd58e/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
--
diff --git 
a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
 
b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
index 4cd8cea..72b5b9a 100644
--- 
a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
+++ 
b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
@@ -55,6 +55,8 @@ public final class ToyGraphInputRDD implements InputRDD {
 vertices = 
IteratorUtils.list(IteratorUtils.map(TinkerFactory.createClassic().vertices(), 
VertexWritable::new));
 else if 
(configuration.getString(Constants.GREMLIN_HADOOP_INPUT_LOCATION).contains("crew"))
 vertices = 
IteratorUtils.list(IteratorUtils.map(TinkerFactory.createTheCrew().vertices(), 
VertexWritable::new));
+else if 
(configuration.getString(Constants.GREMLIN_HADOOP_INPUT_LOCATION).contains("sink"))
+vertices = 
IteratorUtils.list(IteratorUtils.map(TinkerFactory.createKitchenSink().vertices(),
 VertexWritable::new));
 else if 
(configuration.getString(Constants.GREMLIN_HADOOP_INPUT_LOCATION).contains("grateful"))
 {
 try {
 final Graph graph = TinkerGraph.open();

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

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 9eed217fb -> 92e899f4c


TINKERPOP-1894 Fixed deserialization of P.not() for GraphSON 2.x

javascript and python GLVs seemed to respond well to this fix, but .NET did 
not. The related tests are still failing.


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

Branch: refs/heads/tp33
Commit: 2350cbe04b5a4ed3fdca389b8a345017a4bc7d0a
Parents: aaf5146
Author: Stephen Mallette 
Authored: Thu Mar 1 12:04:42 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 12:06:43 2018 -0500

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


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

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

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

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

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

[spmallette]

Merge branch 'tp33'


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

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

--

--

tinkerpop git commit: TINKERPOP-1894 Fixed deserialization of P.not() for GraphSON 2.x

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 aaf51464d -> 2350cbe04


TINKERPOP-1894 Fixed deserialization of P.not() for GraphSON 2.x

javascript and python GLVs seemed to respond well to this fix, but .NET did 
not. The related tests are still failing.


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

Branch: refs/heads/tp32
Commit: 2350cbe04b5a4ed3fdca389b8a345017a4bc7d0a
Parents: aaf5146
Author: Stephen Mallette 
Authored: Thu Mar 1 12:04:42 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 12:06:43 2018 -0500

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


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

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

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

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

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

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master 5d36ec116 -> 4e8d63c4a


Merge branch 'tp32' into tp33

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


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

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

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


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

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

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

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

[spmallette]

Merge branch 'tp32' into tp33

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


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

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

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


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

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

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

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

[spmallette]

Merge branch 'tp32' into tp33

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


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

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

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


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

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

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

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

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

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


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

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

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master cef13dd65 -> 5d36ec116


TINKERPOP-1894 Fixed deserialization of P.not() for GraphSON 2.x

javascript and python GLVs seemed to respond well to this fix, but .NET did 
not. The related tests are still failing.


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

Branch: refs/heads/master
Commit: 2350cbe04b5a4ed3fdca389b8a345017a4bc7d0a
Parents: aaf5146
Author: Stephen Mallette 
Authored: Thu Mar 1 12:04:42 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 12:06:43 2018 -0500

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


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

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

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

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

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

[florianhockmann]

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


Increase test timeout for slow systems TINKERPOP-1897


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

Branch: refs/heads/TINKERPOP-1897
Commit: f0d040421d535c06ab541c6e321b2022e16224e7
Parents: 7e3cee6
Author: Florian Hockmann 
Authored: Thu Mar 1 17:17:11 2018 +0100
Committer: Florian Hockmann 
Committed: Thu Mar 1 17:17:11 2018 +0100

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


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

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

[florianhockmann]

Remove verbose log output TINKERPOP-1897


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

Branch: refs/heads/TINKERPOP-1897
Commit: a64f04ec342a8c85a9a74ffe9001a557b8573bda
Parents: f0d0404
Author: Florian Hockmann 
Authored: Thu Mar 1 17:19:39 2018 +0100
Committer: Florian Hockmann 
Committed: Thu Mar 1 17:19:39 2018 +0100

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


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

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

[dkuppitz]

Merge branch 'tp32' into tp33


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

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

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

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

[dkuppitz]

Merge branch 'tp33'


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

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

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

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

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/master b31e27d04 -> cef13dd65


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


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

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

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


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

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

[dkuppitz]

Merge branch 'tp32' into tp33


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

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

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

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

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 532a5de26 -> 9eed217fb


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


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

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

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


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

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

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 8ef717f6c -> aaf51464d


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


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

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

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


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

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

[spmallette]

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


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

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

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


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

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

[4/8] tinkerpop git commit: Fixed up failing .NET GLV test

[spmallette]

Fixed up failing .NET GLV test

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


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

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

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


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

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

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

[2/8] tinkerpop git commit: Removed more ignored GLV tests for .NET

[spmallette]

Removed more ignored GLV tests for .NET

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


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

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

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


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

[4/9] tinkerpop git commit: Fixed up failing .NET GLV test

[spmallette]

Fixed up failing .NET GLV test

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


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

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

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


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

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

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

[04/10] tinkerpop git commit: Fixed up failing .NET GLV test

[spmallette]

Fixed up failing .NET GLV test

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


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

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

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


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

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

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

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

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

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

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

[spmallette]

Merge branch 'tp33'


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

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

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

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

[spmallette]

Created issue for ignored GLV test in .NET CTR


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

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

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


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

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

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master c722cda05 -> b31e27d04


Added JIRA issue for ignored GLV test for .NET CTR


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

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

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/532a5de2/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 7e15757..eb0a7e1 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -39,8 +39,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 private static readonly IDictionary 
IgnoredScenarios = new Dictionary
 {
-{ "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },
-{ "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported },
+{ "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
+{ "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
 { 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
 { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation },// TINKERPOP-1859??
 { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation }  // TINKERPOP-1907

tinkerpop git commit: Added JIRA issue for ignored GLV test for .NET CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 247e008c4 -> 532a5de26


Added JIRA issue for ignored GLV test for .NET CTR


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

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

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/532a5de2/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 7e15757..eb0a7e1 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -39,8 +39,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 private static readonly IDictionary 
IgnoredScenarios = new Dictionary
 {
-{ "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },
-{ "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported },
+{ "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
+{ "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
 { 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
 { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation },// TINKERPOP-1859??
 { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation }  // TINKERPOP-1907

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

[spmallette]

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


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

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

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


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

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

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

[spmallette]

Created issue for ignored GLV test in .NET CTR


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

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

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


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

[2/9] tinkerpop git commit: Removed more ignored GLV tests for .NET

[spmallette]

Removed more ignored GLV tests for .NET

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


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

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

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


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

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

[spmallette]

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


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

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

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


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

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

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

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master e48e8340f -> c722cda05


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


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

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

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


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

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

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

[05/10] tinkerpop git commit: Fixed some types in GLV tests that were failing for .NET CTR

[spmallette]

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


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

Branch: refs/heads/master
Commit: bbc96eeaf41e97ec0fecc1e7a36da824e9654015
Parents: 2ddf2e3
Author: Stephen Mallette 
Authored: Thu Mar 1 10:07:33 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 10:07:33 2018 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bbc96eea/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index a8c25ec..3b39cd3 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -43,9 +43,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation },
 { 
"g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX",
 IgnoreReason.NeedsFurtherInvestigation },
 { "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
-{ "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
-{ 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX",
 IgnoreReason.NeedsFurtherInvestigation },
-{ 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX",
 IgnoreReason.NeedsFurtherInvestigation }
+{ "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation }
 };
 
 private static class Keywords

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bbc96eea/gremlin-test/features/map/Order.feature
--
diff --git a/gremlin-test/features/map/Order.feature 
b/gremlin-test/features/map/Order.feature
index e7ff00c..6dd8ac4 100644
--- a/gremlin-test/features/map/Order.feature
+++ b/gremlin-test/features/map/Order.feature
@@ -192,7 +192,7 @@ Feature: Step - order()
 When iterated to list
 Then the result should be ordered
   | result |
-  | 
m[{"vadas":"d[0].d","peter":"d[0.2].d","josh":"d[1.4].d","marko":"d[1.9].d"}] |
+  | 
m[{"vadas":"d[0].i","peter":"d[0.2].d","josh":"d[1.4].d","marko":"d[1.9].d"}] |
 
   Scenario: g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX
 Given the modern graph
@@ -203,12 +203,12 @@ Feature: Step - order()
 When iterated to list
 Then the result should be ordered
   | result |
-  | l[d[1.0].f,d[0.4].f,d[1.0].f] |
-  | l[d[0.4].f,d[0.5].f,d[1.0].f] |
-  | l[d[0.4].f,d[0.4].f,d[0.2].f] |
-  | l[d[1.0].f]   |
-  | l[d[0.5].f]   |
-  | l[d[0.2].f]   |
+  | l[d[1.0].d,d[0.4].d,d[1.0].d] |
+  | l[d[0.4].d,d[0.5].d,d[1.0].d] |
+  | l[d[0.4].d,d[0.4].d,d[0.2].d] |
+  | l[d[1.0].d]   |
+  | l[d[0.5].d]   |
+  | l[d[0.2].d]   |
 
   Scenario: g_V_group_byXlabelX_byXname_order_byXdecrX_foldX
 Given the modern graph
@@ -233,7 +233,7 @@ Feature: Step - order()
   | m[{"marko":"d[1.9].d"}]  |
   | m[{"josh":"d[1.4].d"}]  |
   | m[{"peter":"d[0.2].d"}]  |
-  | m[{"vadas":"d[0].d"}]  |
+  | m[{"vadas":"d[0].i"}]  |
 
   Scenario: 
g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_decrX
 Given the modern graph

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

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

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/247e008c/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index bb97867,f3e823a..7e15757
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -37,30 -37,11 +37,14 @@@ namespace Gremlin.Net.IntegrationTest.G
  {
  public class GherkinTestRunner
  {
- private static readonly IDictionary 
IgnoredScenarios =
- new Dictionary
- {
- { "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },
- { "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported },
- { 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation },
- { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0X_selectXa_bX",
 IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXd_selectXa_b_c_dX",
 IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX",
 IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
 IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack",
 IgnoreReason.NeedsFurtherInvestigation },
- { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
 IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasXageX_groupCountXaX_byXnameX_out_capXaX", 
IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX",
 IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_asXaX_out_asXbX_matchXa_out_count_c__b_in_count_cX", 
IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_foo_injectX99X_min", 
IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX",
 IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX", 
IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX",
 

[07/10] tinkerpop git commit: Added friendWeight to type info in .NET

[spmallette]

Added friendWeight to type info in .NET

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


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

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

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


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

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

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

[spmallette]

Created issue for ignored GLV test in .NET CTR


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

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

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


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

[7/8] tinkerpop git commit: Added friendWeight to type info in .NET

[spmallette]

Added friendWeight to type info in .NET

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


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

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

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


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

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

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

[spmallette]

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


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

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

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


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

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

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

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 6cfdfa937 -> 8ef717f6c


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


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

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

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


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

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

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

[5/8] tinkerpop git commit: Fixed some types in GLV tests that were failing for .NET CTR

[spmallette]

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


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

Branch: refs/heads/tp32
Commit: bbc96eeaf41e97ec0fecc1e7a36da824e9654015
Parents: 2ddf2e3
Author: Stephen Mallette 
Authored: Thu Mar 1 10:07:33 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 10:07:33 2018 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bbc96eea/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index a8c25ec..3b39cd3 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -43,9 +43,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation },
 { 
"g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX",
 IgnoreReason.NeedsFurtherInvestigation },
 { "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
-{ "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
-{ 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX",
 IgnoreReason.NeedsFurtherInvestigation },
-{ 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX",
 IgnoreReason.NeedsFurtherInvestigation }
+{ "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation }
 };
 
 private static class Keywords

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bbc96eea/gremlin-test/features/map/Order.feature
--
diff --git a/gremlin-test/features/map/Order.feature 
b/gremlin-test/features/map/Order.feature
index e7ff00c..6dd8ac4 100644
--- a/gremlin-test/features/map/Order.feature
+++ b/gremlin-test/features/map/Order.feature
@@ -192,7 +192,7 @@ Feature: Step - order()
 When iterated to list
 Then the result should be ordered
   | result |
-  | 
m[{"vadas":"d[0].d","peter":"d[0.2].d","josh":"d[1.4].d","marko":"d[1.9].d"}] |
+  | 
m[{"vadas":"d[0].i","peter":"d[0.2].d","josh":"d[1.4].d","marko":"d[1.9].d"}] |
 
   Scenario: g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX
 Given the modern graph
@@ -203,12 +203,12 @@ Feature: Step - order()
 When iterated to list
 Then the result should be ordered
   | result |
-  | l[d[1.0].f,d[0.4].f,d[1.0].f] |
-  | l[d[0.4].f,d[0.5].f,d[1.0].f] |
-  | l[d[0.4].f,d[0.4].f,d[0.2].f] |
-  | l[d[1.0].f]   |
-  | l[d[0.5].f]   |
-  | l[d[0.2].f]   |
+  | l[d[1.0].d,d[0.4].d,d[1.0].d] |
+  | l[d[0.4].d,d[0.5].d,d[1.0].d] |
+  | l[d[0.4].d,d[0.4].d,d[0.2].d] |
+  | l[d[1.0].d]   |
+  | l[d[0.5].d]   |
+  | l[d[0.2].d]   |
 
   Scenario: g_V_group_byXlabelX_byXname_order_byXdecrX_foldX
 Given the modern graph
@@ -233,7 +233,7 @@ Feature: Step - order()
   | m[{"marko":"d[1.9].d"}]  |
   | m[{"josh":"d[1.4].d"}]  |
   | m[{"peter":"d[0.2].d"}]  |
-  | m[{"vadas":"d[0].d"}]  |
+  | m[{"vadas":"d[0].i"}]  |
 
   Scenario: 
g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_decrX
 Given the modern graph

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

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

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/247e008c/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index bb97867,f3e823a..7e15757
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -37,30 -37,11 +37,14 @@@ namespace Gremlin.Net.IntegrationTest.G
  {
  public class GherkinTestRunner
  {
- private static readonly IDictionary 
IgnoredScenarios =
- new Dictionary
- {
- { "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },
- { "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported },
- { 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation },
- { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0X_selectXa_bX",
 IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXd_selectXa_b_c_dX",
 IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX",
 IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
 IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack",
 IgnoreReason.NeedsFurtherInvestigation },
- { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
 IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasXageX_groupCountXaX_byXnameX_out_capXaX", 
IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX",
 IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_asXaX_out_asXbX_matchXa_out_count_c__b_in_count_cX", 
IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_foo_injectX99X_min", 
IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX",
 IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX", 
IgnoreReason.NeedsFurtherInvestigation },
- { 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX",
 

[5/9] tinkerpop git commit: Fixed some types in GLV tests that were failing for .NET CTR

[spmallette]

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


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

Branch: refs/heads/tp33
Commit: bbc96eeaf41e97ec0fecc1e7a36da824e9654015
Parents: 2ddf2e3
Author: Stephen Mallette 
Authored: Thu Mar 1 10:07:33 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 10:07:33 2018 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bbc96eea/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index a8c25ec..3b39cd3 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -43,9 +43,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation },
 { 
"g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX",
 IgnoreReason.NeedsFurtherInvestigation },
 { "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
-{ "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
-{ 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX",
 IgnoreReason.NeedsFurtherInvestigation },
-{ 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX",
 IgnoreReason.NeedsFurtherInvestigation }
+{ "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation }
 };
 
 private static class Keywords

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bbc96eea/gremlin-test/features/map/Order.feature
--
diff --git a/gremlin-test/features/map/Order.feature 
b/gremlin-test/features/map/Order.feature
index e7ff00c..6dd8ac4 100644
--- a/gremlin-test/features/map/Order.feature
+++ b/gremlin-test/features/map/Order.feature
@@ -192,7 +192,7 @@ Feature: Step - order()
 When iterated to list
 Then the result should be ordered
   | result |
-  | 
m[{"vadas":"d[0].d","peter":"d[0.2].d","josh":"d[1.4].d","marko":"d[1.9].d"}] |
+  | 
m[{"vadas":"d[0].i","peter":"d[0.2].d","josh":"d[1.4].d","marko":"d[1.9].d"}] |
 
   Scenario: g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX
 Given the modern graph
@@ -203,12 +203,12 @@ Feature: Step - order()
 When iterated to list
 Then the result should be ordered
   | result |
-  | l[d[1.0].f,d[0.4].f,d[1.0].f] |
-  | l[d[0.4].f,d[0.5].f,d[1.0].f] |
-  | l[d[0.4].f,d[0.4].f,d[0.2].f] |
-  | l[d[1.0].f]   |
-  | l[d[0.5].f]   |
-  | l[d[0.2].f]   |
+  | l[d[1.0].d,d[0.4].d,d[1.0].d] |
+  | l[d[0.4].d,d[0.5].d,d[1.0].d] |
+  | l[d[0.4].d,d[0.4].d,d[0.2].d] |
+  | l[d[1.0].d]   |
+  | l[d[0.5].d]   |
+  | l[d[0.2].d]   |
 
   Scenario: g_V_group_byXlabelX_byXname_order_byXdecrX_foldX
 Given the modern graph
@@ -233,7 +233,7 @@ Feature: Step - order()
   | m[{"marko":"d[1.9].d"}]  |
   | m[{"josh":"d[1.4].d"}]  |
   | m[{"peter":"d[0.2].d"}]  |
-  | m[{"vadas":"d[0].d"}]  |
+  | m[{"vadas":"d[0].i"}]  |
 
   Scenario: 
g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_decrX
 Given the modern graph

[7/9] tinkerpop git commit: Added friendWeight to type info in .NET

[spmallette]

Added friendWeight to type info in .NET

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


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

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

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


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

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

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

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 b516a6a57 -> 247e008c4


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


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

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

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


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

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

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

[02/10] tinkerpop git commit: Removed more ignored GLV tests for .NET

[spmallette]

Removed more ignored GLV tests for .NET

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


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

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

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


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

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

[spmallette]

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


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

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

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


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

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

[1/2] tinkerpop git commit: Fixed a GLV test definition.

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 e1d7f80ba -> b516a6a57


Fixed a GLV test definition.

This allowed some ignored tests to pass CTR


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

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

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


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

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

[1/3] tinkerpop git commit: Fixed a GLV test definition.

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master 773d51014 -> e48e8340f


Fixed a GLV test definition.

This allowed some ignored tests to pass CTR


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

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

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


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

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

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

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

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b516a6a5/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 5f331cb,627570c..bb97867
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -37,32 -37,26 +37,30 @@@ namespace Gremlin.Net.IntegrationTest.G
  {
  public class GherkinTestRunner
  {
 -private static readonly IDictionary 
IgnoredScenarios = new Dictionary {
 -{ 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0X_selectXa_bX",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXd_selectXa_b_c_dX",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_V_hasXageX_groupCountXaX_byXnameX_out_capXaX", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_V_asXaX_out_asXbX_matchXa_out_count_c__b_in_count_cX", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_V_foo_injectX99X_min", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX",
 IgnoreReason.NeedsFurtherInvestigation }
 -};
 +private static readonly IDictionary 
IgnoredScenarios =
 +new Dictionary
 +{
 +{ "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },
 +{ "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported },
 +{ 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.NeedsFurtherInvestigation },
 + 

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

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

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

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

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

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b516a6a5/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 5f331cb,627570c..bb97867
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -37,32 -37,26 +37,30 @@@ namespace Gremlin.Net.IntegrationTest.G
  {
  public class GherkinTestRunner
  {
 -private static readonly IDictionary 
IgnoredScenarios = new Dictionary {
 -{ 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0X_selectXa_bX",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXd_selectXa_b_c_dX",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_V_hasXageX_groupCountXaX_byXnameX_out_capXaX", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_V_asXaX_out_asXbX_matchXa_out_count_c__b_in_count_cX", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_V_foo_injectX99X_min", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX",
 IgnoreReason.NeedsFurtherInvestigation }
 -};
 +private static readonly IDictionary 
IgnoredScenarios =
 +new Dictionary
 +{
 +{ "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },
 +{ "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported },
 +{ 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.NeedsFurtherInvestigation },
 +