You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2019/09/03 16:42:16 UTC
[tinkerpop] branch master updated (9cd6db2 -> 5120f2b)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from 9cd6db2 Added greskell to provider index list CTR
add 12a8bdf TINKERPOP-2291 Added GraphSON support for deserialization of TraversalExplanation
new dd14552 Merge branch 'TINKERPOP-2291' into tp33
new 3630afc Merge branch 'tp33' into tp34
new 5120f2b Merge branch 'tp34'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.asciidoc | 2 +
...alExplanation.java => AbstractExplanation.java} | 104 +++++++------------
.../traversal/util/ImmutableExplanation.java | 80 +++++++++++++++
.../traversal/util/TraversalExplanation.java | 112 ++++-----------------
.../structure/io/graphson/GraphSONModule.java | 2 +
.../io/graphson/GraphSONSerializersV2d0.java | 28 ++++++
.../io/graphson/GraphSONSerializersV3d0.java | 28 ++++++
.../traversal/util/TraversalExplanationTest.java | 8 ++
.../graphson/GraphSONMapperEmbeddedTypeTest.java | 11 ++
9 files changed, 215 insertions(+), 160 deletions(-)
copy gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/{TraversalExplanation.java => AbstractExplanation.java} (51%)
create mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableExplanation.java
[tinkerpop] 03/03: Merge branch 'tp34'
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 5120f2bfee1135944c12a9a2b3718add4501d47a
Merge: 9cd6db2 3630afc
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Sep 3 12:42:03 2019 -0400
Merge branch 'tp34'
CHANGELOG.asciidoc | 2 +
...alExplanation.java => AbstractExplanation.java} | 104 +++++++------------
.../traversal/util/ImmutableExplanation.java | 80 +++++++++++++++
.../traversal/util/TraversalExplanation.java | 112 ++++-----------------
.../structure/io/graphson/GraphSONModule.java | 2 +
.../io/graphson/GraphSONSerializersV2d0.java | 28 ++++++
.../io/graphson/GraphSONSerializersV3d0.java | 28 ++++++
.../traversal/util/TraversalExplanationTest.java | 8 ++
.../graphson/GraphSONMapperEmbeddedTypeTest.java | 11 ++
9 files changed, 215 insertions(+), 160 deletions(-)
[tinkerpop] 01/03: Merge branch 'TINKERPOP-2291' into tp33
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit dd145528718ecada73b95f3e5c25488067a597ce
Merge: 20fcff7 12a8bdf
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Sep 3 12:40:57 2019 -0400
Merge branch 'TINKERPOP-2291' into tp33
CHANGELOG.asciidoc | 2 +
...alExplanation.java => AbstractExplanation.java} | 104 +++++++------------
.../traversal/util/ImmutableExplanation.java | 80 +++++++++++++++
.../traversal/util/TraversalExplanation.java | 112 ++++-----------------
.../structure/io/graphson/GraphSONModule.java | 2 +
.../io/graphson/GraphSONSerializersV2d0.java | 28 ++++++
.../io/graphson/GraphSONSerializersV3d0.java | 28 ++++++
.../traversal/util/TraversalExplanationTest.java | 8 ++
.../graphson/GraphSONMapperEmbeddedTypeTest.java | 11 ++
9 files changed, 215 insertions(+), 160 deletions(-)
diff --cc CHANGELOG.asciidoc
index 1d1d06a,7705a17..b29f301
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -23,10 -23,10 +23,12 @@@ image::https://raw.githubusercontent.co
[[release-3-3-9]]
=== TinkerPop 3.3.9 (Release Date: NOT OFFICIALLY RELEASED YET)
+ * Added `ImmutableExplanation` for a `TraversalExplanation` that just contains data.
+ * Fixed `TraversalExplanation` deserialization in GraphSON 2 and 3 which was not supported before in Java.
-* Updated jackson databind 2.9.9.3.
-* Postponed the timing of transport creation to `connection.write` in Gremlin Python.
+* Update jackson databind 2.9.9.3.
+* Modified Java driver to use IP address rather than hostname to create connections.
+* Fixed potential for `NullPointerException` with empty identifiers in `GraphStep`.
+* Postpone the timing of transport creation to `connection.write` in Gremlin Python.
[[release-3-3-8]]
=== TinkerPop 3.3.8 (Release Date: August 5, 2019)
[tinkerpop] 02/03: Merge branch 'tp33' into tp34
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 3630afcbbcca503556bbc66711b2d7f5a83668c3
Merge: c2a01b8 dd14552
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Sep 3 12:41:57 2019 -0400
Merge branch 'tp33' into tp34
CHANGELOG.asciidoc | 2 +
...alExplanation.java => AbstractExplanation.java} | 104 +++++++------------
.../traversal/util/ImmutableExplanation.java | 80 +++++++++++++++
.../traversal/util/TraversalExplanation.java | 112 ++++-----------------
.../structure/io/graphson/GraphSONModule.java | 2 +
.../io/graphson/GraphSONSerializersV2d0.java | 28 ++++++
.../io/graphson/GraphSONSerializersV3d0.java | 28 ++++++
.../traversal/util/TraversalExplanationTest.java | 8 ++
.../graphson/GraphSONMapperEmbeddedTypeTest.java | 11 ++
9 files changed, 215 insertions(+), 160 deletions(-)
diff --cc gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
index af569e2,6c27770..f7dce28
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
@@@ -22,7 -22,7 +22,8 @@@ import org.apache.tinkerpop.gremlin.pro
import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
+ import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
import org.apache.tinkerpop.gremlin.util.function.Lambda;
import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
import org.junit.Test;
@@@ -52,8 -52,8 +53,9 @@@ import java.util.List
import java.util.Map;
import java.util.Set;
+ import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.__;
import static org.hamcrest.Matchers.either;
+import static org.hamcrest.core.AnyOf.anyOf;
import static org.hamcrest.core.IsNot.not;
import static org.hamcrest.core.StringStartsWith.startsWith;
import static org.junit.Assert.assertEquals;
@@@ -86,19 -86,15 +88,28 @@@ public class GraphSONMapperEmbeddedType
public String version;
@Test
+ public void shouldHandleTraversalExplanation() throws Exception {
+ assumeThat(version, not(startsWith("v1")));
-
++
+ final TraversalExplanation o = __().out().outV().outE().explain();
+ final TraversalExplanation deser = serializeDeserialize(mapper, o, TraversalExplanation.class);
+ assertEquals(o.prettyPrint(), deser.prettyPrint());
+ }
+
+ @Test
+ public void shouldHandleBulkSet() throws Exception {
+ // only supported on V3
+ assumeThat(version, not(anyOf(startsWith("v1"), startsWith("v2"))));
+
+ final BulkSet<String> bs = new BulkSet<>();
+ bs.add("test1", 1);
+ bs.add("test2", 2);
+ bs.add("test3", 3);
+
+ assertEquals(bs, serializeDeserialize(mapper, bs, BulkSet.class));
+ }
+
+ @Test
public void shouldHandleNumberConstants() throws Exception {
assumeThat(version, not(startsWith("v1")));