tinkerpop git commit: Don't use recursive calls for streaming response

[davebshow]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1933 [created] 4c8717dd4


Don't use recursive calls for streaming response


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

Branch: refs/heads/TINKERPOP-1933
Commit: 4c8717dd4e94ec248a959911d8c11f3b45b2d7b3
Parents: 268423d
Author: davebshow 
Authored: Mon Apr 23 16:21:48 2018 -0700
Committer: davebshow 
Committed: Mon Apr 23 16:21:48 2018 -0700

--
 .../src/main/jython/gremlin_python/driver/connection.py  | 7 +--
 .../src/main/jython/gremlin_python/driver/protocol.py| 8 
 2 files changed, 9 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4c8717dd/gremlin-python/src/main/jython/gremlin_python/driver/connection.py
--
diff --git a/gremlin-python/src/main/jython/gremlin_python/driver/connection.py 
b/gremlin-python/src/main/jython/gremlin_python/driver/connection.py
index abc4545..bff1904 100644
--- a/gremlin-python/src/main/jython/gremlin_python/driver/connection.py
+++ b/gremlin-python/src/main/jython/gremlin_python/driver/connection.py
@@ -73,6 +73,9 @@ class Connection:
 return future
 
 def _receive(self):
-data = self._transport.read()
-self._protocol.data_received(data, self._results)
+while True:
+data = self._transport.read()
+status_code = self._protocol.data_received(data, self._results)
+if status_code != 206:
+break
 self._pool.put_nowait(self)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4c8717dd/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py
--
diff --git a/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py 
b/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py
index 84a7d82..2fc7c1b 100644
--- a/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py
+++ b/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py
@@ -80,21 +80,21 @@ class GremlinServerWSProtocol(AbstractBaseProtocol):
 {'sasl': base64.b64encode(auth).decode()})
 self.write(request_id, request_message)
 data = self._transport.read()
+# Allow recursive call for auth
 self.data_received(data, results_dict)
 elif status_code == 204:
 result_set.stream.put_nowait([])
 del results_dict[request_id]
+return status_code
 elif status_code in [200, 206]:
 results = []
 for msg in data["result"]["data"]:
 results.append(
 self._message_serializer.deserialize_message(msg))
 result_set.stream.put_nowait(results)
-if status_code == 206:
-data = self._transport.read()
-self.data_received(data, results_dict)
-else:
+if status_code == 200:
 del results_dict[request_id]
+return status_code
 else:
 del results_dict[request_id]
 raise GremlinServerError(

[49/50] [abbrv] tinkerpop git commit: updating the reference documentation

[spmallette]

updating the reference documentation

added the following:
- fix the logo
- added prefixes
- added limitations
- added examples

todo:
- cover all limitations and special cases with examples

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

Branch: refs/heads/TINKERPOP-1878
Commit: ddc840daae921f177ad250d991e085a7664cef20
Parents: 29123df
Author: Harsh Thakkar 
Authored: Wed Mar 28 17:27:32 2018 +0200
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:49 2018 -0400

--
 docs/src/reference/transpilers.asciidoc | 355 ++-
 1 file changed, 351 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddc840da/docs/src/reference/transpilers.asciidoc
--
diff --git a/docs/src/reference/transpilers.asciidoc 
b/docs/src/reference/transpilers.asciidoc
index 9100f84..386b4a5 100644
--- a/docs/src/reference/transpilers.asciidoc
+++ b/docs/src/reference/transpilers.asciidoc
@@ -17,10 +17,6 @@ limitations under the License.
 [[transpilers]]
 = Gremlin Transpilers
 
-![gremlinator][SPARQL-Gremlin]
-
-[SPARQL-Gremlin]: 
https://raw.githubusercontent.com/LITMUS-Benchmark-Suite/sparql-to-gremlin/master/docs/images/sparql-gremlin-logo.png
-
 There are many languages built to query data. SQL is typically used to query 
relational data. There is SPARQL for RDF
 data. Cypher is used to do pattern matching in graph data. The list could go 
on. Transpilers convert languages like
 these to Gremlin so that it becomes possible to use them in any context that 
Gremlin is used. In other words, a
@@ -28,6 +24,24 @@ Gremlin Transpiler enables a particular query language to 
work on any TinkerPop-
 
 == SPARQL-Gremlin
 
+image:https://raw.githubusercontent.com/LITMUS-Benchmark-Suite/sparql-to-gremlin/master/docs/images/sparql-gremlin-logo.png[gremlinator]
+
+The SPARQL-Gremlin transpiler, transforms 
link:https://en.wikipedia.org/wiki/SPARQL[SPARQL] queries into Gremlin 
traversals. It is based on the  https://jena.apache.org/index.html[Apache Jena] 
SPARQL processor https://jena.apache.org/documentation/query/index.html[ARQ], 
which provides access to a syntax tree of a SPARQL query.
+
+
+The goal of this work is to bridge the query interoperability gap between the 
two famous, yet fairly disconnected, graph communities: Semantic Web (which 
relies on the RDF data model) and Graph database
+(which relies on Property graph data model).
+
+NOTE: The foundational research work on SPARQL-Gremlin transpiler (aka 
Gremlinator) can be found from -
+https://arxiv.org/pdf/1801.02911.pdf[Gremlinator full paper]. In this
+paper, we present and discuss the notion of graph query language
+semantics of SPARQL and Gremlin, and a formal mapping between SPARQL
+pattern matching graph patterns and Gremlin traversals. Furthermore, we
+point the interested reader to the following resourcesfor a better
+understanding: (1) Gremlinator demonstration -
+(http://gremlinator.iai.uni-bonn.de:8080/Demo/[Public Demo Mirror 1])
+and (http://195.201.31.31:8080/Demo/[Public Demo Mirror 2]); (2) A short video 
tutorial on how to use the demonstration - 
https://www.youtube.com/watch?v=Z0ETx2IBamw[here]
+
 [source,xml]
 
 
@@ -68,3 +82,336 @@ start step.
 <2> Execute a SPARQL query against the TinkerGraph instance. The 
`SparqlTraversalSource` uses a
 <> to transparently converts that SPARQL 
query into a standard Gremlin traversal
 and then when finally iterated, executes that against the TinkerGraph.
+
+[[prefixes]]
+Prefixes
+~
+
+The SPARQL-Gremlin transpiler supports the following prefixes to traverse the 
graph:
+
+[cols=",",options="header",]
+|
+|Prefix |Purpose
+|`v:` |label-access traversal
+|`e:` |out-edge traversal
+|`p:` |property traversal
+|`v:` |property-value traversal
+|
+
+Note that element IDs and labels are treated like normal properties, hence 
they can be accessed using the same pattern:
+
+[gremlin-groovy,existing]
+
+g.sparql("""SELECT ?name ?id ?label 
+   WHERE { 
+   ?element v:name ?name . 
+   ?element v:id ?id . 
+   ?element v:label ?label .}""")
+
+
+[[supported-queries]]
+Supported Queries
+~~
+
+The SPARQL-Gremlin transpiler is currently an on-going effort with an aim to 
cover the entire SPARQL 1.1 query feature spectrum, however we currently only 
support translation of the SPARQL 1.0 specification, especially _SELECT_ 
queries. The supported SPARQL 

[46/50] [abbrv] tinkerpop git commit: TINKERPOP-1878 Added the plugin for sparql-gremlin

[spmallette]

TINKERPOP-1878 Added the plugin for sparql-gremlin


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

Branch: refs/heads/TINKERPOP-1878
Commit: cc81dfb483b6c832fe545b04b2cff1d7affaf59c
Parents: 806394f
Author: Stephen Mallette 
Authored: Mon Jan 29 09:37:15 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:05 2018 -0400

--
 .../sparql/jsr223/SparqlGremlinPlugin.java  | 63 
 ...pache.tinkerpop.gremlin.jsr223.GremlinPlugin |  1 +
 2 files changed, 64 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cc81dfb4/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/jsr223/SparqlGremlinPlugin.java
--
diff --git 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/jsr223/SparqlGremlinPlugin.java
 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/jsr223/SparqlGremlinPlugin.java
new file mode 100644
index 000..8d0115b
--- /dev/null
+++ 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/jsr223/SparqlGremlinPlugin.java
@@ -0,0 +1,63 @@
+/*
+ * 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.sparql.jsr223;
+
+import org.apache.tinkerpop.gremlin.jsr223.AbstractGremlinPlugin;
+import org.apache.tinkerpop.gremlin.jsr223.DefaultImportCustomizer;
+import org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin;
+import org.apache.tinkerpop.gremlin.jsr223.ImportCustomizer;
+import 
org.apache.tinkerpop.gremlin.sparql.process.traversal.dsl.sparql.DefaultSparqlTraversal;
+import 
org.apache.tinkerpop.gremlin.sparql.process.traversal.dsl.sparql.SparqlTraversal;
+import 
org.apache.tinkerpop.gremlin.sparql.process.traversal.dsl.sparql.SparqlTraversalSource;
+import 
org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy.SparqlStrategy;
+
+/**
+ * {@link GremlinPlugin} implementation for {@code sparql-gremlin} that 
imports the key classes and interfaces required
+ * to use SPARQL in TinkerPop.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class SparqlGremlinPlugin extends AbstractGremlinPlugin {
+
+private static final String NAME = "tinkerpop.sparql";
+
+private static final ImportCustomizer imports;
+
+static {
+try {
+imports = DefaultImportCustomizer.build().addClassImports(
+SparqlTraversalSource.class,
+SparqlTraversal.class,
+DefaultSparqlTraversal.class,
+SparqlStrategy.class).create();
+} catch (Exception ex) {
+throw new RuntimeException(ex);
+}
+}
+
+private static final SparqlGremlinPlugin instance = new 
SparqlGremlinPlugin();
+
+public SparqlGremlinPlugin() {
+super(NAME, imports);
+}
+
+public static SparqlGremlinPlugin instance() {
+return instance;
+}
+}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cc81dfb4/sparql-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin
--
diff --git 
a/sparql-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin
 
b/sparql-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin
new file mode 100644
index 000..882054c
--- /dev/null
+++ 
b/sparql-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin
@@ -0,0 +1 @@
+org.apache.tinkerpop.gremlin.sparql.jsr223.SparqlGremlinPlugin
\ No newline at end of file

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

Branch: refs/heads/TINKERPOP-1878
Commit: 250994dbe0f7d6fc8b09870ecadbf2aa352c1d79
Parents: 90e70e7 ead5659
Author: Stephen Mallette 
Authored: Mon Apr 23 13:50:40 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Apr 23 13:50:40 2018 -0400

--
 .../java/org/apache/tinkerpop/gremlin/server/GraphManager.java   | 4 ++--
 .../tinkerpop/gremlin/server/util/DefaultGraphManager.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--

[42/50] [abbrv] tinkerpop git commit: TINKERPOP-1878 More tests for ordering

[spmallette]

TINKERPOP-1878 More tests for ordering

Factored the order index creation into its own method to tidy up a bit.


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

Branch: refs/heads/TINKERPOP-1878
Commit: 9fba5233c9950dc444f077d09c6b69997c4f1453
Parents: 114b209
Author: Stephen Mallette 
Authored: Fri Jan 26 15:56:55 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:04 2018 -0400

--
 .../sparql/SparqlToGremlinTranspiler.java   | 29 ++--
 .../dsl/sparql/SparqlTraversalSourceTest.java   |  6 
 2 files changed, 26 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9fba5233/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
--
diff --git 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
index ea3f828..c3bc907 100644
--- 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
+++ 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
@@ -99,15 +99,8 @@ public class SparqlToGremlinTranspiler {
arrayOfAllTraversals[traversalIndex++] = tempTrav;
}
 
-   final Map orderingIndex = new HashMap<>();
-   if (query.hasOrderBy()) {
-final List sortingConditions = query.getOrderBy();
-
-   for (SortCondition sortCondition : sortingConditions) {
-final Expr expr = sortCondition.getExpression();
-orderingIndex.put(expr.getVarName(), 
sortCondition.getDirection() == 1 ? Order.incr : Order.decr);
-   }
-   }
+   // creates a map of ordering keys and their ordering direction
+final Map orderingIndex = 
createOrderIndexFromQuery(query);
 
if (traversalList.size() > 0)
traversal = traversal.match(arrayOfAllTraversals);
@@ -203,6 +196,24 @@ public class SparqlToGremlinTranspiler {
return traversal;
}
 
+/**
+ * Extracts any {@code SortCondition} instances from the SPARQL query and 
holds them in an index of their keys
+ * where the value is that keys sorting direction.
+ */
+private static Map createOrderIndexFromQuery(final Query 
query) {
+final Map orderingIndex = new HashMap<>();
+if (query.hasOrderBy()) {
+final List sortingConditions = query.getOrderBy();
+
+for (SortCondition sortCondition : sortingConditions) {
+final Expr expr = sortCondition.getExpression();
+orderingIndex.put(expr.getVarName(), 
sortCondition.getDirection() == 1 ? Order.incr : Order.decr);
+}
+}
+
+return orderingIndex;
+}
+
 private static GraphTraversal transpile(final 
GraphTraversalSource g, final Query query) {
 return new SparqlToGremlinTranspiler(g).transpile(query);
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9fba5233/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
--
diff --git 
a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
 
b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
index 2743255..1b39813 100644
--- 
a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
+++ 
b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
@@ -82,4 +82,10 @@ public class SparqlTraversalSourceTest {
 }}
 ));
 }
+
+@Test
+public void shouldFindAllNamesOrdered() {
+final List x = g.sparql("SELECT ?name WHERE { ?person v:name ?name 
} ORDER BY DESC(?name)").toList();
+assertThat(x, contains("vadas", "ripple", "peter", "marko", "lop", 
"josh"));
+}
 }

[45/50] [abbrv] tinkerpop git commit: TINKERPOP-1878 sparql() step works over remoting

[spmallette]

TINKERPOP-1878 sparql() step works over remoting

At this point it is only tested to work with Gryo 3.0. Fixed a bug with how 
dynamic gryo registrations work - they failed if you didn't have a specific 
serializer specified. Introduced a bit of a hack to make SparqlTraversalSource 
behave like a GraphTraversalSource and thus more cleanly follow the DSL 
pattern. Not sure if that's a great approach yet or not, but it seems harmless 
at this point.


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

Branch: refs/heads/TINKERPOP-1878
Commit: fcb33dd6cba68e18d0bb3f26bb268fa615f7f482
Parents: 3f77129
Author: Stephen Mallette 
Authored: Thu Jan 25 17:00:54 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:04 2018 -0400

--
 .../apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java | 5 -
 sparql-gremlin/pom.xml  | 4 
 .../process/traversal/dsl/sparql/SparqlTraversalSource.java | 3 +++
 .../sparql/process/traversal/strategy/SparqlStrategy.java   | 5 +++--
 4 files changed, 10 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fcb33dd6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 6bb7b34..4a325dd 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@ -382,6 +382,9 @@ public enum GryoVersion {
 
"org.apache.tinkerpop.gremlin.driver.ser.RequestMessageGryoSerializer", 167);
 tryAddDynamicType(this, 
"org.apache.tinkerpop.gremlin.driver.message.ResponseMessage",
 
"org.apache.tinkerpop.gremlin.driver.ser.ResponseMessageGryoSerializer", 169);
+
+tryAddDynamicType(this, 
"org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy.SparqlStrategy",
+null, 1690);
 }};
 }
 
@@ -560,7 +563,7 @@ public enum GryoVersion {
 final String serializer, final int 
registrationId) {
 try {
 final Class typeClass = Class.forName(type);
-final Optional serializerInstance = 
Optional.of(serializer)
+final Optional serializerInstance = 
Optional.ofNullable(serializer)
 .map(FunctionUtils.wrapFunction(Class::forName))
 .map(FunctionUtils.wrapFunction(c -> (SerializerShim) 
c.getConstructor().newInstance()));
 if (serializerInstance.isPresent()) {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fcb33dd6/sparql-gremlin/pom.xml
--
diff --git a/sparql-gremlin/pom.xml b/sparql-gremlin/pom.xml
index 0dceb85..0e3da38 100644
--- a/sparql-gremlin/pom.xml
+++ b/sparql-gremlin/pom.xml
@@ -11,10 +11,6 @@
 sparql-gremlin
 Apache TinkerPop :: SPARQL Gremlin
 
-
-src/test/resources/sparql/queries
-
-
 
 
 org.apache.jena

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fcb33dd6/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
--
diff --git 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
index b156ed1..3889d95 100644
--- 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
+++ 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
@@ -27,6 +27,7 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConstantStep;
+import 

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

Branch: refs/heads/TINKERPOP-1878
Commit: 90e70e79470df06a23b98dfd642229b776c5f744
Parents: a187ce1 9a58689
Author: Stephen Mallette 
Authored: Mon Apr 23 13:06:27 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Apr 23 13:06:27 2018 -0400

--
 .../io/graphson/GraphSONCompatibility.java  |   9 +-
 .../structure/io/gryo/GryoCompatibility.java|   5 +-
 .../GraphSONTypedCompatibilityTest.java |   5 +-
 .../GraphSONUntypedCompatibilityTest.java   |   8 +-
 .../io/gryo/GryoCompatibilityTest.java  |   5 +-
 .../_3_2_9/authenticationchallenge-v1d0.json|  12 +
 .../authenticationchallenge-v2d0-no-types.json  |  12 +
 .../authenticationchallenge-v2d0-partial.json   |  12 +
 .../_3_2_9/authenticationresponse-v1d0.json |   9 +
 .../authenticationresponse-v2d0-no-types.json   |   9 +
 .../authenticationresponse-v2d0-partial.json|   9 +
 .../graphson/_3_2_9/barrier-v2d0-no-types.json  |   1 +
 .../graphson/_3_2_9/barrier-v2d0-partial.json   |   4 +
 .../_3_2_9/bigdecimal-v2d0-partial.json |   1 +
 .../_3_2_9/biginteger-v2d0-partial.json |   1 +
 .../graphson/_3_2_9/binding-v2d0-no-types.json  |   4 +
 .../graphson/_3_2_9/binding-v2d0-partial.json   |  10 +
 .../io/graphson/_3_2_9/byte-v2d0-partial.json   |   1 +
 .../_3_2_9/bytebuffer-v2d0-partial.json |   1 +
 .../graphson/_3_2_9/bytecode-v2d0-no-types.json |   3 +
 .../graphson/_3_2_9/bytecode-v2d0-partial.json  |   6 +
 .../_3_2_9/cardinality-v2d0-no-types.json   |   1 +
 .../_3_2_9/cardinality-v2d0-partial.json|   4 +
 .../io/graphson/_3_2_9/char-v2d0-partial.json   |   1 +
 .../io/graphson/_3_2_9/class-v2d0-no-types.json |   1 +
 .../io/graphson/_3_2_9/class-v2d0-partial.json  |   4 +
 .../graphson/_3_2_9/column-v2d0-no-types.json   |   1 +
 .../io/graphson/_3_2_9/column-v2d0-partial.json |   4 +
 .../io/graphson/_3_2_9/date-v2d0-no-types.json  |   1 +
 .../io/graphson/_3_2_9/date-v2d0-partial.json   |   4 +
 .../_3_2_9/direction-v2d0-no-types.json |   1 +
 .../graphson/_3_2_9/direction-v2d0-partial.json |   4 +
 .../graphson/_3_2_9/double-v2d0-no-types.json   |   1 +
 .../io/graphson/_3_2_9/double-v2d0-partial.json |   4 +
 .../graphson/_3_2_9/duration-v2d0-partial.json  |   1 +
 .../structure/io/graphson/_3_2_9/edge-v1d0.json |  12 +
 .../io/graphson/_3_2_9/edge-v2d0-no-types.json  |  14 +
 .../io/graphson/_3_2_9/edge-v2d0-partial.json   |  32 +
 .../io/graphson/_3_2_9/float-v2d0-no-types.json |   1 +
 .../io/graphson/_3_2_9/float-v2d0-partial.json  |   4 +
 .../_3_2_9/inetaddress-v2d0-partial.json|   1 +
 .../graphson/_3_2_9/instant-v2d0-partial.json   |   1 +
 .../graphson/_3_2_9/integer-v2d0-no-types.json  |   1 +
 .../graphson/_3_2_9/integer-v2d0-partial.json   |   4 +
 .../graphson/_3_2_9/lambda-v2d0-no-types.json   |   5 +
 .../io/graphson/_3_2_9/lambda-v2d0-partial.json |   8 +
 .../graphson/_3_2_9/localdate-v2d0-partial.json |   1 +
 .../_3_2_9/localdatetime-v2d0-partial.json  |   1 +
 .../graphson/_3_2_9/localtime-v2d0-partial.json |   1 +
 .../io/graphson/_3_2_9/long-v2d0-no-types.json  |   1 +
 .../io/graphson/_3_2_9/long-v2d0-partial.json   |   4 +
 .../graphson/_3_2_9/metrics-v2d0-no-types.json  |  24 +
 .../graphson/_3_2_9/metrics-v2d0-partial.json   |  54 ++
 .../graphson/_3_2_9/monthday-v2d0-partial.json  |   1 +
 .../_3_2_9/offsetdatetime-v2d0-partial.json |   1 +
 .../_3_2_9/offsettime-v2d0-partial.json |   1 +
 .../graphson/_3_2_9/operator-v2d0-no-types.json |   1 +
 .../graphson/_3_2_9/operator-v2d0-partial.json  |   4 +
 .../io/graphson/_3_2_9/order-v2d0-no-types.json |   1 +
 .../io/graphson/_3_2_9/order-v2d0-partial.json  |   4 +
 .../io/graphson/_3_2_9/p-v2d0-no-types.json |   4 +
 .../io/graphson/_3_2_9/p-v2d0-partial.json  |  10 +
 .../io/graphson/_3_2_9/pand-v2d0-no-types.json  |  10 +
 .../io/graphson/_3_2_9/pand-v2d0-partial.json   |  25 +
 .../structure/io/graphson/_3_2_9/path-v1d0.json |  62 ++
 .../io/graphson/_3_2_9/path-v2d0-no-types.json  |  13 +
 .../io/graphson/_3_2_9/path-v2d0-partial.json   |  34 +
 .../io/graphson/_3_2_9/period-v2d0-partial.json |   1 +
 .../io/graphson/_3_2_9/pick-v2d0-no-types.json  |   1 +
 .../io/graphson/_3_2_9/pick-v2d0-partial.json   |   4 +
 .../io/graphson/_3_2_9/pop-v2d0-no-types.json   |   1 +
 .../io/graphson/_3_2_9/pop-v2d0-partial.json|   4 +
 .../io/graphson/_3_2_9/por-v2d0-no-types.json   |  10 +
 .../io/graphson/_3_2_9/por-v2d0-partial.json|  31 +
 .../io/graphson/_3_2_9/property-v1d0.json   |   4 +
 .../graphson/_3_2_9/property-v2d0-no-types.json |   4 +
 

[41/50] [abbrv] tinkerpop git commit: TINKERPOP-1878 Added a test for ordering and corrected some problems in logic

[spmallette]

TINKERPOP-1878 Added a test for ordering and corrected some problems in logic

Ordering didn't work - at least not completely. The test, as it is written in 
this commit, that failed to sort properly. Changed the logic for ordering to 
track all of the keys specified to ORDER with their appropriate ASC/DESC 
operators and added all of them to the traversal.


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

Branch: refs/heads/TINKERPOP-1878
Commit: 114b20976491f4b642f70cdd55a6d0a263f42023
Parents: 7c3c6f6
Author: Stephen Mallette 
Authored: Fri Jan 26 15:41:10 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:04 2018 -0400

--
 .../sparql/SparqlToGremlinTranspiler.java   | 55 ++--
 .../dsl/sparql/SparqlTraversalSourceTest.java   | 31 +--
 2 files changed, 44 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/114b2097/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
--
diff --git 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
index 9db7d82..ea3f828 100644
--- 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
+++ 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
@@ -21,9 +21,10 @@ package org.apache.tinkerpop.gremlin.sparql;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
-import org.apache.jena.graph.Triple;
 import org.apache.jena.query.Query;
 import org.apache.jena.query.QueryFactory;
 import org.apache.jena.query.SortCondition;
@@ -58,8 +59,6 @@ public class SparqlToGremlinTranspiler {
 
 private List traversalList = new ArrayList<>();
 
-private String sortingVariable = "";
-
private SparqlToGremlinTranspiler(final GraphTraversal 
traversal) {
this.traversal = traversal;
}
@@ -96,31 +95,18 @@ public class SparqlToGremlinTranspiler {
final int numberOfTraversal = traversalList.size();
 final Traversal arrayOfAllTraversals[] = new 
Traversal[numberOfTraversal];
 
-   if (query.hasOrderBy() && !query.hasGroupBy()) {
-final List sortingConditions = query.getOrderBy();
-
-   for (SortCondition sortCondition : sortingConditions) {
-final Expr expr = sortCondition.getExpression();
-   sortingVariable = expr.getVarName();
-   }
-   }
-
for (Traversal tempTrav : traversalList) {
arrayOfAllTraversals[traversalIndex++] = tempTrav;
}
 
-   Order orderDirection = Order.incr;
+   final Map orderingIndex = new HashMap<>();
if (query.hasOrderBy()) {
-int directionOfSort = 0;
 final List sortingConditions = query.getOrderBy();
 
for (SortCondition sortCondition : sortingConditions) {
 final Expr expr = sortCondition.getExpression();
-   directionOfSort = sortCondition.getDirection();
-   sortingVariable = expr.getVarName();
+orderingIndex.put(expr.getVarName(), 
sortCondition.getDirection() == 1 ? Order.incr : Order.decr);
}
-
-   if (directionOfSort == -1) orderDirection = Order.decr;
}
 
if (traversalList.size() > 0)
@@ -128,6 +114,8 @@ public class SparqlToGremlinTranspiler {
 
final List vars = query.getResultVars();
if (!query.isQueryResultStar() && !query.hasGroupBy()) {
+   // the result sizes have special handling to get the right 
signatures of select() called. perhaps this
+// could be refactored to work more nicely
 switch (vars.size()) {
 case 0:
 throw new IllegalStateException();
@@ -135,20 +123,16 @@ public class SparqlToGremlinTranspiler {
 if (query.isDistinct())
 traversal = traversal.dedup(vars.get(0));
 
-if (query.hasOrderBy())
-traversal = 

[20/50] [abbrv] tinkerpop git commit: Added io tests for 3.3.3 CTR

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v2d0-partial.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v2d0-partial.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v2d0-partial.json
new file mode 100644
index 000..03f45cd
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+  "@type" : "gx:OffsetDateTime",
+  "@value" : "2007-12-03T10:15:30+01:00"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v3d0.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v3d0.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v3d0.json
new file mode 100644
index 000..03f45cd
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v3d0.json
@@ -0,0 +1,4 @@
+{
+  "@type" : "gx:OffsetDateTime",
+  "@value" : "2007-12-03T10:15:30+01:00"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v2d0-partial.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v2d0-partial.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v2d0-partial.json
new file mode 100644
index 000..b124953
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+  "@type" : "gx:OffsetTime",
+  "@value" : "10:15:30+01:00"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v3d0.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v3d0.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v3d0.json
new file mode 100644
index 000..b124953
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v3d0.json
@@ -0,0 +1,4 @@
+{
+  "@type" : "gx:OffsetTime",
+  "@value" : "10:15:30+01:00"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v2d0-partial.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v2d0-partial.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v2d0-partial.json
new file mode 100644
index 000..14c1400
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+  "@type" : "g:Operator",
+  "@value" : "sum"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v3d0.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v3d0.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v3d0.json
new file mode 100644
index 000..14c1400
--- /dev/null
+++ 

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

Branch: refs/heads/TINKERPOP-1878
Commit: a098437886e05142a551d8574142052963726dac
Parents: cfa14e2 7e6e985
Author: Stephen Mallette 
Authored: Fri Apr 20 19:26:44 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 20 19:26:44 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../io/graphson/TraversalSerializersV2d0.java   | 35 +---
 .../io/graphson/TraversalSerializersV3d0.java   | 33 --
 3 files changed, 47 insertions(+), 22 deletions(-)
--


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

[44/50] [abbrv] tinkerpop git commit: TINKERPOP-1878 Minor javadoc and code cleanup

[spmallette]

TINKERPOP-1878 Minor javadoc and code cleanup


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

Branch: refs/heads/TINKERPOP-1878
Commit: 3f77129f72ca1c2cf8e94d5c55aa1459a42ca8f2
Parents: 01cd9a3
Author: Stephen Mallette 
Authored: Thu Jan 25 15:36:53 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:04 2018 -0400

--
 .../process/traversal/dsl/sparql/SparqlTraversal.java   | 12 +++-
 .../traversal/dsl/sparql/SparqlTraversalSource.java |  8 +++-
 .../process/traversal/strategy/SparqlStrategy.java  | 11 ---
 3 files changed, 18 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3f77129f/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversal.java
--
diff --git 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversal.java
 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversal.java
index efa9489..843267d 100644
--- 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversal.java
+++ 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversal.java
@@ -22,6 +22,9 @@ import org.apache.tinkerpop.gremlin.process.traversal.Step;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 
 /**
+ * The {@code SparqlTraversal} has no additional traversal steps. The only 
step available for "SPARQL" is the
+ * {@link SparqlTraversalSource#sparql(String)} start step.
+ *
  * @author Stephen Mallette (http://stephen.genoprime.com)
  */
 public interface SparqlTraversal extends Traversal {
@@ -56,13 +59,4 @@ public interface SparqlTraversal extends Traversal {
 Traversal.super.iterate();
 return this;
 }
-
-public static final class Symbols {
-
-private Symbols() {
-// static fields only
-}
-
-public static final String sparql = "sparql";
-}
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3f77129f/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
--
diff --git 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
index 3596716..b156ed1 100644
--- 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
+++ 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
@@ -25,12 +25,15 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConstantStep;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Transaction;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
 
 /**
+ * A {@link TraversalSource} implementation that spawns {@link 
SparqlTraversal} instances.
+ *
  * @author Stephen Mallette (http://stephen.genoprime.com)
  */
 public class SparqlTraversalSource implements TraversalSource {
@@ -115,9 +118,12 @@ public class SparqlTraversalSource implements 
TraversalSource {
 return (SparqlTraversalSource) clone;
 }
 
+/**
+ * The start step for a SPARQL based traversal that accepts a string 
representation of the query to execute.
+ */
 public  SparqlTraversal sparql(final String query) {
 final SparqlTraversalSource clone = this.clone();
-clone.bytecode.addStep(SparqlTraversal.Symbols.sparql, query);
+clone.bytecode.addStep(GraphTraversal.Symbols.constant, query);
 final SparqlTraversal.Admin traversal = new 
DefaultSparqlTraversal<>(clone);
 return traversal.addStep(new ConstantStep(traversal, query));
 }

[29/50] [abbrv] tinkerpop git commit: Initial commit for sparql-gremlin changes

[spmallette]

Initial commit for sparql-gremlin changes


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

Branch: refs/heads/TINKERPOP-1878
Commit: ef0d05f675c14713cb8a4fa2600576d911dfcd12
Parents: 250994d
Author: harsh9t 
Authored: Thu Jan 18 01:33:29 2018 +0100
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:03 2018 -0400

--
 sparql-gremlin/pom.xml  |  63 +++
 .../gremlin/sparql/ConsoleCompiler.java | 165 
 .../tinkerpop/gremlin/sparql/Prefixes.java  |  64 
 .../gremlin/sparql/SparqlToGremlinCompiler.java | 381 +++
 .../gremlin/sparql/TraversalBuilder.java|  82 
 .../gremlin/sparql/WhereTraversalBuilder.java   | 134 +++
 .../tinkerpop/gremlin/sparql/PrefixesTest.java  |  67 
 .../gremlin/sparql/ResourceHelper.java  |  37 ++
 .../sparql/SparqlToGremlinCompilerTest.java | 223 +++
 9 files changed, 1216 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef0d05f6/sparql-gremlin/pom.xml
--
diff --git a/sparql-gremlin/pom.xml b/sparql-gremlin/pom.xml
new file mode 100644
index 000..e134d31
--- /dev/null
+++ b/sparql-gremlin/pom.xml
@@ -0,0 +1,63 @@
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+
+tinkerpop
+org.apache.tinkerpop
+3.3.2-SNAPSHOT
+
+4.0.0
+
+sparql-gremlin
+
+WDAQUA-ITN
+http://wdaqua.eu
+
+
+
+Harsh Thakkar
+hars...@gmail.com
+University of Bonn
+http://harshthakkar.in
+
+
+Dharmen Punjani
+dharmen.punj...@gmail.com
+National and Kapodistrian University of 
Athens
+
http://wdaqua.eu/students/dharmen-punjani
+
+
+
+
+UTF-8
+3.0.0
+src/test/resources/sparql/queries
+
+
+
+
+org.apache.jena
+apache-jena-libs
+pom
+${jena.version}
+
+
+org.apache.tinkerpop
+gremlin-core
+3.3.2-SNAPSHOT
+
+
+org.apache.tinkerpop
+tinkergraph-gremlin
+3.3.2-SNAPSHOT
+
+
+org.apache.tinkerpop
+gremlin-test
+${project.version}
+test
+
+
+
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef0d05f6/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/ConsoleCompiler.java
--
diff --git 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/ConsoleCompiler.java
 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/ConsoleCompiler.java
new file mode 100644
index 000..0d50475
--- /dev/null
+++ 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/ConsoleCompiler.java
@@ -0,0 +1,165 @@
+/*
+ * 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.sparql;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
+import 

[24/50] [abbrv] tinkerpop git commit: Added io test data for 3.2.9. CTR

[spmallette]

Added io test data for 3.2.9. CTR


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

Branch: refs/heads/TINKERPOP-1878
Commit: 9a5868959c6dec1c5757198289cbb23068e65a0f
Parents: 27778e0
Author: Stephen Mallette 
Authored: Mon Apr 23 13:04:12 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Apr 23 13:05:26 2018 -0400

--
 .../io/graphson/GraphSONCompatibility.java  |   3 +
 .../structure/io/gryo/GryoCompatibility.java|   1 +
 .../GraphSONTypedCompatibilityTest.java |   1 +
 .../GraphSONUntypedCompatibilityTest.java   |   2 +
 .../io/gryo/GryoCompatibilityTest.java  |   1 +
 .../_3_2_9/authenticationchallenge-v1d0.json|  12 +
 .../authenticationchallenge-v2d0-no-types.json  |  12 +
 .../authenticationchallenge-v2d0-partial.json   |  12 +
 .../_3_2_9/authenticationresponse-v1d0.json |   9 +
 .../authenticationresponse-v2d0-no-types.json   |   9 +
 .../authenticationresponse-v2d0-partial.json|   9 +
 .../graphson/_3_2_9/barrier-v2d0-no-types.json  |   1 +
 .../graphson/_3_2_9/barrier-v2d0-partial.json   |   4 +
 .../_3_2_9/bigdecimal-v2d0-partial.json |   1 +
 .../_3_2_9/biginteger-v2d0-partial.json |   1 +
 .../graphson/_3_2_9/binding-v2d0-no-types.json  |   4 +
 .../graphson/_3_2_9/binding-v2d0-partial.json   |  10 +
 .../io/graphson/_3_2_9/byte-v2d0-partial.json   |   1 +
 .../_3_2_9/bytebuffer-v2d0-partial.json |   1 +
 .../graphson/_3_2_9/bytecode-v2d0-no-types.json |   3 +
 .../graphson/_3_2_9/bytecode-v2d0-partial.json  |   6 +
 .../_3_2_9/cardinality-v2d0-no-types.json   |   1 +
 .../_3_2_9/cardinality-v2d0-partial.json|   4 +
 .../io/graphson/_3_2_9/char-v2d0-partial.json   |   1 +
 .../io/graphson/_3_2_9/class-v2d0-no-types.json |   1 +
 .../io/graphson/_3_2_9/class-v2d0-partial.json  |   4 +
 .../graphson/_3_2_9/column-v2d0-no-types.json   |   1 +
 .../io/graphson/_3_2_9/column-v2d0-partial.json |   4 +
 .../io/graphson/_3_2_9/date-v2d0-no-types.json  |   1 +
 .../io/graphson/_3_2_9/date-v2d0-partial.json   |   4 +
 .../_3_2_9/direction-v2d0-no-types.json |   1 +
 .../graphson/_3_2_9/direction-v2d0-partial.json |   4 +
 .../graphson/_3_2_9/double-v2d0-no-types.json   |   1 +
 .../io/graphson/_3_2_9/double-v2d0-partial.json |   4 +
 .../graphson/_3_2_9/duration-v2d0-partial.json  |   1 +
 .../structure/io/graphson/_3_2_9/edge-v1d0.json |  12 +
 .../io/graphson/_3_2_9/edge-v2d0-no-types.json  |  14 +
 .../io/graphson/_3_2_9/edge-v2d0-partial.json   |  32 +
 .../io/graphson/_3_2_9/float-v2d0-no-types.json |   1 +
 .../io/graphson/_3_2_9/float-v2d0-partial.json  |   4 +
 .../_3_2_9/inetaddress-v2d0-partial.json|   1 +
 .../graphson/_3_2_9/instant-v2d0-partial.json   |   1 +
 .../graphson/_3_2_9/integer-v2d0-no-types.json  |   1 +
 .../graphson/_3_2_9/integer-v2d0-partial.json   |   4 +
 .../graphson/_3_2_9/lambda-v2d0-no-types.json   |   5 +
 .../io/graphson/_3_2_9/lambda-v2d0-partial.json |   8 +
 .../graphson/_3_2_9/localdate-v2d0-partial.json |   1 +
 .../_3_2_9/localdatetime-v2d0-partial.json  |   1 +
 .../graphson/_3_2_9/localtime-v2d0-partial.json |   1 +
 .../io/graphson/_3_2_9/long-v2d0-no-types.json  |   1 +
 .../io/graphson/_3_2_9/long-v2d0-partial.json   |   4 +
 .../graphson/_3_2_9/metrics-v2d0-no-types.json  |  24 +
 .../graphson/_3_2_9/metrics-v2d0-partial.json   |  54 ++
 .../graphson/_3_2_9/monthday-v2d0-partial.json  |   1 +
 .../_3_2_9/offsetdatetime-v2d0-partial.json |   1 +
 .../_3_2_9/offsettime-v2d0-partial.json |   1 +
 .../graphson/_3_2_9/operator-v2d0-no-types.json |   1 +
 .../graphson/_3_2_9/operator-v2d0-partial.json  |   4 +
 .../io/graphson/_3_2_9/order-v2d0-no-types.json |   1 +
 .../io/graphson/_3_2_9/order-v2d0-partial.json  |   4 +
 .../io/graphson/_3_2_9/p-v2d0-no-types.json |   4 +
 .../io/graphson/_3_2_9/p-v2d0-partial.json  |  10 +
 .../io/graphson/_3_2_9/pand-v2d0-no-types.json  |  10 +
 .../io/graphson/_3_2_9/pand-v2d0-partial.json   |  25 +
 .../structure/io/graphson/_3_2_9/path-v1d0.json |  62 ++
 .../io/graphson/_3_2_9/path-v2d0-no-types.json  |  13 +
 .../io/graphson/_3_2_9/path-v2d0-partial.json   |  34 +
 .../io/graphson/_3_2_9/period-v2d0-partial.json |   1 +
 .../io/graphson/_3_2_9/pick-v2d0-no-types.json  |   1 +
 .../io/graphson/_3_2_9/pick-v2d0-partial.json   |   4 +
 .../io/graphson/_3_2_9/pop-v2d0-no-types.json   |   1 +
 .../io/graphson/_3_2_9/pop-v2d0-partial.json|   4 +
 .../io/graphson/_3_2_9/por-v2d0-no-types.json   |  10 +
 .../io/graphson/_3_2_9/por-v2d0-partial.json|  31 +
 .../io/graphson/_3_2_9/property-v1d0.json   |   4 +
 .../graphson/_3_2_9/property-v2d0-no-types.json |   4 +
 

[31/50] [abbrv] tinkerpop git commit: TINKERPOP-1878 Added some Traversal infrastructure

[spmallette]

TINKERPOP-1878 Added some Traversal infrastructure

This is the start of getting Sparql working as a DSL in TinkerPop


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

Branch: refs/heads/TINKERPOP-1878
Commit: 49263d3ac4075dcb30b623913f0c39e23a8862d8
Parents: 227d35b
Author: Stephen Mallette 
Authored: Wed Jan 24 17:04:27 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:03 2018 -0400

--
 .../dsl/sparql/DefaultSparqlTraversal.java  |  55 
 .../traversal/dsl/sparql/SparqlTraversal.java   |  68 +
 .../dsl/sparql/SparqlTraversalSource.java   | 138 +++
 .../traversal/strategy/SparqlStrategy.java  |  25 
 4 files changed, 286 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49263d3a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/DefaultSparqlTraversal.java
--
diff --git 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/DefaultSparqlTraversal.java
 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/DefaultSparqlTraversal.java
new file mode 100644
index 000..133d4be
--- /dev/null
+++ 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/DefaultSparqlTraversal.java
@@ -0,0 +1,55 @@
+/*
+ * 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.sparql.process.traversal.dsl.sparql;
+
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversal;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class DefaultSparqlTraversal extends DefaultTraversal 
implements SparqlTraversal.Admin {
+
+public DefaultSparqlTraversal() {
+super();
+}
+
+public DefaultSparqlTraversal(final SparqlTraversalSource 
sparqlTraversalSource) {
+super(sparqlTraversalSource);
+}
+
+public DefaultSparqlTraversal(final Graph graph) {
+super(graph);
+}
+
+@Override
+public SparqlTraversal.Admin asAdmin() {
+return this;
+}
+
+@Override
+public SparqlTraversal iterate() {
+return SparqlTraversal.Admin.super.iterate();
+}
+
+@Override
+public DefaultSparqlTraversal clone() {
+return (DefaultSparqlTraversal) super.clone();
+}
+}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49263d3a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversal.java
--
diff --git 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversal.java
 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversal.java
new file mode 100644
index 000..efa9489
--- /dev/null
+++ 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversal.java
@@ -0,0 +1,68 @@
+/*
+ * 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 

[36/50] [abbrv] tinkerpop git commit: TINKERPOP-1878 General refactoring and javadoc on Prefixes class

[spmallette]

TINKERPOP-1878 General refactoring and javadoc on Prefixes class


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

Branch: refs/heads/TINKERPOP-1878
Commit: 804dad9026fc94b7375116cb695006ea37262b83
Parents: 8f2de95
Author: Stephen Mallette 
Authored: Fri Jan 26 09:39:28 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:04 2018 -0400

--
 .../tinkerpop/gremlin/sparql/Prefixes.java  | 23 ++--
 1 file changed, 12 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/804dad90/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/Prefixes.java
--
diff --git 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/Prefixes.java
 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/Prefixes.java
index 452bf68..32768a7 100644
--- 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/Prefixes.java
+++ 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/Prefixes.java
@@ -22,15 +22,16 @@ package org.apache.tinkerpop.gremlin.sparql;
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * Helper methods for working with prefix lines in SPARQL queries.
+ */
+class Prefixes {
 
-public class Prefixes {
-
-   // public final static String BASE_URI = "http://northwind.com/model/;;
-public final static String BASE_URI = 
"http://www.tinkerpop.com/traversal/;;
+final static String BASE_URI = "http://tinkerpop.apache.org/traversal/;;
 
-final static List PREFIXES = Arrays.asList("edge", "property", 
"value");
+private final static List PREFIXES = Arrays.asList("edge", 
"property", "value");
 
-final static String PREFIX_DEFINITIONS;
+private final static String PREFIX_DEFINITIONS;
 
 static {
 final StringBuilder builder = new StringBuilder();
@@ -41,24 +42,24 @@ public class Prefixes {
 PREFIX_DEFINITIONS = builder.toString();
 }
 
-public static String getURI(final String prefix) {
+static String getURI(final String prefix) {
 return BASE_URI + prefix + "#";
 }
 
-public static String getURIValue(final String uri) {
+static String getURIValue(final String uri) {
 return uri.substring(uri.indexOf("#") + 1);
 }
 
-public static String getPrefix(final String uri) {
+static String getPrefix(final String uri) {
 final String tmp = uri.substring(0, uri.indexOf("#"));
 return tmp.substring(tmp.lastIndexOf("/") + 1);
 }
 
-public static String prepend(final String script) {
+static String prepend(final String script) {
 return PREFIX_DEFINITIONS + script;
 }
 
-public static StringBuilder prepend(final StringBuilder scriptBuilder) {
+static StringBuilder prepend(final StringBuilder scriptBuilder) {
 return scriptBuilder.insert(0, PREFIX_DEFINITIONS);
 }
 }

[18/50] [abbrv] tinkerpop git commit: Added io tests for 3.3.3 CTR

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v1d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v1d0.kryo
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v1d0.kryo
new file mode 100644
index 000..ba94b5d
Binary files /dev/null and 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v1d0.kryo
 differ

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v3d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v3d0.kryo
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v3d0.kryo
new file mode 100644
index 000..ba94b5d
Binary files /dev/null and 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v3d0.kryo
 differ

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v1d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v1d0.kryo
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v1d0.kryo
new file mode 100644
index 000..edf8dd4
Binary files /dev/null and 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v1d0.kryo
 differ

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v3d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v3d0.kryo
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v3d0.kryo
new file mode 100644
index 000..edf8dd4
Binary files /dev/null and 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v3d0.kryo
 differ

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v1d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v1d0.kryo
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v1d0.kryo
new file mode 100644
index 000..71bd63e
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v1d0.kryo
@@ -0,0 +1 @@
+

\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v3d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v3d0.kryo
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v3d0.kryo
new file mode 100644
index 000..71bd63e
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v3d0.kryo
@@ -0,0 +1 @@
+

\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/char-v1d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/char-v1d0.kryo
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/char-v1d0.kryo
new file mode 100644
index 000..718882c
Binary files 

[32/50] [abbrv] tinkerpop git commit: TINKERPOP-1878 Test cleanup for sparql-gremlin

[spmallette]

TINKERPOP-1878 Test cleanup for sparql-gremlin


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

Branch: refs/heads/TINKERPOP-1878
Commit: a94172fe99536af30413934e60c01ce1434fa70c
Parents: 199a963
Author: Stephen Mallette 
Authored: Fri Jan 26 08:10:48 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:04 2018 -0400

--
 sparql-gremlin/pom.xml  |  10 +-
 .../dsl/sparql/SparqlTraversalSource.java   |   4 +-
 .../gremlin/sparql/ResourceHelper.java  |  37 ---
 .../sparql/SparqlToGremlinCompilerTest.java | 223 ---
 .../dsl/sparql/SparqlTraversalSourceTest.java   |  31 ++-
 5 files changed, 36 insertions(+), 269 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a94172fe/sparql-gremlin/pom.xml
--
diff --git a/sparql-gremlin/pom.xml b/sparql-gremlin/pom.xml
index 0e3da38..731b822 100644
--- a/sparql-gremlin/pom.xml
+++ b/sparql-gremlin/pom.xml
@@ -41,9 +41,13 @@
 test
 
 
-org.apache.tinkerpop
-gremlin-test
-${project.version}
+junit
+junit
+test
+
+
+org.hamcrest
+hamcrest-all
 test
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a94172fe/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
--
diff --git 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
index deb16f7..cc54aa5 100644
--- 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
+++ 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
@@ -28,6 +28,7 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConstantStep;
 import 
org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectStep;
+import 
org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy.SparqlStrategy;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Transaction;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
@@ -46,6 +47,7 @@ public class SparqlTraversalSource implements TraversalSource 
{
 public SparqlTraversalSource(final Graph graph, final TraversalStrategies 
traversalStrategies) {
 this.graph = graph;
 this.strategies = traversalStrategies;
+this.strategies.addStrategies(SparqlStrategy.instance());
 }
 
 public SparqlTraversalSource(final Graph graph) {
@@ -122,7 +124,7 @@ public class SparqlTraversalSource implements 
TraversalSource {
 /**
  * The start step for a SPARQL based traversal that accepts a string 
representation of the query to execute.
  */
-public  SparqlTraversal sparql(final String query) {
+public  SparqlTraversal sparql(final String query) {
 final SparqlTraversalSource clone = this.clone();
 
 // this is a bit of a hack to get remote traversals to work cleanly. 
on the remote side, we'd expect a

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a94172fe/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/ResourceHelper.java
--
diff --git 
a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/ResourceHelper.java
 
b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/ResourceHelper.java
deleted file mode 100644
index 4f58e61..000
--- 
a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/ResourceHelper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in 

[48/50] [abbrv] tinkerpop git commit: TINKERPOP-1878 Fixed up formatting of traspiler section

[spmallette]

TINKERPOP-1878 Fixed up formatting of traspiler section

There were some examples that didn't return results or generated errors. These 
will need some review.


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

Branch: refs/heads/TINKERPOP-1878
Commit: 752e38c4e0910aad7a095e5f04c990fc2d9d5220
Parents: ddc840d
Author: Stephen Mallette 
Authored: Tue Apr 3 10:52:17 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:49 2018 -0400

--
 docs/src/reference/transpilers.asciidoc | 156 ---
 1 file changed, 71 insertions(+), 85 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/752e38c4/docs/src/reference/transpilers.asciidoc
--
diff --git a/docs/src/reference/transpilers.asciidoc 
b/docs/src/reference/transpilers.asciidoc
index 386b4a5..b05be68 100644
--- a/docs/src/reference/transpilers.asciidoc
+++ b/docs/src/reference/transpilers.asciidoc
@@ -84,8 +84,7 @@ start step.
 and then when finally iterated, executes that against the TinkerGraph.
 
 [[prefixes]]
-Prefixes
-~
+=== Prefixes
 
 The SPARQL-Gremlin transpiler supports the following prefixes to traverse the 
graph:
 
@@ -110,10 +109,11 @@ g.sparql("""SELECT ?name ?id ?label
 
 
 [[supported-queries]]
-Supported Queries
-~~
+=== Supported Queries
 
-The SPARQL-Gremlin transpiler is currently an on-going effort with an aim to 
cover the entire SPARQL 1.1 query feature spectrum, however we currently only 
support translation of the SPARQL 1.0 specification, especially _SELECT_ 
queries. The supported SPARQL query types are: 
+The SPARQL-Gremlin transpiler is currently an on-going effort with an aim to 
cover the entire SPARQL 1.1 query feature
+spectrum, however we currently only support translation of the SPARQL 1.0 
specification, especially _SELECT_ queries.
+The supported SPARQL query types are:
 
 * Union 
 * Optional 
@@ -127,29 +127,25 @@ The SPARQL-Gremlin transpiler is currently an on-going 
effort with an aim to cov
 ** OFFSET
 
 [[limitations]]
-Limitations
-
+=== Limitations
 
 The current implementation of SPARQL-Gremlin transpiler (i.e. SPARQL-Gremlin) 
does
 not support the following cases: 
 
-* SPARQL queries with variables in the
-predicate position are not currently covered, with an exception of the
-following case:
+* SPARQL queries with variables in the predicate position are not currently 
covered, with an exception of the following
+case:
 
-[gremlin-groovy,existing]
+[source,groovy]
 
 g.sparql("""SELECT * WHERE { ?x ?y ?z . }""")
 
 
-* A SPARQL Union query with un-balanced patterns, i.e. a gremlin union
-traversal can only be generated if the unput SPARQL query has the same
-number of patterns on both the side of the union operator. For instance,
-the following SPARQL query cannot be mapped using Gremlinator, since a
-union is executed between different number of graph patterns (two
-patterns _union_ 1 pattern).
+* A SPARQL Union query with un-balanced patterns, i.e. a gremlin union 
traversal can only be generated if the input
+SPARQL query has the same number of patterns on both the side of the union 
operator. For instance, the following
+SPARQL query cannot be mapped using Gremlinator, since a union is executed 
between different number of graph patterns
+(two patterns _union_ 1 pattern).
 
-[gremlin-groovy,existing]
+[source,groovy]
 
 g.sparql("""SELECT * 
WHERE {
@@ -170,16 +166,15 @@ Adding more here...
 
 
 [[examples]]
-Examples
-~
+=== Examples
 
-The following section presents a comprehensive examples of SPARQL queries that 
are currently covered by the SPARQL-Gremlin transpiler.
+The following section presents a comprehensive examples of SPARQL queries that 
are currently covered by the
+SPARQL-Gremlin transpiler.
 
 [[select-all]]
-Select All
-^^
+ Select All
 
-.Select all vertices in the graph.
+Select all vertices in the graph.
 
 [gremlin-groovy,existing]
 
@@ -187,10 +182,9 @@ g.sparql("""SELECT * WHERE { }""")
 
 
 [[match-constant-values]]
-Match Constant Values
-^
+ Match Constant Values
 
-.Select all vertices with the label `person`.
+Select all vertices with the label `person`.
 
 [gremlin-groovy,existing]
 
@@ -198,10 +192,9 @@ g.sparql("""SELECT * WHERE {  ?person v:label "person" 
.}""")
 
 
 [[select-specific-elements]]
-Select Specific Elements
-
+ Select Specific Elements
 
-.Select the values of the properties `name` and `age` for 

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

Branch: refs/heads/TINKERPOP-1878
Commit: b8b46b06a26c58395ef2d878c2c2ed0665c0e788
Parents: 4705c04 6b259f7
Author: Stephen Mallette 
Authored: Fri Apr 20 19:03:42 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 20 19:03:42 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../io/graphson/TraversalSerializersV2d0.java   | 35 +---
 2 files changed, 24 insertions(+), 12 deletions(-)
--


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

[14/50] [abbrv] tinkerpop git commit: TINKERPOP-1936 Improved performance of Bytecode deserialization.

[spmallette]

TINKERPOP-1936 Improved performance of Bytecode deserialization.

GraphSON deserialization of Bytecode was using generic List deserialization 
which became especially costly for Jackson in 2.5.x because of changes that 
synchronized access to the deserialization cache and because the collection 
deserialization were no longer cacheable when type deserialization was in play. 
This change removed the use of generic type lists in deserialization and more 
directly handled the parsing of the lists thus bypassing the collection 
deserializer for this specific case.


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

Branch: refs/heads/TINKERPOP-1878
Commit: 682f298cc82d66fd7040cb29a7d3b769be5e2794
Parents: 2591302
Author: Stephen Mallette 
Authored: Thu Apr 12 10:25:20 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 20 19:29:02 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../io/graphson/TraversalSerializersV2d0.java   | 35 +---
 2 files changed, 24 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/682f298c/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 0f3a71a..51c9f68 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -24,6 +24,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 === TinkerPop 3.2.9 (Release Date: NOT OFFICIALLY RELEASED YET)
 
 * Bumped to httpclient 4.5.5.
+* Improved performance of GraphSON deserialization of `Bytecode`.
 
 [[release-3-2-8]]
 === TinkerPop 3.2.8 (Release Date: April 2, 2018)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/682f298c/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 a696280..040fd1d 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
@@ -248,8 +248,6 @@ final class TraversalSerializersV2d0 {
 //
 
 final static class BytecodeJacksonDeserializer extends 
StdDeserializer {
-private static final JavaType listJavaType = 
TypeFactory.defaultInstance().constructCollectionType(ArrayList.class, 
Object.class);
-private static final JavaType listListJavaType = 
TypeFactory.defaultInstance().constructCollectionType(ArrayList.class, 
listJavaType);
 
 public BytecodeJacksonDeserializer() {
 super(Bytecode.class);
@@ -260,17 +258,30 @@ final class TraversalSerializersV2d0 {
 final Bytecode bytecode = new Bytecode();
 
 while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-if (jsonParser.getCurrentName().equals(GraphSONTokens.SOURCE)) 
{
+final String current = jsonParser.getCurrentName();
+if (current.equals(GraphSONTokens.SOURCE) || 
current.equals(GraphSONTokens.STEP)) {
 jsonParser.nextToken();
-final List instructions = 
deserializationContext.readValue(jsonParser, listListJavaType);
-for (final List instruction : instructions) {
-bytecode.addSource((String) instruction.get(0), 
Arrays.copyOfRange(instruction.toArray(), 1, instruction.size()));
-}
-} else if 
(jsonParser.getCurrentName().equals(GraphSONTokens.STEP)) {
-jsonParser.nextToken();
-final List instructions = 
deserializationContext.readValue(jsonParser, listListJavaType);
-for (final List instruction : instructions) {
-bytecode.addStep((String) instruction.get(0), 
Arrays.copyOfRange(instruction.toArray(), 1, instruction.size()));
+
+while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+
+// there should be a list now and the first item in 
the list is always string and is the step name
+// skip the start array
+jsonParser.nextToken();
+
+

[30/50] [abbrv] tinkerpop git commit: TINKERPOP-1878 sparql-gremlin is now building

[spmallette]

TINKERPOP-1878 sparql-gremlin is now building

Fixed some basic pom.xml issues and resolved dependency conflicts.


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

Branch: refs/heads/TINKERPOP-1878
Commit: 227d35b3db441e1d065b766e58a9832cf69142c3
Parents: ef0d05f
Author: Stephen Mallette 
Authored: Wed Jan 24 15:23:57 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:03 2018 -0400

--
 pom.xml| 18 
 sparql-gremlin/pom.xml | 52 ++---
 2 files changed, 39 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/227d35b3/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e0548a3..434e25c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,6 +108,18 @@ limitations under the License.
 twil...@gmail.com
 https://github.com/twilmes
 
+
+Harsh Thakkar
+hars...@gmail.com
+University of Bonn
+http://harshthakkar.in
+
+
+Dharmen Punjani
+dharmen.punj...@gmail.com
+National and Kapodistrian University of 
Athens
+
http://wdaqua.eu/students/dharmen-punjani
+
 
 
 3.0.5
@@ -124,6 +136,7 @@ limitations under the License.
 hadoop-gremlin
 spark-gremlin
 neo4j-gremlin
+sparql-gremlin
 gremlin-driver
 gremlin-console
 gremlin-server
@@ -635,6 +648,11 @@ limitations under the License.
 
 
 
+org.apache.httpcomponents
+httpclient
+4.5.1
+
+
 commons-httpclient
 commons-httpclient
 3.1

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/227d35b3/sparql-gremlin/pom.xml
--
diff --git a/sparql-gremlin/pom.xml b/sparql-gremlin/pom.xml
index e134d31..d38a85d 100644
--- a/sparql-gremlin/pom.xml
+++ b/sparql-gremlin/pom.xml
@@ -2,55 +2,46 @@
 http://maven.apache.org/POM/4.0.0;
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
 
 tinkerpop
 org.apache.tinkerpop
 3.3.2-SNAPSHOT
 
-4.0.0
-
 sparql-gremlin
-
-WDAQUA-ITN
-http://wdaqua.eu
-
-
-
-Harsh Thakkar
-hars...@gmail.com
-University of Bonn
-http://harshthakkar.in
-
-
-Dharmen Punjani
-dharmen.punj...@gmail.com
-National and Kapodistrian University of 
Athens
-
http://wdaqua.eu/students/dharmen-punjani
-
-
+Apache TinkerPop :: SPARQL Gremlin
 
 
-UTF-8
-3.0.0
 src/test/resources/sparql/queries
 
 
 
-
-org.apache.jena
-apache-jena-libs
-pom
-${jena.version}
-
+
+org.apache.jena
+apache-jena-libs
+pom
+3.0.0
+
+
+
+org.apache.httpcomponents
+httpclient
+
+
+
+
+org.apache.httpcomponents
+httpclient
+
 
 org.apache.tinkerpop
 gremlin-core
-3.3.2-SNAPSHOT
+${project.version}
 
 
 org.apache.tinkerpop
 tinkergraph-gremlin
-3.3.2-SNAPSHOT
+${project.version}
 
 
 org.apache.tinkerpop
@@ -59,5 +50,4 @@
 test
 
 
-
 
\ No newline at end of file

[35/50] [abbrv] tinkerpop git commit: TINKERPOP-1878 Test for FILTER

[spmallette]

TINKERPOP-1878 Test for FILTER

Also fixed how the SparqlStrategy was being added to the TraversalStrategies in 
SparqlTraversalSource...it was adding it globally and all spawned 
TraversalSource instances were getting that strategy.


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

Branch: refs/heads/TINKERPOP-1878
Commit: a205706f88abcae978080dbc9ace2ca20f651519
Parents: b4d09f3
Author: Stephen Mallette 
Authored: Fri Jan 26 16:29:55 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:04 2018 -0400

--
 .../dsl/sparql/SparqlTraversalSource.java   |  2 +-
 .../dsl/sparql/SparqlTraversalSourceTest.java   | 23 
 2 files changed, 24 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a205706f/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
--
diff --git 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
index cc54aa5..f78708b 100644
--- 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
+++ 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
@@ -47,7 +47,6 @@ public class SparqlTraversalSource implements TraversalSource 
{
 public SparqlTraversalSource(final Graph graph, final TraversalStrategies 
traversalStrategies) {
 this.graph = graph;
 this.strategies = traversalStrategies;
-this.strategies.addStrategies(SparqlStrategy.instance());
 }
 
 public SparqlTraversalSource(final Graph graph) {
@@ -126,6 +125,7 @@ public class SparqlTraversalSource implements 
TraversalSource {
  */
 public  SparqlTraversal sparql(final String query) {
 final SparqlTraversalSource clone = this.clone();
+clone.getStrategies().addStrategies(SparqlStrategy.instance());
 
 // this is a bit of a hack to get remote traversals to work cleanly. 
on the remote side, we'd expect a
 // GraphTraversalSource not a SparqlTraversalSource (given that 
sparql-gremlin is to be implemented in the

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a205706f/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
--
diff --git 
a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
 
b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
index 1b39813..4092e58 100644
--- 
a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
+++ 
b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
@@ -18,16 +18,21 @@
  */
 package org.apache.tinkerpop.gremlin.sparql.process.traversal.dsl.sparql;
 
+import 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import 
org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy.SparqlStrategy;
 import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
 import org.junit.Test;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static 
org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
 import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author Stephen Mallette (http://stephen.genoprime.com)
@@ -36,6 +41,7 @@ public class SparqlTraversalSourceTest {
 
 private static final Graph graph = TinkerFactory.createModern();
 private static final SparqlTraversalSource g = 
graph.traversal(SparqlTraversalSource.class);
+private static final GraphTraversalSource _g = graph.traversal();
 
 @Test
 public void shouldFindAllPersonsNamesAndAges() {
@@ -88,4 +94,21 @@ public class SparqlTraversalSourceTest {
 final 

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

Branch: refs/heads/TINKERPOP-1878
Commit: ead56590a6374d5757b53a5412bef47b87c1e4b2
Parents: 9a58689 268423d
Author: Stephen Mallette 
Authored: Mon Apr 23 13:50:29 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Apr 23 13:50:29 2018 -0400

--
 .../java/org/apache/tinkerpop/gremlin/server/GraphManager.java   | 4 ++--
 .../tinkerpop/gremlin/server/util/DefaultGraphManager.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--

[37/50] [abbrv] tinkerpop git commit: TINKERPOP-1878 Major refactoring of sparql-gremlin classes

[spmallette]

TINKERPOP-1878 Major refactoring of sparql-gremlin classes

Renamed the "compiler" to a "transpiler" since it's really transforming sparql 
to a language of a similar level of abstraction in Gremlin. Lots of code 
reformatting and dead code pruning.


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

Branch: refs/heads/TINKERPOP-1878
Commit: 7c3c6f642d8ab8cd81901f2ced1051ee72147733
Parents: 804dad9
Author: Stephen Mallette 
Authored: Fri Jan 26 13:36:29 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:04 2018 -0400

--
 .../gremlin/sparql/SparqlToGremlinCompiler.java | 381 ---
 .../sparql/SparqlToGremlinTranspiler.java   | 286 ++
 .../gremlin/sparql/TraversalBuilder.java|   7 +-
 .../gremlin/sparql/WhereTraversalBuilder.java   |  66 ++--
 .../traversal/strategy/SparqlStrategy.java  |   5 +-
 5 files changed, 322 insertions(+), 423 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7c3c6f64/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompiler.java
--
diff --git 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompiler.java
 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompiler.java
deleted file mode 100644
index adb36e9..000
--- 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompiler.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.sparql;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.jena.graph.Triple;
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryFactory;
-import org.apache.jena.query.SortCondition;
-import org.apache.jena.query.Syntax;
-import org.apache.jena.sparql.algebra.Algebra;
-import org.apache.jena.sparql.algebra.Op;
-import org.apache.jena.sparql.algebra.OpVisitorBase;
-import org.apache.jena.sparql.algebra.OpWalker;
-import org.apache.jena.sparql.algebra.op.OpBGP;
-import org.apache.jena.sparql.algebra.op.OpFilter;
-import org.apache.jena.sparql.algebra.op.OpLeftJoin;
-import org.apache.jena.sparql.algebra.op.OpUnion;
-import org.apache.jena.sparql.core.Var;
-import org.apache.jena.sparql.core.VarExprList;
-import org.apache.jena.sparql.expr.Expr;
-import org.apache.jena.sparql.expr.ExprAggregator;
-import org.apache.tinkerpop.gremlin.process.traversal.Order;
-import org.apache.tinkerpop.gremlin.process.traversal.Scope;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-import 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-
-// TODO: implement OpVisitor, don't extend OpVisitorBase
-public class SparqlToGremlinCompiler extends OpVisitorBase {
-
-   private GraphTraversal traversal;
-
-   List traversalList = new ArrayList();
-
-   String groupVariable = "";
-   int sortingDirection = 0;
-   long offsetLimit = 0;
-   String sortingVariable = "";
-
-   GraphTraversalSource temp;
-   Graph graph;
-
-   private SparqlToGremlinCompiler(final GraphTraversal 
traversal) {
-   this.traversal = traversal;
-   }
-
-   private SparqlToGremlinCompiler(final GraphTraversalSource g) {
-   this(g.V());
-   temp = g;
-
-   }
-
-   private SparqlToGremlinCompiler(final Graph g) {
- 

[22/50] [abbrv] tinkerpop git commit: Added io test data for 3.2.9. CTR

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9a586895/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v1d0.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v1d0.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v1d0.json
new file mode 100644
index 000..db030dd
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v1d0.json
@@ -0,0 +1,276 @@
+{
+  "1" : {
+"key" : {
+  "id" : 1,
+  "label" : "person",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 0,
+  "value" : "marko"
+} ],
+"location" : [ {
+  "id" : 6,
+  "value" : "san diego",
+  "properties" : {
+"startTime" : 1997,
+"endTime" : 2001
+  }
+}, {
+  "id" : 7,
+  "value" : "santa cruz",
+  "properties" : {
+"startTime" : 2001,
+"endTime" : 2004
+  }
+}, {
+  "id" : 8,
+  "value" : "brussels",
+  "properties" : {
+"startTime" : 2004,
+"endTime" : 2005
+  }
+}, {
+  "id" : 9,
+  "value" : "santa fe",
+  "properties" : {
+"startTime" : 2005
+  }
+} ]
+  }
+},
+"value" : {
+  "10" : {
+"key" : {
+  "id" : 10,
+  "label" : "software",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 4,
+  "value" : "gremlin"
+} ]
+  }
+},
+"value" : {
+  "11" : {
+"key" : {
+  "id" : 11,
+  "label" : "software",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 5,
+  "value" : "tinkergraph"
+} ]
+  }
+},
+"value" : { }
+  }
+}
+  }
+}
+  },
+  "7" : {
+"key" : {
+  "id" : 7,
+  "label" : "person",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 1,
+  "value" : "stephen"
+} ],
+"location" : [ {
+  "id" : 10,
+  "value" : "centreville",
+  "properties" : {
+"startTime" : 1990,
+"endTime" : 2000
+  }
+}, {
+  "id" : 11,
+  "value" : "dulles",
+  "properties" : {
+"startTime" : 2000,
+"endTime" : 2006
+  }
+}, {
+  "id" : 12,
+  "value" : "purcellville",
+  "properties" : {
+"startTime" : 2006
+  }
+} ]
+  }
+},
+"value" : {
+  "10" : {
+"key" : {
+  "id" : 10,
+  "label" : "software",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 4,
+  "value" : "gremlin"
+} ]
+  }
+},
+"value" : {
+  "11" : {
+"key" : {
+  "id" : 11,
+  "label" : "software",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 5,
+  "value" : "tinkergraph"
+} ]
+  }
+},
+"value" : { }
+  }
+}
+  }
+}
+  },
+  "8" : {
+"key" : {
+  "id" : 8,
+  "label" : "person",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 2,
+  "value" : "matthias"
+} ],
+"location" : [ {
+  "id" : 13,
+  "value" : "bremen",
+  "properties" : {
+"startTime" : 2004,
+"endTime" : 2007
+  }
+}, {
+  "id" : 14,
+  "value" : "baltimore",
+  "properties" : {
+"startTime" : 2007,
+"endTime" : 2011
+  }
+}, {
+  "id" : 15,
+  "value" : "oakland",
+  "properties" : {
+"startTime" : 2011,
+"endTime" : 2014
+  }
+}, {
+  "id" : 16,
+  "value" : "seattle",
+  "properties" : {
+"startTime" : 2014
+  }
+} ]
+  }
+},
+"value" : {
+  "10" : {
+"key" : {
+  "id" : 10,
+  "label" : "software",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 4,
+  "value" : "gremlin"
+} ]
+  }
+ 

[12/50] [abbrv] tinkerpop git commit: TINKERPOP-1936 Implemented bytecode serialization performance enhancement for GraphSON 3.0

[spmallette]

TINKERPOP-1936 Implemented bytecode serialization performance enhancement for 
GraphSON 3.0


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

Branch: refs/heads/TINKERPOP-1878
Commit: 7e6e98548625c83ad419737166fe6c679d204468
Parents: b8b46b0
Author: Stephen Mallette 
Authored: Fri Apr 20 19:26:05 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 20 19:26:05 2018 -0400

--
 .../io/graphson/TraversalSerializersV3d0.java   | 33 ++--
 1 file changed, 23 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e6e9854/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java
--
diff --git 
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
index fd11f25..eaa7b0f 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
@@ -252,17 +252,30 @@ final class TraversalSerializersV3d0 {
 final Bytecode bytecode = new Bytecode();
 
 while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
-if (jsonParser.getCurrentName().equals(GraphSONTokens.SOURCE)) 
{
+final String current = jsonParser.getCurrentName();
+if (current.equals(GraphSONTokens.SOURCE) || 
current.equals(GraphSONTokens.STEP)) {
 jsonParser.nextToken();
-final List instructions = 
deserializationContext.readValue(jsonParser, listListJavaType);
-for (final List instruction : instructions) {
-bytecode.addSource((String) instruction.get(0), 
Arrays.copyOfRange(instruction.toArray(), 1, instruction.size()));
-}
-} else if 
(jsonParser.getCurrentName().equals(GraphSONTokens.STEP)) {
-jsonParser.nextToken();
-final List instructions = 
deserializationContext.readValue(jsonParser, listListJavaType);
-for (final List instruction : instructions) {
-bytecode.addStep((String) instruction.get(0), 
Arrays.copyOfRange(instruction.toArray(), 1, instruction.size()));
+
+while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+
+// there should be a list now and the first item in 
the list is always string and is the step name
+// skip the start array
+jsonParser.nextToken();
+
+final String stepName = jsonParser.getText();
+
+// iterate through the rest of the list for arguments 
until it gets to the end
+final List arguments = new ArrayList<>();
+while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
+// we don't know the types here, so let the 
deserializer figure that business out
+
arguments.add(deserializationContext.readValue(jsonParser, Object.class));
+}
+
+// if it's not a "source" then it must be a "step"
+if (current.equals(GraphSONTokens.SOURCE))
+bytecode.addSource(stepName, arguments.toArray());
+else
+bytecode.addStep(stepName, arguments.toArray());
 }
 }
 }

[33/50] [abbrv] tinkerpop git commit: TINKERPOP-1878 Changed gryo version of SparqlStrategy

[spmallette]

TINKERPOP-1878 Changed gryo version of SparqlStrategy

Was using some temporary nonsense before...


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

Branch: refs/heads/TINKERPOP-1878
Commit: 8f2de9574e9152170fa45fc9eff00ae42c4d039a
Parents: a94172f
Author: Stephen Mallette 
Authored: Fri Jan 26 08:16:24 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:04 2018 -0400

--
 .../tinkerpop/gremlin/structure/io/gryo/GryoVersion.java  | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f2de957/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 4a325dd..f922411 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@ -373,7 +373,7 @@ public enum GryoVersion {
 add(GryoTypeReg.of(RangeGlobalStep.RangeBiOperator.class, 114));
 add(GryoTypeReg.of(OrderGlobalStep.OrderBiOperator.class, 118));
 add(GryoTypeReg.of(ProfileStep.ProfileBiOperator.class, 119));
-
add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));  
   // ***LAST ID***
+
add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
 
 // placeholder serializers for classes that don't live here in 
core. this will allow them to be used if
 // present  or ignored if the class isn't available. either way 
the registration numbers are held as
@@ -383,8 +383,9 @@ public enum GryoVersion {
 tryAddDynamicType(this, 
"org.apache.tinkerpop.gremlin.driver.message.ResponseMessage",
 
"org.apache.tinkerpop.gremlin.driver.ser.ResponseMessageGryoSerializer", 169);
 
-tryAddDynamicType(this, 
"org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy.SparqlStrategy",
-null, 1690);
+tryAddDynamicType(this,
+
"org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy.SparqlStrategy",
+null, 174); // ***LAST ID***
 }};
 }
 

[28/50] [abbrv] tinkerpop git commit: TINKERPOP-1878 Added a basics for sparql execution in a traversal

[spmallette]

TINKERPOP-1878 Added a basics for sparql execution in a traversal


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

Branch: refs/heads/TINKERPOP-1878
Commit: 02f15a5451c4b54557dc6c578c8fb6075afc619b
Parents: 49263d3
Author: Stephen Mallette 
Authored: Thu Jan 25 14:46:31 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:03 2018 -0400

--
 .../traversal/step/map/ConstantStep.java|  4 ++
 .../traversal/strategy/SparqlStrategy.java  | 56 +++-
 .../dsl/sparql/SparqlTraversalSourceTest.java   | 39 ++
 .../src/test/resources/log4j-silent.properties  | 23 
 .../src/test/resources/log4j-test.properties| 23 
 5 files changed, 144 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02f15a54/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
index 5d02e28..749de31 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
@@ -36,6 +36,10 @@ public class ConstantStep extends MapStep {
 this.constant = constant;
 }
 
+public E getConstant() {
+return this.constant;
+}
+
 @Override
 protected E map(final Traverser.Admin traverser) {
 return this.constant;

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02f15a54/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
--
diff --git 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
index 6440127..07ac4cf 100644
--- 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
+++ 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
@@ -18,8 +18,62 @@
  */
 package org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy;
 
+import 
org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConstantStep;
+import 
org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalMapStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
+import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
+import org.apache.tinkerpop.gremlin.sparql.SparqlToGremlinCompiler;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+
+import java.util.Collections;
+import java.util.Set;
+
 /**
  * @author Stephen Mallette (http://stephen.genoprime.com)
  */
-public class SparqlStrategy {
+public class SparqlStrategy extends 
AbstractTraversalStrategy
+implements TraversalStrategy.DecorationStrategy {
+private static final SparqlStrategy INSTANCE = new SparqlStrategy();
+
+private static final Set POSTS = 
Collections.singleton(VertexProgramStrategy.class);
+
+private SparqlStrategy() {}
+
+public static SparqlStrategy instance() {
+return INSTANCE;
+}
+
+@Override
+public Set applyPost() {
+return POSTS;
+}
+
+
+@Override
+public void apply(final Traversal.Admin traversal) {
+if (!(traversal.getParent() instanceof EmptyStep))
+return;
+
+if (traversal.getSteps().size() == 1 && traversal.getEndStep() 
instanceof ConstantStep) {
+final ConstantStep stepWithSparql = (ConstantStep) 
traversal.getEndStep();
+final Object constant = stepWithSparql.getConstant();
+if (constant instanceof String) {
+final String sparql = (String) constant;
+final Traversal 

[34/50] [abbrv] tinkerpop git commit: TINKERPOP-1878 Testing for DISTINCT

[spmallette]

TINKERPOP-1878 Testing for DISTINCT

Refactoring around the distinct and ordering - much less code there now.


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

Branch: refs/heads/TINKERPOP-1878
Commit: 3e29b24ccc26c31bf69f86a8c659f8fdc27dfd85
Parents: a205706
Author: Stephen Mallette 
Authored: Fri Jan 26 16:56:14 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:04 2018 -0400

--
 .../sparql/SparqlToGremlinTranspiler.java   | 44 
 .../dsl/sparql/SparqlTraversalSourceTest.java   | 23 ++
 2 files changed, 41 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3e29b24c/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
--
diff --git 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
index 1b28a1d..67ac1e1 100644
--- 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
+++ 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
@@ -107,39 +107,28 @@ public class SparqlToGremlinTranspiler {
 
 final List vars = query.getResultVars();
 if (!query.isQueryResultStar() && !query.hasGroupBy()) {
-// the result sizes have special handling to get the right 
signatures of select() called. perhaps this
-// could be refactored to work more nicely
-switch (vars.size()) {
+final String[] all = new String[vars.size()];
+vars.toArray(all);
+if (query.isDistinct()) {
+traversal = traversal.dedup(all);
+}
+
+// apply ordering from ORDER BY
+orderingIndex.forEach((k, v) -> traversal = 
traversal.order().by(__.select(k), v));
+
+// the result sizes have special handling to get the right 
signatures of select() called.
+switch (all.length) {
 case 0:
 throw new IllegalStateException();
 case 1:
-if (query.isDistinct())
-traversal = traversal.dedup(vars.get(0));
-
-orderingIndex.forEach((k, v) -> traversal = 
traversal.order().by(__.select(k), v));
-traversal = traversal.select(vars.get(0));
-
+traversal = traversal.select(all[0]);
 break;
 case 2:
-if (query.isDistinct())
-traversal = traversal.dedup(vars.get(0), vars.get(1));
-
-orderingIndex.forEach((k, v) -> traversal = 
traversal.order().by(__.select(k), v));
-traversal = traversal.select(vars.get(0), vars.get(1));
-
+traversal = traversal.select(all[0], all[1]);
 break;
 default:
-final String[] all = new String[vars.size()];
-vars.toArray(all);
-if (query.isDistinct())
-traversal = traversal.dedup(all);
-
-orderingIndex.forEach((k, v) -> traversal = 
traversal.order().by(__.select(k), v));
-
-// just some shenanigans to get the right signature of 
select() called
 final String[] others = Arrays.copyOfRange(all, 2, 
vars.size());
-traversal = traversal.select(vars.get(0), vars.get(1), 
others);
-
+traversal = traversal.select(all[0], all[1], others);
 break;
 }
 }
@@ -207,7 +196,10 @@ public class SparqlToGremlinTranspiler {
 
 for (SortCondition sortCondition : sortingConditions) {
 final Expr expr = sortCondition.getExpression();
-orderingIndex.put(expr.getVarName(), 
sortCondition.getDirection() == 1 ? Order.incr : Order.decr);
+
+// by default, the sort will be ascending. getDirection() 
returns -2 if the DESC/ASC isn't
+// supplied - weird
+orderingIndex.put(expr.getVarName(), 
sortCondition.getDirection() == -1 ? Order.decr : Order.incr);
 }
 }
 

[17/50] [abbrv] tinkerpop git commit: Fix typos in GraphManager and DefaultGraphManager javadoc

[spmallette]

Fix typos in GraphManager and DefaultGraphManager javadoc


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

Branch: refs/heads/TINKERPOP-1878
Commit: 268423d2d16397ad749082041ea0e17075a3093d
Parents: 682f298
Author: Justin Chu <15710241+justinch...@users.noreply.github.com>
Authored: Fri Apr 20 22:47:31 2018 -0400
Committer: Justin Chu <15710241+justinch...@users.noreply.github.com>
Committed: Fri Apr 20 22:52:30 2018 -0400

--
 .../java/org/apache/tinkerpop/gremlin/server/GraphManager.java   | 4 ++--
 .../tinkerpop/gremlin/server/util/DefaultGraphManager.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/268423d2/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
--
diff --git 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
index 8e3198f..bcb4a8e 100644
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
@@ -69,8 +69,8 @@ public interface GraphManager {
  *
  * @return a {@link Map} where the key is the name of the {@link 
TraversalSource} and the value is the
  * {@link TraversalSource} itself
- * @deprecated  As of release 3.2.5, replaced by a combination of {@link 
#getTraversalSource(String)} ()} and
- * {@link #getTraversalSource(String)} (String)} - note that the 
expectation is this method return an immutable
+ * @deprecated  As of release 3.2.5, replaced by a combination of {@link 
#getTraversalSourceNames()} and
+ * {@link #getTraversalSource(String)} - note that the expectation is this 
method return an immutable
  * {@code Map} which was not the expectation prior to 3.2.5.
  */
 @Deprecated

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/268423d2/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
--
diff --git 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
index 5e4a355..9b5668f 100644
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
@@ -96,8 +96,8 @@ public final class DefaultGraphManager implements 
GraphManager {
  *
  * @return a {@code Map} where the key is the name of the {@link 
TraversalSource} and the value is the
  * {@link TraversalSource} itself
- * @deprecated As of release 3.2.5, replaced by a combination of {@link 
#getTraversalSource(String)} ()} and
- * {@link #getTraversalSource(String)} (String)}
+ * @deprecated As of release 3.2.5, replaced by a combination of {@link 
#getTraversalSourceNames()} and
+ * {@link #getTraversalSource(String)}
  */
 @Deprecated
 public final Map getTraversalSources() {

[21/50] [abbrv] tinkerpop git commit: Added io tests for 3.3.3 CTR

[spmallette]

Added io tests for 3.3.3 CTR


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

Branch: refs/heads/TINKERPOP-1878
Commit: 27778e0dfaa62622a3827b284cb07aa8316457b5
Parents: 81add60
Author: Stephen Mallette 
Authored: Mon Apr 23 07:49:36 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Apr 23 13:05:17 2018 -0400

--
 .../io/graphson/GraphSONCompatibility.java  |   6 +-
 .../structure/io/gryo/GryoCompatibility.java|   4 +-
 .../GraphSONTypedCompatibilityTest.java |   4 +-
 .../GraphSONUntypedCompatibilityTest.java   |   6 +-
 .../io/gryo/GryoCompatibilityTest.java  |   4 +-
 .../_3_3_3/authenticationchallenge-v1d0.json|  12 +
 .../authenticationchallenge-v2d0-no-types.json  |  12 +
 .../authenticationchallenge-v2d0-partial.json   |  12 +
 .../_3_3_3/authenticationchallenge-v3d0.json|  18 +
 .../_3_3_3/authenticationresponse-v1d0.json |   9 +
 .../authenticationresponse-v2d0-no-types.json   |   9 +
 .../authenticationresponse-v2d0-partial.json|   9 +
 .../_3_3_3/authenticationresponse-v3d0.json |   9 +
 .../graphson/_3_3_3/barrier-v2d0-partial.json   |   4 +
 .../io/graphson/_3_3_3/barrier-v3d0.json|   4 +
 .../_3_3_3/bigdecimal-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/bigdecimal-v3d0.json |   4 +
 .../_3_3_3/biginteger-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/biginteger-v3d0.json |   4 +
 .../graphson/_3_3_3/binding-v2d0-partial.json   |  10 +
 .../io/graphson/_3_3_3/binding-v3d0.json|  10 +
 .../io/graphson/_3_3_3/byte-v2d0-partial.json   |   4 +
 .../structure/io/graphson/_3_3_3/byte-v3d0.json |   4 +
 .../_3_3_3/bytebuffer-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/bytebuffer-v3d0.json |   4 +
 .../graphson/_3_3_3/bytecode-v2d0-partial.json  |   6 +
 .../io/graphson/_3_3_3/bytecode-v3d0.json   |   6 +
 .../_3_3_3/cardinality-v2d0-partial.json|   4 +
 .../io/graphson/_3_3_3/cardinality-v3d0.json|   4 +
 .../io/graphson/_3_3_3/char-v2d0-partial.json   |   4 +
 .../structure/io/graphson/_3_3_3/char-v3d0.json |   4 +
 .../io/graphson/_3_3_3/class-v2d0-partial.json  |   4 +
 .../io/graphson/_3_3_3/class-v3d0.json  |   4 +
 .../io/graphson/_3_3_3/column-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/column-v3d0.json |   4 +
 .../io/graphson/_3_3_3/date-v2d0-no-types.json  |   1 +
 .../io/graphson/_3_3_3/date-v2d0-partial.json   |   4 +
 .../structure/io/graphson/_3_3_3/date-v3d0.json |   4 +
 .../graphson/_3_3_3/direction-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/direction-v3d0.json  |   4 +
 .../graphson/_3_3_3/double-v2d0-no-types.json   |   1 +
 .../io/graphson/_3_3_3/double-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/double-v3d0.json |   4 +
 .../graphson/_3_3_3/duration-v2d0-partial.json  |   4 +
 .../io/graphson/_3_3_3/duration-v3d0.json   |   4 +
 .../structure/io/graphson/_3_3_3/edge-v1d0.json |  12 +
 .../io/graphson/_3_3_3/edge-v2d0-no-types.json  |  14 +
 .../io/graphson/_3_3_3/edge-v2d0-partial.json   |  32 +
 .../structure/io/graphson/_3_3_3/edge-v3d0.json |  32 +
 .../io/graphson/_3_3_3/float-v2d0-partial.json  |   4 +
 .../io/graphson/_3_3_3/float-v3d0.json  |   4 +
 .../_3_3_3/inetaddress-v2d0-partial.json|   4 +
 .../io/graphson/_3_3_3/inetaddress-v3d0.json|   4 +
 .../graphson/_3_3_3/instant-v2d0-partial.json   |   4 +
 .../io/graphson/_3_3_3/instant-v3d0.json|   4 +
 .../graphson/_3_3_3/integer-v2d0-no-types.json  |   1 +
 .../graphson/_3_3_3/integer-v2d0-partial.json   |   4 +
 .../io/graphson/_3_3_3/integer-v3d0.json|   4 +
 .../io/graphson/_3_3_3/lambda-v2d0-partial.json |   8 +
 .../io/graphson/_3_3_3/lambda-v3d0.json |   8 +
 .../structure/io/graphson/_3_3_3/list-v3d0.json |   7 +
 .../graphson/_3_3_3/localdate-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/localdate-v3d0.json  |   4 +
 .../_3_3_3/localdatetime-v2d0-partial.json  |   4 +
 .../io/graphson/_3_3_3/localdatetime-v3d0.json  |   4 +
 .../graphson/_3_3_3/localtime-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/localtime-v3d0.json  |   4 +
 .../io/graphson/_3_3_3/long-v2d0-partial.json   |   4 +
 .../structure/io/graphson/_3_3_3/long-v3d0.json |   4 +
 .../structure/io/graphson/_3_3_3/map-v3d0.json  |  25 +
 .../graphson/_3_3_3/metrics-v2d0-partial.json   |  54 ++
 .../io/graphson/_3_3_3/metrics-v3d0.json|  52 ++
 .../graphson/_3_3_3/monthday-v2d0-partial.json  |   4 +
 .../io/graphson/_3_3_3/monthday-v3d0.json   |   4 +
 .../_3_3_3/offsetdatetime-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/offsetdatetime-v3d0.json |   4 +
 

[19/50] [abbrv] tinkerpop git commit: Added io tests for 3.3.3 CTR

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v2d0-partial.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v2d0-partial.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v2d0-partial.json
new file mode 100644
index 000..24e95ed
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v2d0-partial.json
@@ -0,0 +1,829 @@
+{
+  "@type" : "tinker:graph",
+  "@value" : {
+"vertices" : [ {
+  "@type" : "g:Vertex",
+  "@value" : {
+"id" : {
+  "@type" : "g:Int32",
+  "@value" : 1
+},
+"label" : "person",
+"properties" : {
+  "name" : [ {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 0
+  },
+  "value" : "marko",
+  "label" : "name"
+}
+  } ],
+  "location" : [ {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 6
+  },
+  "value" : "san diego",
+  "label" : "location",
+  "properties" : {
+"startTime" : {
+  "@type" : "g:Int32",
+  "@value" : 1997
+},
+"endTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2001
+}
+  }
+}
+  }, {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 7
+  },
+  "value" : "santa cruz",
+  "label" : "location",
+  "properties" : {
+"startTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2001
+},
+"endTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2004
+}
+  }
+}
+  }, {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 8
+  },
+  "value" : "brussels",
+  "label" : "location",
+  "properties" : {
+"startTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2004
+},
+"endTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2005
+}
+  }
+}
+  }, {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 9
+  },
+  "value" : "santa fe",
+  "label" : "location",
+  "properties" : {
+"startTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2005
+}
+  }
+}
+  } ]
+}
+  }
+}, {
+  "@type" : "g:Vertex",
+  "@value" : {
+"id" : {
+  "@type" : "g:Int32",
+  "@value" : 7
+},
+"label" : "person",
+"properties" : {
+  "name" : [ {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 1
+  },
+  "value" : "stephen",
+  "label" : "name"
+}
+  } ],
+  "location" : [ {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 10
+  },
+  "value" : "centreville",
+  "label" : "location",
+  "properties" : {
+"startTime" : {
+  "@type" : "g:Int32",
+  "@value" : 1990
+},
+"endTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2000
+}
+  }
+}
+  }, {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 11
+  },
+  "value" : "dulles",
+  "label" : "location",
+  

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

Branch: refs/heads/TINKERPOP-1878
Commit: a187ce11c96077d143afb54bffbb5fc636c065eb
Parents: a098437 81add60
Author: Stephen Mallette 
Authored: Fri Apr 20 19:29:27 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 20 19:29:27 2018 -0400

--

--

[43/50] [abbrv] tinkerpop git commit: TINKERPOP-1878 Dropped the console app

[spmallette]

TINKERPOP-1878 Dropped the console app

This allows TinkerGraph to remain a test dependency only and the console app 
was more of a test rig than something that a user of this library would use, so 
it seemed like something that could be dropped.


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

Branch: refs/heads/TINKERPOP-1878
Commit: 01cd9a34b360efaa119a5daf91bbf9a1d6ce88da
Parents: 02f15a5
Author: Stephen Mallette 
Authored: Thu Jan 25 14:49:18 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:04 2018 -0400

--
 sparql-gremlin/pom.xml  |   1 +
 .../gremlin/sparql/ConsoleCompiler.java | 165 ---
 2 files changed, 1 insertion(+), 165 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/01cd9a34/sparql-gremlin/pom.xml
--
diff --git a/sparql-gremlin/pom.xml b/sparql-gremlin/pom.xml
index d38a85d..0dceb85 100644
--- a/sparql-gremlin/pom.xml
+++ b/sparql-gremlin/pom.xml
@@ -42,6 +42,7 @@
 org.apache.tinkerpop
 tinkergraph-gremlin
 ${project.version}
+test
 
 
 org.apache.tinkerpop

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/01cd9a34/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/ConsoleCompiler.java
--
diff --git 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/ConsoleCompiler.java
 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/ConsoleCompiler.java
deleted file mode 100644
index 0d50475..000
--- 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/ConsoleCompiler.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.sparql;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.io.IoCore;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-
-import org.apache.tinkerpop.gremlin.sparql.SparqlToGremlinCompiler;
-
-class ConsoleCompiler {
-
-public static void main(final String[] args) throws IOException {
-   //args = "/examples/modern1.sparql";
-final Options options = new Options();
-options.addOption("f", "file", true, "a file that contains a SPARQL 
query");
-options.addOption("g", "graph", true, "the graph that's used to 
execute the query [classic|modern|crew|kryo file]");
-// TODO: add an OLAP option (perhaps: "--olap spark"?)
-
-final CommandLineParser parser = new DefaultParser();
-final CommandLine commandLine;
-
-try {
-commandLine = parser.parse(options, args);
-} catch (ParseException e) {
-System.out.println(e.getMessage());
-printHelp(1);
-return;
-}
-
-final InputStream inputStream = 

[40/50] [abbrv] tinkerpop git commit: TINKERPOP-1878 Added a test for GROUP

[spmallette]

TINKERPOP-1878 Added a test for GROUP


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

Branch: refs/heads/TINKERPOP-1878
Commit: 806394f6e08cfc9378500dc4058a809d910fbb7b
Parents: 3e29b24
Author: Stephen Mallette 
Authored: Mon Jan 29 09:09:07 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:04 2018 -0400

--
 .../dsl/sparql/SparqlTraversalSourceTest.java   | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/806394f6/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
--
diff --git 
a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
 
b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
index 56d62c9..0e56347 100644
--- 
a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
+++ 
b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
@@ -110,6 +110,7 @@ public class SparqlTraversalSourceTest {
 assertEquals(x.get("a"), _g.V(1).next());
 assertEquals(x.get("b"), _g.V(4).next());
 assertEquals(x.get("c"), _g.V(3).next());
+assertEquals(3, x.size());
 }
 
 @Test
@@ -134,4 +135,19 @@ public class SparqlTraversalSourceTest {
 "ORDER BY ?name").toList();
 assertThat(x, contains("josh", "marko", "peter"));
 }
+
+@Test
+public void shouldGroup() {
+final Map x = (Map) g.sparql(
+"SELECT ?name (COUNT(?name) AS ?name_count)\n" +
+"WHERE {\n" +
+"?a e:created ?b .\n" +
+"?a v:name ?name .\n" +
+"}" +
+"GROUP BY ?name").next();
+assertEquals(new Long(2), x.get("josh"));
+assertEquals(new Long(1), x.get("peter"));
+assertEquals(new Long(1), x.get("marko"));
+assertEquals(3, x.size());
+}
 }

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

[spmallette]

Merge branch 'TINKERPOP-1936' into tp32


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

Branch: refs/heads/TINKERPOP-1878
Commit: 6b259f729137033a240254ade36e4726809b46e7
Parents: b99c56a e68df44
Author: Stephen Mallette 
Authored: Fri Apr 20 19:03:20 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 20 19:03:20 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../io/graphson/TraversalSerializersV2d0.java   | 35 +---
 2 files changed, 24 insertions(+), 12 deletions(-)
--

[50/50] [abbrv] tinkerpop git commit: TINKERPOP-1878 Added basic docs for sparql-gremlin

[spmallette]

TINKERPOP-1878 Added basic docs for sparql-gremlin


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

Branch: refs/heads/TINKERPOP-1878
Commit: 0388a79c070768ef138de48f24e8684d13ee7c0e
Parents: cc81dfb
Author: Stephen Mallette 
Authored: Mon Jan 29 11:04:23 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:49 2018 -0400

--
 docs/preprocessor/install-plugins.sh|  2 +-
 docs/src/reference/index.asciidoc   |  2 +
 docs/src/reference/transpilers.asciidoc | 66 
 3 files changed, 69 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0388a79c/docs/preprocessor/install-plugins.sh
--
diff --git a/docs/preprocessor/install-plugins.sh 
b/docs/preprocessor/install-plugins.sh
index 0a7ca31..f1da197 100755
--- a/docs/preprocessor/install-plugins.sh
+++ b/docs/preprocessor/install-plugins.sh
@@ -25,7 +25,7 @@ TMP_DIR=$3
 INSTALL_TEMPLATE="docs/preprocessor/install-plugins.groovy"
 INSTALL_FILE="${TMP_DIR}/install-plugins.groovy"
 
-plugins=("hadoop-gremlin" "spark-gremlin" "neo4j-gremlin")
+plugins=("hadoop-gremlin" "spark-gremlin" "neo4j-gremlin", "sparql-gremlin")
 # plugins=()
 pluginsCount=${#plugins[@]}
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0388a79c/docs/src/reference/index.asciidoc
--
diff --git a/docs/src/reference/index.asciidoc 
b/docs/src/reference/index.asciidoc
index 6e81bf2..02a218b 100644
--- a/docs/src/reference/index.asciidoc
+++ b/docs/src/reference/index.asciidoc
@@ -45,6 +45,8 @@ include::implementations-hadoop-end.asciidoc[]
 
 include::gremlin-variants.asciidoc[]
 
+include::transpilers.asciidoc[]
+
 include::conclusion.asciidoc[]
 
 include::acknowledgements.asciidoc[]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0388a79c/docs/src/reference/transpilers.asciidoc
--
diff --git a/docs/src/reference/transpilers.asciidoc 
b/docs/src/reference/transpilers.asciidoc
new file mode 100644
index 000..305e3dc
--- /dev/null
+++ b/docs/src/reference/transpilers.asciidoc
@@ -0,0 +1,66 @@
+
+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.
+
+[[transpilers]]
+= Gremlin Transpilers
+
+There are many languages built to query data. SQL is typically used to query 
relational data. There is SPARQL for RDF
+data. Cypher is used to do pattern matching in graph data. The list could go 
on. Transpilers convert languages like
+these to Gremlin so that it becomes possible to use them in any context that 
Gremlin is used. In other words, a
+Gremlin Transpiler enables a particular query language to work on any 
TinkerPop-enabled graph system.
+
+== SPARQL-Gremlin
+
+[source,xml]
+
+
+   org.apache.tinkerpop
+   sparql-gremlin
+   x.y.z
+
+
+
+The SPARQL-Gremlin transpiler converts 
link:https://en.wikipedia.org/wiki/SPARQL[SPARQL] queries into Gremlin so that
+they can be executed across any TinkerPop-enabled graph system. To use this 
transpiler in the Gremlin Console, first
+install and activate the "tinkerpop.sparql" plugin:
+
+[source,text]
+
+gremlin> :install org.apache.tinkerpop sparql-gremlin x.y.z
+==>Loaded: [org.apache.tinkerpop, sparql-gremlin, x.y.z]
+gremlin> :plugin use tinkerpop.sparql
+==>tinkerpop.sparql activated
+
+
+Installing this plugin will download appropriate dependencies and import 
certain classes to the console so that they
+may be used as follows:
+
+[gremlin-groovy,modern]
+
+graph = TinkerFactory.createModern()
+g = graph.traversal(SparqlTraversalSource) 
<1>
+g.sparql("""SELECT ?name ?age
+WHERE { ?person v:name ?name . ?person v:age ?age }
+ORDER BY 

[03/50] [abbrv] tinkerpop git commit: TINKERPOP-1949 Fixed some formatting problems on the web site CTR

[spmallette]

TINKERPOP-1949 Fixed some formatting problems on the web site CTR


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

Branch: refs/heads/TINKERPOP-1878
Commit: f2a59544b3a38e447a84aee81cf54db4edaf7daf
Parents: 12d2aef
Author: Stephen Mallette 
Authored: Fri Apr 20 07:07:14 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 20 07:07:14 2018 -0400

--
 docs/site/home/gremlin.html   | 4 +++-
 docs/site/home/providers.html | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f2a59544/docs/site/home/gremlin.html
--
diff --git a/docs/site/home/gremlin.html b/docs/site/home/gremlin.html
index a9e224b..3b1a86b 100644
--- a/docs/site/home/gremlin.html
+++ b/docs/site/home/gremlin.html
@@ -340,7 +340,7 @@ GraphTraversalSource g;
 g = graph.traversal(); 
// local OLTP
 g = graph.traversal().withRemote(DriverRemoteConnection.using("server.yaml"))  
// remote OLTP
 g = graph.traversal().withComputer(SparkGraphComputer.class);  
// distributed OLAP/code>
-
+  


 
@@ -391,5 +391,7 @@ g = 
graph.traversal().withComputer(SparkGraphComputer.class);  /
   });

 
+
+
  
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f2a59544/docs/site/home/providers.html
--
diff --git a/docs/site/home/providers.html b/docs/site/home/providers.html
index 7a2396d..6738831 100644
--- a/docs/site/home/providers.html
+++ b/docs/site/home/providers.html
@@ -373,4 +373,6 @@ WHERE(Created.by(Friends.of("gremlin")))
  });
   

+   
+   
 

[06/50] [abbrv] tinkerpop git commit: Merge branch 'pr-845'

[spmallette]

Merge branch 'pr-845'


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

Branch: refs/heads/TINKERPOP-1878
Commit: f4b4d867add811c3527a0eebe7f138b6a16e2572
Parents: e2fce7b 70a3723
Author: Stephen Mallette 
Authored: Fri Apr 20 10:08:35 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 20 10:08:35 2018 -0400

--
 CHANGELOG.asciidoc  |   4 ++--
 docs/src/upgrade/release-3.4.x.asciidoc |   4 ++--
 docs/static/images/avant-gremlin-simple.png | Bin 0 -> 57676 bytes
 docs/static/images/avant-gremlin.png| Bin 0 -> 117645 bytes
 4 files changed, 4 insertions(+), 4 deletions(-)
--

[47/50] [abbrv] tinkerpop git commit: testing logo

[spmallette]

testing logo

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

Branch: refs/heads/TINKERPOP-1878
Commit: 29123dffde0699074e1ddc40d9a998c48035fce7
Parents: 0388a79
Author: Harsh Thakkar 
Authored: Wed Mar 28 10:29:43 2018 +0200
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:49 2018 -0400

--
 docs/src/reference/transpilers.asciidoc | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/29123dff/docs/src/reference/transpilers.asciidoc
--
diff --git a/docs/src/reference/transpilers.asciidoc 
b/docs/src/reference/transpilers.asciidoc
index 305e3dc..9100f84 100644
--- a/docs/src/reference/transpilers.asciidoc
+++ b/docs/src/reference/transpilers.asciidoc
@@ -17,6 +17,10 @@ limitations under the License.
 [[transpilers]]
 = Gremlin Transpilers
 
+![gremlinator][SPARQL-Gremlin]
+
+[SPARQL-Gremlin]: 
https://raw.githubusercontent.com/LITMUS-Benchmark-Suite/sparql-to-gremlin/master/docs/images/sparql-gremlin-logo.png
+
 There are many languages built to query data. SQL is typically used to query 
relational data. There is SPARQL for RDF
 data. Cypher is used to do pattern matching in graph data. The list could go 
on. Transpilers convert languages like
 these to Gremlin so that it becomes possible to use them in any context that 
Gremlin is used. In other words, a

[02/50] [abbrv] tinkerpop git commit: Moved gremlin-javascript to "languages" in the index and pointed it at our docs CTR

[spmallette]

Moved gremlin-javascript to "languages" in the index and pointed it at our docs 
CTR


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

Branch: refs/heads/TINKERPOP-1878
Commit: 12d2aef8425b6d322637d85177e878c92bf1242e
Parents: 9525626
Author: Stephen Mallette 
Authored: Fri Apr 20 06:47:30 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 20 06:47:30 2018 -0400

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/12d2aef8/docs/site/home/index.html
--
diff --git a/docs/site/home/index.html b/docs/site/home/index.html
index c28a012..9c74b5d 100644
--- a/docs/site/home/index.html
+++ b/docs/site/home/index.html
@@ -247,6 +247,7 @@ limitations under the License.
 http://syncleus.com/Ferma/;>Ferma (java/dsl) - An 
ORM / OGM for Apache TinkerPop.
 https://github.com/davebshow/goblin;>Goblin 
(python/dsl) - Goblin OGM for the TinkerPop 3 Gremlin Server.
 http://tinkerpop.apache.org/docs/current/reference/#gremlin-DotNet;>Gremlin.Net
 (.NET - C#/variant) - Gremlin hosted in C# for use with any .NET-based VM.
+http://tinkerpop.apache.org/docs/current/reference/#gremlin-javascript;>gremlin-javascript
 (js) - Gremlin hosted in JavaScript for use with Node.js.
 https://github.com/gremlin-orm/gremlin-orm;>gremlin-orm (javascript) 
Gremlin ORM for Node.js.
 http://tinkerpop.apache.org/docs/current/reference/#gremlin-python;>gremlin-python
 (python/variant) - Gremlin hosted in Python for use with any Python-based 
VM.
 https://github.com/emehrkay/gremlinpy;>gremlin-py 
(python/variant) - Write pure Python Gremlin that can be sent to Gremlin 
Server.
@@ -265,7 +266,6 @@ limitations under the License.
 https://github.com/davebshow/gremlinclient;>gremlinclient (python) - 
An asynchronous Python 2/3 client for Gremlin Server that allows for flexible 
coroutine syntax - Trollius, Tornado, Asyncio.
 https://github.com/marcelocf/gremlin_client;>gremlin_client (ruby) - 
A Gremlin Server driver for Ruby.
 http://tinkerpop.apache.org/docs/current/reference/#connecting-via-java;>gremlin-driver
 (java) - A Gremlin Server driver for Java.
-https://github.com/jbmusso/gremlin-javascript;>gremlin-javascript 
(js) - A Gremlin Server driver for JavaScript.
 https://github.com/qasaur/gremgo;>gremgo (go) - A 
Gremlin Server driver for Go.
 http://tinkerpop.apache.org/docs/current/reference/#gremlin-DotNet;>Gremlin.Net
 (.NET - C#) - Gremlin Server driver for .NET.
 https://github.com/PommeVerte/gremlin-php;>gremlin-php (php) - A 
Gremlin Server driver for PHP.

[38/50] [abbrv] tinkerpop git commit: TINKERPOP-1878 Updates to changelog and code comments

[spmallette]

TINKERPOP-1878 Updates to changelog and code comments


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

Branch: refs/heads/TINKERPOP-1878
Commit: 199a96356ba85e9352a8372f5f0b77d784677d93
Parents: fcb33dd
Author: Stephen Mallette 
Authored: Thu Jan 25 17:09:17 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:04 2018 -0400

--
 CHANGELOG.asciidoc | 1 +
 .../process/traversal/dsl/sparql/SparqlTraversalSource.java| 6 ++
 2 files changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/199a9635/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index cfda696..3458874 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -53,6 +53,7 @@ This release also includes changes from <>.
 
 * Fixed regression issue where the HTTPChannelizer doesn't instantiate the 
specified AuthenticationHandler.
 * Defaulted GLV tests for gremlin-python to run for GraphSON 3.0.
+* Fixed a bug in dynamic Gryo registration where registrations that did not 
have serializers would fail.
 * Fixed a bug with `Tree` serialization in GraphSON 3.0.
 * In gremlin-python, the GraphSON 3.0 `g:Set` type is now deserialized to 
`List`.
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/199a9635/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
--
diff --git 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
index 3889d95..deb16f7 100644
--- 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
+++ 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
@@ -124,6 +124,12 @@ public class SparqlTraversalSource implements 
TraversalSource {
  */
 public  SparqlTraversal sparql(final String query) {
 final SparqlTraversalSource clone = this.clone();
+
+// this is a bit of a hack to get remote traversals to work cleanly. 
on the remote side, we'd expect a
+// GraphTraversalSource not a SparqlTraversalSource (given that 
sparql-gremlin is to be implemented in the
+// DSL pattern). Instead of just sending the constant() step with the 
sparql query we also include an
+// inject() step which will be recognized by a GraphTraversalSource on 
the remote side. Since SparqlStrategy
+// wholly replaces both of these steps, the traversal bytecode can be 
read properly.
 clone.bytecode.addStep(GraphTraversal.Symbols.inject);
 clone.bytecode.addStep(GraphTraversal.Symbols.constant, query);
 final SparqlTraversal.Admin traversal = new 
DefaultSparqlTraversal<>(clone);

[39/50] [abbrv] tinkerpop git commit: TINKERPOP-1878 Code reformatting - bad spacing/tabs or something

[spmallette]

TINKERPOP-1878 Code reformatting - bad spacing/tabs or something


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

Branch: refs/heads/TINKERPOP-1878
Commit: b4d09f3cb0c909e3338ca49487adc8152db700fe
Parents: 9fba523
Author: Stephen Mallette 
Authored: Fri Jan 26 16:03:49 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Apr 23 14:21:04 2018 -0400

--
 .../sparql/SparqlToGremlinTranspiler.java   | 138 +--
 1 file changed, 69 insertions(+), 69 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b4d09f3c/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
--
diff --git 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
index c3bc907..1b28a1d 100644
--- 
a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
+++ 
b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
@@ -55,59 +55,59 @@ import org.apache.tinkerpop.gremlin.structure.Vertex;
  */
 public class SparqlToGremlinTranspiler {
 
-   private GraphTraversal traversal;
+private GraphTraversal traversal;
 
 private List traversalList = new ArrayList<>();
 
-   private SparqlToGremlinTranspiler(final GraphTraversal 
traversal) {
-   this.traversal = traversal;
-   }
+private SparqlToGremlinTranspiler(final GraphTraversal 
traversal) {
+this.traversal = traversal;
+}
 
-   private SparqlToGremlinTranspiler(final GraphTraversalSource g) {
-   this(g.V());
-   }
+private SparqlToGremlinTranspiler(final GraphTraversalSource g) {
+this(g.V());
+}
 
 /**
  * Converts SPARQL to a Gremlin traversal.
  *
- * @param graph the {@link Graph} instance to execute the traversal from
+ * @param graph   the {@link Graph} instance to execute the traversal 
from
  * @param sparqlQuery the query to transpile to Gremlin
  */
 public static GraphTraversal transpile(final Graph graph, final 
String sparqlQuery) {
-return transpile(graph.traversal(),sparqlQuery);
+return transpile(graph.traversal(), sparqlQuery);
 }
 
 /**
  * Converts SPARQL to a Gremlin traversal.
  *
- * @param g the {@link GraphTraversalSource} instance to execute the 
traversal from
+ * @param g   the {@link GraphTraversalSource} instance to execute 
the traversal from
  * @param sparqlQuery the query to transpile to Gremlin
  */
 public static GraphTraversal transpile(final 
GraphTraversalSource g, final String sparqlQuery) {
 return transpile(g, QueryFactory.create(Prefixes.prepend(sparqlQuery), 
Syntax.syntaxSPARQL));
 }
 
-   private GraphTraversal transpile(final Query query) {
-   final Op op = Algebra.compile(query);
-   OpWalker.walk(op, new GremlinOpVisitor());
+private GraphTraversal transpile(final Query query) {
+final Op op = Algebra.compile(query);
+OpWalker.walk(op, new GremlinOpVisitor());
 
-   int traversalIndex = 0;
-   final int numberOfTraversal = traversalList.size();
+int traversalIndex = 0;
+final int numberOfTraversal = traversalList.size();
 final Traversal arrayOfAllTraversals[] = new 
Traversal[numberOfTraversal];
 
-   for (Traversal tempTrav : traversalList) {
-   arrayOfAllTraversals[traversalIndex++] = tempTrav;
-   }
+for (Traversal tempTrav : traversalList) {
+arrayOfAllTraversals[traversalIndex++] = tempTrav;
+}
 
-   // creates a map of ordering keys and their ordering direction
+// creates a map of ordering keys and their ordering direction
 final Map orderingIndex = 
createOrderIndexFromQuery(query);
 
-   if (traversalList.size() > 0)
-   traversal = traversal.match(arrayOfAllTraversals);
+if (traversalList.size() > 0)
+traversal = traversal.match(arrayOfAllTraversals);
 
-   final List vars = query.getResultVars();
-   if (!query.isQueryResultStar() && !query.hasGroupBy()) {
-   // the result sizes have special 

[07/50] [abbrv] tinkerpop git commit: Shutdown server in test to try to ensure log flush for assertion

[spmallette]

Shutdown server in test to try to ensure log flush for assertion

Tests that check logs for assertions tend to randomly fail despite a number of 
attempt to try to harden them. In this attempt I shutdown the server prior to 
log assertion in the hopes that it will flush everything through and prevent 
failures. CTR


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

Branch: refs/heads/TINKERPOP-1878
Commit: 4705c0416d522cce4d8c6ec498215f7f446fee4d
Parents: 1daf3f1
Author: Stephen Mallette 
Authored: Fri Apr 20 10:56:34 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 20 10:56:34 2018 -0400

--
 .../tinkerpop/gremlin/server/GremlinServerIntegrateTest.java  | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4705c041/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
--
diff --git 
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
 
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index 6454ad5..a1689e9 100644
--- 
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++ 
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@ -327,9 +327,12 @@ public class GremlinServerIntegrateTest extends 
AbstractGremlinServerIntegration
 // there record
 Thread.sleep(3000);
 
-assertThat(recordingAppender.logContainsAny(".*Checking channel - 
sending ping to client after idle period of .*$"), is(true));
-
 client.close();
+
+// stop the server to be sure that logs flush
+stopServer();
+
+assertThat(recordingAppender.logContainsAny(".*Checking channel - 
sending ping to client after idle period of .*$"), is(true));
 }
 
 @Test

[01/50] [abbrv] tinkerpop git commit: Add name and logo for Gremlin 3.4.x [Forced Update!]

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1878 71d384534 -> 752e38c4e (forced update)


Add name and logo for Gremlin 3.4.x


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

Branch: refs/heads/TINKERPOP-1878
Commit: 70a3723f5563ff68ff8c9332a4278eb9e8f726ae
Parents: 9525626
Author: Joshua Shinavier 
Authored: Thu Apr 19 19:38:58 2018 -0700
Committer: Joshua Shinavier 
Committed: Thu Apr 19 19:38:58 2018 -0700

--
 CHANGELOG.asciidoc  |   4 ++--
 docs/src/upgrade/release-3.4.x.asciidoc |   4 ++--
 docs/static/images/avant-gremlin-simple.png | Bin 0 -> 57676 bytes
 docs/static/images/avant-gremlin.png| Bin 0 -> 117645 bytes
 4 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70a3723f/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 5a3f1aa..8420372 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -16,9 +16,9 @@ limitations under the License.
 
 = TinkerPop3 CHANGELOG
 
-== TinkerPop 3.4.0 (NOT NAMED YET)
+== TinkerPop 3.4.0 (Avant-Gremlin Construction #3 for Theremin and Flowers)
 
-NEED AND IMAGE
+image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/avant-gremlin.png[width=185]
 
 [[release-3-4-0]]
 === TinkerPop 3.4.0 (Release Date: NOT OFFICIALLY RELEASED YET)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70a3723f/docs/src/upgrade/release-3.4.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.4.x.asciidoc 
b/docs/src/upgrade/release-3.4.x.asciidoc
index 5a3da78..f673c47 100644
--- a/docs/src/upgrade/release-3.4.x.asciidoc
+++ b/docs/src/upgrade/release-3.4.x.asciidoc
@@ -17,9 +17,9 @@ limitations under the License.
 
 = TinkerPop 3.4.0
 
-NEED AN IMAGE
+image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/avant-gremlin.png[width=225]
 
-*NOT NAMED YET*
+*Avant-Gremlin Construction #3 for Theremin and Flowers*
 
 == TinkerPop 3.4.0
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70a3723f/docs/static/images/avant-gremlin-simple.png
--
diff --git a/docs/static/images/avant-gremlin-simple.png 
b/docs/static/images/avant-gremlin-simple.png
new file mode 100644
index 000..0c3ebaf
Binary files /dev/null and b/docs/static/images/avant-gremlin-simple.png differ

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70a3723f/docs/static/images/avant-gremlin.png
--
diff --git a/docs/static/images/avant-gremlin.png 
b/docs/static/images/avant-gremlin.png
new file mode 100644
index 000..55a318a
Binary files /dev/null and b/docs/static/images/avant-gremlin.png differ

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

Branch: refs/heads/TINKERPOP-1878
Commit: e2fce7bef715a1d6c18c788e8046c186254165ce
Parents: f2a5954 1daf3f1
Author: Stephen Mallette 
Authored: Fri Apr 20 09:27:46 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 20 09:27:46 2018 -0400

--
 .../server/auth/SimpleAuthenticator.java| 32 +---
 1 file changed, 15 insertions(+), 17 deletions(-)
--

[09/50] [abbrv] tinkerpop git commit: Cleaner/anti-aliased version of the 3.4.x logo

[spmallette]

Cleaner/anti-aliased version of the 3.4.x logo


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

Branch: refs/heads/TINKERPOP-1878
Commit: cfa14e2a106a408984208f33a7d6574e813c122b
Parents: 5df1ce7
Author: Joshua Shinavier 
Authored: Fri Apr 20 15:41:26 2018 -0700
Committer: Joshua Shinavier 
Committed: Fri Apr 20 15:41:26 2018 -0700

--
 docs/static/images/avant-gremlin-simple.png | Bin 57676 -> 85749 bytes
 docs/static/images/avant-gremlin.png| Bin 117645 -> 127052 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cfa14e2a/docs/static/images/avant-gremlin-simple.png
--
diff --git a/docs/static/images/avant-gremlin-simple.png 
b/docs/static/images/avant-gremlin-simple.png
index 0c3ebaf..350af11 100644
Binary files a/docs/static/images/avant-gremlin-simple.png and 
b/docs/static/images/avant-gremlin-simple.png differ

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cfa14e2a/docs/static/images/avant-gremlin.png
--
diff --git a/docs/static/images/avant-gremlin.png 
b/docs/static/images/avant-gremlin.png
index 55a318a..08659b7 100644
Binary files a/docs/static/images/avant-gremlin.png and 
b/docs/static/images/avant-gremlin.png differ

[04/50] [abbrv] tinkerpop git commit: Refactored SimpleAuthenticator to use the revised Credentials DSL

[spmallette]

Refactored SimpleAuthenticator to use the revised Credentials DSL

This should have been done on TINKERPOP-1903 but was missed CTR


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

Branch: refs/heads/TINKERPOP-1878
Commit: 1daf3f12243a9a29ba3a00729a3fe4f2f76eccdd
Parents: 38b85d2
Author: Stephen Mallette 
Authored: Fri Apr 20 09:26:14 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 20 09:26:14 2018 -0400

--
 .../server/auth/SimpleAuthenticator.java| 32 +---
 1 file changed, 15 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1daf3f12/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java
--
diff --git 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java
 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java
index 8d90bf8..88e4e70 100644
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java
@@ -18,17 +18,17 @@
  */
 package org.apache.tinkerpop.gremlin.server.auth;
 
-import 
org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential.CredentialGraph;
+import 
org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential.CredentialTraversal;
+import 
org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential.CredentialTraversalDsl;
+import 
org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential.CredentialTraversalSource;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.io.IoCore;
 import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
 import org.mindrot.jbcrypt.BCrypt;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
 import java.net.InetAddress;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
@@ -40,14 +40,14 @@ import static 
org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential.Credenti
 
 /**
  * A simple implementation of an {@link Authenticator} that uses a {@link 
Graph} instance as a credential store.
- * Management of the credential store can be handled through the {@link 
CredentialGraph} DSL.
+ * Management of the credential store can be handled through the {@link 
CredentialTraversalDsl} DSL.
  *
  * @author Stephen Mallette (http://stephen.genoprime.com)
  */
 public class SimpleAuthenticator implements Authenticator {
 private static final Logger logger = 
LoggerFactory.getLogger(SimpleAuthenticator.class);
 private static final byte NUL = 0;
-private CredentialGraph credentialStore;
+private CredentialTraversalSource credentialStore;
 
 /**
  * The location of the configuration file that contains the credentials 
database.
@@ -82,7 +82,7 @@ public class SimpleAuthenticator implements Authenticator {
 tinkerGraph.createIndex(PROPERTY_USERNAME, Vertex.class);
 }
 
-credentialStore = CredentialGraph.credentials(graph);
+credentialStore = graph.traversal(CredentialTraversalSource.class);
 logger.info("CredentialGraph initialized at {}", credentialStore);
 }
 
@@ -98,17 +98,15 @@ public class SimpleAuthenticator implements Authenticator {
 
 final String username = credentials.get(PROPERTY_USERNAME);
 final String password = credentials.get(PROPERTY_PASSWORD);
-try {
-user = credentialStore.findUser(username);
-} catch (IllegalStateException ex) {
-// typically thrown when there are multiple users with the same 
name in the credential store
-logger.warn(ex.getMessage());
-throw new AuthenticationException("Username and/or password are 
incorrect", ex);
-} catch (Exception ex) {
-throw new AuthenticationException("Username and/or password are 
incorrect", ex);
-}
+final CredentialTraversal t = 
credentialStore.users(username);
+if (!t.hasNext())
+throw new AuthenticationException("Username and/or password are 
incorrect");
 
-if (null == user)  throw new AuthenticationException("Username and/or 
password are incorrect");
+user = t.next();
+if (t.hasNext()) {
+logger.warn("There is 

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

Branch: refs/heads/TINKERPOP-1878
Commit: 5df1ce77a4ae4b0af831081664e9e5d73ee9cc4f
Parents: f4b4d86 4705c04
Author: Stephen Mallette 
Authored: Fri Apr 20 10:58:26 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 20 10:58:26 2018 -0400

--
 .../tinkerpop/gremlin/server/GremlinServerIntegrateTest.java  | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5df1ce77/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
--

tinkerpop git commit: Fix typos in GraphManager and DefaultGraphManager javadoc

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 682f298cc -> 268423d2d


Fix typos in GraphManager and DefaultGraphManager javadoc


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

Branch: refs/heads/tp32
Commit: 268423d2d16397ad749082041ea0e17075a3093d
Parents: 682f298
Author: Justin Chu <15710241+justinch...@users.noreply.github.com>
Authored: Fri Apr 20 22:47:31 2018 -0400
Committer: Justin Chu <15710241+justinch...@users.noreply.github.com>
Committed: Fri Apr 20 22:52:30 2018 -0400

--
 .../java/org/apache/tinkerpop/gremlin/server/GraphManager.java   | 4 ++--
 .../tinkerpop/gremlin/server/util/DefaultGraphManager.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/268423d2/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
--
diff --git 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
index 8e3198f..bcb4a8e 100644
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
@@ -69,8 +69,8 @@ public interface GraphManager {
  *
  * @return a {@link Map} where the key is the name of the {@link 
TraversalSource} and the value is the
  * {@link TraversalSource} itself
- * @deprecated  As of release 3.2.5, replaced by a combination of {@link 
#getTraversalSource(String)} ()} and
- * {@link #getTraversalSource(String)} (String)} - note that the 
expectation is this method return an immutable
+ * @deprecated  As of release 3.2.5, replaced by a combination of {@link 
#getTraversalSourceNames()} and
+ * {@link #getTraversalSource(String)} - note that the expectation is this 
method return an immutable
  * {@code Map} which was not the expectation prior to 3.2.5.
  */
 @Deprecated

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/268423d2/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
--
diff --git 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
index 5e4a355..9b5668f 100644
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
@@ -96,8 +96,8 @@ public final class DefaultGraphManager implements 
GraphManager {
  *
  * @return a {@code Map} where the key is the name of the {@link 
TraversalSource} and the value is the
  * {@link TraversalSource} itself
- * @deprecated As of release 3.2.5, replaced by a combination of {@link 
#getTraversalSource(String)} ()} and
- * {@link #getTraversalSource(String)} (String)}
+ * @deprecated As of release 3.2.5, replaced by a combination of {@link 
#getTraversalSourceNames()} and
+ * {@link #getTraversalSource(String)}
  */
 @Deprecated
 public final Map getTraversalSources() {

[1/2] tinkerpop git commit: Fix typos in GraphManager and DefaultGraphManager javadoc

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 9a5868959 -> ead56590a


Fix typos in GraphManager and DefaultGraphManager javadoc


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

Branch: refs/heads/tp33
Commit: 268423d2d16397ad749082041ea0e17075a3093d
Parents: 682f298
Author: Justin Chu <15710241+justinch...@users.noreply.github.com>
Authored: Fri Apr 20 22:47:31 2018 -0400
Committer: Justin Chu <15710241+justinch...@users.noreply.github.com>
Committed: Fri Apr 20 22:52:30 2018 -0400

--
 .../java/org/apache/tinkerpop/gremlin/server/GraphManager.java   | 4 ++--
 .../tinkerpop/gremlin/server/util/DefaultGraphManager.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/268423d2/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
--
diff --git 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
index 8e3198f..bcb4a8e 100644
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
@@ -69,8 +69,8 @@ public interface GraphManager {
  *
  * @return a {@link Map} where the key is the name of the {@link 
TraversalSource} and the value is the
  * {@link TraversalSource} itself
- * @deprecated  As of release 3.2.5, replaced by a combination of {@link 
#getTraversalSource(String)} ()} and
- * {@link #getTraversalSource(String)} (String)} - note that the 
expectation is this method return an immutable
+ * @deprecated  As of release 3.2.5, replaced by a combination of {@link 
#getTraversalSourceNames()} and
+ * {@link #getTraversalSource(String)} - note that the expectation is this 
method return an immutable
  * {@code Map} which was not the expectation prior to 3.2.5.
  */
 @Deprecated

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/268423d2/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
--
diff --git 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
index 5e4a355..9b5668f 100644
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
@@ -96,8 +96,8 @@ public final class DefaultGraphManager implements 
GraphManager {
  *
  * @return a {@code Map} where the key is the name of the {@link 
TraversalSource} and the value is the
  * {@link TraversalSource} itself
- * @deprecated As of release 3.2.5, replaced by a combination of {@link 
#getTraversalSource(String)} ()} and
- * {@link #getTraversalSource(String)} (String)}
+ * @deprecated As of release 3.2.5, replaced by a combination of {@link 
#getTraversalSourceNames()} and
+ * {@link #getTraversalSource(String)}
  */
 @Deprecated
 public final Map getTraversalSources() {

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

Branch: refs/heads/tp33
Commit: ead56590a6374d5757b53a5412bef47b87c1e4b2
Parents: 9a58689 268423d
Author: Stephen Mallette 
Authored: Mon Apr 23 13:50:29 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Apr 23 13:50:29 2018 -0400

--
 .../java/org/apache/tinkerpop/gremlin/server/GraphManager.java   | 4 ++--
 .../tinkerpop/gremlin/server/util/DefaultGraphManager.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--

[1/3] tinkerpop git commit: Fix typos in GraphManager and DefaultGraphManager javadoc

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master 90e70e794 -> 250994dbe


Fix typos in GraphManager and DefaultGraphManager javadoc


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

Branch: refs/heads/master
Commit: 268423d2d16397ad749082041ea0e17075a3093d
Parents: 682f298
Author: Justin Chu <15710241+justinch...@users.noreply.github.com>
Authored: Fri Apr 20 22:47:31 2018 -0400
Committer: Justin Chu <15710241+justinch...@users.noreply.github.com>
Committed: Fri Apr 20 22:52:30 2018 -0400

--
 .../java/org/apache/tinkerpop/gremlin/server/GraphManager.java   | 4 ++--
 .../tinkerpop/gremlin/server/util/DefaultGraphManager.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/268423d2/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
--
diff --git 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
index 8e3198f..bcb4a8e 100644
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
@@ -69,8 +69,8 @@ public interface GraphManager {
  *
  * @return a {@link Map} where the key is the name of the {@link 
TraversalSource} and the value is the
  * {@link TraversalSource} itself
- * @deprecated  As of release 3.2.5, replaced by a combination of {@link 
#getTraversalSource(String)} ()} and
- * {@link #getTraversalSource(String)} (String)} - note that the 
expectation is this method return an immutable
+ * @deprecated  As of release 3.2.5, replaced by a combination of {@link 
#getTraversalSourceNames()} and
+ * {@link #getTraversalSource(String)} - note that the expectation is this 
method return an immutable
  * {@code Map} which was not the expectation prior to 3.2.5.
  */
 @Deprecated

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/268423d2/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
--
diff --git 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
index 5e4a355..9b5668f 100644
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
@@ -96,8 +96,8 @@ public final class DefaultGraphManager implements 
GraphManager {
  *
  * @return a {@code Map} where the key is the name of the {@link 
TraversalSource} and the value is the
  * {@link TraversalSource} itself
- * @deprecated As of release 3.2.5, replaced by a combination of {@link 
#getTraversalSource(String)} ()} and
- * {@link #getTraversalSource(String)} (String)}
+ * @deprecated As of release 3.2.5, replaced by a combination of {@link 
#getTraversalSourceNames()} and
+ * {@link #getTraversalSource(String)}
  */
 @Deprecated
 public final Map getTraversalSources() {

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

Branch: refs/heads/master
Commit: ead56590a6374d5757b53a5412bef47b87c1e4b2
Parents: 9a58689 268423d
Author: Stephen Mallette 
Authored: Mon Apr 23 13:50:29 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Apr 23 13:50:29 2018 -0400

--
 .../java/org/apache/tinkerpop/gremlin/server/GraphManager.java   | 4 ++--
 .../tinkerpop/gremlin/server/util/DefaultGraphManager.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--

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

[spmallette]

Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: 250994dbe0f7d6fc8b09870ecadbf2aa352c1d79
Parents: 90e70e7 ead5659
Author: Stephen Mallette 
Authored: Mon Apr 23 13:50:40 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Apr 23 13:50:40 2018 -0400

--
 .../java/org/apache/tinkerpop/gremlin/server/GraphManager.java   | 4 ++--
 .../tinkerpop/gremlin/server/util/DefaultGraphManager.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--

[7/7] tinkerpop git commit: Added io test data for 3.2.9. CTR

[spmallette]

Added io test data for 3.2.9. CTR


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

Branch: refs/heads/tp33
Commit: 9a5868959c6dec1c5757198289cbb23068e65a0f
Parents: 27778e0
Author: Stephen Mallette 
Authored: Mon Apr 23 13:04:12 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Apr 23 13:05:26 2018 -0400

--
 .../io/graphson/GraphSONCompatibility.java  |   3 +
 .../structure/io/gryo/GryoCompatibility.java|   1 +
 .../GraphSONTypedCompatibilityTest.java |   1 +
 .../GraphSONUntypedCompatibilityTest.java   |   2 +
 .../io/gryo/GryoCompatibilityTest.java  |   1 +
 .../_3_2_9/authenticationchallenge-v1d0.json|  12 +
 .../authenticationchallenge-v2d0-no-types.json  |  12 +
 .../authenticationchallenge-v2d0-partial.json   |  12 +
 .../_3_2_9/authenticationresponse-v1d0.json |   9 +
 .../authenticationresponse-v2d0-no-types.json   |   9 +
 .../authenticationresponse-v2d0-partial.json|   9 +
 .../graphson/_3_2_9/barrier-v2d0-no-types.json  |   1 +
 .../graphson/_3_2_9/barrier-v2d0-partial.json   |   4 +
 .../_3_2_9/bigdecimal-v2d0-partial.json |   1 +
 .../_3_2_9/biginteger-v2d0-partial.json |   1 +
 .../graphson/_3_2_9/binding-v2d0-no-types.json  |   4 +
 .../graphson/_3_2_9/binding-v2d0-partial.json   |  10 +
 .../io/graphson/_3_2_9/byte-v2d0-partial.json   |   1 +
 .../_3_2_9/bytebuffer-v2d0-partial.json |   1 +
 .../graphson/_3_2_9/bytecode-v2d0-no-types.json |   3 +
 .../graphson/_3_2_9/bytecode-v2d0-partial.json  |   6 +
 .../_3_2_9/cardinality-v2d0-no-types.json   |   1 +
 .../_3_2_9/cardinality-v2d0-partial.json|   4 +
 .../io/graphson/_3_2_9/char-v2d0-partial.json   |   1 +
 .../io/graphson/_3_2_9/class-v2d0-no-types.json |   1 +
 .../io/graphson/_3_2_9/class-v2d0-partial.json  |   4 +
 .../graphson/_3_2_9/column-v2d0-no-types.json   |   1 +
 .../io/graphson/_3_2_9/column-v2d0-partial.json |   4 +
 .../io/graphson/_3_2_9/date-v2d0-no-types.json  |   1 +
 .../io/graphson/_3_2_9/date-v2d0-partial.json   |   4 +
 .../_3_2_9/direction-v2d0-no-types.json |   1 +
 .../graphson/_3_2_9/direction-v2d0-partial.json |   4 +
 .../graphson/_3_2_9/double-v2d0-no-types.json   |   1 +
 .../io/graphson/_3_2_9/double-v2d0-partial.json |   4 +
 .../graphson/_3_2_9/duration-v2d0-partial.json  |   1 +
 .../structure/io/graphson/_3_2_9/edge-v1d0.json |  12 +
 .../io/graphson/_3_2_9/edge-v2d0-no-types.json  |  14 +
 .../io/graphson/_3_2_9/edge-v2d0-partial.json   |  32 +
 .../io/graphson/_3_2_9/float-v2d0-no-types.json |   1 +
 .../io/graphson/_3_2_9/float-v2d0-partial.json  |   4 +
 .../_3_2_9/inetaddress-v2d0-partial.json|   1 +
 .../graphson/_3_2_9/instant-v2d0-partial.json   |   1 +
 .../graphson/_3_2_9/integer-v2d0-no-types.json  |   1 +
 .../graphson/_3_2_9/integer-v2d0-partial.json   |   4 +
 .../graphson/_3_2_9/lambda-v2d0-no-types.json   |   5 +
 .../io/graphson/_3_2_9/lambda-v2d0-partial.json |   8 +
 .../graphson/_3_2_9/localdate-v2d0-partial.json |   1 +
 .../_3_2_9/localdatetime-v2d0-partial.json  |   1 +
 .../graphson/_3_2_9/localtime-v2d0-partial.json |   1 +
 .../io/graphson/_3_2_9/long-v2d0-no-types.json  |   1 +
 .../io/graphson/_3_2_9/long-v2d0-partial.json   |   4 +
 .../graphson/_3_2_9/metrics-v2d0-no-types.json  |  24 +
 .../graphson/_3_2_9/metrics-v2d0-partial.json   |  54 ++
 .../graphson/_3_2_9/monthday-v2d0-partial.json  |   1 +
 .../_3_2_9/offsetdatetime-v2d0-partial.json |   1 +
 .../_3_2_9/offsettime-v2d0-partial.json |   1 +
 .../graphson/_3_2_9/operator-v2d0-no-types.json |   1 +
 .../graphson/_3_2_9/operator-v2d0-partial.json  |   4 +
 .../io/graphson/_3_2_9/order-v2d0-no-types.json |   1 +
 .../io/graphson/_3_2_9/order-v2d0-partial.json  |   4 +
 .../io/graphson/_3_2_9/p-v2d0-no-types.json |   4 +
 .../io/graphson/_3_2_9/p-v2d0-partial.json  |  10 +
 .../io/graphson/_3_2_9/pand-v2d0-no-types.json  |  10 +
 .../io/graphson/_3_2_9/pand-v2d0-partial.json   |  25 +
 .../structure/io/graphson/_3_2_9/path-v1d0.json |  62 ++
 .../io/graphson/_3_2_9/path-v2d0-no-types.json  |  13 +
 .../io/graphson/_3_2_9/path-v2d0-partial.json   |  34 +
 .../io/graphson/_3_2_9/period-v2d0-partial.json |   1 +
 .../io/graphson/_3_2_9/pick-v2d0-no-types.json  |   1 +
 .../io/graphson/_3_2_9/pick-v2d0-partial.json   |   4 +
 .../io/graphson/_3_2_9/pop-v2d0-no-types.json   |   1 +
 .../io/graphson/_3_2_9/pop-v2d0-partial.json|   4 +
 .../io/graphson/_3_2_9/por-v2d0-no-types.json   |  10 +
 .../io/graphson/_3_2_9/por-v2d0-partial.json|  31 +
 .../io/graphson/_3_2_9/property-v1d0.json   |   4 +
 .../graphson/_3_2_9/property-v2d0-no-types.json |   4 +
 

[2/7] tinkerpop git commit: Added io tests for 3.3.3 CTR

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v2d0-partial.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v2d0-partial.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v2d0-partial.json
new file mode 100644
index 000..24e95ed
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v2d0-partial.json
@@ -0,0 +1,829 @@
+{
+  "@type" : "tinker:graph",
+  "@value" : {
+"vertices" : [ {
+  "@type" : "g:Vertex",
+  "@value" : {
+"id" : {
+  "@type" : "g:Int32",
+  "@value" : 1
+},
+"label" : "person",
+"properties" : {
+  "name" : [ {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 0
+  },
+  "value" : "marko",
+  "label" : "name"
+}
+  } ],
+  "location" : [ {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 6
+  },
+  "value" : "san diego",
+  "label" : "location",
+  "properties" : {
+"startTime" : {
+  "@type" : "g:Int32",
+  "@value" : 1997
+},
+"endTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2001
+}
+  }
+}
+  }, {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 7
+  },
+  "value" : "santa cruz",
+  "label" : "location",
+  "properties" : {
+"startTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2001
+},
+"endTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2004
+}
+  }
+}
+  }, {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 8
+  },
+  "value" : "brussels",
+  "label" : "location",
+  "properties" : {
+"startTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2004
+},
+"endTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2005
+}
+  }
+}
+  }, {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 9
+  },
+  "value" : "santa fe",
+  "label" : "location",
+  "properties" : {
+"startTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2005
+}
+  }
+}
+  } ]
+}
+  }
+}, {
+  "@type" : "g:Vertex",
+  "@value" : {
+"id" : {
+  "@type" : "g:Int32",
+  "@value" : 7
+},
+"label" : "person",
+"properties" : {
+  "name" : [ {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 1
+  },
+  "value" : "stephen",
+  "label" : "name"
+}
+  } ],
+  "location" : [ {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 10
+  },
+  "value" : "centreville",
+  "label" : "location",
+  "properties" : {
+"startTime" : {
+  "@type" : "g:Int32",
+  "@value" : 1990
+},
+"endTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2000
+}
+  }
+}
+  }, {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 11
+  },
+  "value" : "dulles",
+  "label" : "location",
+  

[4/7] tinkerpop git commit: Added io tests for 3.3.3 CTR

[spmallette]

Added io tests for 3.3.3 CTR


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

Branch: refs/heads/tp33
Commit: 27778e0dfaa62622a3827b284cb07aa8316457b5
Parents: 81add60
Author: Stephen Mallette 
Authored: Mon Apr 23 07:49:36 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Apr 23 13:05:17 2018 -0400

--
 .../io/graphson/GraphSONCompatibility.java  |   6 +-
 .../structure/io/gryo/GryoCompatibility.java|   4 +-
 .../GraphSONTypedCompatibilityTest.java |   4 +-
 .../GraphSONUntypedCompatibilityTest.java   |   6 +-
 .../io/gryo/GryoCompatibilityTest.java  |   4 +-
 .../_3_3_3/authenticationchallenge-v1d0.json|  12 +
 .../authenticationchallenge-v2d0-no-types.json  |  12 +
 .../authenticationchallenge-v2d0-partial.json   |  12 +
 .../_3_3_3/authenticationchallenge-v3d0.json|  18 +
 .../_3_3_3/authenticationresponse-v1d0.json |   9 +
 .../authenticationresponse-v2d0-no-types.json   |   9 +
 .../authenticationresponse-v2d0-partial.json|   9 +
 .../_3_3_3/authenticationresponse-v3d0.json |   9 +
 .../graphson/_3_3_3/barrier-v2d0-partial.json   |   4 +
 .../io/graphson/_3_3_3/barrier-v3d0.json|   4 +
 .../_3_3_3/bigdecimal-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/bigdecimal-v3d0.json |   4 +
 .../_3_3_3/biginteger-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/biginteger-v3d0.json |   4 +
 .../graphson/_3_3_3/binding-v2d0-partial.json   |  10 +
 .../io/graphson/_3_3_3/binding-v3d0.json|  10 +
 .../io/graphson/_3_3_3/byte-v2d0-partial.json   |   4 +
 .../structure/io/graphson/_3_3_3/byte-v3d0.json |   4 +
 .../_3_3_3/bytebuffer-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/bytebuffer-v3d0.json |   4 +
 .../graphson/_3_3_3/bytecode-v2d0-partial.json  |   6 +
 .../io/graphson/_3_3_3/bytecode-v3d0.json   |   6 +
 .../_3_3_3/cardinality-v2d0-partial.json|   4 +
 .../io/graphson/_3_3_3/cardinality-v3d0.json|   4 +
 .../io/graphson/_3_3_3/char-v2d0-partial.json   |   4 +
 .../structure/io/graphson/_3_3_3/char-v3d0.json |   4 +
 .../io/graphson/_3_3_3/class-v2d0-partial.json  |   4 +
 .../io/graphson/_3_3_3/class-v3d0.json  |   4 +
 .../io/graphson/_3_3_3/column-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/column-v3d0.json |   4 +
 .../io/graphson/_3_3_3/date-v2d0-no-types.json  |   1 +
 .../io/graphson/_3_3_3/date-v2d0-partial.json   |   4 +
 .../structure/io/graphson/_3_3_3/date-v3d0.json |   4 +
 .../graphson/_3_3_3/direction-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/direction-v3d0.json  |   4 +
 .../graphson/_3_3_3/double-v2d0-no-types.json   |   1 +
 .../io/graphson/_3_3_3/double-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/double-v3d0.json |   4 +
 .../graphson/_3_3_3/duration-v2d0-partial.json  |   4 +
 .../io/graphson/_3_3_3/duration-v3d0.json   |   4 +
 .../structure/io/graphson/_3_3_3/edge-v1d0.json |  12 +
 .../io/graphson/_3_3_3/edge-v2d0-no-types.json  |  14 +
 .../io/graphson/_3_3_3/edge-v2d0-partial.json   |  32 +
 .../structure/io/graphson/_3_3_3/edge-v3d0.json |  32 +
 .../io/graphson/_3_3_3/float-v2d0-partial.json  |   4 +
 .../io/graphson/_3_3_3/float-v3d0.json  |   4 +
 .../_3_3_3/inetaddress-v2d0-partial.json|   4 +
 .../io/graphson/_3_3_3/inetaddress-v3d0.json|   4 +
 .../graphson/_3_3_3/instant-v2d0-partial.json   |   4 +
 .../io/graphson/_3_3_3/instant-v3d0.json|   4 +
 .../graphson/_3_3_3/integer-v2d0-no-types.json  |   1 +
 .../graphson/_3_3_3/integer-v2d0-partial.json   |   4 +
 .../io/graphson/_3_3_3/integer-v3d0.json|   4 +
 .../io/graphson/_3_3_3/lambda-v2d0-partial.json |   8 +
 .../io/graphson/_3_3_3/lambda-v3d0.json |   8 +
 .../structure/io/graphson/_3_3_3/list-v3d0.json |   7 +
 .../graphson/_3_3_3/localdate-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/localdate-v3d0.json  |   4 +
 .../_3_3_3/localdatetime-v2d0-partial.json  |   4 +
 .../io/graphson/_3_3_3/localdatetime-v3d0.json  |   4 +
 .../graphson/_3_3_3/localtime-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/localtime-v3d0.json  |   4 +
 .../io/graphson/_3_3_3/long-v2d0-partial.json   |   4 +
 .../structure/io/graphson/_3_3_3/long-v3d0.json |   4 +
 .../structure/io/graphson/_3_3_3/map-v3d0.json  |  25 +
 .../graphson/_3_3_3/metrics-v2d0-partial.json   |  54 ++
 .../io/graphson/_3_3_3/metrics-v3d0.json|  52 ++
 .../graphson/_3_3_3/monthday-v2d0-partial.json  |   4 +
 .../io/graphson/_3_3_3/monthday-v3d0.json   |   4 +
 .../_3_3_3/offsetdatetime-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/offsetdatetime-v3d0.json |   4 +
 

[5/7] tinkerpop git commit: Added io test data for 3.2.9. CTR

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9a586895/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v1d0.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v1d0.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v1d0.json
new file mode 100644
index 000..db030dd
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v1d0.json
@@ -0,0 +1,276 @@
+{
+  "1" : {
+"key" : {
+  "id" : 1,
+  "label" : "person",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 0,
+  "value" : "marko"
+} ],
+"location" : [ {
+  "id" : 6,
+  "value" : "san diego",
+  "properties" : {
+"startTime" : 1997,
+"endTime" : 2001
+  }
+}, {
+  "id" : 7,
+  "value" : "santa cruz",
+  "properties" : {
+"startTime" : 2001,
+"endTime" : 2004
+  }
+}, {
+  "id" : 8,
+  "value" : "brussels",
+  "properties" : {
+"startTime" : 2004,
+"endTime" : 2005
+  }
+}, {
+  "id" : 9,
+  "value" : "santa fe",
+  "properties" : {
+"startTime" : 2005
+  }
+} ]
+  }
+},
+"value" : {
+  "10" : {
+"key" : {
+  "id" : 10,
+  "label" : "software",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 4,
+  "value" : "gremlin"
+} ]
+  }
+},
+"value" : {
+  "11" : {
+"key" : {
+  "id" : 11,
+  "label" : "software",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 5,
+  "value" : "tinkergraph"
+} ]
+  }
+},
+"value" : { }
+  }
+}
+  }
+}
+  },
+  "7" : {
+"key" : {
+  "id" : 7,
+  "label" : "person",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 1,
+  "value" : "stephen"
+} ],
+"location" : [ {
+  "id" : 10,
+  "value" : "centreville",
+  "properties" : {
+"startTime" : 1990,
+"endTime" : 2000
+  }
+}, {
+  "id" : 11,
+  "value" : "dulles",
+  "properties" : {
+"startTime" : 2000,
+"endTime" : 2006
+  }
+}, {
+  "id" : 12,
+  "value" : "purcellville",
+  "properties" : {
+"startTime" : 2006
+  }
+} ]
+  }
+},
+"value" : {
+  "10" : {
+"key" : {
+  "id" : 10,
+  "label" : "software",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 4,
+  "value" : "gremlin"
+} ]
+  }
+},
+"value" : {
+  "11" : {
+"key" : {
+  "id" : 11,
+  "label" : "software",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 5,
+  "value" : "tinkergraph"
+} ]
+  }
+},
+"value" : { }
+  }
+}
+  }
+}
+  },
+  "8" : {
+"key" : {
+  "id" : 8,
+  "label" : "person",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 2,
+  "value" : "matthias"
+} ],
+"location" : [ {
+  "id" : 13,
+  "value" : "bremen",
+  "properties" : {
+"startTime" : 2004,
+"endTime" : 2007
+  }
+}, {
+  "id" : 14,
+  "value" : "baltimore",
+  "properties" : {
+"startTime" : 2007,
+"endTime" : 2011
+  }
+}, {
+  "id" : 15,
+  "value" : "oakland",
+  "properties" : {
+"startTime" : 2011,
+"endTime" : 2014
+  }
+}, {
+  "id" : 16,
+  "value" : "seattle",
+  "properties" : {
+"startTime" : 2014
+  }
+} ]
+  }
+},
+"value" : {
+  "10" : {
+"key" : {
+  "id" : 10,
+  "label" : "software",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 4,
+  "value" : "gremlin"
+} ]
+  }
+ 

[6/8] tinkerpop git commit: Added io test data for 3.2.9. CTR

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9a586895/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/scope-v2d0-partial.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/scope-v2d0-partial.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/scope-v2d0-partial.json
new file mode 100644
index 000..4a74af0
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/scope-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+  "@type" : "g:Scope",
+  "@value" : "local"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9a586895/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v1d0.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v1d0.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v1d0.json
new file mode 100644
index 000..e2cbb13
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v1d0.json
@@ -0,0 +1,8 @@
+{
+  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+  "op" : "close",
+  "processor" : "session",
+  "args" : {
+"session" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
+  }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9a586895/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-no-types.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-no-types.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-no-types.json
new file mode 100644
index 000..e2cbb13
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-no-types.json
@@ -0,0 +1,8 @@
+{
+  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+  "op" : "close",
+  "processor" : "session",
+  "args" : {
+"session" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
+  }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9a586895/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-partial.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-partial.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-partial.json
new file mode 100644
index 000..cc4386b
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-partial.json
@@ -0,0 +1,11 @@
+{
+  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+  "op" : "close",
+  "processor" : "session",
+  "args" : {
+"session" : {
+  "@type" : "g:UUID",
+  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
+}
+  }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9a586895/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessioneval-v1d0.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessioneval-v1d0.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessioneval-v1d0.json
new file mode 100644
index 000..ffedd7d
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessioneval-v1d0.json
@@ -0,0 +1,13 @@
+{
+  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+  "op" : "eval",
+  "processor" : "session",
+  "args" : {
+"gremlin" : "g.V(x)",
+"language" : "gremlin-groovy",
+"session" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+"bindings" : {
+  "x" : 1
+}
+  }
+}
\ No newline at end of file

[6/7] tinkerpop git commit: Added io test data for 3.2.9. CTR

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9a586895/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/scope-v2d0-partial.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/scope-v2d0-partial.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/scope-v2d0-partial.json
new file mode 100644
index 000..4a74af0
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/scope-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+  "@type" : "g:Scope",
+  "@value" : "local"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9a586895/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v1d0.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v1d0.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v1d0.json
new file mode 100644
index 000..e2cbb13
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v1d0.json
@@ -0,0 +1,8 @@
+{
+  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+  "op" : "close",
+  "processor" : "session",
+  "args" : {
+"session" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
+  }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9a586895/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-no-types.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-no-types.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-no-types.json
new file mode 100644
index 000..e2cbb13
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-no-types.json
@@ -0,0 +1,8 @@
+{
+  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+  "op" : "close",
+  "processor" : "session",
+  "args" : {
+"session" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
+  }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9a586895/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-partial.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-partial.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-partial.json
new file mode 100644
index 000..cc4386b
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessionclose-v2d0-partial.json
@@ -0,0 +1,11 @@
+{
+  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+  "op" : "close",
+  "processor" : "session",
+  "args" : {
+"session" : {
+  "@type" : "g:UUID",
+  "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
+}
+  }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9a586895/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessioneval-v1d0.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessioneval-v1d0.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessioneval-v1d0.json
new file mode 100644
index 000..ffedd7d
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/sessioneval-v1d0.json
@@ -0,0 +1,13 @@
+{
+  "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+  "op" : "eval",
+  "processor" : "session",
+  "args" : {
+"gremlin" : "g.V(x)",
+"language" : "gremlin-groovy",
+"session" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+"bindings" : {
+  "x" : 1
+}
+  }
+}
\ No newline at end of file

[4/8] tinkerpop git commit: Added io tests for 3.3.3 CTR

[spmallette]

Added io tests for 3.3.3 CTR


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

Branch: refs/heads/master
Commit: 27778e0dfaa62622a3827b284cb07aa8316457b5
Parents: 81add60
Author: Stephen Mallette 
Authored: Mon Apr 23 07:49:36 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Apr 23 13:05:17 2018 -0400

--
 .../io/graphson/GraphSONCompatibility.java  |   6 +-
 .../structure/io/gryo/GryoCompatibility.java|   4 +-
 .../GraphSONTypedCompatibilityTest.java |   4 +-
 .../GraphSONUntypedCompatibilityTest.java   |   6 +-
 .../io/gryo/GryoCompatibilityTest.java  |   4 +-
 .../_3_3_3/authenticationchallenge-v1d0.json|  12 +
 .../authenticationchallenge-v2d0-no-types.json  |  12 +
 .../authenticationchallenge-v2d0-partial.json   |  12 +
 .../_3_3_3/authenticationchallenge-v3d0.json|  18 +
 .../_3_3_3/authenticationresponse-v1d0.json |   9 +
 .../authenticationresponse-v2d0-no-types.json   |   9 +
 .../authenticationresponse-v2d0-partial.json|   9 +
 .../_3_3_3/authenticationresponse-v3d0.json |   9 +
 .../graphson/_3_3_3/barrier-v2d0-partial.json   |   4 +
 .../io/graphson/_3_3_3/barrier-v3d0.json|   4 +
 .../_3_3_3/bigdecimal-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/bigdecimal-v3d0.json |   4 +
 .../_3_3_3/biginteger-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/biginteger-v3d0.json |   4 +
 .../graphson/_3_3_3/binding-v2d0-partial.json   |  10 +
 .../io/graphson/_3_3_3/binding-v3d0.json|  10 +
 .../io/graphson/_3_3_3/byte-v2d0-partial.json   |   4 +
 .../structure/io/graphson/_3_3_3/byte-v3d0.json |   4 +
 .../_3_3_3/bytebuffer-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/bytebuffer-v3d0.json |   4 +
 .../graphson/_3_3_3/bytecode-v2d0-partial.json  |   6 +
 .../io/graphson/_3_3_3/bytecode-v3d0.json   |   6 +
 .../_3_3_3/cardinality-v2d0-partial.json|   4 +
 .../io/graphson/_3_3_3/cardinality-v3d0.json|   4 +
 .../io/graphson/_3_3_3/char-v2d0-partial.json   |   4 +
 .../structure/io/graphson/_3_3_3/char-v3d0.json |   4 +
 .../io/graphson/_3_3_3/class-v2d0-partial.json  |   4 +
 .../io/graphson/_3_3_3/class-v3d0.json  |   4 +
 .../io/graphson/_3_3_3/column-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/column-v3d0.json |   4 +
 .../io/graphson/_3_3_3/date-v2d0-no-types.json  |   1 +
 .../io/graphson/_3_3_3/date-v2d0-partial.json   |   4 +
 .../structure/io/graphson/_3_3_3/date-v3d0.json |   4 +
 .../graphson/_3_3_3/direction-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/direction-v3d0.json  |   4 +
 .../graphson/_3_3_3/double-v2d0-no-types.json   |   1 +
 .../io/graphson/_3_3_3/double-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/double-v3d0.json |   4 +
 .../graphson/_3_3_3/duration-v2d0-partial.json  |   4 +
 .../io/graphson/_3_3_3/duration-v3d0.json   |   4 +
 .../structure/io/graphson/_3_3_3/edge-v1d0.json |  12 +
 .../io/graphson/_3_3_3/edge-v2d0-no-types.json  |  14 +
 .../io/graphson/_3_3_3/edge-v2d0-partial.json   |  32 +
 .../structure/io/graphson/_3_3_3/edge-v3d0.json |  32 +
 .../io/graphson/_3_3_3/float-v2d0-partial.json  |   4 +
 .../io/graphson/_3_3_3/float-v3d0.json  |   4 +
 .../_3_3_3/inetaddress-v2d0-partial.json|   4 +
 .../io/graphson/_3_3_3/inetaddress-v3d0.json|   4 +
 .../graphson/_3_3_3/instant-v2d0-partial.json   |   4 +
 .../io/graphson/_3_3_3/instant-v3d0.json|   4 +
 .../graphson/_3_3_3/integer-v2d0-no-types.json  |   1 +
 .../graphson/_3_3_3/integer-v2d0-partial.json   |   4 +
 .../io/graphson/_3_3_3/integer-v3d0.json|   4 +
 .../io/graphson/_3_3_3/lambda-v2d0-partial.json |   8 +
 .../io/graphson/_3_3_3/lambda-v3d0.json |   8 +
 .../structure/io/graphson/_3_3_3/list-v3d0.json |   7 +
 .../graphson/_3_3_3/localdate-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/localdate-v3d0.json  |   4 +
 .../_3_3_3/localdatetime-v2d0-partial.json  |   4 +
 .../io/graphson/_3_3_3/localdatetime-v3d0.json  |   4 +
 .../graphson/_3_3_3/localtime-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/localtime-v3d0.json  |   4 +
 .../io/graphson/_3_3_3/long-v2d0-partial.json   |   4 +
 .../structure/io/graphson/_3_3_3/long-v3d0.json |   4 +
 .../structure/io/graphson/_3_3_3/map-v3d0.json  |  25 +
 .../graphson/_3_3_3/metrics-v2d0-partial.json   |  54 ++
 .../io/graphson/_3_3_3/metrics-v3d0.json|  52 ++
 .../graphson/_3_3_3/monthday-v2d0-partial.json  |   4 +
 .../io/graphson/_3_3_3/monthday-v3d0.json   |   4 +
 .../_3_3_3/offsetdatetime-v2d0-partial.json |   4 +
 .../io/graphson/_3_3_3/offsetdatetime-v3d0.json |   4 +
 

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

Branch: refs/heads/master
Commit: 90e70e79470df06a23b98dfd642229b776c5f744
Parents: a187ce1 9a58689
Author: Stephen Mallette 
Authored: Mon Apr 23 13:06:27 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Apr 23 13:06:27 2018 -0400

--
 .../io/graphson/GraphSONCompatibility.java  |   9 +-
 .../structure/io/gryo/GryoCompatibility.java|   5 +-
 .../GraphSONTypedCompatibilityTest.java |   5 +-
 .../GraphSONUntypedCompatibilityTest.java   |   8 +-
 .../io/gryo/GryoCompatibilityTest.java  |   5 +-
 .../_3_2_9/authenticationchallenge-v1d0.json|  12 +
 .../authenticationchallenge-v2d0-no-types.json  |  12 +
 .../authenticationchallenge-v2d0-partial.json   |  12 +
 .../_3_2_9/authenticationresponse-v1d0.json |   9 +
 .../authenticationresponse-v2d0-no-types.json   |   9 +
 .../authenticationresponse-v2d0-partial.json|   9 +
 .../graphson/_3_2_9/barrier-v2d0-no-types.json  |   1 +
 .../graphson/_3_2_9/barrier-v2d0-partial.json   |   4 +
 .../_3_2_9/bigdecimal-v2d0-partial.json |   1 +
 .../_3_2_9/biginteger-v2d0-partial.json |   1 +
 .../graphson/_3_2_9/binding-v2d0-no-types.json  |   4 +
 .../graphson/_3_2_9/binding-v2d0-partial.json   |  10 +
 .../io/graphson/_3_2_9/byte-v2d0-partial.json   |   1 +
 .../_3_2_9/bytebuffer-v2d0-partial.json |   1 +
 .../graphson/_3_2_9/bytecode-v2d0-no-types.json |   3 +
 .../graphson/_3_2_9/bytecode-v2d0-partial.json  |   6 +
 .../_3_2_9/cardinality-v2d0-no-types.json   |   1 +
 .../_3_2_9/cardinality-v2d0-partial.json|   4 +
 .../io/graphson/_3_2_9/char-v2d0-partial.json   |   1 +
 .../io/graphson/_3_2_9/class-v2d0-no-types.json |   1 +
 .../io/graphson/_3_2_9/class-v2d0-partial.json  |   4 +
 .../graphson/_3_2_9/column-v2d0-no-types.json   |   1 +
 .../io/graphson/_3_2_9/column-v2d0-partial.json |   4 +
 .../io/graphson/_3_2_9/date-v2d0-no-types.json  |   1 +
 .../io/graphson/_3_2_9/date-v2d0-partial.json   |   4 +
 .../_3_2_9/direction-v2d0-no-types.json |   1 +
 .../graphson/_3_2_9/direction-v2d0-partial.json |   4 +
 .../graphson/_3_2_9/double-v2d0-no-types.json   |   1 +
 .../io/graphson/_3_2_9/double-v2d0-partial.json |   4 +
 .../graphson/_3_2_9/duration-v2d0-partial.json  |   1 +
 .../structure/io/graphson/_3_2_9/edge-v1d0.json |  12 +
 .../io/graphson/_3_2_9/edge-v2d0-no-types.json  |  14 +
 .../io/graphson/_3_2_9/edge-v2d0-partial.json   |  32 +
 .../io/graphson/_3_2_9/float-v2d0-no-types.json |   1 +
 .../io/graphson/_3_2_9/float-v2d0-partial.json  |   4 +
 .../_3_2_9/inetaddress-v2d0-partial.json|   1 +
 .../graphson/_3_2_9/instant-v2d0-partial.json   |   1 +
 .../graphson/_3_2_9/integer-v2d0-no-types.json  |   1 +
 .../graphson/_3_2_9/integer-v2d0-partial.json   |   4 +
 .../graphson/_3_2_9/lambda-v2d0-no-types.json   |   5 +
 .../io/graphson/_3_2_9/lambda-v2d0-partial.json |   8 +
 .../graphson/_3_2_9/localdate-v2d0-partial.json |   1 +
 .../_3_2_9/localdatetime-v2d0-partial.json  |   1 +
 .../graphson/_3_2_9/localtime-v2d0-partial.json |   1 +
 .../io/graphson/_3_2_9/long-v2d0-no-types.json  |   1 +
 .../io/graphson/_3_2_9/long-v2d0-partial.json   |   4 +
 .../graphson/_3_2_9/metrics-v2d0-no-types.json  |  24 +
 .../graphson/_3_2_9/metrics-v2d0-partial.json   |  54 ++
 .../graphson/_3_2_9/monthday-v2d0-partial.json  |   1 +
 .../_3_2_9/offsetdatetime-v2d0-partial.json |   1 +
 .../_3_2_9/offsettime-v2d0-partial.json |   1 +
 .../graphson/_3_2_9/operator-v2d0-no-types.json |   1 +
 .../graphson/_3_2_9/operator-v2d0-partial.json  |   4 +
 .../io/graphson/_3_2_9/order-v2d0-no-types.json |   1 +
 .../io/graphson/_3_2_9/order-v2d0-partial.json  |   4 +
 .../io/graphson/_3_2_9/p-v2d0-no-types.json |   4 +
 .../io/graphson/_3_2_9/p-v2d0-partial.json  |  10 +
 .../io/graphson/_3_2_9/pand-v2d0-no-types.json  |  10 +
 .../io/graphson/_3_2_9/pand-v2d0-partial.json   |  25 +
 .../structure/io/graphson/_3_2_9/path-v1d0.json |  62 ++
 .../io/graphson/_3_2_9/path-v2d0-no-types.json  |  13 +
 .../io/graphson/_3_2_9/path-v2d0-partial.json   |  34 +
 .../io/graphson/_3_2_9/period-v2d0-partial.json |   1 +
 .../io/graphson/_3_2_9/pick-v2d0-no-types.json  |   1 +
 .../io/graphson/_3_2_9/pick-v2d0-partial.json   |   4 +
 .../io/graphson/_3_2_9/pop-v2d0-no-types.json   |   1 +
 .../io/graphson/_3_2_9/pop-v2d0-partial.json|   4 +
 .../io/graphson/_3_2_9/por-v2d0-no-types.json   |  10 +
 .../io/graphson/_3_2_9/por-v2d0-partial.json|  31 +
 .../io/graphson/_3_2_9/property-v1d0.json   |   4 +
 .../graphson/_3_2_9/property-v2d0-no-types.json |   4 +
 

[3/8] tinkerpop git commit: Added io tests for 3.3.3 CTR

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v2d0-partial.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v2d0-partial.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v2d0-partial.json
new file mode 100644
index 000..03f45cd
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+  "@type" : "gx:OffsetDateTime",
+  "@value" : "2007-12-03T10:15:30+01:00"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v3d0.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v3d0.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v3d0.json
new file mode 100644
index 000..03f45cd
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v3d0.json
@@ -0,0 +1,4 @@
+{
+  "@type" : "gx:OffsetDateTime",
+  "@value" : "2007-12-03T10:15:30+01:00"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v2d0-partial.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v2d0-partial.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v2d0-partial.json
new file mode 100644
index 000..b124953
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+  "@type" : "gx:OffsetTime",
+  "@value" : "10:15:30+01:00"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v3d0.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v3d0.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v3d0.json
new file mode 100644
index 000..b124953
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v3d0.json
@@ -0,0 +1,4 @@
+{
+  "@type" : "gx:OffsetTime",
+  "@value" : "10:15:30+01:00"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v2d0-partial.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v2d0-partial.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v2d0-partial.json
new file mode 100644
index 000..14c1400
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+  "@type" : "g:Operator",
+  "@value" : "sum"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v3d0.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v3d0.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v3d0.json
new file mode 100644
index 000..14c1400
--- /dev/null
+++ 

[3/7] tinkerpop git commit: Added io tests for 3.3.3 CTR

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v2d0-partial.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v2d0-partial.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v2d0-partial.json
new file mode 100644
index 000..03f45cd
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+  "@type" : "gx:OffsetDateTime",
+  "@value" : "2007-12-03T10:15:30+01:00"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v3d0.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v3d0.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v3d0.json
new file mode 100644
index 000..03f45cd
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsetdatetime-v3d0.json
@@ -0,0 +1,4 @@
+{
+  "@type" : "gx:OffsetDateTime",
+  "@value" : "2007-12-03T10:15:30+01:00"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v2d0-partial.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v2d0-partial.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v2d0-partial.json
new file mode 100644
index 000..b124953
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+  "@type" : "gx:OffsetTime",
+  "@value" : "10:15:30+01:00"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v3d0.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v3d0.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v3d0.json
new file mode 100644
index 000..b124953
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/offsettime-v3d0.json
@@ -0,0 +1,4 @@
+{
+  "@type" : "gx:OffsetTime",
+  "@value" : "10:15:30+01:00"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v2d0-partial.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v2d0-partial.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v2d0-partial.json
new file mode 100644
index 000..14c1400
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+  "@type" : "g:Operator",
+  "@value" : "sum"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v3d0.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v3d0.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/operator-v3d0.json
new file mode 100644
index 000..14c1400
--- /dev/null
+++ 

[1/7] tinkerpop git commit: Added io tests for 3.3.3 CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 81add6085 -> 9a5868959


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v1d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v1d0.kryo
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v1d0.kryo
new file mode 100644
index 000..ba94b5d
Binary files /dev/null and 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v1d0.kryo
 differ

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v3d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v3d0.kryo
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v3d0.kryo
new file mode 100644
index 000..ba94b5d
Binary files /dev/null and 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v3d0.kryo
 differ

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v1d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v1d0.kryo
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v1d0.kryo
new file mode 100644
index 000..edf8dd4
Binary files /dev/null and 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v1d0.kryo
 differ

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v3d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v3d0.kryo
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v3d0.kryo
new file mode 100644
index 000..edf8dd4
Binary files /dev/null and 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v3d0.kryo
 differ

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v1d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v1d0.kryo
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v1d0.kryo
new file mode 100644
index 000..71bd63e
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v1d0.kryo
@@ -0,0 +1 @@
+

\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v3d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v3d0.kryo
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v3d0.kryo
new file mode 100644
index 000..71bd63e
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v3d0.kryo
@@ -0,0 +1 @@
+

\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/char-v1d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/char-v1d0.kryo
 

[7/8] tinkerpop git commit: Added io test data for 3.2.9. CTR

[spmallette]

Added io test data for 3.2.9. CTR


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

Branch: refs/heads/master
Commit: 9a5868959c6dec1c5757198289cbb23068e65a0f
Parents: 27778e0
Author: Stephen Mallette 
Authored: Mon Apr 23 13:04:12 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Apr 23 13:05:26 2018 -0400

--
 .../io/graphson/GraphSONCompatibility.java  |   3 +
 .../structure/io/gryo/GryoCompatibility.java|   1 +
 .../GraphSONTypedCompatibilityTest.java |   1 +
 .../GraphSONUntypedCompatibilityTest.java   |   2 +
 .../io/gryo/GryoCompatibilityTest.java  |   1 +
 .../_3_2_9/authenticationchallenge-v1d0.json|  12 +
 .../authenticationchallenge-v2d0-no-types.json  |  12 +
 .../authenticationchallenge-v2d0-partial.json   |  12 +
 .../_3_2_9/authenticationresponse-v1d0.json |   9 +
 .../authenticationresponse-v2d0-no-types.json   |   9 +
 .../authenticationresponse-v2d0-partial.json|   9 +
 .../graphson/_3_2_9/barrier-v2d0-no-types.json  |   1 +
 .../graphson/_3_2_9/barrier-v2d0-partial.json   |   4 +
 .../_3_2_9/bigdecimal-v2d0-partial.json |   1 +
 .../_3_2_9/biginteger-v2d0-partial.json |   1 +
 .../graphson/_3_2_9/binding-v2d0-no-types.json  |   4 +
 .../graphson/_3_2_9/binding-v2d0-partial.json   |  10 +
 .../io/graphson/_3_2_9/byte-v2d0-partial.json   |   1 +
 .../_3_2_9/bytebuffer-v2d0-partial.json |   1 +
 .../graphson/_3_2_9/bytecode-v2d0-no-types.json |   3 +
 .../graphson/_3_2_9/bytecode-v2d0-partial.json  |   6 +
 .../_3_2_9/cardinality-v2d0-no-types.json   |   1 +
 .../_3_2_9/cardinality-v2d0-partial.json|   4 +
 .../io/graphson/_3_2_9/char-v2d0-partial.json   |   1 +
 .../io/graphson/_3_2_9/class-v2d0-no-types.json |   1 +
 .../io/graphson/_3_2_9/class-v2d0-partial.json  |   4 +
 .../graphson/_3_2_9/column-v2d0-no-types.json   |   1 +
 .../io/graphson/_3_2_9/column-v2d0-partial.json |   4 +
 .../io/graphson/_3_2_9/date-v2d0-no-types.json  |   1 +
 .../io/graphson/_3_2_9/date-v2d0-partial.json   |   4 +
 .../_3_2_9/direction-v2d0-no-types.json |   1 +
 .../graphson/_3_2_9/direction-v2d0-partial.json |   4 +
 .../graphson/_3_2_9/double-v2d0-no-types.json   |   1 +
 .../io/graphson/_3_2_9/double-v2d0-partial.json |   4 +
 .../graphson/_3_2_9/duration-v2d0-partial.json  |   1 +
 .../structure/io/graphson/_3_2_9/edge-v1d0.json |  12 +
 .../io/graphson/_3_2_9/edge-v2d0-no-types.json  |  14 +
 .../io/graphson/_3_2_9/edge-v2d0-partial.json   |  32 +
 .../io/graphson/_3_2_9/float-v2d0-no-types.json |   1 +
 .../io/graphson/_3_2_9/float-v2d0-partial.json  |   4 +
 .../_3_2_9/inetaddress-v2d0-partial.json|   1 +
 .../graphson/_3_2_9/instant-v2d0-partial.json   |   1 +
 .../graphson/_3_2_9/integer-v2d0-no-types.json  |   1 +
 .../graphson/_3_2_9/integer-v2d0-partial.json   |   4 +
 .../graphson/_3_2_9/lambda-v2d0-no-types.json   |   5 +
 .../io/graphson/_3_2_9/lambda-v2d0-partial.json |   8 +
 .../graphson/_3_2_9/localdate-v2d0-partial.json |   1 +
 .../_3_2_9/localdatetime-v2d0-partial.json  |   1 +
 .../graphson/_3_2_9/localtime-v2d0-partial.json |   1 +
 .../io/graphson/_3_2_9/long-v2d0-no-types.json  |   1 +
 .../io/graphson/_3_2_9/long-v2d0-partial.json   |   4 +
 .../graphson/_3_2_9/metrics-v2d0-no-types.json  |  24 +
 .../graphson/_3_2_9/metrics-v2d0-partial.json   |  54 ++
 .../graphson/_3_2_9/monthday-v2d0-partial.json  |   1 +
 .../_3_2_9/offsetdatetime-v2d0-partial.json |   1 +
 .../_3_2_9/offsettime-v2d0-partial.json |   1 +
 .../graphson/_3_2_9/operator-v2d0-no-types.json |   1 +
 .../graphson/_3_2_9/operator-v2d0-partial.json  |   4 +
 .../io/graphson/_3_2_9/order-v2d0-no-types.json |   1 +
 .../io/graphson/_3_2_9/order-v2d0-partial.json  |   4 +
 .../io/graphson/_3_2_9/p-v2d0-no-types.json |   4 +
 .../io/graphson/_3_2_9/p-v2d0-partial.json  |  10 +
 .../io/graphson/_3_2_9/pand-v2d0-no-types.json  |  10 +
 .../io/graphson/_3_2_9/pand-v2d0-partial.json   |  25 +
 .../structure/io/graphson/_3_2_9/path-v1d0.json |  62 ++
 .../io/graphson/_3_2_9/path-v2d0-no-types.json  |  13 +
 .../io/graphson/_3_2_9/path-v2d0-partial.json   |  34 +
 .../io/graphson/_3_2_9/period-v2d0-partial.json |   1 +
 .../io/graphson/_3_2_9/pick-v2d0-no-types.json  |   1 +
 .../io/graphson/_3_2_9/pick-v2d0-partial.json   |   4 +
 .../io/graphson/_3_2_9/pop-v2d0-no-types.json   |   1 +
 .../io/graphson/_3_2_9/pop-v2d0-partial.json|   4 +
 .../io/graphson/_3_2_9/por-v2d0-no-types.json   |  10 +
 .../io/graphson/_3_2_9/por-v2d0-partial.json|  31 +
 .../io/graphson/_3_2_9/property-v1d0.json   |   4 +
 .../graphson/_3_2_9/property-v2d0-no-types.json |   4 +
 

[5/8] tinkerpop git commit: Added io test data for 3.2.9. CTR

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9a586895/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v1d0.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v1d0.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v1d0.json
new file mode 100644
index 000..db030dd
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/tree-v1d0.json
@@ -0,0 +1,276 @@
+{
+  "1" : {
+"key" : {
+  "id" : 1,
+  "label" : "person",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 0,
+  "value" : "marko"
+} ],
+"location" : [ {
+  "id" : 6,
+  "value" : "san diego",
+  "properties" : {
+"startTime" : 1997,
+"endTime" : 2001
+  }
+}, {
+  "id" : 7,
+  "value" : "santa cruz",
+  "properties" : {
+"startTime" : 2001,
+"endTime" : 2004
+  }
+}, {
+  "id" : 8,
+  "value" : "brussels",
+  "properties" : {
+"startTime" : 2004,
+"endTime" : 2005
+  }
+}, {
+  "id" : 9,
+  "value" : "santa fe",
+  "properties" : {
+"startTime" : 2005
+  }
+} ]
+  }
+},
+"value" : {
+  "10" : {
+"key" : {
+  "id" : 10,
+  "label" : "software",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 4,
+  "value" : "gremlin"
+} ]
+  }
+},
+"value" : {
+  "11" : {
+"key" : {
+  "id" : 11,
+  "label" : "software",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 5,
+  "value" : "tinkergraph"
+} ]
+  }
+},
+"value" : { }
+  }
+}
+  }
+}
+  },
+  "7" : {
+"key" : {
+  "id" : 7,
+  "label" : "person",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 1,
+  "value" : "stephen"
+} ],
+"location" : [ {
+  "id" : 10,
+  "value" : "centreville",
+  "properties" : {
+"startTime" : 1990,
+"endTime" : 2000
+  }
+}, {
+  "id" : 11,
+  "value" : "dulles",
+  "properties" : {
+"startTime" : 2000,
+"endTime" : 2006
+  }
+}, {
+  "id" : 12,
+  "value" : "purcellville",
+  "properties" : {
+"startTime" : 2006
+  }
+} ]
+  }
+},
+"value" : {
+  "10" : {
+"key" : {
+  "id" : 10,
+  "label" : "software",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 4,
+  "value" : "gremlin"
+} ]
+  }
+},
+"value" : {
+  "11" : {
+"key" : {
+  "id" : 11,
+  "label" : "software",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 5,
+  "value" : "tinkergraph"
+} ]
+  }
+},
+"value" : { }
+  }
+}
+  }
+}
+  },
+  "8" : {
+"key" : {
+  "id" : 8,
+  "label" : "person",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 2,
+  "value" : "matthias"
+} ],
+"location" : [ {
+  "id" : 13,
+  "value" : "bremen",
+  "properties" : {
+"startTime" : 2004,
+"endTime" : 2007
+  }
+}, {
+  "id" : 14,
+  "value" : "baltimore",
+  "properties" : {
+"startTime" : 2007,
+"endTime" : 2011
+  }
+}, {
+  "id" : 15,
+  "value" : "oakland",
+  "properties" : {
+"startTime" : 2011,
+"endTime" : 2014
+  }
+}, {
+  "id" : 16,
+  "value" : "seattle",
+  "properties" : {
+"startTime" : 2014
+  }
+} ]
+  }
+},
+"value" : {
+  "10" : {
+"key" : {
+  "id" : 10,
+  "label" : "software",
+  "type" : "vertex",
+  "properties" : {
+"name" : [ {
+  "id" : 4,
+  "value" : "gremlin"
+} ]
+  }
+ 

[2/8] tinkerpop git commit: Added io tests for 3.3.3 CTR

[spmallette]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v2d0-partial.json
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v2d0-partial.json
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v2d0-partial.json
new file mode 100644
index 000..24e95ed
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/tinkergraph-v2d0-partial.json
@@ -0,0 +1,829 @@
+{
+  "@type" : "tinker:graph",
+  "@value" : {
+"vertices" : [ {
+  "@type" : "g:Vertex",
+  "@value" : {
+"id" : {
+  "@type" : "g:Int32",
+  "@value" : 1
+},
+"label" : "person",
+"properties" : {
+  "name" : [ {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 0
+  },
+  "value" : "marko",
+  "label" : "name"
+}
+  } ],
+  "location" : [ {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 6
+  },
+  "value" : "san diego",
+  "label" : "location",
+  "properties" : {
+"startTime" : {
+  "@type" : "g:Int32",
+  "@value" : 1997
+},
+"endTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2001
+}
+  }
+}
+  }, {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 7
+  },
+  "value" : "santa cruz",
+  "label" : "location",
+  "properties" : {
+"startTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2001
+},
+"endTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2004
+}
+  }
+}
+  }, {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 8
+  },
+  "value" : "brussels",
+  "label" : "location",
+  "properties" : {
+"startTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2004
+},
+"endTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2005
+}
+  }
+}
+  }, {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 9
+  },
+  "value" : "santa fe",
+  "label" : "location",
+  "properties" : {
+"startTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2005
+}
+  }
+}
+  } ]
+}
+  }
+}, {
+  "@type" : "g:Vertex",
+  "@value" : {
+"id" : {
+  "@type" : "g:Int32",
+  "@value" : 7
+},
+"label" : "person",
+"properties" : {
+  "name" : [ {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 1
+  },
+  "value" : "stephen",
+  "label" : "name"
+}
+  } ],
+  "location" : [ {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 10
+  },
+  "value" : "centreville",
+  "label" : "location",
+  "properties" : {
+"startTime" : {
+  "@type" : "g:Int32",
+  "@value" : 1990
+},
+"endTime" : {
+  "@type" : "g:Int32",
+  "@value" : 2000
+}
+  }
+}
+  }, {
+"@type" : "g:VertexProperty",
+"@value" : {
+  "id" : {
+"@type" : "g:Int64",
+"@value" : 11
+  },
+  "value" : "dulles",
+  "label" : "location",
+  

[1/8] tinkerpop git commit: Added io tests for 3.3.3 CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master a187ce11c -> 90e70e794


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v1d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v1d0.kryo
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v1d0.kryo
new file mode 100644
index 000..ba94b5d
Binary files /dev/null and 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v1d0.kryo
 differ

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v3d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v3d0.kryo
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v3d0.kryo
new file mode 100644
index 000..ba94b5d
Binary files /dev/null and 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytebuffer-v3d0.kryo
 differ

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v1d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v1d0.kryo
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v1d0.kryo
new file mode 100644
index 000..edf8dd4
Binary files /dev/null and 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v1d0.kryo
 differ

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v3d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v3d0.kryo
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v3d0.kryo
new file mode 100644
index 000..edf8dd4
Binary files /dev/null and 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/bytecode-v3d0.kryo
 differ

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v1d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v1d0.kryo
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v1d0.kryo
new file mode 100644
index 000..71bd63e
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v1d0.kryo
@@ -0,0 +1 @@
+

\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v3d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v3d0.kryo
 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v3d0.kryo
new file mode 100644
index 000..71bd63e
--- /dev/null
+++ 
b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/cardinality-v3d0.kryo
@@ -0,0 +1 @@
+

\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/27778e0d/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/char-v1d0.kryo
--
diff --git 
a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/char-v1d0.kryo
 

tinkerpop git commit: TINKERPOP-1953 Bump to Groovy 2.4.15

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1953 [created] 40dad2788


TINKERPOP-1953 Bump to Groovy 2.4.15

Fixes a bug in Lambda construction for remote traversals


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

Branch: refs/heads/TINKERPOP-1953
Commit: 40dad27880189ffb8c901a8d7bdcf3d505325693
Parents: 682f298
Author: Stephen Mallette 
Authored: Mon Apr 23 09:33:25 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Apr 23 09:33:25 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../upgrade/release-3.2.x-incubating.asciidoc   | 24 
 .../jsr223/GremlinGroovyScriptEngineTest.java   |  9 
 pom.xml |  2 +-
 4 files changed, 35 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/40dad278/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 51c9f68..797072d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -24,6 +24,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 === TinkerPop 3.2.9 (Release Date: NOT OFFICIALLY RELEASED YET)
 
 * Bumped to httpclient 4.5.5.
+* Bumped to Groovy 2.4.15 - fixes bug with `Lambda` construction.
 * Improved performance of GraphSON deserialization of `Bytecode`.
 
 [[release-3-2-8]]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/40dad278/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc 
b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index b57a657..51b85d3 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -21,6 +21,30 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 
 *Nine Inch Gremlins*
 
+== TinkerPop 3.2.9
+
+*Release Date: NOT OFFICIALLY RELEASED YET*
+
+Please see the 
link:https://github.com/apache/tinkerpop/blob/3.2.8/CHANGELOG.asciidoc#release-3-2-9[changelog]
 for a complete list of all the modifications that are part of this release.
+
+=== Upgrading for Users
+
+ Lambda Construction
+
+It was realized quite shortly after release of 3.2.8 that there was a bug in 
construction of `Lambda` instances:
+
+[source,text]
+
+gremlin> org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ 
it.get() }")
+(class: org/apache/tinkerpop/gremlin/util/function/Lambda$function, method: 
callStatic signature: (Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;) 
Illegal type in constant pool
+Type ':help' or ':h' for help.
+Display stack trace? [yN]n
+
+
+The problem was related to a bug in Groovy 2.4.14 and was fixed in 2.4.15.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1953[TINKERPOP-1953]
+
 == TinkerPop 3.2.8
 
 *Release Date: April 2, 2018*

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/40dad278/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
--
diff --git 
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
 
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
index 0606721..54e997f 100644
--- 
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
+++ 
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
@@ -26,6 +26,7 @@ import 
org.apache.tinkerpop.gremlin.groovy.CompilerCustomizerProvider;
 import org.apache.tinkerpop.gremlin.groovy.NoImportCustomizerProvider;
 import 
org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.InterpreterModeCustomizerProvider;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.util.function.Lambda;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 import org.javatuples.Pair;
 import org.junit.Test;
@@ -603,4 +604,12 @@ public class GremlinGroovyScriptEngineTest {
 assertEquals(1, engine.getClassCacheLoadFailureCount());
 assertEquals(100, engine.getClassCacheLoadSuccessCount());
 }
+
+@Test
+public void shouldEvalForLambda() throws Exception {
+// https://issues.apache.org/jira/browse/TINKERPOP-1953
+final 

tinkerpop git commit: TINKERPOP-1944 Export DriverRemoteConnection

[jorgebg]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1944 [created] d037ef704


TINKERPOP-1944 Export DriverRemoteConnection


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

Branch: refs/heads/TINKERPOP-1944
Commit: d037ef7049f36410caba9362bd60cb8dfc04f857
Parents: 2591302
Author: Jorge Bay Gondra 
Authored: Mon Apr 23 15:13:32 2018 +0200
Committer: Jorge Bay Gondra 
Committed: Mon Apr 23 15:13:32 2018 +0200

--
 .../main/javascript/gremlin-javascript/index.js | 20 +++-
 .../test/unit/exports-test.js   |  2 ++
 2 files changed, 13 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d037ef70/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
--
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
index 61ab274..2ebae48 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
@@ -22,20 +22,22 @@
  */
 'use strict';
 
-var t = require('./lib/process/traversal');
-var gt = require('./lib/process/graph-traversal');
-var strategiesModule = require('./lib/process/traversal-strategy');
-var graph = require('./lib/structure/graph');
-var gs = require('./lib/structure/io/graph-serializer');
-var rc = require('./lib/driver/remote-connection');
-var Bytecode = require('./lib/process/bytecode');
-var utils = require('./lib/utils');
+const t = require('./lib/process/traversal');
+const gt = require('./lib/process/graph-traversal');
+const strategiesModule = require('./lib/process/traversal-strategy');
+const graph = require('./lib/structure/graph');
+const gs = require('./lib/structure/io/graph-serializer');
+const rc = require('./lib/driver/remote-connection');
+const Bytecode = require('./lib/process/bytecode');
+const utils = require('./lib/utils');
+const DriverRemoteConnection = 
require('./lib/driver/driver-remote-connection');
 
 module.exports = {
   driver: {
 RemoteConnection: rc.RemoteConnection,
 RemoteStrategy: rc.RemoteStrategy,
-RemoteTraversal: rc.RemoteTraversal
+RemoteTraversal: rc.RemoteTraversal,
+DriverRemoteConnection: DriverRemoteConnection
   },
   process: {
 Bytecode: Bytecode,

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d037ef70/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js
--
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js
 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js
index 53b6577..e0dfb12 100644
--- 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js
@@ -69,5 +69,7 @@ describe('API', function () {
 assert.strictEqual(typeof glvModule.driver.RemoteConnection, 'function');
 assert.strictEqual(typeof glvModule.driver.RemoteStrategy, 'function');
 assert.strictEqual(typeof glvModule.driver.RemoteTraversal, 'function');
+assert.strictEqual(typeof glvModule.driver.DriverRemoteConnection, 
'function');
+assert.strictEqual(glvModule.driver.DriverRemoteConnection.name, 
'DriverRemoteConnection');
   });
 });
\ No newline at end of file

tinkerpop git commit: Improve JavaScript Gremlin documentation

[jorgebg]

Repository: tinkerpop
Updated Branches:
  refs/heads/js-doc-example [created] e08651b94


Improve JavaScript Gremlin documentation

Several fixes to the JavaScript GLV documentation:
- Use 'gremlin' package name
- Include information regarding Promises
- Fix method names


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

Branch: refs/heads/js-doc-example
Commit: e08651b946e936579db538f9114dd1c5c9079bcb
Parents: 2591302
Author: Jorge Bay Gondra 
Authored: Mon Apr 23 10:26:36 2018 +0200
Committer: Jorge Bay Gondra 
Committed: Mon Apr 23 10:26:36 2018 +0200

--
 docs/src/reference/gremlin-variants.asciidoc | 47 +--
 1 file changed, 36 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e08651b9/docs/src/reference/gremlin-variants.asciidoc
--
diff --git a/docs/src/reference/gremlin-variants.asciidoc 
b/docs/src/reference/gremlin-variants.asciidoc
index d929b3c..7a85ab1 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -458,17 +458,24 @@ their Java counterparts which makes it possible to use 
lambdas with Gremlin.Net
 == Gremlin-JavaScript
 
 image:gremlin-js.png[width=130,float=right] Apache TinkerPop's 
Gremlin-JavaScript implements Gremlin within the
-JavaScript language. It targets Node.js runtime and can be used on different 
operating systems on any Node.js 4 or
+JavaScript language. It targets Node.js runtime and can be used on different 
operating systems on any Node.js 6 or
 above. Since the JavaScript naming conventions are very similar to that of 
Java, it should be very easy to switch
 between Gremlin-Java and Gremlin-JavaScript.
 
 [source,bash]
-npm install gremlin-javascript
+npm install gremlin
 
 The Gremlin-JavaScript provides `GraphTraversalSource`, `GraphTraversal`, and 
`__` which mirror the respective classes
 in Gremlin-Java. The `GraphTraversalSource` requires a RemoteConnection 
implementation in order to communicate with
 <>.
 
+[source,javascript]
+
+const gremlin = require('gremlin');
+const Graph = gremlin.structure.Graph;
+const DriverRemoteConnection = gremlin.driver.DriverRemoteConnection;
+
+
 A traversal source can be spawned with `RemoteStrategy` from an empty `Graph`.
 
 [source,javascript]
@@ -489,27 +496,45 @@ IMPORTANT: Gremlin-JavaScript’s `Traversal` base class 
supports the standard G
 
 === RemoteConnection Submission
 
-Very similar to Gremlin-Python and Gremlin-Java, there are various ways to 
submit a traversal to a
-`RemoteConnection` using terminal/action methods off of `Traversal`.
+In a similar way as in other GLVs, there are various ways to submit a 
traversal to a
+`RemoteConnection` using terminal/action methods off of `Traversal`. Given 
that I/O operations in Node.js are
+asynchronous by default, this terminal methods return a `Promise`.
 
-* `Traversal.next()`
-* `Traversal.toList()`
+* `Traversal.toList()`: Returns a `Promise` with an `Array` as result value.
+* `Traversal.next()`: Returns a `Promise` with a `{ value, done }` tuple as 
result value, according to the
+link:https://github.com/tc39/proposal-async-iteration[async iterator proposal].
+* `Traversal.iterate()`: Returns a `Promise` without a value.
+
+
+For example:
+
+[source,javascript]
+
+g.V().hasLabel('person').values('name').toList()
+  .then(names => console.log(names));
+
+
+You can `await` the promises if you are using `async` functions.
+
+[source,javascript]
+
+const names = await g.V().hasLabel('person').values('name').toList();
+console.log(names);
+
 
 === Static Enums and Methods
 
 Gremlin has various tokens (e.g. `t`, `P`, `order`, `direction`, etc.) that 
are represented in Gremlin-JavaScript as
 objects.
 
-These can be used analogously to how they are used in Gremlin-Java.
-
 [source,javascript]
-g.V().hasLabel("person").has("age",P.gt(30)).Order().By("age", 
order.decr).toList()
+g.V().hasLabel('person').has('age', P.gt(30)).order().by('age', 
order.decr).toList()
 
 These objects must be required manually from the `process` namespace:
 
 [source,javascript]
 
-const gremlin = require('gremlin-javascript');
+const gremlin = require('gremlin');
 const P = gremlin.process.P;
 
 
@@ -517,7 +542,7 @@ Finally, using static `__` anonymous traversals like 
`__.out()` can be expressed
 
 [source,javascript]
 
-const gremlin = require('gremlin-javascript');
+const gremlin = require('gremlin');
 const __ = 

[tinkerpop] Git Push Summary

[jorgebg]

Repository: tinkerpop
Updated Branches:
  refs/heads/js-doc-graphson3 [deleted] 7d0d83705

[tinkerpop] Git Push Summary

[jorgebg]

Repository: tinkerpop
Updated Branches:
  refs/heads/js-doc-fixes [deleted] b6aa8302e