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 2016/12/20 20:25:19 UTC
[01/47] tinkerpop git commit: Remove errant import of javafx class
[Forced Update!]
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1130 525d314d8 -> e564a70bb (forced update)
Remove errant import of javafx class
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7720a9a6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7720a9a6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7720a9a6
Branch: refs/heads/TINKERPOP-1130
Commit: 7720a9a6c9c232b4c44c03885ca543ad0f0d9bda
Parents: 6ec9648
Author: Geoff Reedy <ge...@programmer-monk.net>
Authored: Thu Dec 8 13:36:11 2016 -0700
Committer: GitHub <no...@github.com>
Committed: Thu Dec 8 13:36:11 2016 -0700
----------------------------------------------------------------------
.../gremlin/process/traversal/dsl/graph/GraphTraversal.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7720a9a6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 23b1d11..7ffee40 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -159,8 +159,6 @@ import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Predicate;
-import static javafx.scene.input.KeyCode.M;
-
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
@@ -1711,4 +1709,4 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
public static final String option = "option";
}
-}
\ No newline at end of file
+}
[05/47] tinkerpop git commit: TINKERPOP-1490 Cleaned up documentation
based on latest changes to promise API
Posted by sp...@apache.org.
TINKERPOP-1490 Cleaned up documentation based on latest changes to promise API
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/81fa7e0e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/81fa7e0e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/81fa7e0e
Branch: refs/heads/TINKERPOP-1130
Commit: 81fa7e0e19ad337d764f6bcb7c36c286ca33396d
Parents: 42e8588
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Nov 14 06:38:18 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 16 10:00:40 2016 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
docs/src/upgrade/release-3.2.x-incubating.asciidoc | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81fa7e0e/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 24c75a7..b637552 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -52,7 +52,7 @@ TinkerPop 3.2.4 (Release Date: NOT OFFICIALLY RELEASED YET)
* Factored `GremlinPlugin` functionality out of gremlin-groovy and into gremlin-core - related classes were deprecated.
* Added a `force` option for killing sessions without waiting for transaction close or timeout of a currently running job or multiple jobs.
* Deprecated `Session.kill()` and `Session.manualKill()`.
-* Added `Traversal.promise()` methods to allow for asynchronous traversal processing.
+* Added `Traversal.promise()` method to allow for asynchronous traversal processing on "remote" traversals.
* Added `choose(predicate,traversal)` and `choose(traversal,traversal)` to effect if/then-semantics (no else). Equivalent to `choose(x,y,identity())`.
* Removed `ImmutablePath.TailPath` as it is no longer required with new recursion model.
* Removed call stack recursion in `ImmutablePath`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81fa7e0e/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 34ff427..428b0c6 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -35,7 +35,7 @@ Upgrading for Users
Traversal Promises
^^^^^^^^^^^^^^^^^^
-The `Traversal` API now has two `promise()` method overloads. These methods return a promise in the form of a
+The `Traversal` API now has a new `promise()` method. These methods return a promise in the form of a
`CompleteableFuture`. Usage is as follows:
[source,groovy]
@@ -50,6 +50,8 @@ gremlin> g.V().out().promise{it.toList()}.thenApply{it.size()}.get()
==>6
----
+At this time, this method is only used for traversals that are configured using `withRemote()`.
+
See: link:https://issues.apache.org/jira/browse/TINKERPOP-1490[TINKERPOP-1490]
If/Then-Semantics with Choose Step
[28/47] tinkerpop git commit: Added basics for versioning Gryo.
Posted by sp...@apache.org.
Added basics for versioning Gryo.
This is not a breaking change. build() remains the operative which gets the default gryo version and simply calls the new build(version). CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/651b0f3b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/651b0f3b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/651b0f3b
Branch: refs/heads/TINKERPOP-1130
Commit: 651b0f3b025d13aa0370abff530cb41fd3ef6ef6
Parents: 49668ce
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Dec 20 14:18:09 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 20 14:18:09 2016 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../gremlin/structure/io/gryo/GryoMapper.java | 299 ++++++++++---------
.../gremlin/structure/io/gryo/GryoVersion.java | 36 +++
3 files changed, 194 insertions(+), 142 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/651b0f3b/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 02531ba..6fd7255 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.2.4 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Added `GryoVersion` for future flexibility when introducing a new verison of Gryo.
* Lessened the severity of Gremlin Server logging when it encounters two or more serializers addressing the same mime type.
* Bumped to Netty 4.0.42.final.
* Added `ByteBuffer`, `InetAddress`, `Timestamp` to the list of Gryo supported classes.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/651b0f3b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
index bbd3999..60ed74e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
@@ -207,7 +207,11 @@ public final class GryoMapper implements Mapper<Kryo> {
}
public static Builder build() {
- return new Builder();
+ return build(GryoVersion.V1_0);
+ }
+
+ public static Builder build(final GryoVersion version) {
+ return new BuilderV1d0();
}
private void validate() {
@@ -225,27 +229,169 @@ public final class GryoMapper implements Mapper<Kryo> {
throw new IllegalStateException("There are duplicate kryo identifiers in use: " + duplicates);
}
+ public final static class BuilderV1d0 extends Builder {
+ @Override
+ public List<TypeRegistration<?>> initTypeRegistrations() {
+ return new ArrayList<TypeRegistration<?>>() {{
+ add(GryoTypeReg.of(byte[].class, 25));
+ add(GryoTypeReg.of(char[].class, 26));
+ add(GryoTypeReg.of(short[].class, 27));
+ add(GryoTypeReg.of(int[].class, 28));
+ add(GryoTypeReg.of(long[].class, 29));
+ add(GryoTypeReg.of(float[].class, 30));
+ add(GryoTypeReg.of(double[].class, 31));
+ add(GryoTypeReg.of(String[].class, 32));
+ add(GryoTypeReg.of(Object[].class, 33));
+ add(GryoTypeReg.of(ArrayList.class, 10));
+ add(GryoTypeReg.of(ARRAYS_AS_LIST, 134, new UtilSerializers.ArraysAsListSerializer()));
+ add(GryoTypeReg.of(BigInteger.class, 34));
+ add(GryoTypeReg.of(BigDecimal.class, 35));
+ add(GryoTypeReg.of(Calendar.class, 39));
+ add(GryoTypeReg.of(Class.class, 41, new UtilSerializers.ClassSerializer()));
+ add(GryoTypeReg.of(Collection.class, 37));
+ add(GryoTypeReg.of(Collections.EMPTY_LIST.getClass(), 51));
+ add(GryoTypeReg.of(Collections.EMPTY_MAP.getClass(), 52));
+ add(GryoTypeReg.of(Collections.EMPTY_SET.getClass(), 53));
+ add(GryoTypeReg.of(Collections.singleton(null).getClass(), 54));
+ add(GryoTypeReg.of(Collections.singletonList(null).getClass(), 24));
+ add(GryoTypeReg.of(Collections.singletonMap(null, null).getClass(), 23));
+ add(GryoTypeReg.of(Contains.class, 49));
+ add(GryoTypeReg.of(Currency.class, 40));
+ add(GryoTypeReg.of(Date.class, 38));
+ add(GryoTypeReg.of(Direction.class, 12));
+ add(GryoTypeReg.of(DetachedEdge.class, 21));
+ add(GryoTypeReg.of(DetachedVertexProperty.class, 20));
+ add(GryoTypeReg.of(DetachedProperty.class, 18));
+ add(GryoTypeReg.of(DetachedVertex.class, 19));
+ add(GryoTypeReg.of(DetachedPath.class, 60));
+ // skip 14
+ add(GryoTypeReg.of(EnumSet.class, 46));
+ add(GryoTypeReg.of(HashMap.class, 11));
+ add(GryoTypeReg.of(HashMap.Entry.class, 16));
+ add(GryoTypeReg.of(HASH_MAP_NODE, 92));
+ add(GryoTypeReg.of(KryoSerializable.class, 36));
+ add(GryoTypeReg.of(LinkedHashMap.class, 47));
+ add(GryoTypeReg.of(LinkedHashSet.class, 71));
+ add(GryoTypeReg.of(LinkedList.class, 116));
+ add(GryoTypeReg.of(LINKED_HASH_MAP_ENTRY_CLASS, 15));
+ add(GryoTypeReg.of(Locale.class, 22));
+ add(GryoTypeReg.of(StringBuffer.class, 43));
+ add(GryoTypeReg.of(StringBuilder.class, 44));
+ add(GryoTypeReg.of(T.class, 48));
+ add(GryoTypeReg.of(TimeZone.class, 42));
+ add(GryoTypeReg.of(TreeMap.class, 45));
+ add(GryoTypeReg.of(TreeSet.class, 50));
+ add(GryoTypeReg.of(UUID.class, 17, new UtilSerializers.UUIDSerializer()));
+ add(GryoTypeReg.of(URI.class, 72, new UtilSerializers.URISerializer()));
+ add(GryoTypeReg.of(VertexTerminator.class, 13));
+ add(GryoTypeReg.of(AbstractMap.SimpleEntry.class, 120));
+ add(GryoTypeReg.of(AbstractMap.SimpleImmutableEntry.class, 121));
+ add(GryoTypeReg.of(java.sql.Timestamp.class, 138));
+ add(GryoTypeReg.of(InetAddress.class, 139, new UtilSerializers.InetAddressSerializer()));
+ add(GryoTypeReg.of(ByteBuffer.class, 140, new UtilSerializers.ByteBufferSerializer())); // ***LAST ID***
+
+ add(GryoTypeReg.of(ReferenceEdge.class, 81));
+ add(GryoTypeReg.of(ReferenceVertexProperty.class, 82));
+ add(GryoTypeReg.of(ReferenceProperty.class, 83));
+ add(GryoTypeReg.of(ReferenceVertex.class, 84));
+ add(GryoTypeReg.of(ReferencePath.class, 85));
+
+ add(GryoTypeReg.of(StarGraph.class, 86, new StarGraphSerializer(Direction.BOTH, new GraphFilter())));
+
+ add(GryoTypeReg.of(Edge.class, 65, new GryoSerializers.EdgeSerializer()));
+ add(GryoTypeReg.of(Vertex.class, 66, new GryoSerializers.VertexSerializer()));
+ add(GryoTypeReg.of(Property.class, 67, new GryoSerializers.PropertySerializer()));
+ add(GryoTypeReg.of(VertexProperty.class, 68, new GryoSerializers.VertexPropertySerializer()));
+ add(GryoTypeReg.of(Path.class, 59, new GryoSerializers.PathSerializer()));
+ // skip 55
+ add(GryoTypeReg.of(B_O_Traverser.class, 75));
+ add(GryoTypeReg.of(O_Traverser.class, 76));
+ add(GryoTypeReg.of(B_LP_O_P_S_SE_SL_Traverser.class, 77));
+ add(GryoTypeReg.of(B_O_S_SE_SL_Traverser.class, 78));
+ add(GryoTypeReg.of(B_LP_O_S_SE_SL_Traverser.class, 87));
+ add(GryoTypeReg.of(O_OB_S_SE_SL_Traverser.class, 89));
+ add(GryoTypeReg.of(LP_O_OB_S_SE_SL_Traverser.class, 90));
+ add(GryoTypeReg.of(LP_O_OB_P_S_SE_SL_Traverser.class, 91));
+ add(GryoTypeReg.of(DefaultRemoteTraverser.class, 123, new GryoSerializers.DefaultRemoteTraverserSerializer()));
+
+ add(GryoTypeReg.of(Bytecode.class, 122, new GryoSerializers.BytecodeSerializer()));
+ add(GryoTypeReg.of(P.class, 124, new GryoSerializers.PSerializer()));
+ add(GryoTypeReg.of(Lambda.class, 125, new GryoSerializers.LambdaSerializer()));
+ add(GryoTypeReg.of(Bytecode.Binding.class, 126, new GryoSerializers.BindingSerializer()));
+ add(GryoTypeReg.of(Order.class, 127));
+ add(GryoTypeReg.of(Scope.class, 128));
+ add(GryoTypeReg.of(AndP.class, 129, new GryoSerializers.AndPSerializer()));
+ add(GryoTypeReg.of(OrP.class, 130, new GryoSerializers.OrPSerializer()));
+ add(GryoTypeReg.of(VertexProperty.Cardinality.class, 131));
+ add(GryoTypeReg.of(Column.class, 132));
+ add(GryoTypeReg.of(Pop.class, 133));
+ add(GryoTypeReg.of(SackFunctions.Barrier.class, 135));
+ add(GryoTypeReg.of(TraversalOptionParent.Pick.class, 137));
+ add(GryoTypeReg.of(HashSetSupplier.class, 136, new UtilSerializers.HashSetSupplierSerializer()));
+
+ add(GryoTypeReg.of(TraverserSet.class, 58));
+ add(GryoTypeReg.of(Tree.class, 61));
+ add(GryoTypeReg.of(HashSet.class, 62));
+ add(GryoTypeReg.of(BulkSet.class, 64));
+ add(GryoTypeReg.of(MutableMetrics.class, 69));
+ add(GryoTypeReg.of(ImmutableMetrics.class, 115));
+ add(GryoTypeReg.of(DefaultTraversalMetrics.class, 70));
+ add(GryoTypeReg.of(MapMemory.class, 73));
+ add(GryoTypeReg.of(MapReduce.NullObject.class, 74));
+ add(GryoTypeReg.of(AtomicLong.class, 79));
+ add(GryoTypeReg.of(Pair.class, 88, new UtilSerializers.PairSerializer()));
+ add(GryoTypeReg.of(TraversalExplanation.class, 106, new JavaSerializer()));
+
+ add(GryoTypeReg.of(Duration.class, 93, new JavaTimeSerializers.DurationSerializer()));
+ add(GryoTypeReg.of(Instant.class, 94, new JavaTimeSerializers.InstantSerializer()));
+ add(GryoTypeReg.of(LocalDate.class, 95, new JavaTimeSerializers.LocalDateSerializer()));
+ add(GryoTypeReg.of(LocalDateTime.class, 96, new JavaTimeSerializers.LocalDateTimeSerializer()));
+ add(GryoTypeReg.of(LocalTime.class, 97, new JavaTimeSerializers.LocalTimeSerializer()));
+ add(GryoTypeReg.of(MonthDay.class, 98, new JavaTimeSerializers.MonthDaySerializer()));
+ add(GryoTypeReg.of(OffsetDateTime.class, 99, new JavaTimeSerializers.OffsetDateTimeSerializer()));
+ add(GryoTypeReg.of(OffsetTime.class, 100, new JavaTimeSerializers.OffsetTimeSerializer()));
+ add(GryoTypeReg.of(Period.class, 101, new JavaTimeSerializers.PeriodSerializer()));
+ add(GryoTypeReg.of(Year.class, 102, new JavaTimeSerializers.YearSerializer()));
+ add(GryoTypeReg.of(YearMonth.class, 103, new JavaTimeSerializers.YearMonthSerializer()));
+ add(GryoTypeReg.of(ZonedDateTime.class, 104, new JavaTimeSerializers.ZonedDateTimeSerializer()));
+ add(GryoTypeReg.of(ZoneOffset.class, 105, new JavaTimeSerializers.ZoneOffsetSerializer()));
+
+ add(GryoTypeReg.of(Operator.class, 107));
+ add(GryoTypeReg.of(FoldStep.FoldBiOperator.class, 108));
+ add(GryoTypeReg.of(GroupCountStep.GroupCountBiOperator.class, 109));
+ add(GryoTypeReg.of(GroupStep.GroupBiOperator.class, 117, new JavaSerializer())); // because they contain traversals
+ add(GryoTypeReg.of(MeanGlobalStep.MeanGlobalBiOperator.class, 110));
+ add(GryoTypeReg.of(MeanGlobalStep.MeanNumber.class, 111));
+ add(GryoTypeReg.of(TreeStep.TreeBiOperator.class, 112));
+ add(GryoTypeReg.of(GroupStepV3d0.GroupBiOperatorV3d0.class, 113));
+ add(GryoTypeReg.of(RangeGlobalStep.RangeBiOperator.class, 114));
+ add(GryoTypeReg.of(OrderGlobalStep.OrderBiOperator.class, 118, new JavaSerializer())); // because they contain traversals
+ add(GryoTypeReg.of(ProfileStep.ProfileBiOperator.class, 119));
+ }};
+ }
+ }
+
/**
* A builder to construct a {@link GryoMapper} instance.
*/
- public final static class Builder implements Mapper.Builder<Builder> {
+ public abstract static class Builder implements Mapper.Builder<Builder> {
/**
* Map with one entry that is used so that it is possible to get the class of LinkedHashMap.Entry.
*/
- private static final LinkedHashMap m = new LinkedHashMap() {{
+ protected static final LinkedHashMap m = new LinkedHashMap() {{
put("junk", "dummy");
}};
- private static final Class ARRAYS_AS_LIST = Arrays.asList("dummy").getClass();
+ protected static final Class ARRAYS_AS_LIST = Arrays.asList("dummy").getClass();
- private static final Class LINKED_HASH_MAP_ENTRY_CLASS = m.entrySet().iterator().next().getClass();
+ protected static final Class LINKED_HASH_MAP_ENTRY_CLASS = m.entrySet().iterator().next().getClass();
/**
* The {@code HashMap$Node} class comes into serialization play when a {@code Map.entrySet()} is
* serialized.
*/
- private static final Class HASH_MAP_NODE;
+ protected static final Class HASH_MAP_NODE;
static {
// have to instantiate this via reflection because it is a private inner class of HashMap
@@ -261,142 +407,7 @@ public final class GryoMapper implements Mapper<Kryo> {
* Note that the following are pre-registered boolean, Boolean, byte, Byte, char, Character, double, Double,
* int, Integer, float, Float, long, Long, short, Short, String, void.
*/
- private final List<TypeRegistration<?>> typeRegistrations = new ArrayList<TypeRegistration<?>>() {{
- add(GryoTypeReg.of(byte[].class, 25));
- add(GryoTypeReg.of(char[].class, 26));
- add(GryoTypeReg.of(short[].class, 27));
- add(GryoTypeReg.of(int[].class, 28));
- add(GryoTypeReg.of(long[].class, 29));
- add(GryoTypeReg.of(float[].class, 30));
- add(GryoTypeReg.of(double[].class, 31));
- add(GryoTypeReg.of(String[].class, 32));
- add(GryoTypeReg.of(Object[].class, 33));
- add(GryoTypeReg.of(ArrayList.class, 10));
- add(GryoTypeReg.of(ARRAYS_AS_LIST, 134, new UtilSerializers.ArraysAsListSerializer()));
- add(GryoTypeReg.of(BigInteger.class, 34));
- add(GryoTypeReg.of(BigDecimal.class, 35));
- add(GryoTypeReg.of(Calendar.class, 39));
- add(GryoTypeReg.of(Class.class, 41, new UtilSerializers.ClassSerializer()));
- add(GryoTypeReg.of(Collection.class, 37));
- add(GryoTypeReg.of(Collections.EMPTY_LIST.getClass(), 51));
- add(GryoTypeReg.of(Collections.EMPTY_MAP.getClass(), 52));
- add(GryoTypeReg.of(Collections.EMPTY_SET.getClass(), 53));
- add(GryoTypeReg.of(Collections.singleton(null).getClass(), 54));
- add(GryoTypeReg.of(Collections.singletonList(null).getClass(), 24));
- add(GryoTypeReg.of(Collections.singletonMap(null, null).getClass(), 23));
- add(GryoTypeReg.of(Contains.class, 49));
- add(GryoTypeReg.of(Currency.class, 40));
- add(GryoTypeReg.of(Date.class, 38));
- add(GryoTypeReg.of(Direction.class, 12));
- add(GryoTypeReg.of(DetachedEdge.class, 21));
- add(GryoTypeReg.of(DetachedVertexProperty.class, 20));
- add(GryoTypeReg.of(DetachedProperty.class, 18));
- add(GryoTypeReg.of(DetachedVertex.class, 19));
- add(GryoTypeReg.of(DetachedPath.class, 60));
- // skip 14
- add(GryoTypeReg.of(EnumSet.class, 46));
- add(GryoTypeReg.of(HashMap.class, 11));
- add(GryoTypeReg.of(HashMap.Entry.class, 16));
- add(GryoTypeReg.of(HASH_MAP_NODE, 92));
- add(GryoTypeReg.of(KryoSerializable.class, 36));
- add(GryoTypeReg.of(LinkedHashMap.class, 47));
- add(GryoTypeReg.of(LinkedHashSet.class, 71));
- add(GryoTypeReg.of(LinkedList.class, 116));
- add(GryoTypeReg.of(LINKED_HASH_MAP_ENTRY_CLASS, 15));
- add(GryoTypeReg.of(Locale.class, 22));
- add(GryoTypeReg.of(StringBuffer.class, 43));
- add(GryoTypeReg.of(StringBuilder.class, 44));
- add(GryoTypeReg.of(T.class, 48));
- add(GryoTypeReg.of(TimeZone.class, 42));
- add(GryoTypeReg.of(TreeMap.class, 45));
- add(GryoTypeReg.of(TreeSet.class, 50));
- add(GryoTypeReg.of(UUID.class, 17, new UtilSerializers.UUIDSerializer()));
- add(GryoTypeReg.of(URI.class, 72, new UtilSerializers.URISerializer()));
- add(GryoTypeReg.of(VertexTerminator.class, 13));
- add(GryoTypeReg.of(AbstractMap.SimpleEntry.class, 120));
- add(GryoTypeReg.of(AbstractMap.SimpleImmutableEntry.class, 121));
- add(GryoTypeReg.of(java.sql.Timestamp.class, 138));
- add(GryoTypeReg.of(InetAddress.class, 139, new UtilSerializers.InetAddressSerializer()));
- add(GryoTypeReg.of(ByteBuffer.class, 140, new UtilSerializers.ByteBufferSerializer())); // ***LAST ID***
-
- add(GryoTypeReg.of(ReferenceEdge.class, 81));
- add(GryoTypeReg.of(ReferenceVertexProperty.class, 82));
- add(GryoTypeReg.of(ReferenceProperty.class, 83));
- add(GryoTypeReg.of(ReferenceVertex.class, 84));
- add(GryoTypeReg.of(ReferencePath.class, 85));
-
- add(GryoTypeReg.of(StarGraph.class, 86, new StarGraphSerializer(Direction.BOTH, new GraphFilter())));
-
- add(GryoTypeReg.of(Edge.class, 65, new GryoSerializers.EdgeSerializer()));
- add(GryoTypeReg.of(Vertex.class, 66, new GryoSerializers.VertexSerializer()));
- add(GryoTypeReg.of(Property.class, 67, new GryoSerializers.PropertySerializer()));
- add(GryoTypeReg.of(VertexProperty.class, 68, new GryoSerializers.VertexPropertySerializer()));
- add(GryoTypeReg.of(Path.class, 59, new GryoSerializers.PathSerializer()));
- // skip 55
- add(GryoTypeReg.of(B_O_Traverser.class, 75));
- add(GryoTypeReg.of(O_Traverser.class, 76));
- add(GryoTypeReg.of(B_LP_O_P_S_SE_SL_Traverser.class, 77));
- add(GryoTypeReg.of(B_O_S_SE_SL_Traverser.class, 78));
- add(GryoTypeReg.of(B_LP_O_S_SE_SL_Traverser.class, 87));
- add(GryoTypeReg.of(O_OB_S_SE_SL_Traverser.class, 89));
- add(GryoTypeReg.of(LP_O_OB_S_SE_SL_Traverser.class, 90));
- add(GryoTypeReg.of(LP_O_OB_P_S_SE_SL_Traverser.class, 91));
- add(GryoTypeReg.of(DefaultRemoteTraverser.class, 123, new GryoSerializers.DefaultRemoteTraverserSerializer()));
-
- add(GryoTypeReg.of(Bytecode.class, 122, new GryoSerializers.BytecodeSerializer()));
- add(GryoTypeReg.of(P.class, 124, new GryoSerializers.PSerializer()));
- add(GryoTypeReg.of(Lambda.class, 125, new GryoSerializers.LambdaSerializer()));
- add(GryoTypeReg.of(Bytecode.Binding.class, 126, new GryoSerializers.BindingSerializer()));
- add(GryoTypeReg.of(Order.class, 127));
- add(GryoTypeReg.of(Scope.class, 128));
- add(GryoTypeReg.of(AndP.class, 129, new GryoSerializers.AndPSerializer()));
- add(GryoTypeReg.of(OrP.class, 130, new GryoSerializers.OrPSerializer()));
- add(GryoTypeReg.of(VertexProperty.Cardinality.class, 131));
- add(GryoTypeReg.of(Column.class, 132));
- add(GryoTypeReg.of(Pop.class, 133));
- add(GryoTypeReg.of(SackFunctions.Barrier.class, 135));
- add(GryoTypeReg.of(TraversalOptionParent.Pick.class, 137));
- add(GryoTypeReg.of(HashSetSupplier.class, 136, new UtilSerializers.HashSetSupplierSerializer()));
-
- add(GryoTypeReg.of(TraverserSet.class, 58));
- add(GryoTypeReg.of(Tree.class, 61));
- add(GryoTypeReg.of(HashSet.class, 62));
- add(GryoTypeReg.of(BulkSet.class, 64));
- add(GryoTypeReg.of(MutableMetrics.class, 69));
- add(GryoTypeReg.of(ImmutableMetrics.class, 115));
- add(GryoTypeReg.of(DefaultTraversalMetrics.class, 70));
- add(GryoTypeReg.of(MapMemory.class, 73));
- add(GryoTypeReg.of(MapReduce.NullObject.class, 74));
- add(GryoTypeReg.of(AtomicLong.class, 79));
- add(GryoTypeReg.of(Pair.class, 88, new UtilSerializers.PairSerializer()));
- add(GryoTypeReg.of(TraversalExplanation.class, 106, new JavaSerializer()));
-
- add(GryoTypeReg.of(Duration.class, 93, new JavaTimeSerializers.DurationSerializer()));
- add(GryoTypeReg.of(Instant.class, 94, new JavaTimeSerializers.InstantSerializer()));
- add(GryoTypeReg.of(LocalDate.class, 95, new JavaTimeSerializers.LocalDateSerializer()));
- add(GryoTypeReg.of(LocalDateTime.class, 96, new JavaTimeSerializers.LocalDateTimeSerializer()));
- add(GryoTypeReg.of(LocalTime.class, 97, new JavaTimeSerializers.LocalTimeSerializer()));
- add(GryoTypeReg.of(MonthDay.class, 98, new JavaTimeSerializers.MonthDaySerializer()));
- add(GryoTypeReg.of(OffsetDateTime.class, 99, new JavaTimeSerializers.OffsetDateTimeSerializer()));
- add(GryoTypeReg.of(OffsetTime.class, 100, new JavaTimeSerializers.OffsetTimeSerializer()));
- add(GryoTypeReg.of(Period.class, 101, new JavaTimeSerializers.PeriodSerializer()));
- add(GryoTypeReg.of(Year.class, 102, new JavaTimeSerializers.YearSerializer()));
- add(GryoTypeReg.of(YearMonth.class, 103, new JavaTimeSerializers.YearMonthSerializer()));
- add(GryoTypeReg.of(ZonedDateTime.class, 104, new JavaTimeSerializers.ZonedDateTimeSerializer()));
- add(GryoTypeReg.of(ZoneOffset.class, 105, new JavaTimeSerializers.ZoneOffsetSerializer()));
-
- add(GryoTypeReg.of(Operator.class, 107));
- add(GryoTypeReg.of(FoldStep.FoldBiOperator.class, 108));
- add(GryoTypeReg.of(GroupCountStep.GroupCountBiOperator.class, 109));
- add(GryoTypeReg.of(GroupStep.GroupBiOperator.class, 117, new JavaSerializer())); // because they contain traversals
- add(GryoTypeReg.of(MeanGlobalStep.MeanGlobalBiOperator.class, 110));
- add(GryoTypeReg.of(MeanGlobalStep.MeanNumber.class, 111));
- add(GryoTypeReg.of(TreeStep.TreeBiOperator.class, 112));
- add(GryoTypeReg.of(GroupStepV3d0.GroupBiOperatorV3d0.class, 113));
- add(GryoTypeReg.of(RangeGlobalStep.RangeBiOperator.class, 114));
- add(GryoTypeReg.of(OrderGlobalStep.OrderBiOperator.class, 118, new JavaSerializer())); // because they contain traversals
- add(GryoTypeReg.of(ProfileStep.ProfileBiOperator.class, 119));
- }};
+ private final List<TypeRegistration<?>> typeRegistrations;
private final List<IoRegistry> registries = new ArrayList<>();
@@ -410,6 +421,8 @@ public final class GryoMapper implements Mapper<Kryo> {
private Supplier<ClassResolver> classResolver = GryoClassResolver::new;
private Builder() {
+ this.typeRegistrations = initTypeRegistrations();
+
// Validate the default registrations
// For justification of these default registration rules, see TinkerPopKryoRegistrator
for (TypeRegistration<?> tr : typeRegistrations) {
@@ -426,6 +439,8 @@ public final class GryoMapper implements Mapper<Kryo> {
}
}
+ public abstract List<TypeRegistration<?>> initTypeRegistrations();
+
/**
* {@inheritDoc}
*/
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/651b0f3b/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
new file mode 100644
index 0000000..5a52290
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.gryo;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public enum GryoVersion {
+ V1_0("1.0");
+
+ private final String versionNumber;
+
+ GryoVersion(final String versionNumber) {
+ this.versionNumber = versionNumber;
+ }
+
+ public String getVersion() {
+ return versionNumber;
+ }
+}
[14/47] tinkerpop git commit: TINKERPOP-1490 Merge fixes after rebase
on tp32
Posted by sp...@apache.org.
TINKERPOP-1490 Merge fixes after rebase on tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a8c8b655
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a8c8b655
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a8c8b655
Branch: refs/heads/TINKERPOP-1130
Commit: a8c8b6553a0bd0b41c292822f41e2e0d8e073cf1
Parents: 21663f4
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Dec 7 15:01:28 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 16 10:14:20 2016 -0500
----------------------------------------------------------------------
gremlin-python/src/main/jython/gremlin_python/process/traversal.py | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a8c8b655/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
index 2c2db59..07afeac 100644
--- a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
@@ -406,3 +406,4 @@ class Binding(object):
return hash(self.key) + hash(self.value)
def __repr__(self):
return "binding[" + self.key + "=" + str(self.value) + "]"
+
[39/47] tinkerpop git commit: TINKERPOP-1130 Structured the IO
compatibility tests
Posted by sp...@apache.org.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibilityTest.java
new file mode 100644
index 0000000..50c0853
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibilityTest.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.gryo;
+
+import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.apache.tinkerpop.gremlin.structure.io.AbstractTypedCompatibilityTest;
+import org.apache.tinkerpop.gremlin.structure.io.Compatibility;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+@RunWith(Parameterized.class)
+public class GryoCompatibilityTest extends AbstractTypedCompatibilityTest {
+
+ private static Kryo mapperV1 = GryoMapper.build().
+ addRegistry(TinkerIoRegistryV2d0.instance()).create().createMapper();
+
+ @Parameterized.Parameters(name = "expect({0})")
+ public static Iterable<Object[]> data() {
+ return Arrays.asList(new Object[][]{
+ {GryoCompatibility.V1D0_3_2_3, mapperV1 },
+ {GryoCompatibility.V1D0_3_3_0, mapperV1 }});
+ }
+
+ @Parameterized.Parameter(value = 0)
+ public Compatibility compatibility;
+
+ @Parameterized.Parameter(value = 1)
+ public Kryo mapper;
+
+ @Override
+ public <T> T read(final byte[] bytes, final Class<T> clazz) throws Exception {
+ final Input input = new Input(bytes);
+ return mapper.readObject(input, clazz);
+ }
+
+ @Override
+ public byte[] write(final Object o, final Class<?> clazz) throws Exception {
+ try (ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
+ final Output output = new Output(stream);
+ mapper.writeObject(output, o);
+ output.flush();
+ return stream.toByteArray();
+ }
+ }
+
+ @Override
+ public Compatibility getCompatibility() {
+ return compatibility;
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/log4j-silent.properties
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/log4j-silent.properties b/gremlin-tools/gremlin-io-test/src/test/resources/log4j-silent.properties
new file mode 100644
index 0000000..1825bb0
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/log4j-silent.properties
@@ -0,0 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# this file should always have logging set to OFF. it seems, however, that an appender of some sort is
+# required or else some logs throw error and use other log4j.properties files on the path.
+log4j.rootLogger=OFF, stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/log4j-test.properties
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/log4j-test.properties b/gremlin-tools/gremlin-io-test/src/test/resources/log4j-test.properties
new file mode 100644
index 0000000..ef436fe
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/log4j-test.properties
@@ -0,0 +1,21 @@
+# 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.
+
+log4j.rootLogger=WARN, stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v1d0.json
new file mode 100644
index 0000000..8c5b82c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v1d0.json
@@ -0,0 +1,12 @@
+{
+ "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "status" : {
+ "message" : "",
+ "code" : 407,
+ "attributes" : { }
+ },
+ "result" : {
+ "data" : null,
+ "meta" : { }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v2d0-no-types.json
new file mode 100644
index 0000000..8c5b82c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v2d0-no-types.json
@@ -0,0 +1,12 @@
+{
+ "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "status" : {
+ "message" : "",
+ "code" : 407,
+ "attributes" : { }
+ },
+ "result" : {
+ "data" : null,
+ "meta" : { }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v2d0-partial.json
new file mode 100644
index 0000000..8c5b82c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationchallenge-v2d0-partial.json
@@ -0,0 +1,12 @@
+{
+ "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "status" : {
+ "message" : "",
+ "code" : 407,
+ "attributes" : { }
+ },
+ "result" : {
+ "data" : null,
+ "meta" : { }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v1d0.json
new file mode 100644
index 0000000..838e1fd
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v1d0.json
@@ -0,0 +1,9 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "authentication",
+ "processor" : "",
+ "args" : {
+ "saslMechanism" : "PLAIN",
+ "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v2d0-no-types.json
new file mode 100644
index 0000000..838e1fd
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v2d0-no-types.json
@@ -0,0 +1,9 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "authentication",
+ "processor" : "",
+ "args" : {
+ "saslMechanism" : "PLAIN",
+ "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v2d0-partial.json
new file mode 100644
index 0000000..b893667
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/authenticationresponse-v2d0-partial.json
@@ -0,0 +1,12 @@
+{
+ "requestId" : {
+ "@type" : "g:UUID",
+ "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
+ },
+ "op" : "authentication",
+ "processor" : "",
+ "args" : {
+ "saslMechanism" : "PLAIN",
+ "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/barrier-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/barrier-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/barrier-v2d0-no-types.json
new file mode 100644
index 0000000..7dd6c03
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/barrier-v2d0-no-types.json
@@ -0,0 +1 @@
+"normSack"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/barrier-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/barrier-v2d0-partial.json
new file mode 100644
index 0000000..7ddccdd
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/barrier-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Barrier",
+ "@value" : "normSack"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bigdecimal-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bigdecimal-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bigdecimal-v2d0-no-types.json
new file mode 100644
index 0000000..7914536
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bigdecimal-v2d0-no-types.json
@@ -0,0 +1 @@
+123456789987654321123456789987654321
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bigdecimal-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bigdecimal-v2d0-partial.json
new file mode 100644
index 0000000..475337c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bigdecimal-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:BigDecimal",
+ "@value" : 123456789987654321123456789987654321
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/biginteger-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/biginteger-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/biginteger-v2d0-no-types.json
new file mode 100644
index 0000000..7914536
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/biginteger-v2d0-no-types.json
@@ -0,0 +1 @@
+123456789987654321123456789987654321
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/biginteger-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/biginteger-v2d0-partial.json
new file mode 100644
index 0000000..58e6114
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/biginteger-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:BigInteger",
+ "@value" : 123456789987654321123456789987654321
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/binding-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/binding-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/binding-v2d0-no-types.json
new file mode 100644
index 0000000..661b153
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/binding-v2d0-no-types.json
@@ -0,0 +1,4 @@
+{
+ "key" : "x",
+ "value" : 1
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/binding-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/binding-v2d0-partial.json
new file mode 100644
index 0000000..579b8c7
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/binding-v2d0-partial.json
@@ -0,0 +1,10 @@
+{
+ "@type" : "g:Binding",
+ "@value" : {
+ "key" : "x",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/byte-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/byte-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/byte-v2d0-no-types.json
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/byte-v2d0-no-types.json
@@ -0,0 +1 @@
+1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/byte-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/byte-v2d0-partial.json
new file mode 100644
index 0000000..979625b
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/byte-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Byte",
+ "@value" : 1
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-no-types.json
new file mode 100644
index 0000000..2d341b1
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-no-types.json
@@ -0,0 +1 @@
+"AQIDBAU="
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-partial.json
new file mode 100644
index 0000000..eef472e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:ByteBuffer",
+ "@value" : "AQIDBAU="
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytecode-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytecode-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytecode-v2d0-no-types.json
new file mode 100644
index 0000000..1cdc40a
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytecode-v2d0-no-types.json
@@ -0,0 +1,6 @@
+{
+ "step" : [ [ "V" ], [ "has", "label", {
+ "predicate" : "eq",
+ "value" : "person"
+ } ], [ "out" ], [ "in" ], [ "tree" ] ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytecode-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytecode-v2d0-partial.json
new file mode 100644
index 0000000..879f7a8
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytecode-v2d0-partial.json
@@ -0,0 +1,15 @@
+{
+ "@type" : "g:Bytecode",
+ "@value" : {
+ "step" : [ [ "V" ], [ "has", {
+ "@type" : "g:T",
+ "@value" : "label"
+ }, {
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "eq",
+ "value" : "person"
+ }
+ } ], [ "out" ], [ "in" ], [ "tree" ] ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/cardinality-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/cardinality-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/cardinality-v2d0-no-types.json
new file mode 100644
index 0000000..0617890
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/cardinality-v2d0-no-types.json
@@ -0,0 +1 @@
+"list"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/cardinality-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/cardinality-v2d0-partial.json
new file mode 100644
index 0000000..834e64e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/cardinality-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Cardinality",
+ "@value" : "list"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/char-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/char-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/char-v2d0-no-types.json
new file mode 100644
index 0000000..3403a0c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/char-v2d0-no-types.json
@@ -0,0 +1 @@
+"x"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/char-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/char-v2d0-partial.json
new file mode 100644
index 0000000..8f27e9d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/char-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Char",
+ "@value" : "x"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/class-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/class-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/class-v2d0-no-types.json
new file mode 100644
index 0000000..2fbd64d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/class-v2d0-no-types.json
@@ -0,0 +1 @@
+"java.io.File"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/class-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/class-v2d0-partial.json
new file mode 100644
index 0000000..80f15a2
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/class-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Class",
+ "@value" : "java.io.File"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/column-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/column-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/column-v2d0-no-types.json
new file mode 100644
index 0000000..02597c9
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/column-v2d0-no-types.json
@@ -0,0 +1 @@
+"keys"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/column-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/column-v2d0-partial.json
new file mode 100644
index 0000000..0b3a56e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/column-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Column",
+ "@value" : "keys"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-no-types.json
new file mode 100644
index 0000000..5eadd3a
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-no-types.json
@@ -0,0 +1 @@
+1481628637175
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-partial.json
new file mode 100644
index 0000000..7b6d985
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Date",
+ "@value" : 1481628634371
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/direction-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/direction-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/direction-v2d0-no-types.json
new file mode 100644
index 0000000..f6d62d7
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/direction-v2d0-no-types.json
@@ -0,0 +1 @@
+"OUT"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/direction-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/direction-v2d0-partial.json
new file mode 100644
index 0000000..78cb7e4
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/direction-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Direction",
+ "@value" : "OUT"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/double-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/double-v2d0-no-types.json
new file mode 100644
index 0000000..e772e62
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/double-v2d0-no-types.json
@@ -0,0 +1 @@
+100.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/double-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/double-v2d0-partial.json
new file mode 100644
index 0000000..9ae4964
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/double-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Double",
+ "@value" : 100.0
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/duration-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/duration-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/duration-v1d0.json
new file mode 100644
index 0000000..0e15a3c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/duration-v1d0.json
@@ -0,0 +1 @@
+"PT120H"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/duration-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/duration-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/duration-v2d0-no-types.json
new file mode 100644
index 0000000..0e15a3c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/duration-v2d0-no-types.json
@@ -0,0 +1 @@
+"PT120H"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/duration-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/duration-v2d0-partial.json
new file mode 100644
index 0000000..05c0ce9
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/duration-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Duration",
+ "@value" : "PT120H"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v1d0.json
new file mode 100644
index 0000000..0f7f168
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v1d0.json
@@ -0,0 +1,12 @@
+{
+ "id" : 13,
+ "label" : "develops",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 1,
+ "properties" : {
+ "since" : 2009
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v2d0-no-types.json
new file mode 100644
index 0000000..a8e73db
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v2d0-no-types.json
@@ -0,0 +1,14 @@
+{
+ "id" : 13,
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 1,
+ "properties" : {
+ "since" : {
+ "key" : "since",
+ "value" : 2009
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v2d0-partial.json
new file mode 100644
index 0000000..ba1c52e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/edge-v2d0-partial.json
@@ -0,0 +1,32 @@
+{
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 13
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/float-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/float-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/float-v2d0-no-types.json
new file mode 100644
index 0000000..e772e62
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/float-v2d0-no-types.json
@@ -0,0 +1 @@
+100.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/float-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/float-v2d0-partial.json
new file mode 100644
index 0000000..7179aaf
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/float-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Float",
+ "@value" : 100.0
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/inetaddress-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/inetaddress-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/inetaddress-v2d0-no-types.json
new file mode 100644
index 0000000..e34c016
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/inetaddress-v2d0-no-types.json
@@ -0,0 +1 @@
+"localhost"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/inetaddress-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/inetaddress-v2d0-partial.json
new file mode 100644
index 0000000..fba98c0
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/inetaddress-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:InetAddress",
+ "@value" : "localhost"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v1d0.json
new file mode 100644
index 0000000..9d9579c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v1d0.json
@@ -0,0 +1 @@
+"2016-12-13T11:30:29.506Z"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-no-types.json
new file mode 100644
index 0000000..dc5353a
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-no-types.json
@@ -0,0 +1 @@
+"2016-12-13T11:30:37.207Z"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-partial.json
new file mode 100644
index 0000000..b71b3f7
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Instant",
+ "@value" : "2016-12-13T11:30:34.474Z"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/integer-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/integer-v2d0-no-types.json
new file mode 100644
index 0000000..105d7d9
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/integer-v2d0-no-types.json
@@ -0,0 +1 @@
+100
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/integer-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/integer-v2d0-partial.json
new file mode 100644
index 0000000..750ce7a
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/integer-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Int32",
+ "@value" : 100
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/lambda-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/lambda-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/lambda-v2d0-no-types.json
new file mode 100644
index 0000000..c7cabbf
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/lambda-v2d0-no-types.json
@@ -0,0 +1,5 @@
+{
+ "script" : "{ it.get() }",
+ "language" : "gremlin-groovy",
+ "arguments" : 1
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/lambda-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/lambda-v2d0-partial.json
new file mode 100644
index 0000000..5be179b
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/lambda-v2d0-partial.json
@@ -0,0 +1,8 @@
+{
+ "@type" : "g:Lambda",
+ "@value" : {
+ "script" : "{ it.get() }",
+ "language" : "gremlin-groovy",
+ "arguments" : 1
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdate-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdate-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdate-v1d0.json
new file mode 100644
index 0000000..5e4fd2a
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdate-v1d0.json
@@ -0,0 +1 @@
+"2016-01-01"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdate-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdate-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdate-v2d0-no-types.json
new file mode 100644
index 0000000..5e4fd2a
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdate-v2d0-no-types.json
@@ -0,0 +1 @@
+"2016-01-01"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdate-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdate-v2d0-partial.json
new file mode 100644
index 0000000..36fb81d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdate-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:LocalDate",
+ "@value" : "2016-01-01"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdatetime-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdatetime-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdatetime-v1d0.json
new file mode 100644
index 0000000..4be6ada
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdatetime-v1d0.json
@@ -0,0 +1 @@
+"2016-01-01T12:30"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdatetime-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdatetime-v2d0-no-types.json
new file mode 100644
index 0000000..4be6ada
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdatetime-v2d0-no-types.json
@@ -0,0 +1 @@
+"2016-01-01T12:30"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdatetime-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdatetime-v2d0-partial.json
new file mode 100644
index 0000000..2d83668
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localdatetime-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:LocalDateTime",
+ "@value" : "2016-01-01T12:30"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localtime-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localtime-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localtime-v1d0.json
new file mode 100644
index 0000000..720616d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localtime-v1d0.json
@@ -0,0 +1 @@
+"12:30:45"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localtime-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localtime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localtime-v2d0-no-types.json
new file mode 100644
index 0000000..720616d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localtime-v2d0-no-types.json
@@ -0,0 +1 @@
+"12:30:45"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localtime-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localtime-v2d0-partial.json
new file mode 100644
index 0000000..eff65a7
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/localtime-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:LocalTime",
+ "@value" : "12:30:45"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/long-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/long-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/long-v2d0-no-types.json
new file mode 100644
index 0000000..105d7d9
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/long-v2d0-no-types.json
@@ -0,0 +1 @@
+100
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/long-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/long-v2d0-partial.json
new file mode 100644
index 0000000..84b9a23
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/long-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Int64",
+ "@value" : 100
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
new file mode 100644
index 0000000..c21a488
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
@@ -0,0 +1,288 @@
+package org.apache.tinkerpop.gremlin.structure.io.graphson._3_2_3
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.time.*
+import java.nio.file.*
+import org.apache.tinkerpop.gremlin.driver.ser.*
+import org.apache.tinkerpop.gremlin.process.traversal.*
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.*
+import org.apache.tinkerpop.gremlin.structure.*
+import org.apache.tinkerpop.gremlin.structure.io.graphson.*
+import org.apache.tinkerpop.gremlin.driver.message.*
+import org.apache.tinkerpop.gremlin.process.traversal.step.*
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent.Pick
+import org.apache.tinkerpop.gremlin.structure.io.gryo.*
+
+new File("dev-docs/").mkdirs()
+new File("test-case-data/io/").mkdirs()
+
+graph = TinkerFactory.createTheCrew()
+g = graph.traversal()
+
+toJson = { o, type, mapper, comment = "", suffix = "" ->
+ def jsonSample = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(o)
+
+ def fileToWriteTo = new File("test-case-data/io/graphson/" + type.toLowerCase().replace(" ","") + "-" + suffix + ".json")
+ if (fileToWriteTo.exists()) fileToWriteTo.delete()
+ fileToWriteTo.withWriter{ it.write(jsonSample) }
+
+ return type + "\n" +
+ "^".multiply(type.length()) + "\n\n" +
+ (comment.isEmpty() ? "" : comment + "\n\n") +
+ "[source,json]\n" +
+ "----\n" +
+ jsonSample + "\n" +
+ "----\n" +
+ "\n"
+}
+
+toJsonV1d0NoTypes = { o, type, mapper, comment = "" ->
+ toJson(o, type, mapper, comment, "v1d0")
+}
+
+writeSupportedV1Objects = { writer, mapper ->
+ writer.write("Graph Structure\n")
+ writer.write("~~~~~~~~~~~~~~~\n\n")
+ writer.write(toJsonV1d0NoTypes(graph.edges().next(), "Edge", mapper))
+ writer.write(toJsonV1d0NoTypes(g.V().out().out().path().next(), "Path", mapper))
+ writer.write(toJsonV1d0NoTypes(graph.edges().next().properties().next(), "Property", mapper))
+ writer.write(toJsonV1d0NoTypes(new org.apache.tinkerpop.gremlin.structure.util.star.DirectionalStarGraph(org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.of(graph.vertices().next()), Direction.BOTH), "StarGraph", mapper))
+ writer.write(toJsonV1d0NoTypes(graph, "TinkerGraph", mapper, "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`."))
+ writer.write(toJsonV1d0NoTypes(g.V().out().out().tree().next(), "Tree", mapper))
+ writer.write(toJsonV1d0NoTypes(graph.vertices().next(), "Vertex", mapper))
+ writer.write(toJsonV1d0NoTypes(graph.vertices().next().properties().next(), "VertexProperty", mapper))
+
+ writer.write("\n")
+ writer.write("RequestMessage\n")
+ writer.write("~~~~~~~~~~~~~~\n\n")
+ def msg = null
+ msg = RequestMessage.build("authentication").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==").create()
+ writer.write(toJsonV1d0NoTypes(msg, "Authentication Response", mapper, "The following `RequestMessage` is an example of the response that should be made to a SASL-based authentication challenge."))
+ msg = RequestMessage.build("eval").processor("session").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("gremlin", "g.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
+ writer.write(toJsonV1d0NoTypes(msg, "Session Eval", mapper, "The following `RequestMessage` is an example of a simple session request for a script evaluation with parameters."))
+ msg = RequestMessage.build("eval").processor("session").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"], "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
+ writer.write(toJsonV1d0NoTypes(msg, "Session Eval", mapper, "The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
+ msg = RequestMessage.build("close").processor("session").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
+ writer.write(toJsonV1d0NoTypes(msg, "Session Close", mapper, "The following `RequestMessage` is an example of a request to close a session."))
+ msg = RequestMessage.build("eval").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("gremlin", "g.V(x)", "bindings", [x: 1], "language", "gremlin-groovy").create()
+ writer.write(toJsonV1d0NoTypes(msg, "Sessionless Eval", mapper, "The following `RequestMessage` is an example of a simple sessionless request for a script evaluation with parameters."))
+ msg = RequestMessage.build("eval").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"]).create()
+ writer.write(toJsonV1d0NoTypes(msg, "Sessionless Eval", mapper, "The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
+
+ writer.write("\n")
+ writer.write("ResponseMessage\n")
+ writer.write("~~~~~~~~~~~~~~~\n\n")
+ msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
+ code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create()
+ writer.write(toJsonV1d0NoTypes(msg, "Authentication Challenge", mapper, "When authentication is enabled, an initial request to the server will result in an authentication challenge. The typical response message will appear as follows, but handling it could be different dependending on the SASL implementation (e.g. multiple challenges maybe requested in some cases, but no in the default provided by Gremlin Server)."))
+ msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
+ code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.SUCCESS).
+ result(Arrays.asList(graph.vertices().next())).create()
+ writer.write(toJsonV1d0NoTypes(msg, "Standard Result", mapper, "The following `ResponseMessage` is a typical example of the typical successful response Gremlin Server will return when returning results from a script."))
+
+ writer.write("\n")
+ writer.write("Time\n")
+ writer.write("~~~~\n\n")
+ writer.write(toJsonV1d0NoTypes(Duration.ofDays(5), "Duration", mapper, "The following example is a `Duration` of five days."))
+ writer.write(toJsonV1d0NoTypes(Instant.now(), "Instant", mapper))
+ writer.write(toJsonV1d0NoTypes(LocalDate.of(2016, 1, 1), "LocalDate", mapper))
+ writer.write(toJsonV1d0NoTypes(LocalDateTime.of(2016, 1, 1, 12, 30), "LocalDateTime", mapper))
+ writer.write(toJsonV1d0NoTypes(LocalTime.of(12, 30, 45), "LocalTime", mapper))
+ writer.write(toJsonV1d0NoTypes(MonthDay.of(1, 1), "MonthDay", mapper))
+ writer.write(toJsonV1d0NoTypes(OffsetDateTime.now(), "OffsetDateTime", mapper))
+ writer.write(toJsonV1d0NoTypes(OffsetTime.now(), "OffsetTime", mapper))
+ writer.write(toJsonV1d0NoTypes(Period.of(1, 6, 15), "Period", mapper, "The following example is a `Period` of one year, six months and fifteen days."))
+ writer.write(toJsonV1d0NoTypes(Year.of(2016), "Year", mapper, "The following example is of the `Year` \"2016\"."))
+ writer.write(toJsonV1d0NoTypes(YearMonth.of(2016, 6), "YearMonth", mapper, "The following example is a `YearMonth` of \"June 2016\""))
+ writer.write(toJsonV1d0NoTypes(ZonedDateTime.now(), "ZonedDateTime", mapper))
+ writer.write(toJsonV1d0NoTypes(ZoneOffset.ofHoursMinutesSeconds(3, 6, 9), "ZoneOffset", mapper, "The following example is a `ZoneOffset` of three hours, six minutes, and nine seconds."))
+}
+
+mapper = GraphSONMapper.build().
+ addRegistry(TinkerIoRegistry.getInstance()).
+ addCustomModule(new AbstractGraphSONMessageSerializerV1d0.GremlinServerModule()).
+ version(GraphSONVersion.V1_0).create().createMapper()
+
+v1GraphSONFile = new File("dev-docs/out-graphson-1d0.txt")
+if (v1GraphSONFile.exists()) v1GraphSONFile.delete()
+new File("dev-docs/out-graphson-1d0.txt").withWriter { writeSupportedV1Objects(it, mapper) }
+
+toJsonV2d0PartialTypes = { o, type, mapper, comment = "" ->
+ toJson(o, type, mapper, comment, "v2d0-partial")
+}
+
+toJsonV2d0NoTypes = { o, type, mapper, comment = "" ->
+ toJson(o, type, mapper, comment, "v2d0-no-types")
+}
+
+writeSupportedV2Objects = { writer, mapper, toJsonFunction ->
+ writer.write("Core\n")
+ writer.write("~~~~\n\n")
+ writer.write(toJsonFunction(File, "Class", mapper))
+ writer.write(toJsonFunction(new Date(), "Date", mapper))
+ writer.write(toJsonFunction(100.00d, "Double", mapper))
+ writer.write(toJsonFunction(100.00f, "Float", mapper))
+ writer.write(toJsonFunction(100, "Integer", mapper))
+ writer.write(toJsonFunction(100L, "Long", mapper))
+ writer.write(toJsonFunction(new java.sql.Timestamp(System.currentTimeMillis()), "Timestamp", mapper))
+ writer.write(toJsonFunction(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786"), "UUID", mapper))
+
+ writer.write("\n")
+ writer.write("Graph Structure\n")
+ writer.write("~~~~~~~~~~~~~~~\n\n")
+ writer.write(toJsonFunction(graph.edges().next(), "Edge", mapper))
+ writer.write(toJsonFunction(g.V().out().out().path().next(), "Path", mapper))
+ writer.write(toJsonFunction(graph.edges().next().properties().next(), "Property", mapper))
+ writer.write(toJsonFunction(new org.apache.tinkerpop.gremlin.structure.util.star.DirectionalStarGraph(org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.of(graph.vertices().next()), Direction.BOTH), "StarGraph", mapper))
+ writer.write(toJsonFunction(graph, "TinkerGraph", mapper, "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`."))
+ writer.write(toJsonFunction(g.V().out().out().tree().next(), "Tree", mapper))
+ writer.write(toJsonFunction(graph.vertices().next(), "Vertex", mapper))
+ writer.write(toJsonFunction(graph.vertices().next().properties().next(), "VertexProperty", mapper))
+
+ writer.write("\n")
+ writer.write("Graph Process\n")
+ writer.write("~~~~~~~~~~~~~\n\n")
+ writer.write(toJsonFunction(SackFunctions.Barrier.normSack, "Barrier", mapper))
+ writer.write(toJsonFunction(new Bytecode.Binding("x", 1), "Binding", mapper, "A \"Binding\" refers to a `Bytecode.Binding`."))
+ writer.write(toJsonFunction(g.V().hasLabel('person').out().in().tree(), "Bytecode", mapper, "The following `Bytecode` example represents the traversal of `g.V().hasLabel('person').out().in().tree()`. Obviously the serialized `Bytecode` woudl be quite different for the endless variations of commands that could be used together in the Gremlin language."))
+ writer.write(toJsonFunction(VertexProperty.Cardinality.list, "Cardinality", mapper))
+ writer.write(toJsonFunction(Column.keys, "Column", mapper))
+ writer.write(toJsonFunction(Direction.OUT, "Direction", mapper))
+ writer.write(toJsonFunction(Operator.sum, "Operator", mapper))
+ writer.write(toJsonFunction(Order.incr, "Order", mapper))
+ writer.write(toJsonFunction(Pop.all, "Pop", mapper))
+ writer.write(toJsonFunction(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda", mapper))
+ tm = g.V().hasLabel('person').out().out().tree().profile().next()
+ metrics = new org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics(tm.getMetrics(0));
+ metrics.addNested(new org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics(tm.getMetrics(1)));
+ writer.write(toJsonFunction(metrics, "Metrics", mapper))
+ writer.write(toJsonFunction(P.gt(0), "P", mapper))
+ writer.write(toJsonFunction(P.gt(0).and(P.lt(10)), "P and", mapper))
+ writer.write(toJsonFunction(P.gt(0).or(P.within(-1, -10, -100)), "P or", mapper))
+ writer.write(toJsonFunction(Scope.local, "Scope", mapper))
+ writer.write(toJsonFunction(T.label, "T", mapper))
+ writer.write(toJsonFunction(g.V().hasLabel('person').out().out().tree().profile().next(), "TraversalMetrics", mapper))
+ writer.write(toJsonFunction(g.V().hasLabel('person').nextTraverser(), "Traverser", mapper))
+
+ writer.write("\n")
+ writer.write("RequestMessage\n")
+ writer.write("~~~~~~~~~~~~~~\n\n")
+ def msg = null
+ msg = RequestMessage.build("authentication").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==").create()
+ writer.write(toJsonFunction(msg, "Authentication Response", mapper, "The following `RequestMessage` is an example of the response that should be made to a SASL-based authentication challenge."))
+ msg = RequestMessage.build("eval").processor("session").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("gremlin", "g.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
+ writer.write(toJsonFunction(msg, "Session Eval", mapper, "The following `RequestMessage` is an example of a simple session request for a script evaluation with parameters."))
+ msg = RequestMessage.build("eval").processor("session").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"], "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
+ writer.write(toJsonFunction(msg, "Session Eval", mapper, "The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
+ msg = RequestMessage.build("close").processor("session").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
+ writer.write(toJsonFunction(msg, "Session Close", mapper, "The following `RequestMessage` is an example of a request to close a session."))
+ msg = RequestMessage.build("eval").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("gremlin", "g.V(x)", "bindings", [x: 1], "language", "gremlin-groovy").create()
+ writer.write(toJsonFunction(msg, "Sessionless Eval", mapper, "The following `RequestMessage` is an example of a simple sessionless request for a script evaluation with parameters."))
+ msg = RequestMessage.build("eval").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"]).create()
+ writer.write(toJsonFunction(msg, "Sessionless Eval", mapper, "The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
+
+ writer.write("\n")
+ writer.write("ResponseMessage\n")
+ writer.write("~~~~~~~~~~~~~~~\n\n")
+ msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
+ code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create()
+ writer.write(toJsonFunction(msg, "Authentication Challenge", mapper, "When authentication is enabled, an initial request to the server will result in an authentication challenge. The typical response message will appear as follows, but handling it could be different dependending on the SASL implementation (e.g. multiple challenges maybe requested in some cases, but no in the default provided by Gremlin Server)."))
+ msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
+ code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.SUCCESS).
+ result(Arrays.asList(graph.vertices().next())).create()
+ writer.write(toJsonFunction(msg, "Standard Result", mapper, "The following `ResponseMessage` is a typical example of the typical successful response Gremlin Server will return when returning results from a script."))
+
+ writer.write("\n")
+ writer.write("Extended\n")
+ writer.write("~~~~~~~~\n\n")
+ writer.write("""Note that the "extended" types require the addition of the separate `GraphSONXModuleV2d0` module as follows:\n
+[source,java]
+----
+mapper = GraphSONMapper.build().
+ typeInfo(TypeInfo.PARTIAL_TYPES).
+ addCustomModule(GraphSONXModuleV2d0.build().create(false)).
+ version(GraphSONVersion.V2_0).create().createMapper()
+----\n
+""")
+ writer.write(toJsonFunction(new java.math.BigDecimal(new java.math.BigInteger("123456789987654321123456789987654321")), "BigDecimal", mapper))
+ writer.write(toJsonFunction(new java.math.BigInteger("123456789987654321123456789987654321"), "BigInteger", mapper))
+ writer.write(toJsonFunction(new Byte("1"), "Byte", mapper))
+ writer.write(toJsonFunction(java.nio.ByteBuffer.wrap([1,2,3,4,5] as byte[]), "ByteBuffer", mapper))
+ writer.write(toJsonFunction("x".charAt(0), "Char", mapper))
+ writer.write(toJsonFunction(Duration.ofDays(5), "Duration", mapper,"The following example is a `Duration` of five days."))
+ writer.write(toJsonFunction(java.net.InetAddress.getByName("localhost"), "InetAddress", mapper))
+ writer.write(toJsonFunction(Instant.now(), "Instant", mapper))
+ writer.write(toJsonFunction(LocalDate.of(2016, 1, 1), "LocalDate", mapper))
+ writer.write(toJsonFunction(LocalDateTime.of(2016, 1, 1, 12, 30), "LocalDateTime", mapper))
+ writer.write(toJsonFunction(LocalTime.of(12, 30, 45), "LocalTime", mapper))
+ writer.write(toJsonFunction(MonthDay.of(1, 1), "MonthDay", mapper))
+ writer.write(toJsonFunction(OffsetDateTime.now(), "OffsetDateTime", mapper))
+ writer.write(toJsonFunction(OffsetTime.now(), "OffsetTime", mapper))
+ writer.write(toJsonFunction(Period.of(1, 6, 15), "Period", mapper, "The following example is a `Period` of one year, six months and fifteen days."))
+ writer.write(toJsonFunction(new Short("100"), "Short", mapper))
+ writer.write(toJsonFunction(Year.of(2016), "Year", mapper, "The following example is of the `Year` \"2016\"."))
+ writer.write(toJsonFunction(YearMonth.of(2016, 6), "YearMonth", mapper, "The following example is a `YearMonth` of \"June 2016\""))
+ writer.write(toJsonFunction(ZonedDateTime.now(), "ZonedDateTime", mapper))
+ writer.write(toJsonFunction(ZoneOffset.ofHoursMinutesSeconds(3, 6, 9), "ZoneOffset", mapper, "The following example is a `ZoneOffset` of three hours, six minutes, and nine seconds."))
+}
+
+mapper = GraphSONMapper.build().
+ addRegistry(TinkerIoRegistryV2d0.getInstance()).
+ typeInfo(TypeInfo.PARTIAL_TYPES).
+ addCustomModule(GraphSONXModuleV2d0.build().create(false)).
+ addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
+ version(GraphSONVersion.V2_0).create().createMapper()
+
+file = new File("dev-docs/out-graphson-2d0-partial.txt")
+file.withWriter { writeSupportedV2Objects(it, mapper, toJsonV2d0PartialTypes) }
+
+mapper = GraphSONMapper.build().
+ addRegistry(TinkerIoRegistryV2d0.getInstance()).
+ typeInfo(TypeInfo.NO_TYPES).
+ addCustomModule(GraphSONXModuleV2d0.build().create(false)).
+ addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
+ version(GraphSONVersion.V2_0).create().createMapper()
+
+file = new File("dev-docs/out-graphson-2d0-no-type.txt")
+file.withWriter { writeSupportedV2Objects(it, mapper, toJsonV2d0NoTypes) }
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-no-types.json
new file mode 100644
index 0000000..570b31d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-no-types.json
@@ -0,0 +1,24 @@
+{
+ "dur" : 0.079689,
+ "counts" : {
+ "traverserCount" : 4,
+ "elementCount" : 4
+ },
+ "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
+ "annotations" : {
+ "percentDur" : 11.133713822660305
+ },
+ "id" : "7.0.0()",
+ "metrics" : [ {
+ "dur" : 0.174724,
+ "counts" : {
+ "traverserCount" : 13,
+ "elementCount" : 13
+ },
+ "name" : "VertexStep(OUT,vertex)",
+ "annotations" : {
+ "percentDur" : 24.411487331381988
+ },
+ "id" : "2.0.0()"
+ } ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-partial.json
new file mode 100644
index 0000000..f123b72
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-partial.json
@@ -0,0 +1,54 @@
+{
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 0.164766
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ }
+ },
+ "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 15.940165606833242
+ }
+ },
+ "id" : "7.0.0()",
+ "metrics" : [ {
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 0.275414
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 13
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 13
+ }
+ },
+ "name" : "VertexStep(OUT,vertex)",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 26.64472506730982
+ }
+ },
+ "id" : "2.0.0()"
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/monthday-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/monthday-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/monthday-v1d0.json
new file mode 100644
index 0000000..09813a6
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/monthday-v1d0.json
@@ -0,0 +1 @@
+"--01-01"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/monthday-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/monthday-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/monthday-v2d0-no-types.json
new file mode 100644
index 0000000..09813a6
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/monthday-v2d0-no-types.json
@@ -0,0 +1 @@
+"--01-01"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/monthday-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/monthday-v2d0-partial.json
new file mode 100644
index 0000000..5da5914
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/monthday-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:MonthDay",
+ "@value" : "--01-01"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v1d0.json
new file mode 100644
index 0000000..cd60d26
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v1d0.json
@@ -0,0 +1 @@
+"2016-12-13T06:30:29.545-05:00"
\ No newline at end of file
[08/47] tinkerpop git commit: TINKERPOP-1490 Remove some dead tests
from ignores.
Posted by sp...@apache.org.
TINKERPOP-1490 Remove some dead tests from ignores.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/42e85883
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/42e85883
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/42e85883
Branch: refs/heads/TINKERPOP-1130
Commit: 42e858832c294e4cd38e15bdc7c43960217ae094
Parents: ee6a358
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Nov 11 13:39:40 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 16 10:00:40 2016 -0500
----------------------------------------------------------------------
.../org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java | 1 -
.../process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java | 1 -
.../process/jsr223/TinkerGraphJavaTranslatorProvider.java | 1 -
3 files changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/42e85883/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
----------------------------------------------------------------------
diff --git a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
index 5dd9c28..9e03884 100644
--- a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
+++ b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
@@ -69,7 +69,6 @@ public class PythonProvider extends AbstractGraphProvider {
"shouldNeverPropagateANullValuedTraverser",
"shouldHidePartitionKeyForValues",
"g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
- "shouldUsePromiseAndControlTransactionsIfAvailable",
//
ProgramTest.Traversals.class.getCanonicalName(),
TraversalInterruptionTest.class.getCanonicalName(),
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/42e85883/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
index a595c34..dd118d7 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
@@ -51,7 +51,6 @@ public class TinkerGraphGroovyTranslatorProvider extends TinkerGraphProvider {
"g_VX1X_out_injectXv2X_name",
"shouldNeverPropagateANoBulkTraverser",
"shouldNeverPropagateANullValuedTraverser",
- "shouldUsePromiseAndControlTransactionsIfAvailable",
GraphComputerTest.class.getCanonicalName(),
ProgramTest.Traversals.class.getCanonicalName(),
TraversalInterruptionTest.class.getCanonicalName(),
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/42e85883/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java
index 15a6c0b..f40a8c7 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java
@@ -49,7 +49,6 @@ public class TinkerGraphJavaTranslatorProvider extends TinkerGraphProvider {
TraversalInterruptionComputerTest.class.getCanonicalName(),
"shouldNeverPropagateANoBulkTraverser",
"shouldNeverPropagateANullValuedTraverser",
- "shouldUsePromiseAndControlTransactionsIfAvailable",
ElementIdStrategyProcessTest.class.getCanonicalName(),
EventStrategyProcessTest.class.getCanonicalName(),
ProgramTest.Traversals.class.getCanonicalName()));
[25/47] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/104b8d7a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/104b8d7a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/104b8d7a
Branch: refs/heads/TINKERPOP-1130
Commit: 104b8d7a371bc55723afa84193a57f37d7671f29
Parents: f7d5fc7 5f132eb
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Dec 20 13:24:09 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 20 13:24:09 2016 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[32/47] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bb464123
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bb464123
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bb464123
Branch: refs/heads/TINKERPOP-1130
Commit: bb464123aeb374561a95290934ac11c6ea8c2fa1
Parents: 863fbe8 34d9e58
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Dec 20 15:23:40 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 20 15:23:40 2016 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[29/47] tinkerpop git commit: Changed Gryo registration ids to avoid
conflict in 3.3.x
Posted by sp...@apache.org.
Changed Gryo registration ids to avoid conflict in 3.3.x
Ensures better compatibility if we jump to 161 as the next available Gryo type registration id as 3.3.0 has already advanced the identifiers. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/73b2d65b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/73b2d65b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/73b2d65b
Branch: refs/heads/TINKERPOP-1130
Commit: 73b2d65bd11ffe5dc01e0887da7dae78fc7a1f82
Parents: 651b0f3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Dec 20 14:33:21 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 20 14:33:21 2016 -0500
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/73b2d65b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
index 60ed74e..cece932 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
@@ -286,9 +286,9 @@ public final class GryoMapper implements Mapper<Kryo> {
add(GryoTypeReg.of(VertexTerminator.class, 13));
add(GryoTypeReg.of(AbstractMap.SimpleEntry.class, 120));
add(GryoTypeReg.of(AbstractMap.SimpleImmutableEntry.class, 121));
- add(GryoTypeReg.of(java.sql.Timestamp.class, 138));
- add(GryoTypeReg.of(InetAddress.class, 139, new UtilSerializers.InetAddressSerializer()));
- add(GryoTypeReg.of(ByteBuffer.class, 140, new UtilSerializers.ByteBufferSerializer())); // ***LAST ID***
+ add(GryoTypeReg.of(java.sql.Timestamp.class, 161));
+ add(GryoTypeReg.of(InetAddress.class, 162, new UtilSerializers.InetAddressSerializer()));
+ add(GryoTypeReg.of(ByteBuffer.class, 163, new UtilSerializers.ByteBufferSerializer())); // ***LAST ID***
add(GryoTypeReg.of(ReferenceEdge.class, 81));
add(GryoTypeReg.of(ReferenceVertexProperty.class, 82));
[35/47] tinkerpop git commit: TINKERPOP-1130 Structured the IO
compatibility tests
Posted by sp...@apache.org.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-partial.json
new file mode 100644
index 0000000..761b71a
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-partial.json
@@ -0,0 +1,21 @@
+{
+ "requestId" : {
+ "@type" : "g:UUID",
+ "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
+ },
+ "op" : "eval",
+ "processor" : "",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "bindings" : {
+ "x" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v2d0-no-types.json
new file mode 100644
index 0000000..105d7d9
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v2d0-no-types.json
@@ -0,0 +1 @@
+100
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v2d0-partial.json
new file mode 100644
index 0000000..c68f5cd
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Int16",
+ "@value" : 100
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v1d0.json
new file mode 100644
index 0000000..9b93727
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v1d0.json
@@ -0,0 +1,50 @@
+{
+ "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "status" : {
+ "message" : "",
+ "code" : 200,
+ "attributes" : { }
+ },
+ "result" : {
+ "data" : [ {
+ "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
+ }
+ } ]
+ }
+ } ],
+ "meta" : { }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-no-types.json
new file mode 100644
index 0000000..6f65698
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-no-types.json
@@ -0,0 +1,59 @@
+{
+ "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "status" : {
+ "message" : "",
+ "code" : 200,
+ "attributes" : { }
+ },
+ "result" : {
+ "data" : [ {
+ "id" : 1,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 0,
+ "value" : "marko",
+ "vertex" : 1,
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 6,
+ "value" : "san diego",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1997,
+ "endTime" : 2001
+ }
+ }, {
+ "id" : 7,
+ "value" : "santa cruz",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2001,
+ "endTime" : 2004
+ }
+ }, {
+ "id" : 8,
+ "value" : "brussels",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2004,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 9,
+ "value" : "santa fe",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2005
+ }
+ } ]
+ }
+ } ],
+ "meta" : { }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-partial.json
new file mode 100644
index 0000000..e4d6ce0
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-partial.json
@@ -0,0 +1,131 @@
+{
+ "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "status" : {
+ "message" : "",
+ "code" : 200,
+ "attributes" : { }
+ },
+ "result" : {
+ "data" : [ {
+ "@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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "name"
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }
+ } ]
+ }
+ }
+ } ],
+ "meta" : { }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v1d0.json
new file mode 100644
index 0000000..e4935e2
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v1d0.json
@@ -0,0 +1,41 @@
+{
+ "starVertex" : {
+ "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
+ }
+ } ]
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-no-types.json
new file mode 100644
index 0000000..eb87f72
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-no-types.json
@@ -0,0 +1,50 @@
+{
+ "starVertex" : {
+ "id" : 1,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 0,
+ "value" : "marko",
+ "vertex" : 1,
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 6,
+ "value" : "san diego",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1997,
+ "endTime" : 2001
+ }
+ }, {
+ "id" : 7,
+ "value" : "santa cruz",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2001,
+ "endTime" : 2004
+ }
+ }, {
+ "id" : 8,
+ "value" : "brussels",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2004,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 9,
+ "value" : "santa fe",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2005
+ }
+ } ]
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-partial.json
new file mode 100644
index 0000000..d7bb548
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-partial.json
@@ -0,0 +1,122 @@
+{
+ "starVertex" : {
+ "@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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "name"
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }
+ } ]
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v2d0-no-types.json
new file mode 100644
index 0000000..bad8612
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v2d0-no-types.json
@@ -0,0 +1 @@
+"label"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v2d0-partial.json
new file mode 100644
index 0000000..9693983
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:T",
+ "@value" : "label"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-no-types.json
new file mode 100644
index 0000000..87c4e8e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-no-types.json
@@ -0,0 +1 @@
+1481733559207
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-partial.json
new file mode 100644
index 0000000..428385b
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Timestamp",
+ "@value" : 1481733559207
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v1d0.json
new file mode 100644
index 0000000..13719f6
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v1d0.json
@@ -0,0 +1,313 @@
+{
+ "vertices" : [ {
+ "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
+ }
+ } ]
+ }
+ }, {
+ "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
+ }
+ } ]
+ }
+ }, {
+ "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
+ }
+ } ]
+ }
+ }, {
+ "id" : 9,
+ "label" : "person",
+ "type" : "vertex",
+ "properties" : {
+ "name" : [ {
+ "id" : 3,
+ "value" : "daniel"
+ } ],
+ "location" : [ {
+ "id" : 17,
+ "value" : "spremberg",
+ "properties" : {
+ "startTime" : 1982,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 18,
+ "value" : "kaiserslautern",
+ "properties" : {
+ "startTime" : 2005,
+ "endTime" : 2009
+ }
+ }, {
+ "id" : 19,
+ "value" : "aachen",
+ "properties" : {
+ "startTime" : 2009
+ }
+ } ]
+ }
+ }, {
+ "id" : 10,
+ "label" : "software",
+ "type" : "vertex",
+ "properties" : {
+ "name" : [ {
+ "id" : 4,
+ "value" : "gremlin"
+ } ]
+ }
+ }, {
+ "id" : 11,
+ "label" : "software",
+ "type" : "vertex",
+ "properties" : {
+ "name" : [ {
+ "id" : 5,
+ "value" : "tinkergraph"
+ } ]
+ }
+ } ],
+ "edges" : [ {
+ "id" : 13,
+ "label" : "develops",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 1,
+ "properties" : {
+ "since" : 2009
+ }
+ }, {
+ "id" : 14,
+ "label" : "develops",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 1,
+ "properties" : {
+ "since" : 2010
+ }
+ }, {
+ "id" : 15,
+ "label" : "uses",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 1,
+ "properties" : {
+ "skill" : 4
+ }
+ }, {
+ "id" : 16,
+ "label" : "uses",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 1,
+ "properties" : {
+ "skill" : 5
+ }
+ }, {
+ "id" : 17,
+ "label" : "develops",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 7,
+ "properties" : {
+ "since" : 2010
+ }
+ }, {
+ "id" : 18,
+ "label" : "develops",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 7,
+ "properties" : {
+ "since" : 2011
+ }
+ }, {
+ "id" : 19,
+ "label" : "uses",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 7,
+ "properties" : {
+ "skill" : 5
+ }
+ }, {
+ "id" : 20,
+ "label" : "uses",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 7,
+ "properties" : {
+ "skill" : 4
+ }
+ }, {
+ "id" : 21,
+ "label" : "develops",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 8,
+ "properties" : {
+ "since" : 2012
+ }
+ }, {
+ "id" : 22,
+ "label" : "uses",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 8,
+ "properties" : {
+ "skill" : 3
+ }
+ }, {
+ "id" : 23,
+ "label" : "uses",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 8,
+ "properties" : {
+ "skill" : 3
+ }
+ }, {
+ "id" : 24,
+ "label" : "uses",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 9,
+ "properties" : {
+ "skill" : 5
+ }
+ }, {
+ "id" : 25,
+ "label" : "uses",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 9,
+ "properties" : {
+ "skill" : 3
+ }
+ }, {
+ "id" : 26,
+ "label" : "traverses",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "software",
+ "inV" : 11,
+ "outV" : 10
+ } ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-no-types.json
new file mode 100644
index 0000000..8b9376a
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-no-types.json
@@ -0,0 +1,333 @@
+{
+ "vertices" : [ {
+ "id" : 1,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 0,
+ "value" : "marko",
+ "vertex" : 1,
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 6,
+ "value" : "san diego",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1997,
+ "endTime" : 2001
+ }
+ }, {
+ "id" : 7,
+ "value" : "santa cruz",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2001,
+ "endTime" : 2004
+ }
+ }, {
+ "id" : 8,
+ "value" : "brussels",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2004,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 9,
+ "value" : "santa fe",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2005
+ }
+ } ]
+ }
+ }, {
+ "id" : 7,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 1,
+ "value" : "stephen",
+ "vertex" : 7,
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 10,
+ "value" : "centreville",
+ "vertex" : 7,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1990,
+ "endTime" : 2000
+ }
+ }, {
+ "id" : 11,
+ "value" : "dulles",
+ "vertex" : 7,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2000,
+ "endTime" : 2006
+ }
+ }, {
+ "id" : 12,
+ "value" : "purcellville",
+ "vertex" : 7,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2006
+ }
+ } ]
+ }
+ }, {
+ "id" : 8,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 2,
+ "value" : "matthias",
+ "vertex" : 8,
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 13,
+ "value" : "bremen",
+ "vertex" : 8,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2004,
+ "endTime" : 2007
+ }
+ }, {
+ "id" : 14,
+ "value" : "baltimore",
+ "vertex" : 8,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2007,
+ "endTime" : 2011
+ }
+ }, {
+ "id" : 15,
+ "value" : "oakland",
+ "vertex" : 8,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2011,
+ "endTime" : 2014
+ }
+ }, {
+ "id" : 16,
+ "value" : "seattle",
+ "vertex" : 8,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2014
+ }
+ } ]
+ }
+ }, {
+ "id" : 9,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 3,
+ "value" : "daniel",
+ "vertex" : 9,
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 17,
+ "value" : "spremberg",
+ "vertex" : 9,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1982,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 18,
+ "value" : "kaiserslautern",
+ "vertex" : 9,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2005,
+ "endTime" : 2009
+ }
+ }, {
+ "id" : 19,
+ "value" : "aachen",
+ "vertex" : 9,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2009
+ }
+ } ]
+ }
+ }, {
+ "id" : 10,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 4,
+ "value" : "gremlin",
+ "vertex" : 10,
+ "label" : "name"
+ } ]
+ }
+ }, {
+ "id" : 11,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 5,
+ "value" : "tinkergraph",
+ "vertex" : 11,
+ "label" : "name"
+ } ]
+ }
+ } ],
+ "edges" : [ {
+ "id" : 13,
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 1,
+ "properties" : {
+ "since" : 2009
+ }
+ }, {
+ "id" : 14,
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 1,
+ "properties" : {
+ "since" : 2010
+ }
+ }, {
+ "id" : 15,
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 1,
+ "properties" : {
+ "skill" : 4
+ }
+ }, {
+ "id" : 16,
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 1,
+ "properties" : {
+ "skill" : 5
+ }
+ }, {
+ "id" : 17,
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 7,
+ "properties" : {
+ "since" : 2010
+ }
+ }, {
+ "id" : 18,
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 7,
+ "properties" : {
+ "since" : 2011
+ }
+ }, {
+ "id" : 19,
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 7,
+ "properties" : {
+ "skill" : 5
+ }
+ }, {
+ "id" : 20,
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 7,
+ "properties" : {
+ "skill" : 4
+ }
+ }, {
+ "id" : 21,
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 8,
+ "properties" : {
+ "since" : 2012
+ }
+ }, {
+ "id" : 22,
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 8,
+ "properties" : {
+ "skill" : 3
+ }
+ }, {
+ "id" : 23,
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 8,
+ "properties" : {
+ "skill" : 3
+ }
+ }, {
+ "id" : 24,
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 9,
+ "properties" : {
+ "skill" : 5
+ }
+ }, {
+ "id" : 25,
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 9,
+ "properties" : {
+ "skill" : 3
+ }
+ }, {
+ "id" : 26,
+ "label" : "traverses",
+ "inVLabel" : "software",
+ "outVLabel" : "software",
+ "inV" : 11,
+ "outV" : 10
+ } ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-partial.json
new file mode 100644
index 0000000..f2df53e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-partial.json
@@ -0,0 +1,831 @@
+{
+ "@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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "name"
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "label" : "name"
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 10
+ },
+ "value" : "centreville",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2000
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2006
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 12
+ },
+ "value" : "purcellville",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2006
+ }
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 2
+ },
+ "value" : "matthias",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "label" : "name"
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 13
+ },
+ "value" : "bremen",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2007
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 14
+ },
+ "value" : "baltimore",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2007
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2011
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 15
+ },
+ "value" : "oakland",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2011
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2014
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 16
+ },
+ "value" : "seattle",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2014
+ }
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 3
+ },
+ "value" : "daniel",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "label" : "name"
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 17
+ },
+ "value" : "spremberg",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1982
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 18
+ },
+ "value" : "kaiserslautern",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 19
+ },
+ "value" : "aachen",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ } ],
+ "edges" : [ {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 13
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 14
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Int32",
+ "@value" : 2010
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 15
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 4
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 16
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 5
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 17
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Int32",
+ "@value" : 2010
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 18
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Int32",
+ "@value" : 2011
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 19
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 5
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 20
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 4
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 21
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Int32",
+ "@value" : 2012
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 22
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 3
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 23
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 3
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 24
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 5
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 25
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 3
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 26
+ },
+ "label" : "traverses",
+ "inVLabel" : "software",
+ "outVLabel" : "software",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ }
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json
new file mode 100644
index 0000000..6e6f699
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json
@@ -0,0 +1,48 @@
+{
+ "dur" : 0.620654,
+ "metrics" : [ {
+ "dur" : 0.076772,
+ "counts" : {
+ "traverserCount" : 4,
+ "elementCount" : 4
+ },
+ "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
+ "annotations" : {
+ "percentDur" : 12.369532783160988
+ },
+ "id" : "7.0.0()"
+ }, {
+ "dur" : 0.189752,
+ "counts" : {
+ "traverserCount" : 13,
+ "elementCount" : 13
+ },
+ "name" : "VertexStep(OUT,vertex)",
+ "annotations" : {
+ "percentDur" : 30.572911799488928
+ },
+ "id" : "2.0.0()"
+ }, {
+ "dur" : 0.172385,
+ "counts" : {
+ "traverserCount" : 7,
+ "elementCount" : 7
+ },
+ "name" : "VertexStep(OUT,vertex)",
+ "annotations" : {
+ "percentDur" : 27.77473439307569
+ },
+ "id" : "3.0.0()"
+ }, {
+ "dur" : 0.181745,
+ "counts" : {
+ "traverserCount" : 1,
+ "elementCount" : 1
+ },
+ "name" : "TreeStep",
+ "annotations" : {
+ "percentDur" : 29.282821024274394
+ },
+ "id" : "4.0.0()"
+ } ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json
new file mode 100644
index 0000000..097b576
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json
@@ -0,0 +1,114 @@
+{
+ "@type" : "g:TraversalMetrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 0.620654
+ },
+ "metrics" : [ {
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 0.076772
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ }
+ },
+ "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 12.369532783160988
+ }
+ },
+ "id" : "7.0.0()"
+ }
+ }, {
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 0.189752
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 13
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 13
+ }
+ },
+ "name" : "VertexStep(OUT,vertex)",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 30.572911799488928
+ }
+ },
+ "id" : "2.0.0()"
+ }
+ }, {
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 0.172385
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ }
+ },
+ "name" : "VertexStep(OUT,vertex)",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 27.77473439307569
+ }
+ },
+ "id" : "3.0.0()"
+ }
+ }, {
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 0.181745
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 1
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 1
+ }
+ },
+ "name" : "TreeStep",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 29.282821024274394
+ }
+ },
+ "id" : "4.0.0()"
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-no-types.json
new file mode 100644
index 0000000..f254df0
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-no-types.json
@@ -0,0 +1,51 @@
+{
+ "bulk" : 1,
+ "value" : {
+ "id" : 1,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 0,
+ "value" : "marko",
+ "vertex" : 1,
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 6,
+ "value" : "san diego",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1997,
+ "endTime" : 2001
+ }
+ }, {
+ "id" : 7,
+ "value" : "santa cruz",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2001,
+ "endTime" : 2004
+ }
+ }, {
+ "id" : 8,
+ "value" : "brussels",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2004,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 9,
+ "value" : "santa fe",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2005
+ }
+ } ]
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-partial.json
new file mode 100644
index 0000000..d7bbfeb
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-partial.json
@@ -0,0 +1,129 @@
+{
+ "@type" : "g:Traverser",
+ "@value" : {
+ "bulk" : {
+ "@type" : "g:Int64",
+ "@value" : 1
+ },
+ "value" : {
+ "@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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "name"
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }
+ } ]
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v1d0.json
new file mode 100644
index 0000000..db030dd
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/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"
+ } ]
+ }
+ },
+ "value" : {
+ "11" : {
+ "key" : {
+ "id" : 11,
+ "label" : "software",
+ "type" : "vertex",
+ "properties" : {
+ "name" : [ {
+ "id" : 5,
+ "value" : "tinkergraph"
+ } ]
+ }
+ },
+ "value" : { }
+ }
+ }
+ }
+ }
+ },
+ "9" : {
+ "key" : {
+ "id" : 9,
+ "label" : "person",
+ "type" : "vertex",
+ "properties" : {
+ "name" : [ {
+ "id" : 3,
+ "value" : "daniel"
+ } ],
+ "location" : [ {
+ "id" : 17,
+ "value" : "spremberg",
+ "properties" : {
+ "startTime" : 1982,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 18,
+ "value" : "kaiserslautern",
+ "properties" : {
+ "startTime" : 2005,
+ "endTime" : 2009
+ }
+ }, {
+ "id" : 19,
+ "value" : "aachen",
+ "properties" : {
+ "startTime" : 2009
+ }
+ } ]
+ }
+ },
+ "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" : { }
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-no-types.json
new file mode 100644
index 0000000..17b9648
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-no-types.json
@@ -0,0 +1,295 @@
+[ {
+ "key" : {
+ "id" : 1,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 0,
+ "value" : "marko",
+ "vertex" : 1,
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 6,
+ "value" : "san diego",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1997,
+ "endTime" : 2001
+ }
+ }, {
+ "id" : 7,
+ "value" : "santa cruz",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2001,
+ "endTime" : 2004
+ }
+ }, {
+ "id" : 8,
+ "value" : "brussels",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2004,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 9,
+ "value" : "santa fe",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2005
+ }
+ } ]
+ }
+ },
+ "value" : [ {
+ "key" : {
+ "id" : 10,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 4,
+ "value" : "gremlin",
+ "vertex" : 10,
+ "label" : "name"
+ } ]
+ }
+ },
+ "value" : [ {
+ "key" : {
+ "id" : 11,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 5,
+ "value" : "tinkergraph",
+ "vertex" : 11,
+ "label" : "name"
+ } ]
+ }
+ },
+ "value" : [ ]
+ } ]
+ } ]
+}, {
+ "key" : {
+ "id" : 7,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 1,
+ "value" : "stephen",
+ "vertex" : 7,
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 10,
+ "value" : "centreville",
+ "vertex" : 7,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1990,
+ "endTime" : 2000
+ }
+ }, {
+ "id" : 11,
+ "value" : "dulles",
+ "vertex" : 7,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2000,
+ "endTime" : 2006
+ }
+ }, {
+ "id" : 12,
+ "value" : "purcellville",
+ "vertex" : 7,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2006
+ }
+ } ]
+ }
+ },
+ "value" : [ {
+ "key" : {
+ "id" : 10,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 4,
+ "value" : "gremlin",
+ "vertex" : 10,
+ "label" : "name"
+ } ]
+ }
+ },
+ "value" : [ {
+ "key" : {
+ "id" : 11,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 5,
+ "value" : "tinkergraph",
+ "vertex" : 11,
+ "label" : "name"
+ } ]
+ }
+ },
+ "value" : [ ]
+ } ]
+ } ]
+}, {
+ "key" : {
+ "id" : 8,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 2,
+ "value" : "matthias",
+ "vertex" : 8,
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 13,
+ "value" : "bremen",
+ "vertex" : 8,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2004,
+ "endTime" : 2007
+ }
+ }, {
+ "id" : 14,
+ "value" : "baltimore",
+ "vertex" : 8,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2007,
+ "endTime" : 2011
+ }
+ }, {
+ "id" : 15,
+ "value" : "oakland",
+ "vertex" : 8,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2011,
+ "endTime" : 2014
+ }
+ }, {
+ "id" : 16,
+ "value" : "seattle",
+ "vertex" : 8,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2014
+ }
+ } ]
+ }
+ },
+ "value" : [ {
+ "key" : {
+ "id" : 10,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 4,
+ "value" : "gremlin",
+ "vertex" : 10,
+ "label" : "name"
+ } ]
+ }
+ },
+ "value" : [ {
+ "key" : {
+ "id" : 11,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 5,
+ "value" : "tinkergraph",
+ "vertex" : 11,
+ "label" : "name"
+ } ]
+ }
+ },
+ "value" : [ ]
+ } ]
+ } ]
+}, {
+ "key" : {
+ "id" : 9,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 3,
+ "value" : "daniel",
+ "vertex" : 9,
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 17,
+ "value" : "spremberg",
+ "vertex" : 9,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1982,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 18,
+ "value" : "kaiserslautern",
+ "vertex" : 9,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2005,
+ "endTime" : 2009
+ }
+ }, {
+ "id" : 19,
+ "value" : "aachen",
+ "vertex" : 9,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2009
+ }
+ } ]
+ }
+ },
+ "value" : [ {
+ "key" : {
+ "id" : 10,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 4,
+ "value" : "gremlin",
+ "vertex" : 10,
+ "label" : "name"
+ } ]
+ }
+ },
+ "value" : [ {
+ "key" : {
+ "id" : 11,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 5,
+ "value" : "tinkergraph",
+ "vertex" : 11,
+ "label" : "name"
+ } ]
+ }
+ },
+ "value" : [ ]
+ } ]
+ } ]
+} ]
\ No newline at end of file
[40/47] tinkerpop git commit: TINKERPOP-1130 Structured the IO
compatibility tests
Posted by sp...@apache.org.
TINKERPOP-1130 Structured the IO compatibility tests
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/87cbb3ef
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/87cbb3ef
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/87cbb3ef
Branch: refs/heads/TINKERPOP-1130
Commit: 87cbb3ef751d60e78079da0e0ce12b513b10f4b1
Parents: bb46412
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Dec 14 11:50:38 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 20 15:24:52 2016 -0500
----------------------------------------------------------------------
gremlin-tools/gremlin-io-test/pom.xml | 378 +++++++++
.../gremlin/structure/io/Compatibility.java | 28 +
.../tinkerpop/gremlin/structure/io/Model.java | 390 +++++++++
.../io/graphson/GraphSONCompatibility.java | 59 ++
.../structure/io/gryo/GryoCompatibility.java | 55 ++
.../structure/io/AbstractCompatibilityTest.java | 36 +
.../io/AbstractTypedCompatibilityTest.java | 84 ++
.../io/AbstractUntypedCompatibilityTest.java | 63 ++
.../GraphSONTypedCompatibilityTest.java | 70 ++
.../GraphSONUntypedCompatibilityTest.java | 82 ++
.../io/gryo/GryoCompatibilityTest.java | 75 ++
.../src/test/resources/log4j-silent.properties | 23 +
.../src/test/resources/log4j-test.properties | 21 +
.../_3_2_3/authenticationchallenge-v1d0.json | 12 +
.../authenticationchallenge-v2d0-no-types.json | 12 +
.../authenticationchallenge-v2d0-partial.json | 12 +
.../_3_2_3/authenticationresponse-v1d0.json | 9 +
.../authenticationresponse-v2d0-no-types.json | 9 +
.../authenticationresponse-v2d0-partial.json | 12 +
.../graphson/_3_2_3/barrier-v2d0-no-types.json | 1 +
.../graphson/_3_2_3/barrier-v2d0-partial.json | 4 +
.../_3_2_3/bigdecimal-v2d0-no-types.json | 1 +
.../_3_2_3/bigdecimal-v2d0-partial.json | 4 +
.../_3_2_3/biginteger-v2d0-no-types.json | 1 +
.../_3_2_3/biginteger-v2d0-partial.json | 4 +
.../graphson/_3_2_3/binding-v2d0-no-types.json | 4 +
.../graphson/_3_2_3/binding-v2d0-partial.json | 10 +
.../io/graphson/_3_2_3/byte-v2d0-no-types.json | 1 +
.../io/graphson/_3_2_3/byte-v2d0-partial.json | 4 +
.../_3_2_3/bytebuffer-v2d0-no-types.json | 1 +
.../_3_2_3/bytebuffer-v2d0-partial.json | 4 +
.../graphson/_3_2_3/bytecode-v2d0-no-types.json | 6 +
.../graphson/_3_2_3/bytecode-v2d0-partial.json | 15 +
.../_3_2_3/cardinality-v2d0-no-types.json | 1 +
.../_3_2_3/cardinality-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/char-v2d0-no-types.json | 1 +
.../io/graphson/_3_2_3/char-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/class-v2d0-no-types.json | 1 +
.../io/graphson/_3_2_3/class-v2d0-partial.json | 4 +
.../graphson/_3_2_3/column-v2d0-no-types.json | 1 +
.../io/graphson/_3_2_3/column-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/date-v2d0-no-types.json | 1 +
.../io/graphson/_3_2_3/date-v2d0-partial.json | 4 +
.../_3_2_3/direction-v2d0-no-types.json | 1 +
.../graphson/_3_2_3/direction-v2d0-partial.json | 4 +
.../graphson/_3_2_3/double-v2d0-no-types.json | 1 +
.../io/graphson/_3_2_3/double-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/duration-v1d0.json | 1 +
.../graphson/_3_2_3/duration-v2d0-no-types.json | 1 +
.../graphson/_3_2_3/duration-v2d0-partial.json | 4 +
.../structure/io/graphson/_3_2_3/edge-v1d0.json | 12 +
.../io/graphson/_3_2_3/edge-v2d0-no-types.json | 14 +
.../io/graphson/_3_2_3/edge-v2d0-partial.json | 32 +
.../io/graphson/_3_2_3/float-v2d0-no-types.json | 1 +
.../io/graphson/_3_2_3/float-v2d0-partial.json | 4 +
.../_3_2_3/inetaddress-v2d0-no-types.json | 1 +
.../_3_2_3/inetaddress-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/instant-v1d0.json | 1 +
.../graphson/_3_2_3/instant-v2d0-no-types.json | 1 +
.../graphson/_3_2_3/instant-v2d0-partial.json | 4 +
.../graphson/_3_2_3/integer-v2d0-no-types.json | 1 +
.../graphson/_3_2_3/integer-v2d0-partial.json | 4 +
.../graphson/_3_2_3/lambda-v2d0-no-types.json | 5 +
.../io/graphson/_3_2_3/lambda-v2d0-partial.json | 8 +
.../io/graphson/_3_2_3/localdate-v1d0.json | 1 +
.../_3_2_3/localdate-v2d0-no-types.json | 1 +
.../graphson/_3_2_3/localdate-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/localdatetime-v1d0.json | 1 +
.../_3_2_3/localdatetime-v2d0-no-types.json | 1 +
.../_3_2_3/localdatetime-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/localtime-v1d0.json | 1 +
.../_3_2_3/localtime-v2d0-no-types.json | 1 +
.../graphson/_3_2_3/localtime-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/long-v2d0-no-types.json | 1 +
.../io/graphson/_3_2_3/long-v2d0-partial.json | 4 +
.../_3_2_3/manual-graphson-generator.groovy | 288 +++++++
.../graphson/_3_2_3/metrics-v2d0-no-types.json | 24 +
.../graphson/_3_2_3/metrics-v2d0-partial.json | 54 ++
.../io/graphson/_3_2_3/monthday-v1d0.json | 1 +
.../graphson/_3_2_3/monthday-v2d0-no-types.json | 1 +
.../graphson/_3_2_3/monthday-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/offsetdatetime-v1d0.json | 1 +
.../_3_2_3/offsetdatetime-v2d0-no-types.json | 1 +
.../_3_2_3/offsetdatetime-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/offsettime-v1d0.json | 1 +
.../_3_2_3/offsettime-v2d0-no-types.json | 1 +
.../_3_2_3/offsettime-v2d0-partial.json | 4 +
.../graphson/_3_2_3/operator-v2d0-no-types.json | 1 +
.../graphson/_3_2_3/operator-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/order-v2d0-no-types.json | 1 +
.../io/graphson/_3_2_3/order-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/p-v2d0-no-types.json | 4 +
.../io/graphson/_3_2_3/p-v2d0-partial.json | 10 +
.../io/graphson/_3_2_3/pand-v2d0-no-types.json | 10 +
.../io/graphson/_3_2_3/pand-v2d0-partial.json | 25 +
.../structure/io/graphson/_3_2_3/path-v1d0.json | 62 ++
.../io/graphson/_3_2_3/path-v2d0-no-types.json | 66 ++
.../io/graphson/_3_2_3/path-v2d0-partial.json | 150 ++++
.../io/graphson/_3_2_3/period-v1d0.json | 1 +
.../graphson/_3_2_3/period-v2d0-no-types.json | 1 +
.../io/graphson/_3_2_3/period-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/pop-v2d0-no-types.json | 1 +
.../io/graphson/_3_2_3/pop-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/por-v2d0-no-types.json | 10 +
.../io/graphson/_3_2_3/por-v2d0-partial.json | 31 +
.../io/graphson/_3_2_3/property-v1d0.json | 4 +
.../graphson/_3_2_3/property-v2d0-no-types.json | 4 +
.../graphson/_3_2_3/property-v2d0-partial.json | 10 +
.../io/graphson/_3_2_3/scope-v2d0-no-types.json | 1 +
.../io/graphson/_3_2_3/scope-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/sessionclose-v1d0.json | 8 +
.../_3_2_3/sessionclose-v2d0-no-types.json | 8 +
.../_3_2_3/sessionclose-v2d0-partial.json | 14 +
.../io/graphson/_3_2_3/sessioneval-v1d0.json | 16 +
.../_3_2_3/sessioneval-v2d0-no-types.json | 16 +
.../_3_2_3/sessioneval-v2d0-partial.json | 25 +
.../graphson/_3_2_3/sessionlesseval-v1d0.json | 15 +
.../_3_2_3/sessionlesseval-v2d0-no-types.json | 15 +
.../_3_2_3/sessionlesseval-v2d0-partial.json | 21 +
.../io/graphson/_3_2_3/short-v2d0-no-types.json | 1 +
.../io/graphson/_3_2_3/short-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/standardresult-v1d0.json | 50 ++
.../_3_2_3/standardresult-v2d0-no-types.json | 54 ++
.../_3_2_3/standardresult-v2d0-partial.json | 111 +++
.../io/graphson/_3_2_3/stargraph-v1d0.json | 66 ++
.../_3_2_3/stargraph-v2d0-no-types.json | 66 ++
.../graphson/_3_2_3/stargraph-v2d0-partial.json | 141 ++++
.../io/graphson/_3_2_3/t-v2d0-no-types.json | 1 +
.../io/graphson/_3_2_3/t-v2d0-partial.json | 4 +
.../_3_2_3/timestamp-v2d0-no-types.json | 1 +
.../graphson/_3_2_3/timestamp-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/tinkergraph-v1d0.json | 313 +++++++
.../_3_2_3/tinkergraph-v2d0-no-types.json | 352 ++++++++
.../_3_2_3/tinkergraph-v2d0-partial.json | 829 ++++++++++++++++++
.../_3_2_3/traversalmetrics-v2d0-no-types.json | 48 ++
.../_3_2_3/traversalmetrics-v2d0-partial.json | 114 +++
.../_3_2_3/traverser-v2d0-no-types.json | 46 +
.../graphson/_3_2_3/traverser-v2d0-partial.json | 109 +++
.../structure/io/graphson/_3_2_3/tree-v1d0.json | 276 ++++++
.../io/graphson/_3_2_3/tree-v2d0-no-types.json | 269 ++++++
.../io/graphson/_3_2_3/tree-v2d0-partial.json | 608 ++++++++++++++
.../io/graphson/_3_2_3/uuid-v2d0-no-types.json | 1 +
.../io/graphson/_3_2_3/uuid-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/vertex-v1d0.json | 39 +
.../graphson/_3_2_3/vertex-v2d0-no-types.json | 43 +
.../io/graphson/_3_2_3/vertex-v2d0-partial.json | 100 +++
.../io/graphson/_3_2_3/vertexproperty-v1d0.json | 5 +
.../_3_2_3/vertexproperty-v2d0-no-types.json | 5 +
.../_3_2_3/vertexproperty-v2d0-partial.json | 11 +
.../structure/io/graphson/_3_2_3/year-v1d0.json | 1 +
.../io/graphson/_3_2_3/year-v2d0-no-types.json | 1 +
.../io/graphson/_3_2_3/year-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/yearmonth-v1d0.json | 1 +
.../_3_2_3/yearmonth-v2d0-no-types.json | 1 +
.../graphson/_3_2_3/yearmonth-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/zoneddatetime-v1d0.json | 1 +
.../_3_2_3/zoneddatetime-v2d0-no-types.json | 1 +
.../_3_2_3/zoneddatetime-v2d0-partial.json | 4 +
.../io/graphson/_3_2_3/zoneoffset-v1d0.json | 1 +
.../_3_2_3/zoneoffset-v2d0-no-types.json | 1 +
.../_3_2_3/zoneoffset-v2d0-partial.json | 4 +
.../_3_3_0/authenticationchallenge-v1d0.json | 12 +
.../authenticationchallenge-v2d0-no-types.json | 12 +
.../authenticationchallenge-v2d0-partial.json | 12 +
.../_3_3_0/authenticationresponse-v1d0.json | 9 +
.../authenticationresponse-v2d0-no-types.json | 9 +
.../authenticationresponse-v2d0-partial.json | 12 +
.../_3_3_0/bigdecimal-v2d0-no-types.json | 1 +
.../_3_3_0/bigdecimal-v2d0-partial.json | 4 +
.../_3_3_0/biginteger-v2d0-no-types.json | 1 +
.../_3_3_0/biginteger-v2d0-partial.json | 4 +
.../graphson/_3_3_0/binding-v2d0-no-types.json | 4 +
.../graphson/_3_3_0/binding-v2d0-partial.json | 10 +
.../io/graphson/_3_3_0/byte-v2d0-no-types.json | 1 +
.../io/graphson/_3_3_0/byte-v2d0-partial.json | 4 +
.../_3_3_0/bytebuffer-v2d0-no-types.json | 1 +
.../_3_3_0/bytebuffer-v2d0-partial.json | 4 +
.../graphson/_3_3_0/bytecode-v2d0-no-types.json | 3 +
.../graphson/_3_3_0/bytecode-v2d0-partial.json | 6 +
.../_3_3_0/cardinality-v2d0-no-types.json | 1 +
.../_3_3_0/cardinality-v2d0-partial.json | 4 +
.../io/graphson/_3_3_0/char-v2d0-no-types.json | 1 +
.../io/graphson/_3_3_0/char-v2d0-partial.json | 4 +
.../io/graphson/_3_3_0/class-v2d0-no-types.json | 1 +
.../io/graphson/_3_3_0/class-v2d0-partial.json | 4 +
.../graphson/_3_3_0/column-v2d0-no-types.json | 1 +
.../io/graphson/_3_3_0/column-v2d0-partial.json | 4 +
.../io/graphson/_3_3_0/date-v2d0-no-types.json | 1 +
.../io/graphson/_3_3_0/date-v2d0-partial.json | 4 +
.../_3_3_0/direction-v2d0-no-types.json | 1 +
.../graphson/_3_3_0/direction-v2d0-partial.json | 4 +
.../graphson/_3_3_0/double-v2d0-no-types.json | 1 +
.../io/graphson/_3_3_0/double-v2d0-partial.json | 4 +
.../graphson/_3_3_0/duration-v2d0-no-types.json | 1 +
.../graphson/_3_3_0/duration-v2d0-partial.json | 4 +
.../structure/io/graphson/_3_3_0/edge-v1d0.json | 12 +
.../io/graphson/_3_3_0/edge-v2d0-no-types.json | 11 +
.../io/graphson/_3_3_0/edge-v2d0-partial.json | 26 +
.../io/graphson/_3_3_0/float-v2d0-no-types.json | 1 +
.../io/graphson/_3_3_0/float-v2d0-partial.json | 4 +
.../_3_3_0/inetaddress-v2d0-no-types.json | 1 +
.../_3_3_0/inetaddress-v2d0-partial.json | 4 +
.../graphson/_3_3_0/instant-v2d0-no-types.json | 1 +
.../graphson/_3_3_0/instant-v2d0-partial.json | 4 +
.../graphson/_3_3_0/integer-v2d0-no-types.json | 1 +
.../graphson/_3_3_0/integer-v2d0-partial.json | 4 +
.../graphson/_3_3_0/lambda-v2d0-no-types.json | 5 +
.../io/graphson/_3_3_0/lambda-v2d0-partial.json | 8 +
.../_3_3_0/localdate-v2d0-no-types.json | 1 +
.../graphson/_3_3_0/localdate-v2d0-partial.json | 4 +
.../_3_3_0/localdatetime-v2d0-no-types.json | 1 +
.../_3_3_0/localdatetime-v2d0-partial.json | 4 +
.../_3_3_0/localtime-v2d0-no-types.json | 1 +
.../graphson/_3_3_0/localtime-v2d0-partial.json | 4 +
.../io/graphson/_3_3_0/long-v2d0-no-types.json | 1 +
.../io/graphson/_3_3_0/long-v2d0-partial.json | 4 +
.../graphson/_3_3_0/metrics-v2d0-no-types.json | 24 +
.../graphson/_3_3_0/metrics-v2d0-partial.json | 54 ++
.../graphson/_3_3_0/monthday-v2d0-no-types.json | 1 +
.../graphson/_3_3_0/monthday-v2d0-partial.json | 4 +
.../_3_3_0/offsetdatetime-v2d0-no-types.json | 1 +
.../_3_3_0/offsetdatetime-v2d0-partial.json | 4 +
.../_3_3_0/offsettime-v2d0-no-types.json | 1 +
.../_3_3_0/offsettime-v2d0-partial.json | 4 +
.../graphson/_3_3_0/operator-v2d0-no-types.json | 1 +
.../graphson/_3_3_0/operator-v2d0-partial.json | 4 +
.../io/graphson/_3_3_0/order-v2d0-no-types.json | 1 +
.../io/graphson/_3_3_0/order-v2d0-partial.json | 4 +
.../io/graphson/_3_3_0/p-v2d0-no-types.json | 4 +
.../io/graphson/_3_3_0/p-v2d0-partial.json | 10 +
.../io/graphson/_3_3_0/pand-v2d0-no-types.json | 10 +
.../io/graphson/_3_3_0/pand-v2d0-partial.json | 25 +
.../structure/io/graphson/_3_3_0/path-v1d0.json | 62 ++
.../io/graphson/_3_3_0/path-v2d0-no-types.json | 73 ++
.../io/graphson/_3_3_0/path-v2d0-partial.json | 178 ++++
.../graphson/_3_3_0/period-v2d0-no-types.json | 1 +
.../io/graphson/_3_3_0/period-v2d0-partial.json | 4 +
.../io/graphson/_3_3_0/pick-v2d0-no-types.json | 1 +
.../io/graphson/_3_3_0/pick-v2d0-partial.json | 4 +
.../io/graphson/_3_3_0/pop-v2d0-no-types.json | 1 +
.../io/graphson/_3_3_0/pop-v2d0-partial.json | 4 +
.../io/graphson/_3_3_0/por-v2d0-no-types.json | 10 +
.../io/graphson/_3_3_0/por-v2d0-partial.json | 31 +
.../io/graphson/_3_3_0/property-v1d0.json | 4 +
.../graphson/_3_3_0/property-v2d0-no-types.json | 13 +
.../graphson/_3_3_0/property-v2d0-partial.json | 28 +
.../io/graphson/_3_3_0/scope-v2d0-no-types.json | 1 +
.../io/graphson/_3_3_0/scope-v2d0-partial.json | 4 +
.../io/graphson/_3_3_0/sessionclose-v1d0.json | 8 +
.../_3_3_0/sessionclose-v2d0-no-types.json | 8 +
.../_3_3_0/sessionclose-v2d0-partial.json | 14 +
.../io/graphson/_3_3_0/sessioneval-v1d0.json | 16 +
.../_3_3_0/sessioneval-v2d0-no-types.json | 16 +
.../_3_3_0/sessioneval-v2d0-partial.json | 25 +
.../graphson/_3_3_0/sessionlesseval-v1d0.json | 15 +
.../_3_3_0/sessionlesseval-v2d0-no-types.json | 15 +
.../_3_3_0/sessionlesseval-v2d0-partial.json | 21 +
.../io/graphson/_3_3_0/short-v2d0-no-types.json | 1 +
.../io/graphson/_3_3_0/short-v2d0-partial.json | 4 +
.../io/graphson/_3_3_0/standardresult-v1d0.json | 50 ++
.../_3_3_0/standardresult-v2d0-no-types.json | 59 ++
.../_3_3_0/standardresult-v2d0-partial.json | 131 +++
.../io/graphson/_3_3_0/stargraph-v1d0.json | 41 +
.../_3_3_0/stargraph-v2d0-no-types.json | 50 ++
.../graphson/_3_3_0/stargraph-v2d0-partial.json | 122 +++
.../io/graphson/_3_3_0/t-v2d0-no-types.json | 1 +
.../io/graphson/_3_3_0/t-v2d0-partial.json | 4 +
.../_3_3_0/timestamp-v2d0-no-types.json | 1 +
.../graphson/_3_3_0/timestamp-v2d0-partial.json | 4 +
.../io/graphson/_3_3_0/tinkergraph-v1d0.json | 313 +++++++
.../_3_3_0/tinkergraph-v2d0-no-types.json | 333 ++++++++
.../_3_3_0/tinkergraph-v2d0-partial.json | 831 +++++++++++++++++++
.../_3_3_0/traversalmetrics-v2d0-no-types.json | 48 ++
.../_3_3_0/traversalmetrics-v2d0-partial.json | 114 +++
.../_3_3_0/traverser-v2d0-no-types.json | 51 ++
.../graphson/_3_3_0/traverser-v2d0-partial.json | 129 +++
.../structure/io/graphson/_3_3_0/tree-v1d0.json | 276 ++++++
.../io/graphson/_3_3_0/tree-v2d0-no-types.json | 295 +++++++
.../io/graphson/_3_3_0/tree-v2d0-partial.json | 712 ++++++++++++++++
.../io/graphson/_3_3_0/uuid-v2d0-no-types.json | 1 +
.../io/graphson/_3_3_0/uuid-v2d0-partial.json | 4 +
.../io/graphson/_3_3_0/vertex-v1d0.json | 39 +
.../graphson/_3_3_0/vertex-v2d0-no-types.json | 48 ++
.../io/graphson/_3_3_0/vertex-v2d0-partial.json | 120 +++
.../io/graphson/_3_3_0/vertexproperty-v1d0.json | 5 +
.../_3_3_0/vertexproperty-v2d0-no-types.json | 6 +
.../_3_3_0/vertexproperty-v2d0-partial.json | 15 +
.../io/graphson/_3_3_0/year-v2d0-no-types.json | 1 +
.../io/graphson/_3_3_0/year-v2d0-partial.json | 4 +
.../_3_3_0/yearmonth-v2d0-no-types.json | 1 +
.../graphson/_3_3_0/yearmonth-v2d0-partial.json | 4 +
.../_3_3_0/zoneddatetime-v2d0-no-types.json | 1 +
.../_3_3_0/zoneddatetime-v2d0-partial.json | 4 +
.../_3_3_0/zoneoffset-v2d0-no-types.json | 1 +
.../_3_3_0/zoneoffset-v2d0-partial.json | 4 +
.../structure/io/gryo/_3_2_3/barrier-v1d0.kryo | 1 +
.../io/gryo/_3_2_3/bigdecimal-v1d0.kryo | Bin 0 -> 18 bytes
.../io/gryo/_3_2_3/biginteger-v1d0.kryo | 1 +
.../structure/io/gryo/_3_2_3/binding-v1d0.kryo | 1 +
.../structure/io/gryo/_3_2_3/byte-v1d0.kryo | 1 +
.../structure/io/gryo/_3_2_3/bytecode-v1d0.kryo | Bin 0 -> 46 bytes
.../io/gryo/_3_2_3/cardinality-v1d0.kryo | 1 +
.../structure/io/gryo/_3_2_3/char-v1d0.kryo | Bin 0 -> 2 bytes
.../structure/io/gryo/_3_2_3/column-v1d0.kryo | 1 +
.../structure/io/gryo/_3_2_3/date-v1d0.kryo | 1 +
.../io/gryo/_3_2_3/direction-v1d0.kryo | 1 +
.../structure/io/gryo/_3_2_3/double-v1d0.kryo | Bin 0 -> 8 bytes
.../structure/io/gryo/_3_2_3/duration-v1d0.kryo | Bin 0 -> 9 bytes
.../structure/io/gryo/_3_2_3/edge-v1d0.kryo | Bin 0 -> 57 bytes
.../structure/io/gryo/_3_2_3/float-v1d0.kryo | Bin 0 -> 4 bytes
.../structure/io/gryo/_3_2_3/instant-v1d0.kryo | Bin 0 -> 13 bytes
.../structure/io/gryo/_3_2_3/integer-v1d0.kryo | 1 +
.../structure/io/gryo/_3_2_3/lambda-v1d0.kryo | Bin 0 -> 31 bytes
.../io/gryo/_3_2_3/localdate-v1d0.kryo | Bin 0 -> 9 bytes
.../io/gryo/_3_2_3/localdatetime-v1d0.kryo | Bin 0 -> 29 bytes
.../io/gryo/_3_2_3/localtime-v1d0.kryo | Bin 0 -> 9 bytes
.../structure/io/gryo/_3_2_3/long-v1d0.kryo | 1 +
.../io/gryo/_3_2_3/manual-gryo-generator.groovy | 155 ++++
.../structure/io/gryo/_3_2_3/metrics-v1d0.kryo | Bin 0 -> 185 bytes
.../structure/io/gryo/_3_2_3/monthday-v1d0.kryo | Bin 0 -> 9 bytes
.../io/gryo/_3_2_3/offsetdatetime-v1d0.kryo | Bin 0 -> 37 bytes
.../io/gryo/_3_2_3/offsettime-v1d0.kryo | Bin 0 -> 17 bytes
.../structure/io/gryo/_3_2_3/operator-v1d0.kryo | 1 +
.../structure/io/gryo/_3_2_3/order-v1d0.kryo | 1 +
.../structure/io/gryo/_3_2_3/p-v1d0.kryo | Bin 0 -> 6 bytes
.../structure/io/gryo/_3_2_3/pand-v1d0.kryo | Bin 0 -> 17 bytes
.../structure/io/gryo/_3_2_3/path-v1d0.kryo | Bin 0 -> 50 bytes
.../structure/io/gryo/_3_2_3/period-v1d0.kryo | Bin 0 -> 13 bytes
.../structure/io/gryo/_3_2_3/pop-v1d0.kryo | 1 +
.../structure/io/gryo/_3_2_3/por-v1d0.kryo | Bin 0 -> 30 bytes
.../structure/io/gryo/_3_2_3/property-v1d0.kryo | 1 +
.../structure/io/gryo/_3_2_3/scope-v1d0.kryo | 1 +
.../structure/io/gryo/_3_2_3/short-v1d0.kryo | Bin 0 -> 2 bytes
.../io/gryo/_3_2_3/stargraph-v1d0.kryo | Bin 0 -> 247 bytes
.../structure/io/gryo/_3_2_3/t-v1d0.kryo | 1 +
.../io/gryo/_3_2_3/tinkergraph-v1d0.kryo | Bin 0 -> 1117 bytes
.../io/gryo/_3_2_3/traversalmetrics-v1d0.kryo | Bin 0 -> 429 bytes
.../io/gryo/_3_2_3/traverser-v1d0.kryo | Bin 0 -> 211 bytes
.../structure/io/gryo/_3_2_3/tree-v1d0.kryo | Bin 0 -> 762 bytes
.../structure/io/gryo/_3_2_3/uuid-v1d0.kryo | 1 +
.../structure/io/gryo/_3_2_3/vertex-v1d0.kryo | Bin 0 -> 202 bytes
.../io/gryo/_3_2_3/vertexproperty-v1d0.kryo | Bin 0 -> 18 bytes
.../structure/io/gryo/_3_2_3/year-v1d0.kryo | Bin 0 -> 5 bytes
.../io/gryo/_3_2_3/yearmonth-v1d0.kryo | Bin 0 -> 9 bytes
.../io/gryo/_3_2_3/zoneddatetime-v1d0.kryo | Bin 0 -> 45 bytes
.../io/gryo/_3_2_3/zoneoffset-v1d0.kryo | 1 +
.../structure/io/gryo/_3_3_0/barrier-v1d0.kryo | 1 +
.../io/gryo/_3_3_0/bigdecimal-v1d0.kryo | Bin 0 -> 18 bytes
.../io/gryo/_3_3_0/biginteger-v1d0.kryo | 1 +
.../structure/io/gryo/_3_3_0/binding-v1d0.kryo | 1 +
.../structure/io/gryo/_3_3_0/byte-v1d0.kryo | 1 +
.../structure/io/gryo/_3_3_0/bytecode-v1d0.kryo | Bin 0 -> 43 bytes
.../io/gryo/_3_3_0/cardinality-v1d0.kryo | 1 +
.../structure/io/gryo/_3_3_0/char-v1d0.kryo | Bin 0 -> 2 bytes
.../structure/io/gryo/_3_3_0/column-v1d0.kryo | 1 +
.../structure/io/gryo/_3_3_0/date-v1d0.kryo | 1 +
.../io/gryo/_3_3_0/direction-v1d0.kryo | 1 +
.../structure/io/gryo/_3_3_0/double-v1d0.kryo | Bin 0 -> 8 bytes
.../structure/io/gryo/_3_3_0/duration-v1d0.kryo | Bin 0 -> 9 bytes
.../structure/io/gryo/_3_3_0/edge-v1d0.kryo | Bin 0 -> 57 bytes
.../structure/io/gryo/_3_3_0/float-v1d0.kryo | Bin 0 -> 4 bytes
.../structure/io/gryo/_3_3_0/instant-v1d0.kryo | Bin 0 -> 13 bytes
.../structure/io/gryo/_3_3_0/integer-v1d0.kryo | 1 +
.../structure/io/gryo/_3_3_0/lambda-v1d0.kryo | Bin 0 -> 31 bytes
.../io/gryo/_3_3_0/localdate-v1d0.kryo | Bin 0 -> 9 bytes
.../io/gryo/_3_3_0/localdatetime-v1d0.kryo | Bin 0 -> 29 bytes
.../io/gryo/_3_3_0/localtime-v1d0.kryo | Bin 0 -> 9 bytes
.../structure/io/gryo/_3_3_0/long-v1d0.kryo | 1 +
.../structure/io/gryo/_3_3_0/metrics-v1d0.kryo | Bin 0 -> 185 bytes
.../structure/io/gryo/_3_3_0/monthday-v1d0.kryo | Bin 0 -> 9 bytes
.../io/gryo/_3_3_0/offsetdatetime-v1d0.kryo | Bin 0 -> 37 bytes
.../io/gryo/_3_3_0/offsettime-v1d0.kryo | Bin 0 -> 17 bytes
.../structure/io/gryo/_3_3_0/operator-v1d0.kryo | 1 +
.../structure/io/gryo/_3_3_0/order-v1d0.kryo | 1 +
.../structure/io/gryo/_3_3_0/p-v1d0.kryo | Bin 0 -> 6 bytes
.../structure/io/gryo/_3_3_0/pand-v1d0.kryo | Bin 0 -> 17 bytes
.../structure/io/gryo/_3_3_0/path-v1d0.kryo | Bin 0 -> 50 bytes
.../structure/io/gryo/_3_3_0/period-v1d0.kryo | Bin 0 -> 13 bytes
.../structure/io/gryo/_3_3_0/pick-v1d0.kryo | 1 +
.../structure/io/gryo/_3_3_0/pop-v1d0.kryo | 1 +
.../structure/io/gryo/_3_3_0/por-v1d0.kryo | Bin 0 -> 30 bytes
.../structure/io/gryo/_3_3_0/property-v1d0.kryo | 1 +
.../structure/io/gryo/_3_3_0/scope-v1d0.kryo | 1 +
.../structure/io/gryo/_3_3_0/short-v1d0.kryo | Bin 0 -> 2 bytes
.../io/gryo/_3_3_0/stargraph-v1d0.kryo | Bin 0 -> 247 bytes
.../structure/io/gryo/_3_3_0/t-v1d0.kryo | 1 +
.../io/gryo/_3_3_0/tinkergraph-v1d0.kryo | Bin 0 -> 1117 bytes
.../io/gryo/_3_3_0/traversalmetrics-v1d0.kryo | Bin 0 -> 429 bytes
.../io/gryo/_3_3_0/traverser-v1d0.kryo | Bin 0 -> 211 bytes
.../structure/io/gryo/_3_3_0/tree-v1d0.kryo | Bin 0 -> 762 bytes
.../structure/io/gryo/_3_3_0/uuid-v1d0.kryo | 1 +
.../structure/io/gryo/_3_3_0/vertex-v1d0.kryo | Bin 0 -> 202 bytes
.../io/gryo/_3_3_0/vertexproperty-v1d0.kryo | Bin 0 -> 18 bytes
.../structure/io/gryo/_3_3_0/year-v1d0.kryo | Bin 0 -> 5 bytes
.../io/gryo/_3_3_0/yearmonth-v1d0.kryo | Bin 0 -> 9 bytes
.../io/gryo/_3_3_0/zoneddatetime-v1d0.kryo | Bin 0 -> 45 bytes
.../io/gryo/_3_3_0/zoneoffset-v1d0.kryo | 1 +
gremlin-tools/pom.xml | 1 +
398 files changed, 11260 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/pom.xml b/gremlin-tools/gremlin-io-test/pom.xml
new file mode 100644
index 0000000..0ba73d3
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/pom.xml
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>gremlin-tools</artifactId>
+ <groupId>org.apache.tinkerpop</groupId>
+ <version>3.3.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>gremlin-io-test</artifactId>
+ <name>Apache TinkerPop :: Gremlin IO Test</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-driver</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>tinkergraph-gremlin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-test</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>io</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>io</name>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>${groovy.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>generate-io-files-graphson</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <scripts>
+ <script>
+ <![CDATA[
+import java.time.*
+import java.nio.files.*
+import org.apache.tinkerpop.gremlin.driver.ser.*
+import org.apache.tinkerpop.gremlin.process.traversal.*
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.*
+import org.apache.tinkerpop.gremlin.structure.*
+import org.apache.tinkerpop.gremlin.structure.io.graphson.*
+import org.apache.tinkerpop.gremlin.driver.message.*
+import org.apache.tinkerpop.gremlin.process.traversal.step.*
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent.Pick
+import org.apache.tinkerpop.gremlin.structure.io.Model
+
+new File("${project.build.directory}/dev-docs/").mkdirs()
+new File("${project.build.directory}/test-case-data/io/graphson/").mkdirs()
+new File("${project.build.directory}/test-case-data/io/gryo/").mkdirs()
+
+graph = TinkerFactory.createTheCrew()
+g = graph.traversal()
+
+model = Model.instance()
+
+toJsonV1d0NoTypes = { o, type, mapper, comment = "" ->
+ toJson(o, type, mapper, comment, "v1d0")
+}
+
+toJson = { o, type, mapper, comment = "", suffix = "" ->
+ def jsonSample = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(o)
+
+ def fileToWriteTo = new File("${project.build.directory}/test-case-data/io/graphson/" + type.toLowerCase().replace(" ","") + "-" + suffix + ".json")
+ if (fileToWriteTo.exists()) fileToWriteTo.delete()
+ fileToWriteTo.withWriter{ it.write(jsonSample) }
+
+ return type + "\n" +
+ "^".multiply(type.length()) + "\n\n" +
+ (comment.isEmpty() ? "" : comment + "\n\n") +
+ "[source,json]\n" +
+ "----\n" +
+ jsonSample + "\n" +
+ "----\n" +
+ "\n"
+}
+
+writeSupportedV1Objects = { writer, mapper ->
+ writer.write("Graph Structure\n")
+ writer.write("~~~~~~~~~~~~~~~\n\n")
+ model.entries("Graph Structure").findAll{it.isCompatibleWith(GraphSONCompatibility.V1D0_3_3_0)}.each {
+ writer.write(toJsonV1d0NoTypes(it.getObject(), it.getTitle(), mapper, it.getDescription()))
+ }
+
+ writer.write("\n")
+ writer.write("RequestMessage\n")
+ writer.write("~~~~~~~~~~~~~~\n\n")
+ model.entries("RequestMessage").findAll{it.isCompatibleWith(GraphSONCompatibility.V1D0_3_3_0)}.each {
+ writer.write(toJsonV1d0NoTypes(it.getObject(), it.getTitle(), mapper, it.getDescription()))
+ }
+
+ writer.write("\n")
+ writer.write("ResponseMessage\n")
+ writer.write("~~~~~~~~~~~~~~~\n\n")
+ model.entries("ResponseMessage").findAll{it.isCompatibleWith(GraphSONCompatibility.V1D0_3_3_0)}.each {
+ writer.write(toJsonV1d0NoTypes(it.getObject(), it.getTitle(), mapper, it.getDescription()))
+ }
+
+ writer.write("\n")
+ writer.write("Time\n")
+ writer.write("~~~~\n\n")
+ model.entries("RequestMessage").findAll{it.isCompatibleWith(GraphSONCompatibility.V1D0_3_3_0)}.each {
+ writer.write(toJsonV1d0NoTypes(it.getObject(), it.getTitle(), mapper, it.getDescription()))
+ }
+}
+
+mapper = GraphSONMapper.build().
+ addRegistry(TinkerIoRegistry.instance()).
+ addCustomModule(new AbstractGraphSONMessageSerializerV1d0.GremlinServerModule()).
+ version(GraphSONVersion.V1_0).create().createMapper()
+
+v1GraphSONFile = new File("${project.build.directory}/dev-docs/out-graphson-1d0.txt")
+if (v1GraphSONFile.exists()) v1GraphSONFile.delete()
+new File("${project.build.directory}/dev-docs/out-graphson-1d0.txt").withWriter { writeSupportedV1Objects(it, mapper) }
+
+toJsonV2d0PartialTypes = { o, type, mapper, comment = "" ->
+ toJson(o, type, mapper, comment, "v2d0-partial")
+}
+
+toJsonV2d0NoTypes = { o, type, mapper, comment = "" ->
+ toJson(o, type, mapper, comment, "v2d0-no-types")
+}
+
+writeSupportedV2Objects = { writer, mapper, toJsonFunction ->
+ writer.write("Core\n")
+ writer.write("~~~~\n\n")
+ model.entries("Core").each {
+ writer.write(toJsonFunction(it.getObject(), it.getTitle(), mapper, it.getDescription()))
+ }
+
+ writer.write("\n")
+ writer.write("Graph Structure\n")
+ writer.write("~~~~~~~~~~~~~~~\n\n")
+ model.entries("Graph Structure").each {
+ writer.write(toJsonFunction(it.getObject(), it.getTitle(), mapper, it.getDescription()))
+ }
+
+ writer.write("\n")
+ writer.write("Graph Process\n")
+ writer.write("~~~~~~~~~~~~~\n\n")
+ model.entries("Graph Process").each {
+ writer.write(toJsonFunction(it.getObject(), it.getTitle(), mapper, it.getDescription()))
+ }
+
+ writer.write("\n")
+ writer.write("RequestMessage\n")
+ writer.write("~~~~~~~~~~~~~~\n\n")
+ model.entries("RequestMessage").each {
+ writer.write(toJsonFunction(it.getObject(), it.getTitle(), mapper, it.getDescription()))
+ }
+
+ writer.write("\n")
+ writer.write("ResponseMessage\n")
+ writer.write("~~~~~~~~~~~~~~~\n\n")
+ model.entries("ResponseMessage").each {
+ writer.write(toJsonFunction(it.getObject(), it.getTitle(), mapper, it.getDescription()))
+ }
+
+ writer.write("\n")
+ writer.write("Extended\n")
+ writer.write("~~~~~~~~\n\n")
+ writer.write("""Note that the "extended" types require the addition of the separate `GraphSONXModuleV2d0` module as follows:\n
+[source,java]
+----
+mapper = GraphSONMapper.build().
+ typeInfo(TypeInfo.PARTIAL_TYPES).
+ addCustomModule(GraphSONXModuleV2d0.build().create(false)).
+ version(GraphSONVersion.V2_0).create().createMapper()
+----\n
+""")
+ model.entries("Extended").each {
+ writer.write(toJsonFunction(it.getObject(), it.getTitle(), mapper, it.getDescription()))
+ }
+}
+
+mapper = GraphSONMapper.build().
+ addRegistry(TinkerIoRegistryV2d0.instance()).
+ typeInfo(TypeInfo.PARTIAL_TYPES).
+ addCustomModule(GraphSONXModuleV2d0.build().create(false)).
+ addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
+ version(GraphSONVersion.V2_0).create().createMapper()
+
+file = new File("${project.build.directory}/dev-docs/out-graphson-2d0-partial.txt")
+if (file.exists()) file.delete()
+file.withWriter { writeSupportedV2Objects(it, mapper, toJsonV2d0PartialTypes) }
+
+mapper = GraphSONMapper.build().
+ addRegistry(TinkerIoRegistryV2d0.instance()).
+ typeInfo(TypeInfo.NO_TYPES).
+ addCustomModule(GraphSONXModuleV2d0.build().create(false)).
+ addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
+ version(GraphSONVersion.V2_0).create().createMapper()
+
+file = new File("${project.build.directory}/dev-docs/out-graphson-2d0-no-type.txt")
+if (file.exists()) file.delete()
+file.withWriter { writeSupportedV2Objects(it, mapper, toJsonV2d0NoTypes) }
+
+def ver = "_" + "${project.version}".replace(".","_").replace("-SNAPSHOT","")
+def target = "${project.basedir}/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/" + ver
+def targetDir = new File(target)
+if (!targetDir.exists()) targetDir.mkdirs()
+new File("${project.build.directory}/test-case-data/io/graphson/").listFiles().each {
+ def copyTo = new File(target + "/" + it.name)
+ if (copyTo.exists()) copyTo.delete()
+ java.nio.file.Files.copy(it.toPath(), new File(target + "/" + it.name).toPath())
+}
+
+]]>
+ </script>
+ </scripts>
+ </configuration>
+ </execution>
+ <execution>
+ <id>generate-io-files-gryo</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <scripts>
+ <script>
+ <![CDATA[
+import org.apache.tinkerpop.shaded.kryo.io.Output
+
+import java.time.*
+import java.nio.file.*
+import org.apache.tinkerpop.gremlin.driver.ser.*
+import org.apache.tinkerpop.gremlin.process.traversal.*
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.*
+import org.apache.tinkerpop.gremlin.structure.*
+import org.apache.tinkerpop.gremlin.structure.io.graphson.*
+import org.apache.tinkerpop.gremlin.driver.message.*
+import org.apache.tinkerpop.gremlin.process.traversal.step.*
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent.Pick
+import org.apache.tinkerpop.gremlin.structure.io.gryo.*
+import org.apache.tinkerpop.gremlin.structure.io.*
+
+new File("${project.build.directory}/dev-docs/").mkdirs()
+new File("${project.build.directory}/test-case-data/io/gryo").mkdirs()
+
+graph = TinkerFactory.createTheCrew()
+g = graph.traversal()
+
+model = Model.instance()
+
+toGryo = { o, type, mapper, suffix = "" ->
+ def fileToWriteTo = new File("${project.build.directory}/test-case-data/io/gryo/" + type.toLowerCase().replace(" ","") + "-" + suffix + ".kryo")
+ if (fileToWriteTo.exists()) fileToWriteTo.delete()
+ final Output out = new Output(new FileOutputStream(fileToWriteTo))
+ mapper.writeObject(out, o)
+ out.close()
+}
+
+toGryoV1d0 = { o, type, mapper ->
+ toGryo(o, type, mapper, "v1d0")
+}
+
+writeSupportedObjects = { mapper, toGryoFunction ->
+ model.entries().findAll{it.hasGryoCompatibility()}.each {
+ if (it.getObject() instanceof Traversal)
+ toGryoFunction(it.getObject().bytecode, it.getTitle(), mapper)
+ else
+ toGryoFunction(it.getObject(), it.getTitle(), mapper)
+ }
+}
+
+mapper = GryoMapper.build().addRegistry(TinkerIoRegistryV2d0.getInstance()).create().createMapper()
+
+writeSupportedObjects(mapper, toGryoV1d0)
+
+def ver = "_" + "${project.version}".replace(".","_").replace("-SNAPSHOT","")
+def target = "${project.basedir}/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/" + ver
+def targetDir = new File(target)
+if (!targetDir.exists()) targetDir.mkdirs()
+new File("${project.build.directory}/test-case-data/io/gryo/").listFiles().each {
+ def copyTo = new File(target + "/" + it.name)
+ if (copyTo.exists()) copyTo.delete()
+ java.nio.file.Files.copy(it.toPath(), new File(target + "/" + it.name).toPath())
+}
+
+]]>
+ </script>
+ </scripts>
+ </configuration>
+ </execution>
+ <execution>
+ <id>generate-io-model-csv</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <scripts>
+ <script>
+ <![CDATA[
+import org.apache.tinkerpop.gremlin.structure.io.Model
+import java.io.File
+
+new File("${project.build.directory}/dev-docs/").mkdirs()
+Model.instance().saveAsCsv("${project.build.directory}/dev-docs/model.csv")
+]]>
+ </script>
+ </scripts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Compatibility.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Compatibility.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Compatibility.java
new file mode 100644
index 0000000..7b9a5fe
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Compatibility.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io;
+
+import java.io.IOException;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public interface Compatibility {
+ public byte[] readFromResource(final String resource) throws IOException;
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
new file mode 100644
index 0000000..51d44b6
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
@@ -0,0 +1,390 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io;
+
+import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.Operator;
+import org.apache.tinkerpop.gremlin.process.traversal.Order;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.Pop;
+import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
+import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
+import org.apache.tinkerpop.gremlin.structure.Column;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONCompatibility;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoCompatibility;
+import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.Period;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class Model {
+
+ private static final List<Compatibility> ALL = Collections.unmodifiableList(new ArrayList<Compatibility>() {{
+ addAll(Arrays.asList(GraphSONCompatibility.values()));
+ addAll(Arrays.asList(GryoCompatibility.values()));
+ }});
+
+ private static final List<Compatibility> GRAPHSON_ONLY = Collections.unmodifiableList(new ArrayList<Compatibility>() {{
+ addAll(Arrays.asList(GraphSONCompatibility.values()));
+ }});
+
+ private static final List<Compatibility> UNTYPED_GRAPHSON_ONLY = Collections.unmodifiableList(new ArrayList<Compatibility>() {{
+ add(GraphSONCompatibility.V1D0_3_2_3);
+ add(GraphSONCompatibility.V1D0_3_3_0);
+ add(GraphSONCompatibility.V2D0_NO_TYPE_3_2_3);
+ add(GraphSONCompatibility.V2D0_NO_TYPE_3_3_0);
+ }});
+
+ private static final List<Compatibility> GRYO_ONLY = Collections.unmodifiableList(new ArrayList<Compatibility>() {{
+ addAll(Arrays.asList(GryoCompatibility.values()));
+ }});
+
+ private static final Model model = new Model();
+
+ private final Map<String, List<Entry>> entries = new HashMap<>();
+
+ private Model() {
+ final Graph graph = TinkerFactory.createTheCrew();
+ final GraphTraversalSource g = graph.traversal();
+
+ addCoreEntry(File.class, "Class", GryoCompatibility.V1D0_3_2_3, GryoCompatibility.V1D0_3_3_0);
+ addCoreEntry(new Date(), "Date");
+ addCoreEntry(100.00d, "Double");
+ addCoreEntry(100.00f, "Float");
+ addCoreEntry(100, "Integer");
+ addCoreEntry(100L, "Long");
+ addCoreEntry(new java.sql.Timestamp(System.currentTimeMillis()), "Timestamp", GryoCompatibility.V1D0_3_2_3, GryoCompatibility.V1D0_3_3_0);
+ addCoreEntry(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786"), "UUID");
+
+ addGraphStructureEntry(graph.edges().next(), "Edge");
+ addGraphStructureEntry(g.V().out().out().path().next(), "Path");
+ addGraphStructureEntry(graph.edges().next().properties().next(), "Property");
+ addGraphStructureEntry(StarGraph.of(graph.vertices().next()), "StarGraph");
+ addGraphStructureEntry(graph, "TinkerGraph", "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`.");
+ addGraphStructureEntry(g.V().out().out().tree().next(), "Tree");
+ addGraphStructureEntry(graph.vertices().next(), "Vertex");
+ addGraphStructureEntry(graph.vertices().next().properties().next(), "VertexProperty");
+
+ addEntry("Process", SackFunctions.Barrier.normSack, "Barrier", "", GRYO_ONLY);
+ addGraphProcessEntry(new Bytecode.Binding("x", 1), "Binding", "A \"Binding\" refers to a `Bytecode.Binding`.");
+ addGraphProcessEntry(g.V().hasLabel("person").out().in().tree(), "Bytecode", "The following `Bytecode` example represents the traversal of `g.V().hasLabel('person').out().in().tree()`. Obviously the serialized `Bytecode` woudl be quite different for the endless variations of commands that could be used together in the Gremlin language.");
+ addGraphProcessEntry(VertexProperty.Cardinality.list, "Cardinality");
+ addGraphProcessEntry(Column.keys, "Column");
+ addGraphProcessEntry(Direction.OUT, "Direction");
+ addGraphProcessEntry(Operator.sum, "Operator");
+ addGraphProcessEntry(Order.incr, "Order");
+ addGraphProcessEntry(TraversalOptionParent.Pick.any, "Pick");
+ addGraphProcessEntry(Pop.all, "Pop");
+ addGraphProcessEntry(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda");
+ final TraversalMetrics tm = g.V().hasLabel("person").out().out().tree().profile().next();
+ final MutableMetrics metrics = new MutableMetrics(tm.getMetrics(0));
+ metrics.addNested(new MutableMetrics(tm.getMetrics(1)));
+ addGraphProcessEntry(metrics, "Metrics");
+ addGraphProcessEntry(P.gt(0), "P");
+ addGraphProcessEntry(P.gt(0).and(P.lt(10)), "P and");
+ addGraphProcessEntry(P.gt(0).or(P.within(-1, -10, -100)), "P or");
+ addGraphProcessEntry(Scope.local, "Scope");
+ addGraphProcessEntry(T.label, "T");
+ addGraphProcessEntry(g.V().hasLabel("person").out().out().tree().profile().next(), "TraversalMetrics");
+ addGraphProcessEntry(g.V().hasLabel("person").asAdmin().nextTraverser(), "Traverser");
+
+ final Map<String,Object> requestBindings = new HashMap<String,Object>(){{
+ put("x", 1);
+ }};
+ final Map<String,Object> requestAliases = new HashMap<String,Object>(){{
+ put("g", "social");
+ }};
+ RequestMessage requestMessage;
+ requestMessage = RequestMessage.build("authentication").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==").create();
+ addRequestMessageEntry(requestMessage, "Authentication Response", "The following `RequestMessage` is an example of the response that should be made to a SASL-based authentication challenge.",
+ GraphSONCompatibility.V2D0_PARTIAL_3_2_3, GraphSONCompatibility.V2D0_PARTIAL_3_3_0, GryoCompatibility.V1D0_3_2_3, GryoCompatibility.V1D0_3_3_0);
+ requestMessage = RequestMessage.build("eval").processor("session").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("gremlin", "g.V(x)", "bindings", requestBindings, "language", "gremlin-groovy", "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create() ;
+ addRequestMessageEntry(requestMessage, "Session Eval", "The following `RequestMessage` is an example of a simple session request for a script evaluation with parameters.");
+ requestMessage = RequestMessage.build("eval").processor("session").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("gremlin", "social.V(x)", "bindings", requestBindings, "language", "gremlin-groovy", "aliases", requestAliases, "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create();
+ addRequestMessageEntry(requestMessage, "Session Eval", "The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\".");
+ requestMessage = RequestMessage.build("close").processor("session").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create();
+ addRequestMessageEntry(requestMessage, "Session Close", "The following `RequestMessage` is an example of a request to close a session.");
+ requestMessage = RequestMessage.build("eval").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("gremlin", "g.V(x)", "bindings", requestBindings, "language", "gremlin-groovy").create();
+ addRequestMessageEntry(requestMessage, "Sessionless Eval", "The following `RequestMessage` is an example of a simple sessionless request for a script evaluation with parameters.");
+ requestMessage = RequestMessage.build("eval").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("gremlin", "social.V(x)", "bindings", requestBindings, "language", "gremlin-groovy", "aliases", requestAliases).create();
+ addRequestMessageEntry(requestMessage, "Sessionless Eval", "The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\".");
+
+ ResponseMessage responseMessage = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
+ code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create();
+ addResponseMessageEntry(responseMessage, "Authentication Challenge", "When authentication is enabled, an initial request to the server will result in an authentication challenge. The typical response message will appear as follows, but handling it could be different dependending on the SASL implementation (e.g. multiple challenges maybe requested in some cases, but no in the default provided by Gremlin Server).");
+ responseMessage = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
+ code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.SUCCESS).
+ result(Collections.singletonList(graph.vertices().next())).create();
+ addResponseMessageEntry(responseMessage, "Standard Result", "The following `ResponseMessage` is a typical example of the typical successful response Gremlin Server will return when returning results from a script.");
+
+ addExtendedEntry(new BigDecimal(new java.math.BigInteger("123456789987654321123456789987654321")), "BigDecimal", "", UNTYPED_GRAPHSON_ONLY.toArray(new Compatibility[UNTYPED_GRAPHSON_ONLY.size()]));
+ addExtendedEntry(new BigInteger("123456789987654321123456789987654321"), "BigInteger", "", UNTYPED_GRAPHSON_ONLY.toArray(new Compatibility[UNTYPED_GRAPHSON_ONLY.size()]));
+ addExtendedEntry(new Byte("1"), "Byte", "", UNTYPED_GRAPHSON_ONLY.toArray(new Compatibility[UNTYPED_GRAPHSON_ONLY.size()]));
+ addExtendedEntry(java.nio.ByteBuffer.wrap("some bytes for you".getBytes()), "ByteBuffer", "",
+ GraphSONCompatibility.V1D0_3_2_3, GraphSONCompatibility.V1D0_3_3_0, GraphSONCompatibility.V2D0_NO_TYPE_3_2_3, GraphSONCompatibility.V2D0_NO_TYPE_3_3_0,
+ GryoCompatibility.V1D0_3_2_3, GryoCompatibility.V1D0_3_3_0);
+ addExtendedEntry("x".charAt(0), "Char", "", UNTYPED_GRAPHSON_ONLY.toArray(new Compatibility[UNTYPED_GRAPHSON_ONLY.size()]));
+ addExtendedEntry(Duration.ofDays(5), "Duration","The following example is a `Duration` of five days.");
+ try {
+ addExtendedEntry(InetAddress.getByName("localhost"), "InetAddress", "",
+ GraphSONCompatibility.V1D0_3_2_3, GraphSONCompatibility.V1D0_3_3_0, GraphSONCompatibility.V2D0_NO_TYPE_3_2_3, GraphSONCompatibility.V2D0_NO_TYPE_3_3_0,
+ GryoCompatibility.V1D0_3_2_3, GryoCompatibility.V1D0_3_3_0);
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
+ addExtendedEntry(Instant.now(), "Instant");
+ addExtendedEntry(LocalDate.of(2016, 1, 1), "LocalDate");
+ addExtendedEntry(LocalDateTime.of(2016, 1, 1, 12, 30), "LocalDateTime");
+ addExtendedEntry(LocalTime.of(12, 30, 45), "LocalTime");
+ addExtendedEntry(MonthDay.of(1, 1), "MonthDay");
+ addExtendedEntry(OffsetDateTime.now(), "OffsetDateTime");
+ addExtendedEntry(OffsetTime.now(), "OffsetTime");
+ addExtendedEntry(Period.of(1, 6, 15), "Period", "The following example is a `Period` of one year, six months and fifteen days.");
+ addExtendedEntry(new Short("100"), "Short", "", UNTYPED_GRAPHSON_ONLY.toArray(new Compatibility[UNTYPED_GRAPHSON_ONLY.size()]));
+ addExtendedEntry(Year.of(2016), "Year", "The following example is of the `Year` \"2016\".");
+ addExtendedEntry(YearMonth.of(2016, 6), "YearMonth", "The following example is a `YearMonth` of \"June 2016\"");
+ addExtendedEntry(ZonedDateTime.now(), "ZonedDateTime");
+ addExtendedEntry(ZoneOffset.ofHoursMinutesSeconds(3, 6, 9), "ZoneOffset", "The following example is a `ZoneOffset` of three hours, six minutes, and nine seconds.");
+ }
+
+ public static Model instance() {
+ return model;
+ }
+
+ public Set<String> groups() {
+ return Collections.unmodifiableSet(entries.keySet());
+ }
+
+ public List<Entry> entries(final String key) {
+ return Collections.unmodifiableList(entries.get(key));
+ }
+
+ public List<Entry> entries() {
+ return Collections.unmodifiableList(entries.values().stream().flatMap(Collection::stream).collect(Collectors.toList()));
+ }
+
+ public Optional<Entry> find(final String resource) {
+ return entries.values().stream().flatMap(Collection::stream).filter(e -> e.getResourceName().equals(resource)).findFirst();
+ }
+
+ private void addCoreEntry(final Object obj, final String title) {
+ addEntry("Core", obj, title, "");
+ }
+
+ private void addCoreEntry(final Object obj, final String title, final Compatibility... incompatibleWith) {
+ addEntry("Core", obj, title, "", incompatibleWith);
+ }
+
+ private void addGraphStructureEntry(final Object obj, final String title) {
+ addGraphStructureEntry(obj, title, "");
+ }
+
+ private void addGraphStructureEntry(final Object obj, final String title, final String description) {
+ addEntry("Graph Structure", obj, title, description);
+ }
+
+ private void addGraphProcessEntry(final Object obj, final String title) {
+ addGraphProcessEntry(obj, title, "");
+ }
+
+ private void addGraphProcessEntry(final Object obj, final String title, final String description) {
+ addEntry("Graph Process", obj, title, description);
+ }
+
+ private void addRequestMessageEntry(final Object obj, final String title, final String description) {
+ addEntry("RequestMessage", obj, title, description, GRAPHSON_ONLY);
+ }
+
+ private void addRequestMessageEntry(final Object obj, final String title, final String description, final Compatibility... incompatibleWith) {
+ addEntry("RequestMessage", obj, title, description, incompatibleWith);
+ }
+
+ private void addResponseMessageEntry(final Object obj, final String title, final String description) {
+ addEntry("ResponseMessage", obj, title, description, GRAPHSON_ONLY);
+ }
+
+ private void addResponseMessageEntry(final Object obj, final String title, final String description, final Compatibility... incompatibleWith) {
+ addEntry("ResponseMessage", obj, title, description, incompatibleWith);
+ }
+
+ private void addExtendedEntry(final Object obj, final String title) {
+ addExtendedEntry(obj, title, "");
+ }
+
+ private void addExtendedEntry(final Object obj, final String title, final String description) {
+ addEntry("Extended", obj, title, description);
+ }
+
+ private void addExtendedEntry(final Object obj, final String title, final String description, final Compatibility... incompatibleWith) {
+ addEntry("Extended", obj, title, description, incompatibleWith);
+ }
+
+ private void addEntry(final String group, final Object obj, final String title, final String description) {
+ addEntry(group, obj, title, description, ALL);
+ }
+
+ private void addEntry(final String group, final Object obj, final String title, final String description, final List<Compatibility> compatibleWith) {
+ if (!entries.containsKey(group))
+ entries.put(group, new ArrayList<>());
+
+ entries.get(group).add(new Entry(title, obj, description, compatibleWith));
+ }
+
+ private void addEntry(final String group, final Object obj, final String title, final String description, final Compatibility... incompatibleWith) {
+ addEntry(group, obj, title, description, Collections.unmodifiableList(ALL.stream()
+ .filter(c -> !Arrays.asList(incompatibleWith).contains(c))
+ .collect(Collectors.toList())));
+ }
+
+ public void saveAsCsv(final String file) throws Exception {
+ final File f = new File(file);
+ f.getParentFile().mkdirs();
+
+ final List<Compatibility> compatibilities = Stream.concat(
+ Stream.of(GraphSONCompatibility.values()),
+ Stream.of(GryoCompatibility.values())).collect(Collectors.toList());
+
+ final List<String> headers = new ArrayList<>();
+ headers.add("resource");
+ headers.addAll(compatibilities.stream().map(c -> {
+ if (c instanceof GryoCompatibility)
+ return ((GryoCompatibility) c).name();
+ else if (c instanceof GraphSONCompatibility)
+ return ((GraphSONCompatibility) c).name();
+ else
+ throw new IllegalStateException("No support for the provided Compatibility type");
+ }).collect(Collectors.toList()));
+
+ try (final PrintWriter writer = new PrintWriter(f)) {
+ writer.println(String.join("\t", headers));
+
+ final List<Entry> sorted = new ArrayList<>(entries());
+ Collections.sort(sorted, (o1, o2) -> o1.getResourceName().compareTo(o2.getResourceName()));
+
+ sorted.forEach(e -> {
+ writer.write(e.getResourceName());
+ writer.write("\t");
+ compatibilities.forEach(c -> {
+ writer.print(e.isCompatibleWith(c));
+ writer.print("\t");
+ });
+
+ writer.println();
+ });
+ }
+ }
+
+ public static class Entry {
+
+ private final String title;
+ private final Object obj;
+ private final String description;
+ private final List<Compatibility> compatibleWith;
+
+ public Entry(final String title, final Object obj, final String description, final List<Compatibility> compatibleWith) {
+ this.title = title;
+ this.obj = obj;
+ this.description = description;
+ this.compatibleWith = compatibleWith;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public String getResourceName() {
+ return title.replace(" ", "").toLowerCase();
+ }
+
+ public Object getObject() {
+ return obj;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public boolean isCompatibleWith(final Compatibility compatibility) {
+ return compatibleWith.contains(compatibility);
+ }
+
+ public boolean hasGryoCompatibility() {
+ return compatibleWith.stream().anyMatch(c -> c instanceof GryoCompatibility);
+ }
+
+ public boolean hasGraphSONCompatibility() {
+ return compatibleWith.stream().anyMatch(c -> c instanceof GryoCompatibility);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONCompatibility.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONCompatibility.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONCompatibility.java
new file mode 100644
index 0000000..46b43e5
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONCompatibility.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.tinkerpop.gremlin.structure.io.Compatibility;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public enum GraphSONCompatibility implements Compatibility {
+ V1D0_3_2_3("3.2.3", "1.0", "v1d0"),
+ V2D0_PARTIAL_3_2_3("3.2.3", "2.0", "v2d0-partial"),
+ V2D0_NO_TYPE_3_2_3("3.2.3", "2.0", "v2d0-no-types"),
+ V1D0_3_3_0("3.3.0", "2.0", "v1d0"),
+ V2D0_PARTIAL_3_3_0("3.3.0", "2.0", "v2d0-partial"),
+ V2D0_NO_TYPE_3_3_0("3.3.0", "2.0", "v2d0-no-types");
+
+ private static final String SEP = File.separator;
+
+ private final String graphSONVersion;
+ private final String tinkerpopVersion;
+ private final String configuration;
+
+ GraphSONCompatibility(final String tinkerpopVersion, final String graphSONVersion, final String configuration) {
+ this.tinkerpopVersion = tinkerpopVersion;
+ this.configuration = configuration;
+ this.graphSONVersion = graphSONVersion;
+ }
+
+ public byte[] readFromResource(final String resource) throws IOException {
+ final String testResource = "_" + tinkerpopVersion.replace(".", "_") + SEP + resource + "-" + configuration + ".json";
+ return IOUtils.toByteArray(getClass().getResourceAsStream(testResource));
+ }
+
+ @Override
+ public String toString() {
+ return tinkerpopVersion + "-" + configuration;
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibility.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibility.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibility.java
new file mode 100644
index 0000000..11a89b9
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibility.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.structure.io.gryo;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.tinkerpop.gremlin.structure.io.Compatibility;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public enum GryoCompatibility implements Compatibility {
+ V1D0_3_2_3("3.2.3", "1.0", "v1d0"),
+ V1D0_3_3_0("3.3.0", "1.0", "v1d0");
+
+ private static final String SEP = File.separator;
+
+ private final String gryoVersion;
+ private final String tinkerpopVersion;
+ private final String configuration;
+
+ GryoCompatibility(final String tinkerpopVersion, final String gryoVersion, final String configuration) {
+ this.tinkerpopVersion = tinkerpopVersion;
+ this.gryoVersion = gryoVersion;
+ this.configuration = configuration;
+ }
+
+ public byte[] readFromResource(final String resource) throws IOException {
+ final String testResource = "_" + tinkerpopVersion.replace(".", "_") + SEP + resource + "-" + configuration + ".kryo";
+ return IOUtils.toByteArray(getClass().getResourceAsStream(testResource));
+ }
+
+ @Override
+ public String toString() {
+ return tinkerpopVersion + "-" + configuration;
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java
new file mode 100644
index 0000000..b0d7961
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assume.assumeThat;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public abstract class AbstractCompatibilityTest {
+ protected final Model model = Model.instance();
+
+ public abstract Compatibility getCompatibility();
+
+ protected void assumeCompatibility(final String resource) {
+ final Model.Entry e = model.find(resource).orElseThrow(() -> new IllegalStateException("Could not find model"));
+ assumeThat("Test model is not compatible with IO", e.isCompatibleWith(getCompatibility()), is(true));
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
new file mode 100644
index 0000000..bb174be
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io;
+
+import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public abstract class AbstractTypedCompatibilityTest extends AbstractCompatibilityTest {
+
+ public abstract <T> T read(final byte[] bytes, final Class<T> clazz) throws Exception;
+
+ public abstract byte[] write(final Object o, final Class<?> clazz) throws Exception;
+
+ @Test
+ public void shouldReadWriteAuthenticationChallenge() throws Exception {
+ assumeCompatibility("authenticationchallenge");
+
+ final HashMap fromStatic = read(getCompatibility().readFromResource("authenticationchallenge"), HashMap.class);
+ final HashMap recycled = read(write(fromStatic, HashMap.class), HashMap.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals("41d2e28a-20a4-4ab0-b379-d810dede3786", recycled.get("requestId"));
+ assertEquals(ResponseStatusCode.AUTHENTICATE.getValue(), ((Map) recycled.get("status")).get("code"));
+ }
+
+ @Test
+ public void shouldReadWriteAuthenticationResponse() throws Exception {
+ assumeCompatibility("authenticationresponse");
+
+ final HashMap fromStatic = read(getCompatibility().readFromResource("authenticationresponse"), HashMap.class);
+ final HashMap recycled = read(write(fromStatic, HashMap.class), HashMap.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals("cb682578-9d92-4499-9ebc-5c6aa73c5397", recycled.get("requestId"));
+ assertEquals("authentication", recycled.get("op"));
+ assertEquals("", recycled.get("processor"));
+ assertEquals("PLAIN", ((Map) recycled.get("args")).get("saslMechanism"));
+ assertEquals("AHN0ZXBocGhlbgBwYXNzd29yZA==", ((Map) recycled.get("args")).get("sasl"));
+ }
+
+ @Test
+ public void shouldReadWriteBarrier() throws Exception {
+ assumeCompatibility("barrier");
+
+ final SackFunctions.Barrier fromStatic = read(getCompatibility().readFromResource("barrier"), SackFunctions.Barrier.class);
+ final SackFunctions.Barrier recycled = read(write(fromStatic, SackFunctions.Barrier.class), SackFunctions.Barrier.class);
+ assertEquals(fromStatic, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteBigDecimal() throws Exception {
+ assumeCompatibility("bigdecimal");
+
+ final BigDecimal fromStatic = read(getCompatibility().readFromResource("bigdecimal"), BigDecimal.class);
+ final BigDecimal recycled = read(write(fromStatic, BigDecimal.class), BigDecimal.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractUntypedCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractUntypedCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractUntypedCompatibilityTest.java
new file mode 100644
index 0000000..db57145
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractUntypedCompatibilityTest.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.structure.io;
+
+import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public abstract class AbstractUntypedCompatibilityTest extends AbstractCompatibilityTest {
+
+ public abstract <T> T read(final byte[] bytes, final Class<T> clazz) throws Exception;
+
+ public abstract byte[] write(final Object o, final Class<?> clazz) throws Exception;
+
+ @Test
+ public void shouldReadWriteAuthenticationChallenge() throws Exception {
+ assumeCompatibility("authenticationchallenge");
+
+ final HashMap fromStatic = read(getCompatibility().readFromResource("authenticationchallenge"), HashMap.class);
+ final HashMap recycled = read(write(fromStatic, HashMap.class), HashMap.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals("41d2e28a-20a4-4ab0-b379-d810dede3786", recycled.get("requestId"));
+ assertEquals(ResponseStatusCode.AUTHENTICATE.getValue(), ((Map) recycled.get("status")).get("code"));
+ }
+
+ @Test
+ public void shouldReadWriteAuthenticationResponse() throws Exception {
+ assumeCompatibility("authenticationresponse");
+
+ final HashMap fromStatic = read(getCompatibility().readFromResource("authenticationresponse"), HashMap.class);
+ final HashMap recycled = read(write(fromStatic, HashMap.class), HashMap.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals("cb682578-9d92-4499-9ebc-5c6aa73c5397", recycled.get("requestId"));
+ assertEquals("authentication", recycled.get("op"));
+ assertEquals("", recycled.get("processor"));
+ assertEquals("PLAIN", ((Map) recycled.get("args")).get("saslMechanism"));
+ assertEquals("AHN0ZXBocGhlbgBwYXNzd29yZA==", ((Map) recycled.get("args")).get("sasl"));
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypedCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypedCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypedCompatibilityTest.java
new file mode 100644
index 0000000..52c0cb4
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypedCompatibilityTest.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.structure.io.AbstractTypedCompatibilityTest;
+import org.apache.tinkerpop.gremlin.structure.io.Compatibility;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+@RunWith(Parameterized.class)
+public class GraphSONTypedCompatibilityTest extends AbstractTypedCompatibilityTest {
+
+ private static ObjectMapper mapperV2 = GraphSONMapper.build().
+ addRegistry(TinkerIoRegistryV2d0.instance()).
+ typeInfo(TypeInfo.PARTIAL_TYPES).
+ addCustomModule(GraphSONXModuleV2d0.build().create(false)).
+ addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
+ version(GraphSONVersion.V2_0).create().createMapper();
+
+ @Parameterized.Parameters(name = "expect({0})")
+ public static Iterable<Object[]> data() {
+ return Arrays.asList(new Object[][]{
+ {GraphSONCompatibility.V2D0_PARTIAL_3_2_3, mapperV2 },
+ {GraphSONCompatibility.V2D0_PARTIAL_3_3_0, mapperV2 }});
+ }
+
+ @Parameterized.Parameter(value = 0)
+ public Compatibility compatibility;
+
+ @Parameterized.Parameter(value = 1)
+ public ObjectMapper mapper;
+
+ @Override
+ public <T> T read(final byte[] bytes, final Class<T> clazz) throws Exception {
+ return mapper.readValue(bytes, clazz);
+ }
+
+ @Override
+ public byte[] write(final Object o, final Class<?> clazz) throws Exception {
+ return mapper.writeValueAsBytes(o);
+ }
+
+ @Override
+ public Compatibility getCompatibility() {
+ return compatibility;
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUntypedCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUntypedCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUntypedCompatibilityTest.java
new file mode 100644
index 0000000..070308b
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUntypedCompatibilityTest.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV1d0;
+import org.apache.tinkerpop.gremlin.structure.io.AbstractUntypedCompatibilityTest;
+import org.apache.tinkerpop.gremlin.structure.io.Compatibility;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+@RunWith(Parameterized.class)
+public class GraphSONUntypedCompatibilityTest extends AbstractUntypedCompatibilityTest {
+
+ private static ObjectMapper mapperV1 = GraphSONMapper.build().
+ addRegistry(TinkerIoRegistry.instance()).
+ addCustomModule(new AbstractGraphSONMessageSerializerV1d0.GremlinServerModule()).
+ version(GraphSONVersion.V1_0).create().createMapper();
+
+ private static ObjectMapper mapperV2 = GraphSONMapper.build().
+ addRegistry(TinkerIoRegistryV2d0.instance()).
+ typeInfo(TypeInfo.NO_TYPES).
+ addCustomModule(GraphSONXModuleV2d0.build().create(false)).
+ addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
+ version(GraphSONVersion.V2_0).create().createMapper();
+
+ @Parameterized.Parameters(name = "expect({0})")
+ public static Iterable<Object[]> data() {
+ return Arrays.asList(new Object[][]{
+ {GraphSONCompatibility.V1D0_3_2_3, mapperV1 },
+ {GraphSONCompatibility.V1D0_3_2_3, mapperV2 },
+ {GraphSONCompatibility.V2D0_NO_TYPE_3_2_3, mapperV2 },
+ {GraphSONCompatibility.V1D0_3_3_0, mapperV1 },
+ {GraphSONCompatibility.V1D0_3_3_0, mapperV2 },
+ {GraphSONCompatibility.V2D0_NO_TYPE_3_3_0, mapperV2 }
+ });
+ }
+
+ @Parameterized.Parameter(value = 0)
+ public Compatibility compatibility;
+
+ @Parameterized.Parameter(value = 1)
+ public ObjectMapper mapper;
+
+ @Override
+ public <T> T read(final byte[] bytes, final Class<T> clazz) throws Exception {
+ return mapper.readValue(bytes, clazz);
+ }
+
+ @Override
+ public byte[] write(final Object o, final Class<?> clazz) throws Exception {
+ return mapper.writeValueAsBytes(o);
+ }
+
+ @Override
+ public Compatibility getCompatibility() {
+ return compatibility;
+ }
+}
[38/47] tinkerpop git commit: TINKERPOP-1130 Structured the IO
compatibility tests
Posted by sp...@apache.org.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-no-types.json
new file mode 100644
index 0000000..b5b5427
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-no-types.json
@@ -0,0 +1 @@
+"2016-12-13T06:30:37.209-05:00"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-partial.json
new file mode 100644
index 0000000..ec7559d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:OffsetDateTime",
+ "@value" : "2016-12-13T06:30:34.477-05:00"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v1d0.json
new file mode 100644
index 0000000..4b43fb2
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v1d0.json
@@ -0,0 +1 @@
+"06:30:29.551-05:00"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-no-types.json
new file mode 100644
index 0000000..c57977d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-no-types.json
@@ -0,0 +1 @@
+"06:30:37.209-05:00"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-partial.json
new file mode 100644
index 0000000..efeec46
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:OffsetTime",
+ "@value" : "06:30:34.477-05:00"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/operator-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/operator-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/operator-v2d0-no-types.json
new file mode 100644
index 0000000..2571e55
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/operator-v2d0-no-types.json
@@ -0,0 +1 @@
+"sum"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/operator-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/operator-v2d0-partial.json
new file mode 100644
index 0000000..14c1400
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_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/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-no-types.json
new file mode 100644
index 0000000..8f2c236
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-no-types.json
@@ -0,0 +1 @@
+"incr"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-partial.json
new file mode 100644
index 0000000..6ad66d8
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Order",
+ "@value" : "incr"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/p-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/p-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/p-v2d0-no-types.json
new file mode 100644
index 0000000..4b9ce34
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/p-v2d0-no-types.json
@@ -0,0 +1,4 @@
+{
+ "predicate" : "gt",
+ "value" : 0
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/p-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/p-v2d0-partial.json
new file mode 100644
index 0000000..5bdfb3b
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/p-v2d0-partial.json
@@ -0,0 +1,10 @@
+{
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "gt",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 0
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pand-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pand-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pand-v2d0-no-types.json
new file mode 100644
index 0000000..194cdd0
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pand-v2d0-no-types.json
@@ -0,0 +1,10 @@
+{
+ "predicate" : "and",
+ "value" : [ {
+ "predicate" : "gt",
+ "value" : 0
+ }, {
+ "predicate" : "lt",
+ "value" : 10
+ } ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pand-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pand-v2d0-partial.json
new file mode 100644
index 0000000..c271958
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pand-v2d0-partial.json
@@ -0,0 +1,25 @@
+{
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "and",
+ "value" : [ {
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "gt",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 0
+ }
+ }
+ }, {
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "lt",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ }
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v1d0.json
new file mode 100644
index 0000000..2eee883
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v1d0.json
@@ -0,0 +1,62 @@
+{
+ "labels" : [ [ ], [ ], [ ] ],
+ "objects" : [ {
+ "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
+ }
+ } ]
+ }
+ }, {
+ "id" : 10,
+ "label" : "software",
+ "type" : "vertex",
+ "properties" : {
+ "name" : [ {
+ "id" : 4,
+ "value" : "gremlin"
+ } ]
+ }
+ }, {
+ "id" : 11,
+ "label" : "software",
+ "type" : "vertex",
+ "properties" : {
+ "name" : [ {
+ "id" : 5,
+ "value" : "tinkergraph"
+ } ]
+ }
+ } ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v2d0-no-types.json
new file mode 100644
index 0000000..06a9522
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v2d0-no-types.json
@@ -0,0 +1,66 @@
+{
+ "labels" : [ [ ], [ ], [ ] ],
+ "objects" : [ {
+ "id" : 1,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 0,
+ "value" : "marko",
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 6,
+ "value" : "san diego",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1997,
+ "endTime" : 2001
+ }
+ }, {
+ "id" : 7,
+ "value" : "santa cruz",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2001,
+ "endTime" : 2004
+ }
+ }, {
+ "id" : 8,
+ "value" : "brussels",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2004,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 9,
+ "value" : "santa fe",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2005
+ }
+ } ]
+ }
+ }, {
+ "id" : 10,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 4,
+ "value" : "gremlin",
+ "label" : "name"
+ } ]
+ }
+ }, {
+ "id" : 11,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 5,
+ "value" : "tinkergraph",
+ "label" : "name"
+ } ]
+ }
+ } ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v2d0-partial.json
new file mode 100644
index 0000000..54ff76d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/path-v2d0-partial.json
@@ -0,0 +1,150 @@
+{
+ "@type" : "g:Path",
+ "@value" : {
+ "labels" : [ [ ], [ ], [ ] ],
+ "objects" : [ {
+ "@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" : 10
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin",
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph",
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/period-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/period-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/period-v1d0.json
new file mode 100644
index 0000000..a58ce89
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/period-v1d0.json
@@ -0,0 +1 @@
+"P1Y6M15D"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/period-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/period-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/period-v2d0-no-types.json
new file mode 100644
index 0000000..a58ce89
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/period-v2d0-no-types.json
@@ -0,0 +1 @@
+"P1Y6M15D"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/period-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/period-v2d0-partial.json
new file mode 100644
index 0000000..20438a1
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/period-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Period",
+ "@value" : "P1Y6M15D"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pop-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pop-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pop-v2d0-no-types.json
new file mode 100644
index 0000000..99a6195
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pop-v2d0-no-types.json
@@ -0,0 +1 @@
+"all"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pop-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pop-v2d0-partial.json
new file mode 100644
index 0000000..271515f
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/pop-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Pop",
+ "@value" : "all"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/por-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/por-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/por-v2d0-no-types.json
new file mode 100644
index 0000000..4d17d67
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/por-v2d0-no-types.json
@@ -0,0 +1,10 @@
+{
+ "predicate" : "or",
+ "value" : [ {
+ "predicate" : "gt",
+ "value" : 0
+ }, {
+ "predicate" : "within",
+ "value" : [ -1, -10, -100 ]
+ } ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/por-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/por-v2d0-partial.json
new file mode 100644
index 0000000..71fcb7d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/por-v2d0-partial.json
@@ -0,0 +1,31 @@
+{
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "or",
+ "value" : [ {
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "gt",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 0
+ }
+ }
+ }, {
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "within",
+ "value" : [ {
+ "@type" : "g:Int32",
+ "@value" : -1
+ }, {
+ "@type" : "g:Int32",
+ "@value" : -10
+ }, {
+ "@type" : "g:Int32",
+ "@value" : -100
+ } ]
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v1d0.json
new file mode 100644
index 0000000..c051c0a
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v1d0.json
@@ -0,0 +1,4 @@
+{
+ "key" : "since",
+ "value" : 2009
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v2d0-no-types.json
new file mode 100644
index 0000000..c051c0a
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v2d0-no-types.json
@@ -0,0 +1,4 @@
+{
+ "key" : "since",
+ "value" : 2009
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v2d0-partial.json
new file mode 100644
index 0000000..296fe32
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/property-v2d0-partial.json
@@ -0,0 +1,10 @@
+{
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/scope-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/scope-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/scope-v2d0-no-types.json
new file mode 100644
index 0000000..8fde6b5
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/scope-v2d0-no-types.json
@@ -0,0 +1 @@
+"local"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/scope-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/scope-v2d0-partial.json
new file mode 100644
index 0000000..4a74af0
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/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/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v1d0.json
new file mode 100644
index 0000000..883d7d1
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v1d0.json
@@ -0,0 +1,8 @@
+{
+ "requestId" : "4b39e6aa-363b-4f1d-91d2-c173dc81bea5",
+ "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/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/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_3/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v2d0-no-types.json
new file mode 100644
index 0000000..0640bd3
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v2d0-no-types.json
@@ -0,0 +1,8 @@
+{
+ "requestId" : "cca7f0f0-0c51-4e9d-90d8-2ef1b7b1c6ca",
+ "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/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v2d0-partial.json
new file mode 100644
index 0000000..4605a98
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v2d0-partial.json
@@ -0,0 +1,14 @@
+{
+ "requestId" : {
+ "@type" : "g:UUID",
+ "@value" : "4a422689-0f01-457f-8963-b6f07aefb106"
+ },
+ "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/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v1d0.json
new file mode 100644
index 0000000..94a00ae
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v1d0.json
@@ -0,0 +1,16 @@
+{
+ "requestId" : "8479fb7d-620e-44e2-99bb-5625b54fb518",
+ "op" : "eval",
+ "processor" : "session",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "session" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "bindings" : {
+ "x" : 1
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-no-types.json
new file mode 100644
index 0000000..bd23835
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-no-types.json
@@ -0,0 +1,16 @@
+{
+ "requestId" : "80259836-35b0-4399-a0d7-f1d0bf956cbc",
+ "op" : "eval",
+ "processor" : "session",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "session" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "bindings" : {
+ "x" : 1
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-partial.json
new file mode 100644
index 0000000..a1dee0c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-partial.json
@@ -0,0 +1,25 @@
+{
+ "requestId" : {
+ "@type" : "g:UUID",
+ "@value" : "8a9b4c19-bd79-4470-a73d-ac54b7937c65"
+ },
+ "op" : "eval",
+ "processor" : "session",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "session" : {
+ "@type" : "g:UUID",
+ "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
+ },
+ "bindings" : {
+ "x" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v1d0.json
new file mode 100644
index 0000000..47d2314
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v1d0.json
@@ -0,0 +1,15 @@
+{
+ "requestId" : "3f905713-9534-43ff-b6e8-2e2aa4f82451",
+ "op" : "eval",
+ "processor" : "",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "bindings" : {
+ "x" : 1
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-no-types.json
new file mode 100644
index 0000000..d6c3b67
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-no-types.json
@@ -0,0 +1,15 @@
+{
+ "requestId" : "7bee05b0-1bca-4560-8f8d-45fce3d07fd8",
+ "op" : "eval",
+ "processor" : "",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "bindings" : {
+ "x" : 1
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-partial.json
new file mode 100644
index 0000000..ecc5b9d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-partial.json
@@ -0,0 +1,21 @@
+{
+ "requestId" : {
+ "@type" : "g:UUID",
+ "@value" : "fe49a49e-7552-4c5f-ae33-5f4783926919"
+ },
+ "op" : "eval",
+ "processor" : "",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "bindings" : {
+ "x" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/short-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/short-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/short-v2d0-no-types.json
new file mode 100644
index 0000000..105d7d9
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/short-v2d0-no-types.json
@@ -0,0 +1 @@
+100
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/short-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/short-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/short-v2d0-partial.json
new file mode 100644
index 0000000..c68f5cd
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/short-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Int16",
+ "@value" : 100
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v1d0.json
new file mode 100644
index 0000000..9b93727
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v1d0.json
@@ -0,0 +1,50 @@
+{
+ "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "status" : {
+ "message" : "",
+ "code" : 200,
+ "attributes" : { }
+ },
+ "result" : {
+ "data" : [ {
+ "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
+ }
+ } ]
+ }
+ } ],
+ "meta" : { }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v2d0-no-types.json
new file mode 100644
index 0000000..4fd2fd3
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v2d0-no-types.json
@@ -0,0 +1,54 @@
+{
+ "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "status" : {
+ "message" : "",
+ "code" : 200,
+ "attributes" : { }
+ },
+ "result" : {
+ "data" : [ {
+ "id" : 1,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 0,
+ "value" : "marko",
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 6,
+ "value" : "san diego",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1997,
+ "endTime" : 2001
+ }
+ }, {
+ "id" : 7,
+ "value" : "santa cruz",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2001,
+ "endTime" : 2004
+ }
+ }, {
+ "id" : 8,
+ "value" : "brussels",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2004,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 9,
+ "value" : "santa fe",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2005
+ }
+ } ]
+ }
+ } ],
+ "meta" : { }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v2d0-partial.json
new file mode 100644
index 0000000..857c6db
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/standardresult-v2d0-partial.json
@@ -0,0 +1,111 @@
+{
+ "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "status" : {
+ "message" : "",
+ "code" : 200,
+ "attributes" : { }
+ },
+ "result" : {
+ "data" : [ {
+ "@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
+ }
+ }
+ }
+ } ]
+ }
+ }
+ } ],
+ "meta" : { }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v1d0.json
new file mode 100644
index 0000000..4fc3915
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v1d0.json
@@ -0,0 +1,66 @@
+{
+ "id" : 1,
+ "label" : "person",
+ "outE" : {
+ "uses" : [ {
+ "id" : 16,
+ "inV" : 11,
+ "properties" : {
+ "skill" : 5
+ }
+ }, {
+ "id" : 15,
+ "inV" : 10,
+ "properties" : {
+ "skill" : 4
+ }
+ } ],
+ "develops" : [ {
+ "id" : 13,
+ "inV" : 10,
+ "properties" : {
+ "since" : 2009
+ }
+ }, {
+ "id" : 14,
+ "inV" : 11,
+ "properties" : {
+ "since" : 2010
+ }
+ } ]
+ },
+ "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
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v2d0-no-types.json
new file mode 100644
index 0000000..4fc3915
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v2d0-no-types.json
@@ -0,0 +1,66 @@
+{
+ "id" : 1,
+ "label" : "person",
+ "outE" : {
+ "uses" : [ {
+ "id" : 16,
+ "inV" : 11,
+ "properties" : {
+ "skill" : 5
+ }
+ }, {
+ "id" : 15,
+ "inV" : 10,
+ "properties" : {
+ "skill" : 4
+ }
+ } ],
+ "develops" : [ {
+ "id" : 13,
+ "inV" : 10,
+ "properties" : {
+ "since" : 2009
+ }
+ }, {
+ "id" : 14,
+ "inV" : 11,
+ "properties" : {
+ "since" : 2010
+ }
+ } ]
+ },
+ "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
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v2d0-partial.json
new file mode 100644
index 0000000..66b2e1b
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/stargraph-v2d0-partial.json
@@ -0,0 +1,141 @@
+{
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "person",
+ "outE" : {
+ "uses" : [ {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 16
+ },
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 5
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 15
+ },
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 4
+ }
+ }
+ } ],
+ "develops" : [ {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 13
+ },
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 14
+ },
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Int32",
+ "@value" : 2010
+ }
+ }
+ } ]
+ },
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1997
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "value" : "santa cruz",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 8
+ },
+ "value" : "brussels",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 9
+ },
+ "value" : "santa fe",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/t-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/t-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/t-v2d0-no-types.json
new file mode 100644
index 0000000..bad8612
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/t-v2d0-no-types.json
@@ -0,0 +1 @@
+"label"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/t-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/t-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/t-v2d0-partial.json
new file mode 100644
index 0000000..9693983
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/t-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:T",
+ "@value" : "label"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-no-types.json
new file mode 100644
index 0000000..139952d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-no-types.json
@@ -0,0 +1 @@
+1481628637178
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-partial.json
new file mode 100644
index 0000000..8097011
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Timestamp",
+ "@value" : 1481628634377
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tinkergraph-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tinkergraph-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tinkergraph-v1d0.json
new file mode 100644
index 0000000..13719f6
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tinkergraph-v1d0.json
@@ -0,0 +1,313 @@
+{
+ "vertices" : [ {
+ "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
+ }
+ } ]
+ }
+ }, {
+ "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
+ }
+ } ]
+ }
+ }, {
+ "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
+ }
+ } ]
+ }
+ }, {
+ "id" : 9,
+ "label" : "person",
+ "type" : "vertex",
+ "properties" : {
+ "name" : [ {
+ "id" : 3,
+ "value" : "daniel"
+ } ],
+ "location" : [ {
+ "id" : 17,
+ "value" : "spremberg",
+ "properties" : {
+ "startTime" : 1982,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 18,
+ "value" : "kaiserslautern",
+ "properties" : {
+ "startTime" : 2005,
+ "endTime" : 2009
+ }
+ }, {
+ "id" : 19,
+ "value" : "aachen",
+ "properties" : {
+ "startTime" : 2009
+ }
+ } ]
+ }
+ }, {
+ "id" : 10,
+ "label" : "software",
+ "type" : "vertex",
+ "properties" : {
+ "name" : [ {
+ "id" : 4,
+ "value" : "gremlin"
+ } ]
+ }
+ }, {
+ "id" : 11,
+ "label" : "software",
+ "type" : "vertex",
+ "properties" : {
+ "name" : [ {
+ "id" : 5,
+ "value" : "tinkergraph"
+ } ]
+ }
+ } ],
+ "edges" : [ {
+ "id" : 13,
+ "label" : "develops",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 1,
+ "properties" : {
+ "since" : 2009
+ }
+ }, {
+ "id" : 14,
+ "label" : "develops",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 1,
+ "properties" : {
+ "since" : 2010
+ }
+ }, {
+ "id" : 15,
+ "label" : "uses",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 1,
+ "properties" : {
+ "skill" : 4
+ }
+ }, {
+ "id" : 16,
+ "label" : "uses",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 1,
+ "properties" : {
+ "skill" : 5
+ }
+ }, {
+ "id" : 17,
+ "label" : "develops",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 7,
+ "properties" : {
+ "since" : 2010
+ }
+ }, {
+ "id" : 18,
+ "label" : "develops",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 7,
+ "properties" : {
+ "since" : 2011
+ }
+ }, {
+ "id" : 19,
+ "label" : "uses",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 7,
+ "properties" : {
+ "skill" : 5
+ }
+ }, {
+ "id" : 20,
+ "label" : "uses",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 7,
+ "properties" : {
+ "skill" : 4
+ }
+ }, {
+ "id" : 21,
+ "label" : "develops",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 8,
+ "properties" : {
+ "since" : 2012
+ }
+ }, {
+ "id" : 22,
+ "label" : "uses",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 8,
+ "properties" : {
+ "skill" : 3
+ }
+ }, {
+ "id" : 23,
+ "label" : "uses",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 8,
+ "properties" : {
+ "skill" : 3
+ }
+ }, {
+ "id" : 24,
+ "label" : "uses",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 9,
+ "properties" : {
+ "skill" : 5
+ }
+ }, {
+ "id" : 25,
+ "label" : "uses",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 9,
+ "properties" : {
+ "skill" : 3
+ }
+ }, {
+ "id" : 26,
+ "label" : "traverses",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "software",
+ "inV" : 11,
+ "outV" : 10
+ } ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tinkergraph-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tinkergraph-v2d0-no-types.json
new file mode 100644
index 0000000..94ad061
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tinkergraph-v2d0-no-types.json
@@ -0,0 +1,352 @@
+{
+ "vertices" : [ {
+ "id" : 1,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 0,
+ "value" : "marko",
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 6,
+ "value" : "san diego",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1997,
+ "endTime" : 2001
+ }
+ }, {
+ "id" : 7,
+ "value" : "santa cruz",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2001,
+ "endTime" : 2004
+ }
+ }, {
+ "id" : 8,
+ "value" : "brussels",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2004,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 9,
+ "value" : "santa fe",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2005
+ }
+ } ]
+ }
+ }, {
+ "id" : 7,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 1,
+ "value" : "stephen",
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 10,
+ "value" : "centreville",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1990,
+ "endTime" : 2000
+ }
+ }, {
+ "id" : 11,
+ "value" : "dulles",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2000,
+ "endTime" : 2006
+ }
+ }, {
+ "id" : 12,
+ "value" : "purcellville",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2006
+ }
+ } ]
+ }
+ }, {
+ "id" : 8,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 2,
+ "value" : "matthias",
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 13,
+ "value" : "bremen",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2004,
+ "endTime" : 2007
+ }
+ }, {
+ "id" : 14,
+ "value" : "baltimore",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2007,
+ "endTime" : 2011
+ }
+ }, {
+ "id" : 15,
+ "value" : "oakland",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2011,
+ "endTime" : 2014
+ }
+ }, {
+ "id" : 16,
+ "value" : "seattle",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2014
+ }
+ } ]
+ }
+ }, {
+ "id" : 9,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 3,
+ "value" : "daniel",
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 17,
+ "value" : "spremberg",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1982,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 18,
+ "value" : "kaiserslautern",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2005,
+ "endTime" : 2009
+ }
+ }, {
+ "id" : 19,
+ "value" : "aachen",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2009
+ }
+ } ]
+ }
+ }, {
+ "id" : 10,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 4,
+ "value" : "gremlin",
+ "label" : "name"
+ } ]
+ }
+ }, {
+ "id" : 11,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 5,
+ "value" : "tinkergraph",
+ "label" : "name"
+ } ]
+ }
+ } ],
+ "edges" : [ {
+ "id" : 13,
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 1,
+ "properties" : {
+ "since" : {
+ "key" : "since",
+ "value" : 2009
+ }
+ }
+ }, {
+ "id" : 14,
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 1,
+ "properties" : {
+ "since" : {
+ "key" : "since",
+ "value" : 2010
+ }
+ }
+ }, {
+ "id" : 15,
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 1,
+ "properties" : {
+ "skill" : {
+ "key" : "skill",
+ "value" : 4
+ }
+ }
+ }, {
+ "id" : 16,
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 1,
+ "properties" : {
+ "skill" : {
+ "key" : "skill",
+ "value" : 5
+ }
+ }
+ }, {
+ "id" : 17,
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 7,
+ "properties" : {
+ "since" : {
+ "key" : "since",
+ "value" : 2010
+ }
+ }
+ }, {
+ "id" : 18,
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 7,
+ "properties" : {
+ "since" : {
+ "key" : "since",
+ "value" : 2011
+ }
+ }
+ }, {
+ "id" : 19,
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 7,
+ "properties" : {
+ "skill" : {
+ "key" : "skill",
+ "value" : 5
+ }
+ }
+ }, {
+ "id" : 20,
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 7,
+ "properties" : {
+ "skill" : {
+ "key" : "skill",
+ "value" : 4
+ }
+ }
+ }, {
+ "id" : 21,
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 8,
+ "properties" : {
+ "since" : {
+ "key" : "since",
+ "value" : 2012
+ }
+ }
+ }, {
+ "id" : 22,
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 8,
+ "properties" : {
+ "skill" : {
+ "key" : "skill",
+ "value" : 3
+ }
+ }
+ }, {
+ "id" : 23,
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 8,
+ "properties" : {
+ "skill" : {
+ "key" : "skill",
+ "value" : 3
+ }
+ }
+ }, {
+ "id" : 24,
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 9,
+ "properties" : {
+ "skill" : {
+ "key" : "skill",
+ "value" : 5
+ }
+ }
+ }, {
+ "id" : 25,
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 11,
+ "outV" : 9,
+ "properties" : {
+ "skill" : {
+ "key" : "skill",
+ "value" : 3
+ }
+ }
+ }, {
+ "id" : 26,
+ "label" : "traverses",
+ "inVLabel" : "software",
+ "outVLabel" : "software",
+ "inV" : 11,
+ "outV" : 10
+ } ]
+}
\ No newline at end of file
[04/47] tinkerpop git commit: TINKERPOP-1490 Updated dev docs on
RemoteConnection API
Posted by sp...@apache.org.
TINKERPOP-1490 Updated dev docs on RemoteConnection API
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/460f1243
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/460f1243
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/460f1243
Branch: refs/heads/TINKERPOP-1130
Commit: 460f1243b7b0cddb52fc687b370158c1860c9cb7
Parents: 81fa7e0
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Nov 14 10:08:17 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 16 10:00:40 2016 -0500
----------------------------------------------------------------------
docs/src/dev/provider/index.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/460f1243/docs/src/dev/provider/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/provider/index.asciidoc b/docs/src/dev/provider/index.asciidoc
index 8760d01..71d071f 100644
--- a/docs/src/dev/provider/index.asciidoc
+++ b/docs/src/dev/provider/index.asciidoc
@@ -427,7 +427,7 @@ iterate.
There is one method to implement on `RemoteConnection`:
[source,java]
-public <E> RemoteTraversal<?,E> submit(final Bytecode bytecode) throws RemoteConnectionException;
+public <E> CompletableFuture<RemoteTraversal<?, E>> submitAsync(final Bytecode bytecode) throws RemoteConnectionException;
Note that it returns a `RemoteTraversal`. This interface should also be implemented and in most cases implementers can
simply extend the `AbstractRemoteTraversal`, which provides default implementations for all the `Traversal` methods
[18/47] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/60c72138
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/60c72138
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/60c72138
Branch: refs/heads/TINKERPOP-1130
Commit: 60c72138ce31b6a793e2a8dea53f9ca376f7219a
Parents: 7f7af28 d1568f0
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Dec 19 07:05:14 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Dec 19 07:05:14 2016 -0500
----------------------------------------------------------------------
docs/src/dev/developer/development-environment.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/60c72138/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
[45/47] tinkerpop git commit: TINKERPOP-1130 Add gremlin-test back as
compile scope.
Posted by sp...@apache.org.
TINKERPOP-1130 Add gremlin-test back as compile scope.
It can't be test scope since non-test code uses commons-io which comes from gremlin-test. Shouldn't be any harm in including gremlin-test this way as this is a utility module that isn't deployed or anything.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e564a70b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e564a70b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e564a70b
Branch: refs/heads/TINKERPOP-1130
Commit: e564a70bbcc3c851e79b5d7994bf347c21f3344a
Parents: 6dd3f10
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Dec 19 09:16:11 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 20 15:24:52 2016 -0500
----------------------------------------------------------------------
gremlin-tools/gremlin-io-test/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e564a70b/gremlin-tools/gremlin-io-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/pom.xml b/gremlin-tools/gremlin-io-test/pom.xml
index 8fc6278..549afd1 100644
--- a/gremlin-tools/gremlin-io-test/pom.xml
+++ b/gremlin-tools/gremlin-io-test/pom.xml
@@ -21,11 +21,11 @@
<artifactId>tinkergraph-gremlin</artifactId>
<version>${project.version}</version>
</dependency>
+ <!-- gremlin-test needs to be compile scope as it provides commons-io -->
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-test</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
[44/47] tinkerpop git commit: TINKERPOP-1130 Made the test data for
metrics static.
Posted by sp...@apache.org.
TINKERPOP-1130 Made the test data for metrics static.
This helps prevent the data from regenerating on every build.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/46b14b36
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/46b14b36
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/46b14b36
Branch: refs/heads/TINKERPOP-1130
Commit: 46b14b36591827f577f98d04719a8eab28781981
Parents: f0144dd
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Dec 15 13:58:20 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 20 15:24:52 2016 -0500
----------------------------------------------------------------------
.../process/traversal/util/MutableMetrics.java | 2 +-
.../tinkerpop/gremlin/structure/io/Model.java | 63 ++++++++++++++-----
.../_3_2_3/manual-graphson-generator.groovy | 48 ++++++++++++--
.../graphson/_3_2_3/metrics-v2d0-no-types.json | 14 ++---
.../graphson/_3_2_3/metrics-v2d0-partial.json | 14 ++---
.../_3_2_3/traversalmetrics-v2d0-no-types.json | 18 +++---
.../_3_2_3/traversalmetrics-v2d0-partial.json | 18 +++---
.../graphson/_3_3_0/metrics-v2d0-no-types.json | 14 ++---
.../graphson/_3_3_0/metrics-v2d0-partial.json | 14 ++---
.../_3_3_0/traversalmetrics-v2d0-no-types.json | 18 +++---
.../_3_3_0/traversalmetrics-v2d0-partial.json | 18 +++---
.../io/gryo/_3_2_3/manual-gryo-generator.groovy | 48 ++++++++++++--
.../structure/io/gryo/_3_2_3/metrics-v1d0.kryo | Bin 185 -> 187 bytes
.../io/gryo/_3_2_3/traversalmetrics-v1d0.kryo | Bin 429 -> 294 bytes
.../structure/io/gryo/_3_3_0/metrics-v1d0.kryo | Bin 185 -> 187 bytes
.../io/gryo/_3_3_0/traversalmetrics-v1d0.kryo | Bin 429 -> 294 bytes
16 files changed, 201 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46b14b36/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
index 19e2069..0ed3a7b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
@@ -54,7 +54,7 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
other.getNested().forEach(nested -> this.addNested(new MutableMetrics(nested)));
}
- public void addNested(MutableMetrics metrics) {
+ public void addNested(final MutableMetrics metrics) {
this.nested.put(metrics.getId(), metrics);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46b14b36/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
index 26f70bc..1123e89 100644
--- a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
+++ b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
@@ -29,6 +29,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
import org.apache.tinkerpop.gremlin.process.traversal.Scope;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
import org.apache.tinkerpop.gremlin.structure.Column;
@@ -71,6 +72,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -139,16 +141,16 @@ public class Model {
addGraphProcessEntry(TraversalOptionParent.Pick.any, "Pick");
addGraphProcessEntry(Pop.all, "Pop");
addGraphProcessEntry(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda");
- final TraversalMetrics tm = g.V().hasLabel("person").out().out().tree().profile().next();
- final MutableMetrics metrics = new MutableMetrics(tm.getMetrics(0));
- metrics.addNested(new MutableMetrics(tm.getMetrics(1)));
+ final TraversalMetrics tm = createStaticTraversalMetrics();
+ final MutableMetrics metrics = new MutableMetrics(tm.getMetrics("7.0.0()"));
+ metrics.addNested(new MutableMetrics(tm.getMetrics("3.0.0()")));
addGraphProcessEntry(metrics, "Metrics");
addGraphProcessEntry(P.gt(0), "P");
addGraphProcessEntry(P.gt(0).and(P.lt(10)), "P and", "", GRAPHSON_ONLY);
addGraphProcessEntry(P.gt(0).or(P.within(-1, -10, -100)), "P or", "", GRAPHSON_ONLY);
addGraphProcessEntry(Scope.local, "Scope");
addGraphProcessEntry(T.label, "T", "", GRYO_ONLY);
- addGraphProcessEntry(g.V().hasLabel("person").out().out().tree().profile().next(), "TraversalMetrics");
+ addGraphProcessEntry(createStaticTraversalMetrics(), "TraversalMetrics");
addGraphProcessEntry(g.V().hasLabel("person").asAdmin().nextTraverser(), "Traverser");
final Map<String,Object> requestBindings = new HashMap<String,Object>(){{
@@ -221,7 +223,41 @@ public class Model {
addExtendedEntry(ZonedDateTime.of(2016, 12, 23, 12, 12, 24, 36, ZoneId.of("GMT+2")), "ZonedDateTime");
addExtendedEntry(ZoneOffset.ofHoursMinutesSeconds(3, 6, 9), "ZoneOffset", "The following example is a `ZoneOffset` of three hours, six minutes, and nine seconds.");
}
-
+
+ private static DefaultTraversalMetrics createStaticTraversalMetrics() {
+ // based on g.V().hasLabel("person").out().out().tree().profile().next()
+ final List<MutableMetrics> traversalMutableMetrics = new ArrayList<>();
+ final MutableMetrics m7 = new MutableMetrics("7.0.0()", "TinkerGraphStep(vertex,[~label.eq(person)])");
+ m7.setDuration(100, TimeUnit.MILLISECONDS);
+ m7.setCount("traverserCount", 4);
+ m7.setCount("elementCount", 4);
+ m7.setAnnotation("percentDur", 25.0d);
+ traversalMutableMetrics.add(m7);
+
+ final MutableMetrics m2 = new MutableMetrics("2.0.0()", "VertexStep(OUT,vertex)");
+ m2.setDuration(100, TimeUnit.MILLISECONDS);
+ m2.setCount("traverserCount", 13);
+ m2.setCount("elementCount", 13);
+ m2.setAnnotation("percentDur", 25.0d);
+ traversalMutableMetrics.add(m2);
+
+ final MutableMetrics m3 = new MutableMetrics("3.0.0()", "VertexStep(OUT,vertex)");
+ m3.setDuration(100, TimeUnit.MILLISECONDS);
+ m3.setCount("traverserCount", 7);
+ m3.setCount("elementCount", 7);
+ m3.setAnnotation("percentDur", 25.0d);
+ traversalMutableMetrics.add(m3);
+
+ final MutableMetrics m4 = new MutableMetrics("4.0.0()", "TreeStep");
+ m4.setDuration(100, TimeUnit.MILLISECONDS);
+ m4.setCount("traverserCount", 1);
+ m4.setCount("elementCount", 1);
+ m4.setAnnotation("percentDur", 25.0d);
+ traversalMutableMetrics.add(m4);
+
+ return new DefaultTraversalMetrics(4000, traversalMutableMetrics);
+ }
+
public static Model instance() {
return model;
}
@@ -327,28 +363,25 @@ public class Model {
headers.add("resource");
headers.addAll(compatibilities.stream().map(c -> {
if (c instanceof GryoCompatibility)
- return ((GryoCompatibility) c).name();
+ return "gryo-" + ((GryoCompatibility) c).name();
else if (c instanceof GraphSONCompatibility)
- return ((GraphSONCompatibility) c).name();
+ return "graphson-" + ((GraphSONCompatibility) c).name();
else
throw new IllegalStateException("No support for the provided Compatibility type");
}).collect(Collectors.toList()));
try (final PrintWriter writer = new PrintWriter(f)) {
- writer.println(String.join("\t", headers));
+ writer.println(String.join(",", headers));
final List<Entry> sorted = new ArrayList<>(entries());
Collections.sort(sorted, (o1, o2) -> o1.getResourceName().compareTo(o2.getResourceName()));
sorted.forEach(e -> {
writer.write(e.getResourceName());
- writer.write("\t");
- compatibilities.forEach(c -> {
- writer.print(e.isCompatibleWith(c));
- writer.print("\t");
- });
-
- writer.println();
+ writer.write(",");
+ final List<String> compatibleList = new ArrayList<>();
+ compatibilities.forEach(c -> compatibleList.add(Boolean.toString(e.isCompatibleWith(c))));
+ writer.println(String.join(",", compatibleList));
});
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46b14b36/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
index a3117c7..2e6c5bc 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
@@ -17,6 +17,10 @@
* under the License.
*/
+
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics
+import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics
+
import java.time.*
import java.nio.file.*
import org.apache.tinkerpop.gremlin.driver.ser.*
@@ -29,6 +33,8 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.*
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent.Pick
import org.apache.tinkerpop.gremlin.structure.io.gryo.*
+import java.util.concurrent.TimeUnit
+
new File("dev-docs/").mkdirs()
new File("test-case-data/io/graphson").mkdirs()
@@ -126,6 +132,40 @@ writeSupportedV1Objects = { writer, mapper ->
writer.write(toJsonV1d0NoTypes(ZoneOffset.ofHoursMinutesSeconds(3, 6, 9), "ZoneOffset", mapper, "The following example is a `ZoneOffset` of three hours, six minutes, and nine seconds."))
}
+createStaticTraversalMetrics = {
+ // based on g.V().hasLabel("person").out().out().tree().profile().next()
+ def traversalMutableMetrics = new ArrayList<>()
+ def m7 = new MutableMetrics("7.0.0()", "TinkerGraphStep(vertex,[~label.eq(person)])")
+ m7.setDuration(100, TimeUnit.MILLISECONDS)
+ m7.setCount("traverserCount", 4)
+ m7.setCount("elementCount", 4)
+ m7.setAnnotation("percentDur", 25.0d)
+ traversalMutableMetrics.add(m7)
+
+ def m2 = new MutableMetrics("2.0.0()", "VertexStep(OUT,vertex)")
+ m2.setDuration(100, TimeUnit.MILLISECONDS)
+ m2.setCount("traverserCount", 13)
+ m2.setCount("elementCount", 13)
+ m2.setAnnotation("percentDur", 25.0d)
+ traversalMutableMetrics.add(m2)
+
+ def m3 = new MutableMetrics("3.0.0()", "VertexStep(OUT,vertex)")
+ m3.setDuration(100, TimeUnit.MILLISECONDS)
+ m3.setCount("traverserCount", 7)
+ m3.setCount("elementCount", 7)
+ m3.setAnnotation("percentDur", 25.0d)
+ traversalMutableMetrics.add(m3)
+
+ def m4 = new MutableMetrics("4.0.0()", "TreeStep")
+ m4.setDuration(100, TimeUnit.MILLISECONDS)
+ m4.setCount("traverserCount", 1)
+ m4.setCount("elementCount", 1)
+ m4.setAnnotation("percentDur", 25.0d)
+ traversalMutableMetrics.add(m4)
+
+ return new DefaultTraversalMetrics(4000, traversalMutableMetrics)
+}
+
mapper = GraphSONMapper.build().
addRegistry(TinkerIoRegistry.getInstance()).
addCustomModule(new AbstractGraphSONMessageSerializerV1d0.GremlinServerModule()).
@@ -180,16 +220,16 @@ writeSupportedV2Objects = { writer, mapper, toJsonFunction ->
writer.write(toJsonFunction(Order.incr, "Order", mapper))
writer.write(toJsonFunction(Pop.all, "Pop", mapper))
writer.write(toJsonFunction(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda", mapper))
- tm = g.V().hasLabel('person').out().out().tree().profile().next()
- metrics = new org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics(tm.getMetrics(0));
- metrics.addNested(new org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics(tm.getMetrics(1)));
+ def tm = createStaticTraversalMetrics()
+ def metrics = new MutableMetrics(tm.getMetrics("7.0.0()"))
+ metrics.addNested(new MutableMetrics(tm.getMetrics("3.0.0()")))
writer.write(toJsonFunction(metrics, "Metrics", mapper))
writer.write(toJsonFunction(P.gt(0), "P", mapper))
writer.write(toJsonFunction(P.gt(0).and(P.lt(10)), "P and", mapper))
writer.write(toJsonFunction(P.gt(0).or(P.within(-1, -10, -100)), "P or", mapper))
writer.write(toJsonFunction(Scope.local, "Scope", mapper))
writer.write(toJsonFunction(T.label, "T", mapper))
- writer.write(toJsonFunction(g.V().hasLabel('person').out().out().tree().profile().next(), "TraversalMetrics", mapper))
+ writer.write(toJsonFunction(createStaticTraversalMetrics(), "TraversalMetrics", mapper))
writer.write(toJsonFunction(g.V().hasLabel('person').nextTraverser(), "Traverser", mapper))
writer.write("\n")
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46b14b36/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-no-types.json
index 9d647f0..1855cb5 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-no-types.json
@@ -1,24 +1,24 @@
{
- "dur" : 0.112874,
+ "dur" : 100.0,
"counts" : {
"traverserCount" : 4,
"elementCount" : 4
},
"name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
"annotations" : {
- "percentDur" : 12.93474299884718
+ "percentDur" : 25.0
},
"id" : "7.0.0()",
"metrics" : [ {
- "dur" : 0.2619,
+ "dur" : 100.0,
"counts" : {
- "traverserCount" : 13,
- "elementCount" : 13
+ "traverserCount" : 7,
+ "elementCount" : 7
},
"name" : "VertexStep(OUT,vertex)",
"annotations" : {
- "percentDur" : 30.012307452540675
+ "percentDur" : 25.0
},
- "id" : "2.0.0()"
+ "id" : "3.0.0()"
} ]
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46b14b36/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-partial.json
index 5d2a919..7b1e964 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-partial.json
@@ -3,7 +3,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.173382
+ "@value" : 100.0
},
"counts" : {
"traverserCount" : {
@@ -19,7 +19,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 17.538702446366866
+ "@value" : 25.0
}
},
"id" : "7.0.0()",
@@ -28,26 +28,26 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.259902
+ "@value" : 100.0
},
"counts" : {
"traverserCount" : {
"@type" : "g:Int64",
- "@value" : 13
+ "@value" : 7
},
"elementCount" : {
"@type" : "g:Int64",
- "@value" : 13
+ "@value" : 7
}
},
"name" : "VertexStep(OUT,vertex)",
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 26.29075592169684
+ "@value" : 25.0
}
},
- "id" : "2.0.0()"
+ "id" : "3.0.0()"
}
} ]
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46b14b36/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-no-types.json
index 604a166..06fc02d 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-no-types.json
@@ -1,47 +1,47 @@
{
- "dur" : 1.101297,
+ "dur" : 0.004,
"metrics" : [ {
- "dur" : 0.224678,
+ "dur" : 100.0,
"counts" : {
"traverserCount" : 4,
"elementCount" : 4
},
"name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
"annotations" : {
- "percentDur" : 20.401217836786987
+ "percentDur" : 25.0
},
"id" : "7.0.0()"
}, {
- "dur" : 0.323779,
+ "dur" : 100.0,
"counts" : {
"traverserCount" : 13,
"elementCount" : 13
},
"name" : "VertexStep(OUT,vertex)",
"annotations" : {
- "percentDur" : 29.399789520901265
+ "percentDur" : 25.0
},
"id" : "2.0.0()"
}, {
- "dur" : 0.276658,
+ "dur" : 100.0,
"counts" : {
"traverserCount" : 7,
"elementCount" : 7
},
"name" : "VertexStep(OUT,vertex)",
"annotations" : {
- "percentDur" : 25.121107203597212
+ "percentDur" : 25.0
},
"id" : "3.0.0()"
}, {
- "dur" : 0.276182,
+ "dur" : 100.0,
"counts" : {
"traverserCount" : 1,
"elementCount" : 1
},
"name" : "TreeStep",
"annotations" : {
- "percentDur" : 25.077885438714535
+ "percentDur" : 25.0
},
"id" : "4.0.0()"
} ]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46b14b36/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-partial.json
index b40c565..fdd18a4 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-partial.json
@@ -3,14 +3,14 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.701505
+ "@value" : 0.004
},
"metrics" : [ {
"@type" : "g:Metrics",
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.100826
+ "@value" : 100.0
},
"counts" : {
"traverserCount" : {
@@ -26,7 +26,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 14.372812738326884
+ "@value" : 25.0
}
},
"id" : "7.0.0()"
@@ -36,7 +36,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.169312
+ "@value" : 100.0
},
"counts" : {
"traverserCount" : {
@@ -52,7 +52,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 24.135537166520553
+ "@value" : 25.0
}
},
"id" : "2.0.0()"
@@ -62,7 +62,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.268548
+ "@value" : 100.0
},
"counts" : {
"traverserCount" : {
@@ -78,7 +78,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 38.28169435713217
+ "@value" : 25.0
}
},
"id" : "3.0.0()"
@@ -88,7 +88,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.162819
+ "@value" : 100.0
},
"counts" : {
"traverserCount" : {
@@ -104,7 +104,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 23.209955738020398
+ "@value" : 25.0
}
},
"id" : "4.0.0()"
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46b14b36/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json
index 10495e1..1855cb5 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json
@@ -1,24 +1,24 @@
{
- "dur" : 0.206618,
+ "dur" : 100.0,
"counts" : {
"traverserCount" : 4,
"elementCount" : 4
},
"name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
"annotations" : {
- "percentDur" : 18.82133676326716
+ "percentDur" : 25.0
},
"id" : "7.0.0()",
"metrics" : [ {
- "dur" : 0.274299,
+ "dur" : 100.0,
"counts" : {
- "traverserCount" : 13,
- "elementCount" : 13
+ "traverserCount" : 7,
+ "elementCount" : 7
},
"name" : "VertexStep(OUT,vertex)",
"annotations" : {
- "percentDur" : 24.9865638658172
+ "percentDur" : 25.0
},
- "id" : "2.0.0()"
+ "id" : "3.0.0()"
} ]
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46b14b36/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json
index 54a034a..7b1e964 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json
@@ -3,7 +3,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.206618
+ "@value" : 100.0
},
"counts" : {
"traverserCount" : {
@@ -19,7 +19,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 18.82133676326716
+ "@value" : 25.0
}
},
"id" : "7.0.0()",
@@ -28,26 +28,26 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.274299
+ "@value" : 100.0
},
"counts" : {
"traverserCount" : {
"@type" : "g:Int64",
- "@value" : 13
+ "@value" : 7
},
"elementCount" : {
"@type" : "g:Int64",
- "@value" : 13
+ "@value" : 7
}
},
"name" : "VertexStep(OUT,vertex)",
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 24.9865638658172
+ "@value" : 25.0
}
},
- "id" : "2.0.0()"
+ "id" : "3.0.0()"
}
} ]
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46b14b36/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json
index 5b4cd6f..06fc02d 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json
@@ -1,47 +1,47 @@
{
- "dur" : 0.599635,
+ "dur" : 0.004,
"metrics" : [ {
- "dur" : 0.095118,
+ "dur" : 100.0,
"counts" : {
"traverserCount" : 4,
"elementCount" : 4
},
"name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
"annotations" : {
- "percentDur" : 15.862649778615324
+ "percentDur" : 25.0
},
"id" : "7.0.0()"
}, {
- "dur" : 0.168285,
+ "dur" : 100.0,
"counts" : {
"traverserCount" : 13,
"elementCount" : 13
},
"name" : "VertexStep(OUT,vertex)",
"annotations" : {
- "percentDur" : 28.064572615007464
+ "percentDur" : 25.0
},
"id" : "2.0.0()"
}, {
- "dur" : 0.142567,
+ "dur" : 100.0,
"counts" : {
"traverserCount" : 7,
"elementCount" : 7
},
"name" : "VertexStep(OUT,vertex)",
"annotations" : {
- "percentDur" : 23.77563017502314
+ "percentDur" : 25.0
},
"id" : "3.0.0()"
}, {
- "dur" : 0.193665,
+ "dur" : 100.0,
"counts" : {
"traverserCount" : 1,
"elementCount" : 1
},
"name" : "TreeStep",
"annotations" : {
- "percentDur" : 32.29714743135408
+ "percentDur" : 25.0
},
"id" : "4.0.0()"
} ]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46b14b36/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json
index ed6d4cb..fdd18a4 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json
@@ -3,14 +3,14 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.599635
+ "@value" : 0.004
},
"metrics" : [ {
"@type" : "g:Metrics",
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.095118
+ "@value" : 100.0
},
"counts" : {
"traverserCount" : {
@@ -26,7 +26,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 15.862649778615324
+ "@value" : 25.0
}
},
"id" : "7.0.0()"
@@ -36,7 +36,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.168285
+ "@value" : 100.0
},
"counts" : {
"traverserCount" : {
@@ -52,7 +52,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 28.064572615007464
+ "@value" : 25.0
}
},
"id" : "2.0.0()"
@@ -62,7 +62,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.142567
+ "@value" : 100.0
},
"counts" : {
"traverserCount" : {
@@ -78,7 +78,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 23.77563017502314
+ "@value" : 25.0
}
},
"id" : "3.0.0()"
@@ -88,7 +88,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.193665
+ "@value" : 100.0
},
"counts" : {
"traverserCount" : {
@@ -104,7 +104,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 32.29714743135408
+ "@value" : 25.0
}
},
"id" : "4.0.0()"
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46b14b36/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy
index 2d9f967..9a14e20 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy
@@ -17,6 +17,10 @@
* under the License.
*/
+
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics
+import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics
import org.apache.tinkerpop.shaded.kryo.io.Output
import java.time.*
@@ -31,12 +35,48 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.*
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent.Pick
import org.apache.tinkerpop.gremlin.structure.io.gryo.*
+import java.util.concurrent.TimeUnit
+
new File("dev-docs/").mkdirs()
new File("test-case-data/io/gryo").mkdirs()
graph = TinkerFactory.createTheCrew()
g = graph.traversal()
+createStaticTraversalMetrics = {
+ // based on g.V().hasLabel("person").out().out().tree().profile().next()
+ def traversalMutableMetrics = new ArrayList<>()
+ def m7 = new MutableMetrics("7.0.0()", "TinkerGraphStep(vertex,[~label.eq(person)])")
+ m7.setDuration(100, TimeUnit.MILLISECONDS)
+ m7.setCount("traverserCount", 4)
+ m7.setCount("elementCount", 4)
+ m7.setAnnotation("percentDur", 25.0d)
+ traversalMutableMetrics.add(m7)
+
+ def m2 = new MutableMetrics("2.0.0()", "VertexStep(OUT,vertex)")
+ m2.setDuration(100, TimeUnit.MILLISECONDS)
+ m2.setCount("traverserCount", 13)
+ m2.setCount("elementCount", 13)
+ m2.setAnnotation("percentDur", 25.0d)
+ traversalMutableMetrics.add(m2)
+
+ def m3 = new MutableMetrics("3.0.0()", "VertexStep(OUT,vertex)")
+ m3.setDuration(100, TimeUnit.MILLISECONDS)
+ m3.setCount("traverserCount", 7)
+ m3.setCount("elementCount", 7)
+ m3.setAnnotation("percentDur", 25.0d)
+ traversalMutableMetrics.add(m3)
+
+ def m4 = new MutableMetrics("4.0.0()", "TreeStep")
+ m4.setDuration(100, TimeUnit.MILLISECONDS)
+ m4.setCount("traverserCount", 1)
+ m4.setCount("elementCount", 1)
+ m4.setAnnotation("percentDur", 25.0d)
+ traversalMutableMetrics.add(m4)
+
+ return new DefaultTraversalMetrics(4000, traversalMutableMetrics)
+}
+
toGryo = { o, type, mapper, suffix = "" ->
def fileToWriteTo = new File("test-case-data/io/gryo/" + type.toLowerCase().replace(" ","") + "-" + suffix + ".kryo")
if (fileToWriteTo.exists()) fileToWriteTo.delete()
@@ -78,16 +118,16 @@ writeSupportedObjects = { mapper, toGryoFunction ->
toGryoFunction(Order.incr, "Order", mapper)
toGryoFunction(Pop.all, "Pop", mapper)
toGryoFunction(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda", mapper)
- tm = g.V().hasLabel('person').out().out().tree().profile().next()
- metrics = new org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics(tm.getMetrics(0))
- metrics.addNested(new org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics(tm.getMetrics(1)))
+ def tm = createStaticTraversalMetrics()
+ def metrics = new MutableMetrics(tm.getMetrics("7.0.0()"))
+ metrics.addNested(new MutableMetrics(tm.getMetrics("3.0.0()")))
toGryoFunction(metrics, "Metrics", mapper)
toGryoFunction(P.gt(0), "P", mapper)
toGryoFunction(P.gt(0).and(P.lt(10)), "P and", mapper)
toGryoFunction(P.gt(0).or(P.within(-1, -10, -100)), "P or", mapper)
toGryoFunction(Scope.local, "Scope", mapper)
toGryoFunction(T.label, "T", mapper)
- toGryoFunction(g.V().hasLabel('person').out().out().tree().profile().next(), "TraversalMetrics", mapper)
+ toGryoFunction(createStaticTraversalMetrics(), "TraversalMetrics", mapper)
toGryoFunction(g.V().hasLabel('person').nextTraverser(), "Traverser", mapper)
/* not directly supported yet - there is a custom serializer in the way
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46b14b36/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/metrics-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/metrics-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/metrics-v1d0.kryo
index a160f8b..c098e38 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/metrics-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/metrics-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46b14b36/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/traversalmetrics-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/traversalmetrics-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/traversalmetrics-v1d0.kryo
index 5ac54d3..1aee9e9 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/traversalmetrics-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/traversalmetrics-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46b14b36/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo
index a46801c..c098e38 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46b14b36/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo
index e29154a..1aee9e9 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo differ
[41/47] tinkerpop git commit: TINKERPOP-1130 Improved asserts on
Graph elements.
Posted by sp...@apache.org.
TINKERPOP-1130 Improved asserts on Graph elements.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4610295d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4610295d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4610295d
Branch: refs/heads/TINKERPOP-1130
Commit: 4610295da7c775effc653120a49fc2dcb7269892
Parents: 46b14b3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Dec 15 14:40:00 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 20 15:24:52 2016 -0500
----------------------------------------------------------------------
.../structure/io/AbstractCompatibilityTest.java | 59 ++++++++++++++++++++
.../io/AbstractTypedCompatibilityTest.java | 36 +++---------
2 files changed, 68 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4610295d/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java
index c2bb304..edd833e 100644
--- a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java
+++ b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java
@@ -18,7 +18,17 @@
*/
package org.apache.tinkerpop.gremlin.structure.io;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+
+import java.util.Iterator;
+import java.util.List;
+
import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assume.assumeThat;
/**
@@ -37,4 +47,53 @@ public abstract class AbstractCompatibilityTest {
protected <T> T findModelEntryObject(final String resourceName) {
return model.find(resourceName).orElseThrow(() -> new IllegalStateException("Could not find requested model entry")).getObject();
}
+
+ protected void assertVertex(final Vertex expected, final Vertex actual) {
+ assertEquals(expected.id(), actual.id());
+ assertEquals(expected.label(), actual.label());
+ assertEquals(IteratorUtils.count(expected.properties()), IteratorUtils.count(actual.properties()));
+ for (String k : expected.keys()) {
+ final Iterator<VertexProperty<Object>> expectedVps = expected.properties(k);
+ final List<VertexProperty<Object>> actualVps = IteratorUtils.list(actual.properties(k));
+ while (expectedVps.hasNext()) {
+ final VertexProperty expectedVp = expectedVps.next();
+ final VertexProperty<Object> found = actualVps.stream()
+ .filter(vp -> vp.id().equals(expectedVp.id()))
+ .findFirst()
+ .orElseThrow(() -> new RuntimeException("Could not find VertexProperty for " + expectedVp.id()));
+ assertVertexProperty(expectedVp, found);
+ }
+ }
+ }
+
+ protected void assertEdge(final Edge expected, final Edge actual) {
+ assertEquals(expected.id(), actual.id());
+ assertEquals(expected.label(), actual.label());
+ assertEquals(IteratorUtils.count(expected.properties()), IteratorUtils.count(actual.properties()));
+ assertEquals(expected.inVertex().id(), actual.inVertex().id());
+ assertEquals(expected.outVertex().id(), actual.outVertex().id());
+ assertEquals(expected.inVertex().label(), actual.inVertex().label());
+ assertEquals(expected.outVertex().label(), actual.outVertex().label());
+ final Iterator<Property<Object>> itty = expected.properties();
+ while(itty.hasNext()) {
+ final Property p = itty.next();
+ assertProperty(p, actual.property(p.key()));
+ }
+ }
+
+ protected void assertVertexProperty(final VertexProperty expected, final VertexProperty actual) {
+ assertEquals(expected.id(), actual.id());
+ assertEquals(expected.label(), actual.label());
+ assertEquals(IteratorUtils.count(expected.properties()), IteratorUtils.count(actual.properties()));
+ final Iterator<Property> itty = expected.properties();
+ while(itty.hasNext()) {
+ final Property p = itty.next();
+ assertProperty(p, actual.property(p.key()));
+ }
+ }
+
+ protected void assertProperty(final Property expected, final Property actual) {
+ assertEquals(expected.key(), actual.key());
+ assertEquals(expected.value(), actual.value());
+ }
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4610295d/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
index 8db93f6..89275c0 100644
--- a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
+++ b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
@@ -339,22 +339,8 @@ public abstract class AbstractTypedCompatibilityTest extends AbstractCompatibili
assertEquals(fromStatic, recycled);
assertEquals(resource, fromStatic);
assertEquals(resource, recycled);
- assertEquals(resource.id(), recycled.id());
- assertEquals(resource.label(), recycled.label());
- assertEquals(resource.inVertex().id(), recycled.inVertex().id());
- assertEquals(resource.outVertex().id(), recycled.outVertex().id());
- assertEquals(resource.inVertex().label(), recycled.inVertex().label());
- assertEquals(resource.outVertex().label(), recycled.outVertex().label());
- assertEquals(IteratorUtils.count(resource.properties()), IteratorUtils.count(recycled.properties()));
- assertEquals((int) resource.value("since"), (int) recycled.value("since"));
- assertEquals(resource.id(), fromStatic.id());
- assertEquals(resource.label(), fromStatic.label());
- assertEquals(resource.inVertex().id(), fromStatic.inVertex().id());
- assertEquals(resource.outVertex().id(), fromStatic.outVertex().id());
- assertEquals(resource.inVertex().label(), fromStatic.inVertex().label());
- assertEquals(resource.outVertex().label(), fromStatic.outVertex().label());
- assertEquals(IteratorUtils.count(resource.properties()), IteratorUtils.count(fromStatic.properties()));
- assertEquals((int) resource.value("since"), (int) fromStatic.value("since"));
+ assertEdge(resource, fromStatic);
+ assertEdge(resource, recycled);
}
@Test
@@ -653,10 +639,8 @@ public abstract class AbstractTypedCompatibilityTest extends AbstractCompatibili
final Property fromStatic = read(getCompatibility().readFromResource(resourceName), Property.class);
final Property recycled = (Property) read(write(fromStatic, Property.class), getCompatibility().resolve(Property.class));
assertNotSame(fromStatic, recycled);
- assertEquals(resource.key(), recycled.key());
- assertEquals(resource.value(), recycled.value());
- assertEquals(resource.key(), fromStatic.key());
- assertEquals(resource.value(), fromStatic.value());
+ assertProperty(resource, fromStatic);
+ assertProperty(resource, recycled);
}
@Test
@@ -889,7 +873,7 @@ public abstract class AbstractTypedCompatibilityTest extends AbstractCompatibili
final TraversalMetrics recycled = (TraversalMetrics) read(write(fromStatic, TraversalMetrics.class), getCompatibility().resolve(TraversalMetrics.class));
assertNotSame(fromStatic, recycled);
- // need to assert against each other since the model version can change between test runs as it is dyncamically
+ // need to assert against each other since the model version can change between test runs as it is dynamically
// generated
assertEquals(recycled.getDuration(TimeUnit.MILLISECONDS), fromStatic.getDuration(TimeUnit.MILLISECONDS));
final Collection<? extends Metrics> resourceMetrics = resource.getMetrics();
@@ -956,9 +940,8 @@ public abstract class AbstractTypedCompatibilityTest extends AbstractCompatibili
assertEquals(fromStatic, recycled);
assertEquals(resource, fromStatic);
assertEquals(resource, recycled);
- assertEquals(resource.id(), recycled.id());
- assertEquals(resource.label(), recycled.label());
- // todo: more asserts
+ assertVertex(resource, fromStatic);
+ assertVertex(resource, recycled);
}
@Test
@@ -973,9 +956,8 @@ public abstract class AbstractTypedCompatibilityTest extends AbstractCompatibili
assertEquals(fromStatic, recycled);
assertEquals(resource, fromStatic);
assertEquals(resource, recycled);
- assertEquals(resource.id(), recycled.id());
- assertEquals(resource.label(), recycled.label());
- // todo: more asserts
+ assertVertexProperty(resource, recycled);
+ assertVertexProperty(resource, fromStatic);
}
@Test
[19/47] tinkerpop git commit: Fix numbers deserialization for
GraphSON2.
Posted by sp...@apache.org.
Fix numbers deserialization for GraphSON2.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c66bbdf4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c66bbdf4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c66bbdf4
Branch: refs/heads/TINKERPOP-1130
Commit: c66bbdf477c1576eb700271d3473e3d67ff4ab5f
Parents: d1568f0
Author: Kevin Gallardo <ke...@datastax.com>
Authored: Mon Dec 19 10:56:42 2016 -0500
Committer: Kevin Gallardo <ke...@datastax.com>
Committed: Mon Dec 19 11:00:34 2016 -0500
----------------------------------------------------------------------
.../structure/io/graphson/GraphSONModule.java | 4 ++++
.../io/graphson/GraphSONSerializersV2d0.java | 24 ++++++++++++++++++++
2 files changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c66bbdf4/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
index a644d37..dfbd3ee 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
@@ -237,6 +237,10 @@ abstract class GraphSONModule extends TinkerPopJacksonModule {
addDeserializer(TraversalMetrics.class, new GraphSONSerializersV2d0.TraversalMetricsJacksonDeserializer());
addDeserializer(Tree.class, new GraphSONSerializersV2d0.TreeJacksonDeserializer());
+ // numbers
+ addDeserializer(Integer.class, new GraphSONSerializersV2d0.IntegerJackonsDeserializer());
+ addDeserializer(Double.class, new GraphSONSerializersV2d0.DoubleJackonsDeserializer());
+
// traversal
addDeserializer(Bytecode.class, new GraphSONTraversalSerializersV2d0.BytecodeJacksonDeserializer());
addDeserializer(Bytecode.Binding.class, new GraphSONTraversalSerializersV2d0.BindingJacksonDeserializer());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c66bbdf4/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
index 31ca6a2..9a27279 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
@@ -556,6 +556,30 @@ class GraphSONSerializersV2d0 {
return t;
}
}
+
+ static class IntegerJackonsDeserializer extends StdDeserializer<Integer> {
+
+ protected IntegerJackonsDeserializer() {
+ super(Integer.class);
+ }
+
+ @Override
+ public Integer deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ return jsonParser.getIntValue();
+ }
+ }
+
+ static class DoubleJackonsDeserializer extends StdDeserializer<Double> {
+
+ protected DoubleJackonsDeserializer() {
+ super(Double.class);
+ }
+
+ @Override
+ public Double deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ return jsonParser.getDoubleValue();
+ }
+ }
}
[16/47] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Conflicts:
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7f7af288
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7f7af288
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7f7af288
Branch: refs/heads/TINKERPOP-1130
Commit: 7f7af288c69e902cd92e6ea9a2e8841ed49bda03
Parents: fc3b38e 79dac23
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Dec 16 12:18:55 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 16 12:18:55 2016 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +
docs/src/dev/provider/index.asciidoc | 2 +-
.../upgrade/release-3.2.x-incubating.asciidoc | 22 ++
.../process/remote/RemoteConnection.java | 28 +-
.../remote/traversal/RemoteTraversal.java | 8 +-
.../remote/traversal/step/map/RemoteStep.java | 32 +-
.../gremlin/process/traversal/Traversal.java | 23 ++
.../process/traversal/TraversalTest.java | 328 +++++++++++++++++++
.../tinkerpop/gremlin/driver/Connection.java | 6 +-
.../driver/remote/DriverRemoteConnection.java | 18 +
.../driver/remote/DriverRemoteTraversal.java | 16 +-
.../DriverRemoteTraversalSideEffects.java | 22 +-
.../DriverRemoteTraversalSideEffectsTest.java | 12 +-
gremlin-groovy/pom.xml | 10 +-
.../python/TraversalSourceGenerator.groovy | 27 ++
.../driver/driver_remote_connection.py | 21 +-
.../gremlin_python/driver/remote_connection.py | 19 +-
.../jython/gremlin_python/process/traversal.py | 27 ++
.../driver/test_driver_remote_connection.py | 61 ++++
.../server/GremlinServerIntegrateTest.java | 25 ++
20 files changed, 664 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7f7af288/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7f7af288/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7f7af288/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
index 9800009,3e19097..f9ecfe9
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
@@@ -21,11 -21,11 +21,13 @@@ package org.apache.tinkerpop.gremlin.pr
import org.apache.tinkerpop.gremlin.process.remote.RemoteConnection;
import org.apache.tinkerpop.gremlin.process.remote.RemoteConnectionException;
import org.apache.tinkerpop.gremlin.process.remote.traversal.RemoteTraversal;
+ import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep;
+import org.apache.tinkerpop.gremlin.process.traversal.util.BytecodeHelper;
+ import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversal;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import java.util.NoSuchElementException;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7f7af288/gremlin-groovy/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7f7af288/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7f7af288/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
----------------------------------------------------------------------
[34/47] tinkerpop git commit: TINKERPOP-1130 Structured the IO
compatibility tests
Posted by sp...@apache.org.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-partial.json
new file mode 100644
index 0000000..70a4a65
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-partial.json
@@ -0,0 +1,712 @@
+{
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "name"
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ ]
+ }
+ } ]
+ }
+ } ]
+ }
+ }, {
+ "key" : {
+ "@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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "label" : "name"
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 10
+ },
+ "value" : "centreville",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2000
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2006
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 12
+ },
+ "value" : "purcellville",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2006
+ }
+ }
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ ]
+ }
+ } ]
+ }
+ } ]
+ }
+ }, {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 2
+ },
+ "value" : "matthias",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "label" : "name"
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 13
+ },
+ "value" : "bremen",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2007
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 14
+ },
+ "value" : "baltimore",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2007
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2011
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 15
+ },
+ "value" : "oakland",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2011
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2014
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 16
+ },
+ "value" : "seattle",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2014
+ }
+ }
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ ]
+ }
+ } ]
+ }
+ } ]
+ }
+ }, {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 3
+ },
+ "value" : "daniel",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "label" : "name"
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 17
+ },
+ "value" : "spremberg",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1982
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 18
+ },
+ "value" : "kaiserslautern",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 19
+ },
+ "value" : "aachen",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ ]
+ }
+ } ]
+ }
+ } ]
+ }
+ } ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v2d0-no-types.json
new file mode 100644
index 0000000..b36ff96
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v2d0-no-types.json
@@ -0,0 +1 @@
+"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v2d0-partial.json
new file mode 100644
index 0000000..1cf09f0
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@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/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v1d0.json
new file mode 100644
index 0000000..a885f58
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v1d0.json
@@ -0,0 +1,39 @@
+{
+ "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
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-no-types.json
new file mode 100644
index 0000000..5e819ba
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-no-types.json
@@ -0,0 +1,48 @@
+{
+ "id" : 1,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 0,
+ "value" : "marko",
+ "vertex" : 1,
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 6,
+ "value" : "san diego",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1997,
+ "endTime" : 2001
+ }
+ }, {
+ "id" : 7,
+ "value" : "santa cruz",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2001,
+ "endTime" : 2004
+ }
+ }, {
+ "id" : 8,
+ "value" : "brussels",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2004,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 9,
+ "value" : "santa fe",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2005
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-partial.json
new file mode 100644
index 0000000..8358d9c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-partial.json
@@ -0,0 +1,120 @@
+{
+ "@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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "name"
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }
+ } ]
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v1d0.json
new file mode 100644
index 0000000..74025a8
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v1d0.json
@@ -0,0 +1,5 @@
+{
+ "id" : 0,
+ "value" : "marko",
+ "label" : "name"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-no-types.json
new file mode 100644
index 0000000..7ab4f4d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-no-types.json
@@ -0,0 +1,6 @@
+{
+ "id" : 0,
+ "value" : "marko",
+ "vertex" : 1,
+ "label" : "name"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-partial.json
new file mode 100644
index 0000000..0319bd1
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-partial.json
@@ -0,0 +1,15 @@
+{
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "name"
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v2d0-no-types.json
new file mode 100644
index 0000000..313df40
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v2d0-no-types.json
@@ -0,0 +1 @@
+"2016"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v2d0-partial.json
new file mode 100644
index 0000000..ff420bc
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Year",
+ "@value" : "2016"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v2d0-no-types.json
new file mode 100644
index 0000000..185b577
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v2d0-no-types.json
@@ -0,0 +1 @@
+"2016-06"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v2d0-partial.json
new file mode 100644
index 0000000..98a5e27
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:YearMonth",
+ "@value" : "2016-06"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-no-types.json
new file mode 100644
index 0000000..975cd8d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-no-types.json
@@ -0,0 +1 @@
+"2016-12-14T11:39:19.383-05:00[America/New_York]"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-partial.json
new file mode 100644
index 0000000..3f8f159
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:ZonedDateTime",
+ "@value" : "2016-12-14T11:39:19.383-05:00[America/New_York]"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v2d0-no-types.json
new file mode 100644
index 0000000..37ec508
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v2d0-no-types.json
@@ -0,0 +1 @@
+"+03:06:09"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v2d0-partial.json
new file mode 100644
index 0000000..8591794
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:ZoneOffset",
+ "@value" : "+03:06:09"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/barrier-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/barrier-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/barrier-v1d0.kryo
new file mode 100644
index 0000000..40fdece
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/barrier-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/bigdecimal-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/bigdecimal-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/bigdecimal-v1d0.kryo
new file mode 100644
index 0000000..d4f40e0
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/bigdecimal-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/biginteger-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/biginteger-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/biginteger-v1d0.kryo
new file mode 100644
index 0000000..f424ac6
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/biginteger-v1d0.kryo
@@ -0,0 +1 @@
+\ufffd\ufffd\ufffd\ufffd\u0442Z\ufffd}Dv\ufffd\ufffd
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/binding-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/binding-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/binding-v1d0.kryo
new file mode 100644
index 0000000..103143b
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/binding-v1d0.kryo
@@ -0,0 +1 @@
+\ufffdx
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/byte-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/byte-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/byte-v1d0.kryo
new file mode 100644
index 0000000..6b2aaa7
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/byte-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/bytecode-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/bytecode-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/bytecode-v1d0.kryo
new file mode 100644
index 0000000..d0cd658
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/bytecode-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/cardinality-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/cardinality-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/cardinality-v1d0.kryo
new file mode 100644
index 0000000..71bd63e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/cardinality-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/char-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/char-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/char-v1d0.kryo
new file mode 100644
index 0000000..718882c
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/char-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/column-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/column-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/column-v1d0.kryo
new file mode 100644
index 0000000..40fdece
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/column-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/date-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/date-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/date-v1d0.kryo
new file mode 100644
index 0000000..0221297
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/date-v1d0.kryo
@@ -0,0 +1 @@
+\ufffd\ufffd\ufffd\u02cf+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/direction-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/direction-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/direction-v1d0.kryo
new file mode 100644
index 0000000..40fdece
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/direction-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/double-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/double-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/double-v1d0.kryo
new file mode 100644
index 0000000..36506ac
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/double-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/duration-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/duration-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/duration-v1d0.kryo
new file mode 100644
index 0000000..d640ae0
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/duration-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/edge-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/edge-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/edge-v1d0.kryo
new file mode 100644
index 0000000..d2a2492
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/edge-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/float-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/float-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/float-v1d0.kryo
new file mode 100644
index 0000000..19a8865
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/float-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/instant-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/instant-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/instant-v1d0.kryo
new file mode 100644
index 0000000..b58418d
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/instant-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/integer-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/integer-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/integer-v1d0.kryo
new file mode 100644
index 0000000..ff28336
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/integer-v1d0.kryo
@@ -0,0 +1 @@
+\ufffd
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/lambda-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/lambda-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/lambda-v1d0.kryo
new file mode 100644
index 0000000..463661d
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/lambda-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/localdate-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/localdate-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/localdate-v1d0.kryo
new file mode 100644
index 0000000..f82dd16
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/localdate-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/localdatetime-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/localdatetime-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/localdatetime-v1d0.kryo
new file mode 100644
index 0000000..97eae64
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/localdatetime-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/localtime-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/localtime-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/localtime-v1d0.kryo
new file mode 100644
index 0000000..1b5bfa4
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/localtime-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/long-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/long-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/long-v1d0.kryo
new file mode 100644
index 0000000..ff28336
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/long-v1d0.kryo
@@ -0,0 +1 @@
+\ufffd
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy
new file mode 100644
index 0000000..96b13bb
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy
@@ -0,0 +1,155 @@
+package org.apache.tinkerpop.gremlin.structure.io.gryo._3_2_3
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.tinkerpop.shaded.kryo.io.Output
+
+import java.time.*
+import java.nio.file.*
+import org.apache.tinkerpop.gremlin.driver.ser.*
+import org.apache.tinkerpop.gremlin.process.traversal.*
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.*
+import org.apache.tinkerpop.gremlin.structure.*
+import org.apache.tinkerpop.gremlin.structure.io.graphson.*
+import org.apache.tinkerpop.gremlin.driver.message.*
+import org.apache.tinkerpop.gremlin.process.traversal.step.*
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent.Pick
+import org.apache.tinkerpop.gremlin.structure.io.gryo.*
+
+new File("dev-docs/").mkdirs()
+new File("test-case-data/io/gryo").mkdirs()
+
+graph = TinkerFactory.createTheCrew()
+g = graph.traversal()
+
+toGryo = { o, type, mapper, suffix = "" ->
+ def fileToWriteTo = new File("test-case-data/io/gryo/" + type.toLowerCase().replace(" ","") + "-" + suffix + ".kryo")
+ if (fileToWriteTo.exists()) fileToWriteTo.delete()
+ final Output out = new Output(new FileOutputStream(fileToWriteTo))
+ mapper.writeObject(out, o)
+ out.close()
+}
+
+toGryoV1d0 = { o, type, mapper, comment = "" ->
+ toGryo(o, type, mapper, "v1d0")
+}
+
+writeSupportedObjects = { mapper, toGryoFunction ->
+ //toGryoFunction(File, "Class", mapper)
+ toGryoFunction(new Date(), "Date", mapper)
+ toGryoFunction(100.00d, "Double", mapper)
+ toGryoFunction(100.00f, "Float", mapper)
+ toGryoFunction(100, "Integer", mapper)
+ toGryoFunction(100L, "Long", mapper)
+ //toGryoFunction(new java.sql.Timestamp(System.currentTimeMillis()), "Timestamp", mapper)
+ toGryoFunction(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786"), "UUID", mapper)
+
+ toGryoFunction(graph.edges().next(), "Edge", mapper)
+ toGryoFunction(g.V().out().out().path().next(), "Path", mapper)
+ toGryoFunction(graph.edges().next().properties().next(), "Property", mapper)
+ toGryoFunction(org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.of(graph.vertices().next()), "StarGraph", mapper)
+ toGryoFunction(graph, "TinkerGraph", mapper)
+ toGryoFunction(g.V().out().out().tree().next(), "Tree", mapper)
+ toGryoFunction(graph.vertices().next(), "Vertex", mapper)
+ toGryoFunction(graph.vertices().next().properties().next(), "VertexProperty", mapper)
+
+ toGryoFunction(SackFunctions.Barrier.normSack, "Barrier", mapper)
+ toGryoFunction(new Bytecode.Binding("x", 1), "Binding", mapper)
+ toGryoFunction(g.V().hasLabel('person').out().in().tree().getBytecode(), "Bytecode", mapper)
+ toGryoFunction(VertexProperty.Cardinality.list, "Cardinality", mapper)
+ toGryoFunction(Column.keys, "Column", mapper)
+ toGryoFunction(Direction.OUT, "Direction", mapper)
+ toGryoFunction(Operator.sum, "Operator", mapper)
+ toGryoFunction(Order.incr, "Order", mapper)
+ toGryoFunction(Pop.all, "Pop", mapper)
+ toGryoFunction(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda", mapper)
+ tm = g.V().hasLabel('person').out().out().tree().profile().next()
+ metrics = new org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics(tm.getMetrics(0))
+ metrics.addNested(new org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics(tm.getMetrics(1)))
+ toGryoFunction(metrics, "Metrics", mapper)
+ toGryoFunction(P.gt(0), "P", mapper)
+ toGryoFunction(P.gt(0).and(P.lt(10)), "P and", mapper)
+ toGryoFunction(P.gt(0).or(P.within(-1, -10, -100)), "P or", mapper)
+ toGryoFunction(Scope.local, "Scope", mapper)
+ toGryoFunction(T.label, "T", mapper)
+ toGryoFunction(g.V().hasLabel('person').out().out().tree().profile().next(), "TraversalMetrics", mapper)
+ toGryoFunction(g.V().hasLabel('person').nextTraverser(), "Traverser", mapper)
+
+ /* not directly supported yet - there is a custom serializer in the way
+ def msg = null
+ msg = RequestMessage.build("authentication").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("saslMechanism", "PLAIN", "sasl", "AHN0ZXBocGhlbgBwYXNzd29yZA==").create()
+ toGryoFunction(msg, "Authentication Response", mapper)
+ msg = RequestMessage.build("eval").processor("session").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("gremlin", "g.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
+ toGryoFunction(msg, "Session Eval", mapper)
+ msg = RequestMessage.build("eval").processor("session").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"], "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
+ toGryoFunction(msg, "Session Eval", mapper)
+ msg = RequestMessage.build("close").processor("session").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
+ toGryoFunction(msg, "Session Close", mapper)
+ msg = RequestMessage.build("eval").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("gremlin", "g.V(x)", "bindings", [x: 1], "language", "gremlin-groovy").create()
+ toGryoFunction(msg, "Sessionless Eval", mapper)
+ msg = RequestMessage.build("eval").
+ overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
+ add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"]).create()
+ toGryoFunction(msg, "Sessionless Eval", mapper)
+
+ msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
+ code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create()
+ toGryoFunction(msg, "Authentication Challenge", mapper)
+ msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
+ code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.SUCCESS).
+ result(Arrays.asList(graph.vertices().next())).create()
+ toGryoFunction(msg, "Standard Result", mapper)
+ */
+
+ toGryoFunction(new java.math.BigDecimal(new java.math.BigInteger("123456789987654321123456789987654321")), "BigDecimal", mapper)
+ toGryoFunction(new java.math.BigInteger("123456789987654321123456789987654321"), "BigInteger", mapper)
+ toGryoFunction(new Byte("1"), "Byte", mapper)
+ //toGryoFunction(java.nio.ByteBuffer.wrap([1,2,3,4,5] as byte[]), "ByteBuffer", mapper)
+ toGryoFunction("x".charAt(0), "Char", mapper)
+ toGryoFunction(Duration.ofDays(5), "Duration", mapper)
+ //toGryoFunction(java.net.InetAddress.getByName("localhost"), "InetAddress", mapper)
+ toGryoFunction(Instant.now(), "Instant", mapper)
+ toGryoFunction(LocalDate.of(2016, 1, 1), "LocalDate", mapper)
+ toGryoFunction(LocalDateTime.of(2016, 1, 1, 12, 30), "LocalDateTime", mapper)
+ toGryoFunction(LocalTime.of(12, 30, 45), "LocalTime", mapper)
+ toGryoFunction(MonthDay.of(1, 1), "MonthDay", mapper)
+ toGryoFunction(OffsetDateTime.now(), "OffsetDateTime", mapper)
+ toGryoFunction(OffsetTime.now(), "OffsetTime", mapper)
+ toGryoFunction(Period.of(1, 6, 15), "Period", mapper)
+ toGryoFunction(new Short("100"), "Short", mapper)
+ toGryoFunction(Year.of(2016), "Year", mapper)
+ toGryoFunction(YearMonth.of(2016, 6), "YearMonth", mapper)
+ toGryoFunction(ZonedDateTime.now(), "ZonedDateTime", mapper)
+ toGryoFunction(ZoneOffset.ofHoursMinutesSeconds(3, 6, 9), "ZoneOffset", mapper)
+}
+
+mapper = GryoMapper.build().addRegistry(TinkerIoRegistryV2d0.getInstance()).create().createMapper()
+
+writeSupportedObjects(mapper, toGryoV1d0)
+
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/metrics-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/metrics-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/metrics-v1d0.kryo
new file mode 100644
index 0000000..f16832c
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/metrics-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/monthday-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/monthday-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/monthday-v1d0.kryo
new file mode 100644
index 0000000..5acab8f
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/monthday-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/offsetdatetime-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/offsetdatetime-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/offsetdatetime-v1d0.kryo
new file mode 100644
index 0000000..8155941
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/offsetdatetime-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/offsettime-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/offsettime-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/offsettime-v1d0.kryo
new file mode 100644
index 0000000..29b5c2e
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/offsettime-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/operator-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/operator-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/operator-v1d0.kryo
new file mode 100644
index 0000000..40fdece
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/operator-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/order-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/order-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/order-v1d0.kryo
new file mode 100644
index 0000000..40fdece
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/order-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/p-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/p-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/p-v1d0.kryo
new file mode 100644
index 0000000..3c676a8
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/p-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/pand-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/pand-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/pand-v1d0.kryo
new file mode 100644
index 0000000..d5d9f37
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/pand-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/path-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/path-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/path-v1d0.kryo
new file mode 100644
index 0000000..bac203d
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/path-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/period-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/period-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/period-v1d0.kryo
new file mode 100644
index 0000000..f04e9c8
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/period-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/pop-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/pop-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/pop-v1d0.kryo
new file mode 100644
index 0000000..c8c7811
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/pop-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/por-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/por-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/por-v1d0.kryo
new file mode 100644
index 0000000..2589271
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/por-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/property-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/property-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/property-v1d0.kryo
new file mode 100644
index 0000000..133ac6f
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/property-v1d0.kryo
@@ -0,0 +1 @@
+sinc\ufffd\ufffd
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/scope-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/scope-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/scope-v1d0.kryo
new file mode 100644
index 0000000..71bd63e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/scope-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/short-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/short-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/short-v1d0.kryo
new file mode 100644
index 0000000..6060b89
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/short-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/stargraph-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/stargraph-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/stargraph-v1d0.kryo
new file mode 100644
index 0000000..9947842
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/stargraph-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/t-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/t-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/t-v1d0.kryo
new file mode 100644
index 0000000..40fdece
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/t-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/tinkergraph-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/tinkergraph-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/tinkergraph-v1d0.kryo
new file mode 100644
index 0000000..5789986
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/tinkergraph-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/traversalmetrics-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/traversalmetrics-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/traversalmetrics-v1d0.kryo
new file mode 100644
index 0000000..de71cb1
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/traversalmetrics-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/traverser-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/traverser-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/traverser-v1d0.kryo
new file mode 100644
index 0000000..cc019f0
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/traverser-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/tree-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/tree-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/tree-v1d0.kryo
new file mode 100644
index 0000000..997b6e9
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/tree-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/uuid-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/uuid-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/uuid-v1d0.kryo
new file mode 100644
index 0000000..34fc35d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/uuid-v1d0.kryo
@@ -0,0 +1 @@
+A\ufffd\ufffd \ufffdJ\ufffd\ufffdy\ufffd\ufffd\ufffd7\ufffd
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/vertex-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/vertex-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/vertex-v1d0.kryo
new file mode 100644
index 0000000..c58ac46
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/vertex-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/vertexproperty-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/vertexproperty-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/vertexproperty-v1d0.kryo
new file mode 100644
index 0000000..3b74daa
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/vertexproperty-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/year-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/year-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/year-v1d0.kryo
new file mode 100644
index 0000000..2ec2ef9
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/year-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/yearmonth-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/yearmonth-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/yearmonth-v1d0.kryo
new file mode 100644
index 0000000..47e3a3e
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/yearmonth-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/zoneddatetime-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/zoneddatetime-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/zoneddatetime-v1d0.kryo
new file mode 100644
index 0000000..52256c5
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/zoneddatetime-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/zoneoffset-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/zoneoffset-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/zoneoffset-v1d0.kryo
new file mode 100644
index 0000000..4d34f9c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/zoneoffset-v1d0.kryo
@@ -0,0 +1 @@
++03:06:0\ufffd
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/barrier-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/barrier-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/barrier-v1d0.kryo
new file mode 100644
index 0000000..40fdece
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/barrier-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/bigdecimal-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/bigdecimal-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/bigdecimal-v1d0.kryo
new file mode 100644
index 0000000..d4f40e0
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/bigdecimal-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/biginteger-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/biginteger-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/biginteger-v1d0.kryo
new file mode 100644
index 0000000..f424ac6
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/biginteger-v1d0.kryo
@@ -0,0 +1 @@
+\ufffd\ufffd\ufffd\ufffd\u0442Z\ufffd}Dv\ufffd\ufffd
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/binding-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/binding-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/binding-v1d0.kryo
new file mode 100644
index 0000000..103143b
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/binding-v1d0.kryo
@@ -0,0 +1 @@
+\ufffdx
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/byte-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/byte-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/byte-v1d0.kryo
new file mode 100644
index 0000000..6b2aaa7
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/byte-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/bytecode-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/bytecode-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/bytecode-v1d0.kryo
new file mode 100644
index 0000000..edf8dd4
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/bytecode-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/cardinality-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/cardinality-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/cardinality-v1d0.kryo
new file mode 100644
index 0000000..71bd63e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/cardinality-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
[13/47] tinkerpop git commit: raise error if side effect method
called while loop is running
Posted by sp...@apache.org.
raise error if side effect method called while loop is running
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/79dac23b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/79dac23b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/79dac23b
Branch: refs/heads/TINKERPOP-1130
Commit: 79dac23b2f305911e651648c5b43fb3fe59d94c8
Parents: a8c8b65
Author: davebshow <da...@gmail.com>
Authored: Wed Dec 7 16:37:05 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 16 10:14:20 2016 -0500
----------------------------------------------------------------------
.../driver/driver_remote_connection.py | 4 ++--
.../gremlin_python/driver/remote_connection.py | 12 +++++++++-
.../driver/test_driver_remote_connection.py | 24 +++++++++++---------
3 files changed, 26 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/79dac23b/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py b/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
index babb113..b951cdf 100644
--- a/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
+++ b/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
@@ -54,13 +54,13 @@ class DriverRemoteConnection(RemoteConnection):
request_id = str(uuid.uuid4())
traversers = self._loop.run_sync(lambda: self.submit_traversal_bytecode(request_id, bytecode))
keys, value, close = self._get_side_effect_lambdas(request_id)
- return RemoteTraversal(iter(traversers), RemoteTraversalSideEffects(keys, value, close))
+ return RemoteTraversal(iter(traversers), RemoteTraversalSideEffects(keys, value, close, self._loop))
def submit_async(self, bytecode):
request_id = str(uuid.uuid4())
future_traversers = self.submit_traversal_bytecode(request_id, bytecode)
keys, value, close = self._get_side_effect_lambdas(request_id)
- side_effects = RemoteTraversalSideEffects(keys, value, close)
+ side_effects = RemoteTraversalSideEffects(keys, value, close, self._loop)
return RemoteTraversal(future_traversers, side_effects)
@gen.coroutine
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/79dac23b/gremlin-python/src/main/jython/gremlin_python/driver/remote_connection.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/driver/remote_connection.py b/gremlin-python/src/main/jython/gremlin_python/driver/remote_connection.py
index 93c92b7..f7ed48e 100644
--- a/gremlin-python/src/main/jython/gremlin_python/driver/remote_connection.py
+++ b/gremlin-python/src/main/jython/gremlin_python/driver/remote_connection.py
@@ -57,20 +57,27 @@ class RemoteTraversal(Traversal):
class RemoteTraversalSideEffects(TraversalSideEffects):
- def __init__(self, keys_lambda, value_lambda, close_lambda):
+ def __init__(self, keys_lambda, value_lambda, close_lambda, loop):
self._keys_lambda = keys_lambda
self._value_lambda = value_lambda
self._close_lambda = close_lambda
+ self._loop = loop
self._keys = set()
self._side_effects = {}
self._closed = False
def keys(self):
+ if self._loop._running:
+ raise RuntimeError("Cannot call side effect methods"
+ "while event loop is running")
if not self._closed:
self._keys = self._keys_lambda()
return self._keys
def get(self, key):
+ if self._loop._running:
+ raise RuntimeError("Cannot call side effect methods"
+ "while event loop is running")
if not self._side_effects.get(key):
if not self._closed:
results = self._value_lambda(key)
@@ -81,6 +88,9 @@ class RemoteTraversalSideEffects(TraversalSideEffects):
return self._side_effects[key]
def close(self):
+ if self._loop._running:
+ raise RuntimeError("Cannot call side effect methods"
+ "while event loop is running")
results = self._close_lambda()
self._closed = True
return results
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/79dac23b/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py b/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
index c9e64c5..783cf7e 100644
--- a/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
+++ b/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
@@ -211,6 +211,7 @@ class TestDriverRemoteConnection(TestCase):
assert count == 6
loop.run_sync(go)
+ connection.close()
def test_promise_side_effects(self):
loop = ioloop.IOLoop.current()
@@ -224,22 +225,17 @@ class TestDriverRemoteConnection(TestCase):
@gen.coroutine
def go():
traversal = yield g.V().aggregate('a').promise()
- # Trying to get side effect keys throws error - BAD
+ # Calling synchronous side effect methods from coroutine raises.
with pytest.raises(RuntimeError):
keys = traversal.side_effects.keys()
- # IOLoop is now hosed.
- loop.run_sync(go)
+ with pytest.raises(RuntimeError):
+ keys = traversal.side_effects.get('a')
- # Get a new IOLoop - this should happen for each test case.
- connection.close()
- ioloop.IOLoop.clear_instance()
- loop.close()
- loop = ioloop.IOLoop()
- loop.make_current()
+ with pytest.raises(RuntimeError):
+ keys = traversal.side_effects.close()
- connection = DriverRemoteConnection('ws://localhost:45940/gremlin', 'g')
- g = Graph().traversal().withRemote(connection)
+ loop.run_sync(go)
# If we return the traversal though, we can use side effects per usual.
@gen.coroutine
@@ -251,6 +247,12 @@ class TestDriverRemoteConnection(TestCase):
traversal = loop.run_sync(go)
a, = traversal.side_effects.keys()
assert a == 'a'
+ results = traversal.side_effects.get('a')
+ assert results
+ results = traversal.side_effects.close()
+ assert not results
+
+ connection.close()
if __name__ == '__main__':
[27/47] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a4a059cb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a4a059cb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a4a059cb
Branch: refs/heads/TINKERPOP-1130
Commit: a4a059cb84c853c97a955a529f7294ed4a8b1125
Parents: 104b8d7 49668ce
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Dec 20 13:50:32 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 20 13:50:32 2016 -0500
----------------------------------------------------------------------
.../structure/io/gryo/kryoshim/InputShim.java | 2 ++
.../structure/io/gryo/kryoshim/OutputShim.java | 2 ++
.../kryoshim/shaded/ShadedInputAdapter.java | 5 +++
.../kryoshim/shaded/ShadedOutputAdapter.java | 8 +++--
.../io/gryo/IoRegistryAwareKryoSerializer.java | 6 ----
.../kryoshim/unshaded/UnshadedInputAdapter.java | 32 +++++++-----------
.../kryoshim/unshaded/UnshadedKryoAdapter.java | 30 +++++------------
.../unshaded/UnshadedKryoShimService.java | 6 ----
.../unshaded/UnshadedOutputAdapter.java | 35 ++++++++------------
.../unshaded/UnshadedSerializerAdapter.java | 9 +----
10 files changed, 49 insertions(+), 86 deletions(-)
----------------------------------------------------------------------
[37/47] tinkerpop git commit: TINKERPOP-1130 Structured the IO
compatibility tests
Posted by sp...@apache.org.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tinkergraph-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tinkergraph-v2d0-partial.json
new file mode 100644
index 0000000..24e95ed
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_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",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2000
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2006
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 12
+ },
+ "value" : "purcellville",
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2006
+ }
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 2
+ },
+ "value" : "matthias",
+ "label" : "name"
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 13
+ },
+ "value" : "bremen",
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2007
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 14
+ },
+ "value" : "baltimore",
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2007
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2011
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 15
+ },
+ "value" : "oakland",
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2011
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2014
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 16
+ },
+ "value" : "seattle",
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2014
+ }
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 3
+ },
+ "value" : "daniel",
+ "label" : "name"
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 17
+ },
+ "value" : "spremberg",
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1982
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 18
+ },
+ "value" : "kaiserslautern",
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 19
+ },
+ "value" : "aachen",
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin",
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph",
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ } ],
+ "edges" : [ {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 13
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 14
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2010
+ }
+ }
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 15
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 4
+ }
+ }
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 16
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 5
+ }
+ }
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 17
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2010
+ }
+ }
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 18
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2011
+ }
+ }
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 19
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 5
+ }
+ }
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 20
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 4
+ }
+ }
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 21
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2012
+ }
+ }
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 22
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 3
+ }
+ }
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 23
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 3
+ }
+ }
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 24
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 5
+ }
+ }
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 25
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 3
+ }
+ }
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 26
+ },
+ "label" : "traverses",
+ "inVLabel" : "software",
+ "outVLabel" : "software",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ }
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-no-types.json
new file mode 100644
index 0000000..b1598bb
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-no-types.json
@@ -0,0 +1,48 @@
+{
+ "dur" : 0.661531,
+ "metrics" : [ {
+ "dur" : 0.114389,
+ "counts" : {
+ "traverserCount" : 4,
+ "elementCount" : 4
+ },
+ "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
+ "annotations" : {
+ "percentDur" : 17.291555497777125
+ },
+ "id" : "7.0.0()"
+ }, {
+ "dur" : 0.244496,
+ "counts" : {
+ "traverserCount" : 13,
+ "elementCount" : 13
+ },
+ "name" : "VertexStep(OUT,vertex)",
+ "annotations" : {
+ "percentDur" : 36.95911453885003
+ },
+ "id" : "2.0.0()"
+ }, {
+ "dur" : 0.162661,
+ "counts" : {
+ "traverserCount" : 7,
+ "elementCount" : 7
+ },
+ "name" : "VertexStep(OUT,vertex)",
+ "annotations" : {
+ "percentDur" : 24.588568033848755
+ },
+ "id" : "3.0.0()"
+ }, {
+ "dur" : 0.139985,
+ "counts" : {
+ "traverserCount" : 1,
+ "elementCount" : 1
+ },
+ "name" : "TreeStep",
+ "annotations" : {
+ "percentDur" : 21.16076192952409
+ },
+ "id" : "4.0.0()"
+ } ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-partial.json
new file mode 100644
index 0000000..967e743
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-partial.json
@@ -0,0 +1,114 @@
+{
+ "@type" : "g:TraversalMetrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 0.583377
+ },
+ "metrics" : [ {
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 0.084061
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ }
+ },
+ "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 14.409378497952439
+ }
+ },
+ "id" : "7.0.0()"
+ }
+ }, {
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 0.163463
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 13
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 13
+ }
+ },
+ "name" : "VertexStep(OUT,vertex)",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 28.0201310644746
+ }
+ },
+ "id" : "2.0.0()"
+ }
+ }, {
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 0.175719
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ }
+ },
+ "name" : "VertexStep(OUT,vertex)",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 30.12100237067968
+ }
+ },
+ "id" : "3.0.0()"
+ }
+ }, {
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 0.160134
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 1
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 1
+ }
+ },
+ "name" : "TreeStep",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 27.449488066893277
+ }
+ },
+ "id" : "4.0.0()"
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traverser-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traverser-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traverser-v2d0-no-types.json
new file mode 100644
index 0000000..6d1f029
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traverser-v2d0-no-types.json
@@ -0,0 +1,46 @@
+{
+ "bulk" : 1,
+ "value" : {
+ "id" : 1,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 0,
+ "value" : "marko",
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 6,
+ "value" : "san diego",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1997,
+ "endTime" : 2001
+ }
+ }, {
+ "id" : 7,
+ "value" : "santa cruz",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2001,
+ "endTime" : 2004
+ }
+ }, {
+ "id" : 8,
+ "value" : "brussels",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2004,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 9,
+ "value" : "santa fe",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2005
+ }
+ } ]
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traverser-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traverser-v2d0-partial.json
new file mode 100644
index 0000000..a59a29e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traverser-v2d0-partial.json
@@ -0,0 +1,109 @@
+{
+ "@type" : "g:Traverser",
+ "@value" : {
+ "bulk" : {
+ "@type" : "g:Int64",
+ "@value" : 1
+ },
+ "value" : {
+ "@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
+ }
+ }
+ }
+ } ]
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v1d0.json
new file mode 100644
index 0000000..db030dd
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/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"
+ } ]
+ }
+ },
+ "value" : {
+ "11" : {
+ "key" : {
+ "id" : 11,
+ "label" : "software",
+ "type" : "vertex",
+ "properties" : {
+ "name" : [ {
+ "id" : 5,
+ "value" : "tinkergraph"
+ } ]
+ }
+ },
+ "value" : { }
+ }
+ }
+ }
+ }
+ },
+ "9" : {
+ "key" : {
+ "id" : 9,
+ "label" : "person",
+ "type" : "vertex",
+ "properties" : {
+ "name" : [ {
+ "id" : 3,
+ "value" : "daniel"
+ } ],
+ "location" : [ {
+ "id" : 17,
+ "value" : "spremberg",
+ "properties" : {
+ "startTime" : 1982,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 18,
+ "value" : "kaiserslautern",
+ "properties" : {
+ "startTime" : 2005,
+ "endTime" : 2009
+ }
+ }, {
+ "id" : 19,
+ "value" : "aachen",
+ "properties" : {
+ "startTime" : 2009
+ }
+ } ]
+ }
+ },
+ "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" : { }
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-no-types.json
new file mode 100644
index 0000000..50c2417
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-no-types.json
@@ -0,0 +1,269 @@
+[ {
+ "key" : {
+ "id" : 1,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 0,
+ "value" : "marko",
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 6,
+ "value" : "san diego",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1997,
+ "endTime" : 2001
+ }
+ }, {
+ "id" : 7,
+ "value" : "santa cruz",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2001,
+ "endTime" : 2004
+ }
+ }, {
+ "id" : 8,
+ "value" : "brussels",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2004,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 9,
+ "value" : "santa fe",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2005
+ }
+ } ]
+ }
+ },
+ "value" : [ {
+ "key" : {
+ "id" : 10,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 4,
+ "value" : "gremlin",
+ "label" : "name"
+ } ]
+ }
+ },
+ "value" : [ {
+ "key" : {
+ "id" : 11,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 5,
+ "value" : "tinkergraph",
+ "label" : "name"
+ } ]
+ }
+ },
+ "value" : [ ]
+ } ]
+ } ]
+}, {
+ "key" : {
+ "id" : 7,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 1,
+ "value" : "stephen",
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 10,
+ "value" : "centreville",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1990,
+ "endTime" : 2000
+ }
+ }, {
+ "id" : 11,
+ "value" : "dulles",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2000,
+ "endTime" : 2006
+ }
+ }, {
+ "id" : 12,
+ "value" : "purcellville",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2006
+ }
+ } ]
+ }
+ },
+ "value" : [ {
+ "key" : {
+ "id" : 10,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 4,
+ "value" : "gremlin",
+ "label" : "name"
+ } ]
+ }
+ },
+ "value" : [ {
+ "key" : {
+ "id" : 11,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 5,
+ "value" : "tinkergraph",
+ "label" : "name"
+ } ]
+ }
+ },
+ "value" : [ ]
+ } ]
+ } ]
+}, {
+ "key" : {
+ "id" : 8,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 2,
+ "value" : "matthias",
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 13,
+ "value" : "bremen",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2004,
+ "endTime" : 2007
+ }
+ }, {
+ "id" : 14,
+ "value" : "baltimore",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2007,
+ "endTime" : 2011
+ }
+ }, {
+ "id" : 15,
+ "value" : "oakland",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2011,
+ "endTime" : 2014
+ }
+ }, {
+ "id" : 16,
+ "value" : "seattle",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2014
+ }
+ } ]
+ }
+ },
+ "value" : [ {
+ "key" : {
+ "id" : 10,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 4,
+ "value" : "gremlin",
+ "label" : "name"
+ } ]
+ }
+ },
+ "value" : [ {
+ "key" : {
+ "id" : 11,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 5,
+ "value" : "tinkergraph",
+ "label" : "name"
+ } ]
+ }
+ },
+ "value" : [ ]
+ } ]
+ } ]
+}, {
+ "key" : {
+ "id" : 9,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 3,
+ "value" : "daniel",
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 17,
+ "value" : "spremberg",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1982,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 18,
+ "value" : "kaiserslautern",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2005,
+ "endTime" : 2009
+ }
+ }, {
+ "id" : 19,
+ "value" : "aachen",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2009
+ }
+ } ]
+ }
+ },
+ "value" : [ {
+ "key" : {
+ "id" : 10,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 4,
+ "value" : "gremlin",
+ "label" : "name"
+ } ]
+ }
+ },
+ "value" : [ {
+ "key" : {
+ "id" : 11,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 5,
+ "value" : "tinkergraph",
+ "label" : "name"
+ } ]
+ }
+ },
+ "value" : [ ]
+ } ]
+ } ]
+} ]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-partial.json
new file mode 100644
index 0000000..03b4a5a
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-partial.json
@@ -0,0 +1,608 @@
+{
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@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
+ }
+ }
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin",
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph",
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ ]
+ }
+ } ]
+ }
+ } ]
+ }
+ }, {
+ "key" : {
+ "@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",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2000
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2006
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 12
+ },
+ "value" : "purcellville",
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2006
+ }
+ }
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin",
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph",
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ ]
+ }
+ } ]
+ }
+ } ]
+ }
+ }, {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 2
+ },
+ "value" : "matthias",
+ "label" : "name"
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 13
+ },
+ "value" : "bremen",
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2007
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 14
+ },
+ "value" : "baltimore",
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2007
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2011
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 15
+ },
+ "value" : "oakland",
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2011
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2014
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 16
+ },
+ "value" : "seattle",
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2014
+ }
+ }
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin",
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph",
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ ]
+ }
+ } ]
+ }
+ } ]
+ }
+ }, {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 3
+ },
+ "value" : "daniel",
+ "label" : "name"
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 17
+ },
+ "value" : "spremberg",
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1982
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 18
+ },
+ "value" : "kaiserslautern",
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }
+ }, {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 19
+ },
+ "value" : "aachen",
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin",
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph",
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ ]
+ }
+ } ]
+ }
+ } ]
+ }
+ } ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/uuid-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/uuid-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/uuid-v2d0-no-types.json
new file mode 100644
index 0000000..b36ff96
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/uuid-v2d0-no-types.json
@@ -0,0 +1 @@
+"41d2e28a-20a4-4ab0-b379-d810dede3786"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/uuid-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/uuid-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/uuid-v2d0-partial.json
new file mode 100644
index 0000000..1cf09f0
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/uuid-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@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/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v1d0.json
new file mode 100644
index 0000000..a885f58
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v1d0.json
@@ -0,0 +1,39 @@
+{
+ "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
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v2d0-no-types.json
new file mode 100644
index 0000000..8e6155f
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v2d0-no-types.json
@@ -0,0 +1,43 @@
+{
+ "id" : 1,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 0,
+ "value" : "marko",
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 6,
+ "value" : "san diego",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1997,
+ "endTime" : 2001
+ }
+ }, {
+ "id" : 7,
+ "value" : "santa cruz",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2001,
+ "endTime" : 2004
+ }
+ }, {
+ "id" : 8,
+ "value" : "brussels",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2004,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 9,
+ "value" : "santa fe",
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2005
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v2d0-partial.json
new file mode 100644
index 0000000..f102230
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertex-v2d0-partial.json
@@ -0,0 +1,100 @@
+{
+ "@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
+ }
+ }
+ }
+ } ]
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v1d0.json
new file mode 100644
index 0000000..74025a8
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v1d0.json
@@ -0,0 +1,5 @@
+{
+ "id" : 0,
+ "value" : "marko",
+ "label" : "name"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v2d0-no-types.json
new file mode 100644
index 0000000..74025a8
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v2d0-no-types.json
@@ -0,0 +1,5 @@
+{
+ "id" : 0,
+ "value" : "marko",
+ "label" : "name"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v2d0-partial.json
new file mode 100644
index 0000000..af184b1
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/vertexproperty-v2d0-partial.json
@@ -0,0 +1,11 @@
+{
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko",
+ "label" : "name"
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/year-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/year-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/year-v1d0.json
new file mode 100644
index 0000000..313df40
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/year-v1d0.json
@@ -0,0 +1 @@
+"2016"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/year-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/year-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/year-v2d0-no-types.json
new file mode 100644
index 0000000..313df40
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/year-v2d0-no-types.json
@@ -0,0 +1 @@
+"2016"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/year-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/year-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/year-v2d0-partial.json
new file mode 100644
index 0000000..ff420bc
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/year-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Year",
+ "@value" : "2016"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/yearmonth-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/yearmonth-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/yearmonth-v1d0.json
new file mode 100644
index 0000000..185b577
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/yearmonth-v1d0.json
@@ -0,0 +1 @@
+"2016-06"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/yearmonth-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/yearmonth-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/yearmonth-v2d0-no-types.json
new file mode 100644
index 0000000..185b577
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/yearmonth-v2d0-no-types.json
@@ -0,0 +1 @@
+"2016-06"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/yearmonth-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/yearmonth-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/yearmonth-v2d0-partial.json
new file mode 100644
index 0000000..98a5e27
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/yearmonth-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:YearMonth",
+ "@value" : "2016-06"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v1d0.json
new file mode 100644
index 0000000..aa7c22e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v1d0.json
@@ -0,0 +1 @@
+"2016-12-13T06:30:29.567-05:00[America/New_York]"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-no-types.json
new file mode 100644
index 0000000..6fe8540
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-no-types.json
@@ -0,0 +1 @@
+"2016-12-13T06:30:37.210-05:00[America/New_York]"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-partial.json
new file mode 100644
index 0000000..deaa3c6
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:ZonedDateTime",
+ "@value" : "2016-12-13T06:30:34.481-05:00[America/New_York]"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneoffset-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneoffset-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneoffset-v1d0.json
new file mode 100644
index 0000000..37ec508
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneoffset-v1d0.json
@@ -0,0 +1 @@
+"+03:06:09"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneoffset-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneoffset-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneoffset-v2d0-no-types.json
new file mode 100644
index 0000000..37ec508
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneoffset-v2d0-no-types.json
@@ -0,0 +1 @@
+"+03:06:09"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneoffset-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneoffset-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneoffset-v2d0-partial.json
new file mode 100644
index 0000000..8591794
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneoffset-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:ZoneOffset",
+ "@value" : "+03:06:09"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v1d0.json
new file mode 100644
index 0000000..8c5b82c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v1d0.json
@@ -0,0 +1,12 @@
+{
+ "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "status" : {
+ "message" : "",
+ "code" : 407,
+ "attributes" : { }
+ },
+ "result" : {
+ "data" : null,
+ "meta" : { }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v2d0-no-types.json
new file mode 100644
index 0000000..8c5b82c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v2d0-no-types.json
@@ -0,0 +1,12 @@
+{
+ "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "status" : {
+ "message" : "",
+ "code" : 407,
+ "attributes" : { }
+ },
+ "result" : {
+ "data" : null,
+ "meta" : { }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v2d0-partial.json
new file mode 100644
index 0000000..8c5b82c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v2d0-partial.json
@@ -0,0 +1,12 @@
+{
+ "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "status" : {
+ "message" : "",
+ "code" : 407,
+ "attributes" : { }
+ },
+ "result" : {
+ "data" : null,
+ "meta" : { }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v1d0.json
new file mode 100644
index 0000000..838e1fd
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v1d0.json
@@ -0,0 +1,9 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "authentication",
+ "processor" : "",
+ "args" : {
+ "saslMechanism" : "PLAIN",
+ "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v2d0-no-types.json
new file mode 100644
index 0000000..838e1fd
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v2d0-no-types.json
@@ -0,0 +1,9 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "authentication",
+ "processor" : "",
+ "args" : {
+ "saslMechanism" : "PLAIN",
+ "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
+ }
+}
\ No newline at end of file
[06/47] tinkerpop git commit: TINKERPOP-1490 Restructured
Traversal.promise()
Posted by sp...@apache.org.
TINKERPOP-1490 Restructured Traversal.promise()
No longer uses an ExecutorService and is only applicable to "remote" traversals. Moved the commons-lang dependency back to gremlin-groovy for now.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ee6a3589
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ee6a3589
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ee6a3589
Branch: refs/heads/TINKERPOP-1130
Commit: ee6a35893661b015dbb827463f175ddcecf1bcb8
Parents: eb08976
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Nov 11 12:51:40 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 16 10:00:40 2016 -0500
----------------------------------------------------------------------
gremlin-core/pom.xml | 5 -
.../process/remote/RemoteConnection.java | 12 +-
.../remote/traversal/RemoteTraversal.java | 2 +-
.../remote/traversal/step/map/RemoteStep.java | 32 +++-
.../gremlin/process/traversal/Traversal.java | 57 ++------
.../traversal/util/DefaultTraversal.java | 37 -----
.../process/traversal/TraversalTest.java | 145 -------------------
.../tinkerpop/gremlin/driver/Connection.java | 6 +-
.../driver/remote/DriverRemoteConnection.java | 14 ++
.../driver/remote/DriverRemoteTraversal.java | 16 +-
.../DriverRemoteTraversalSideEffects.java | 22 ++-
.../DriverRemoteTraversalSideEffectsTest.java | 12 +-
gremlin-groovy/pom.xml | 5 +
.../server/GremlinServerIntegrateTest.java | 25 ++++
.../process/traversal/CoreTraversalTest.java | 42 ------
15 files changed, 131 insertions(+), 301 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee6a3589/gremlin-core/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index 0594448..e8f3a34 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -61,11 +61,6 @@ limitations under the License.
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.3.1</version>
- </dependency>
<!-- LOGGING -->
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee6a3589/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteConnection.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteConnection.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteConnection.java
index 8506ad7..f4e3976 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteConnection.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteConnection.java
@@ -24,6 +24,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import java.util.Iterator;
+import java.util.concurrent.CompletableFuture;
/**
* A simple abstraction of a "connection" to a "server" that is capable of processing a {@link Traversal} and
@@ -43,9 +44,16 @@ public interface RemoteConnection extends AutoCloseable {
public <E> Iterator<Traverser.Admin<E>> submit(final Traversal<?, E> traversal) throws RemoteConnectionException;
/**
- * Submits {@link Traversal} {@link Bytecode} to a server and returns a {@link Traversal}.
- * The {@link Traversal} is an abstraction over two types of results that can be returned as part of the
+ * Submits {@link Traversal} {@link Bytecode} to a server and returns a {@link RemoteTraversal}.
+ * The {@link RemoteTraversal} is an abstraction over two types of results that can be returned as part of the
* response from the server: the results of the {@link Traversal} itself and the side-effects that it produced.
*/
public <E> RemoteTraversal<?,E> submit(final Bytecode bytecode) throws RemoteConnectionException;
+
+ /**
+ * Submits {@link Traversal} {@link Bytecode} to a server and returns a promise of a {@link RemoteTraversal}.
+ * The {@link RemoteTraversal} is an abstraction over two types of results that can be returned as part of the
+ * response from the server: the results of the {@link Traversal} itself and the side-effects that it produced.
+ */
+ public <E> CompletableFuture<RemoteTraversal<?, E>> submitAsync(final Bytecode bytecode) throws RemoteConnectionException;
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee6a3589/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversal.java
index 9c893c2..57b0cda 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversal.java
@@ -39,7 +39,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep;
public interface RemoteTraversal<S,E> extends Traversal.Admin<S,E> {
/**
- * Returns remote side-effects generated by the traversal so that they can accessible to the client. Note that
+ * Returns remote side-effects generated by the traversal so that they can be accessible to the client. Note that
* "side-effect" refers to the value in "a" in the traversal {@code g.V().aggregate('a').values('name')}.
*/
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee6a3589/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
index 6b2be96..3e19097 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
@@ -21,12 +21,17 @@ package org.apache.tinkerpop.gremlin.process.remote.traversal.step.map;
import org.apache.tinkerpop.gremlin.process.remote.RemoteConnection;
import org.apache.tinkerpop.gremlin.process.remote.RemoteConnectionException;
import org.apache.tinkerpop.gremlin.process.remote.traversal.RemoteTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep;
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversal;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import java.util.NoSuchElementException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
/**
* Sends a {@link Traversal} to a {@link RemoteConnection} and iterates back the results.
@@ -38,6 +43,7 @@ public final class RemoteStep<S, E> extends AbstractStep<S, E> {
private transient RemoteConnection remoteConnection;
private RemoteTraversal<?, E> remoteTraversal;
+ private final AtomicReference<CompletableFuture<Traversal<?, E>>> traversalFuture = new AtomicReference<>(null);
public RemoteStep(final Traversal.Admin traversal, final RemoteConnection remoteConnection) {
super(traversal);
@@ -51,14 +57,26 @@ public final class RemoteStep<S, E> extends AbstractStep<S, E> {
@Override
protected Traverser.Admin<E> processNextStart() throws NoSuchElementException {
- if (null == this.remoteTraversal) {
- try {
- this.remoteTraversal = this.remoteConnection.submit(this.traversal.getBytecode());
- this.traversal.setSideEffects(this.remoteTraversal.getSideEffects());
- } catch (final RemoteConnectionException sce) {
- throw new IllegalStateException(sce);
+ if (null == this.remoteTraversal) promise().join();
+ return this.remoteTraversal.nextTraverser();
+ }
+
+ /**
+ * Submits the traversal asynchronously to a "remote" using {@link RemoteConnection#submitAsync(Bytecode)}.
+ */
+ public CompletableFuture<Traversal<?, E>> promise() {
+ try {
+ if (null == traversalFuture.get()) {
+ traversalFuture.set(this.remoteConnection.submitAsync(this.traversal.getBytecode()).<Traversal<?, E>>thenApply(t -> {
+ this.remoteTraversal = (RemoteTraversal<?, E>) t;
+ this.traversal.setSideEffects(this.remoteTraversal.getSideEffects());
+ return traversal;
+ }));
}
+
+ return traversalFuture.get();
+ } catch (RemoteConnectionException rce) {
+ throw new IllegalStateException(rce);
}
- return this.remoteTraversal.nextTraverser();
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee6a3589/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java
index e4ba5a6..04f5127 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java
@@ -18,8 +18,9 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal;
-import org.apache.commons.lang3.concurrent.BasicThreadFactory;
+import org.apache.commons.configuration.Configuration;
import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
+import org.apache.tinkerpop.gremlin.process.remote.traversal.step.map.RemoteStep;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.ProfileSideEffectStep;
@@ -43,11 +44,7 @@ import java.util.Optional;
import java.util.Set;
import java.util.Spliterator;
import java.util.Spliterators;
-import java.util.concurrent.CancellationException;
import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.stream.Stream;
@@ -148,39 +145,21 @@ public interface Traversal<S, E> extends Iterator<E>, Serializable, Cloneable, A
/**
* Starts a promise to execute a function on the current {@code Traversal} that will be completed in the future.
- * This implementation uses {@link Admin#traversalExecutorService} to execute the supplied
- * {@code traversalFunction}.
+ * Note that this method can only be used if the {@code Traversal} is constructed using
+ * {@link TraversalSource#withRemote(Configuration)}. Calling this method otherwise will yield an
+ * {@code IllegalStateException}.
*/
public default <T> CompletableFuture<T> promise(final Function<Traversal, T> traversalFunction) {
- return promise(traversalFunction, Admin.traversalExecutorService);
- }
-
- /**
- * Starts a promise to execute a function on the current {@code Traversal} that will be completed in the future.
- * This implementation uses the caller supplied {@code ExecutorService} to execute the {@code traversalFunction}.
- */
- public default <T> CompletableFuture<T> promise(final Function<Traversal, T> traversalFunction, final ExecutorService service) {
- final CompletableFuture<T> promise = new CompletableFuture<>();
- final Future iterationFuture = service.submit(() -> {
- try {
- promise.complete(traversalFunction.apply(this));
- } catch (Exception ex) {
- // the promise may have been cancelled by the caller, in which case, there is no need to attempt
- // another write on completion
- if (!promise.isDone()) promise.completeExceptionally(ex);
- }
- });
-
- // if the user cancels the promise then attempt to kill the iteration.
- promise.exceptionally(t -> {
- if (t instanceof CancellationException) {
- iterationFuture.cancel(true);
- }
-
- return null;
- });
-
- return promise;
+ // apply strategies to see if RemoteStrategy has any effect (i.e. add RemoteStep)
+ if (!this.asAdmin().isLocked()) this.asAdmin().applyStrategies();
+
+ // use the end step so the results are bulked
+ final Step<?, E> endStep = this.asAdmin().getEndStep();
+ if (endStep instanceof RemoteStep) {
+ return ((RemoteStep) endStep).promise().thenApply(traversalFunction);
+ } else {
+ throw new IllegalStateException("Only traversals created using withRemote() can be used in an async way");
+ }
}
/**
@@ -297,12 +276,6 @@ public interface Traversal<S, E> extends Iterator<E>, Serializable, Cloneable, A
public interface Admin<S, E> extends Traversal<S, E> {
/**
- * Service that handles promises.
- */
- static final ExecutorService traversalExecutorService = Executors.newCachedThreadPool(
- new BasicThreadFactory.Builder().namingPattern("traversal-executor-%d").build());
-
- /**
* Get the {@link Bytecode} associated with the construction of this traversal.
*
* @return the byte code representation of the traversal
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee6a3589/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
index 6ce6dfe..3c21e37 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
@@ -43,9 +43,6 @@ import java.util.List;
import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Function;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -328,40 +325,6 @@ public class DefaultTraversal<S, E> implements Traversal.Admin<S, E> {
this.graph = graph;
}
- /**
- * Override of {@link Traversal#promise(Function)} that is aware of graph transactions.
- */
- @Override
- public <T2> CompletableFuture<T2> promise(final Function<Traversal, T2> traversalFunction) {
- return this.promise(traversalFunction, Traversal.Admin.traversalExecutorService);
- }
-
- /**
- * Override of {@link Traversal#promise(Function)} that is aware of graph transactions. In a transactional graph
- * a promise represents the full scope of a transaction, even if the graph is only partially iterated.
- */
- @Override
- public <T2> CompletableFuture<T2> promise(final Function<Traversal, T2> traversalFunction, final ExecutorService service) {
- if (graph != null && graph.features().graph().supportsTransactions()) {
- final Function<Traversal, T2> transactionAware = traversal -> {
-
- try {
- if (graph.tx().isOpen()) graph.tx().rollback();
- final T2 obj = traversalFunction.apply(traversal);
- if (graph.tx().isOpen()) graph.tx().commit();
- return obj;
- } catch (Exception ex) {
- if (graph.tx().isOpen()) graph.tx().rollback();
- throw ex;
- }
- };
-
- return Traversal.Admin.super.promise(transactionAware, service);
- } else {
- return Traversal.Admin.super.promise(traversalFunction, service);
- }
- }
-
@Override
public boolean equals(final Object other) {
return other != null && other.getClass().equals(this.getClass()) && this.equals(((Traversal.Admin) other));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee6a3589/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalTest.java
index aa1b99b..c427d8e 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalTest.java
@@ -30,34 +30,22 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import java.util.NoSuchElementException;
import java.util.Optional;
-import java.util.Random;
import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsCollectionContaining.hasItems;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class TraversalTest {
- private final ExecutorService service = Executors.newFixedThreadPool(2);
-
@Test
public void shouldTryNext() {
final MockTraversal<Integer> t = new MockTraversal<>(1, 2, 3);
@@ -117,139 +105,6 @@ public class TraversalTest {
}
@Test
- public void shouldPromiseNextThreeUsingForkJoin() throws Exception {
- final MockTraversal<Integer> t = new MockTraversal<>(1, 2, 3, 4, 5, 6, 7);
- final CompletableFuture<List<Integer>> promiseFirst = t.promise(traversal -> traversal.next(3));
- final List<Integer> listFirst = promiseFirst.get();
- assertEquals(3, listFirst.size());
- assertThat(listFirst, hasItems(1 ,2, 3));
- assertThat(t.hasNext(), is(true));
- assertThat(promiseFirst.isDone(), is(true));
-
- final CompletableFuture<List<Integer>> promiseSecond = t.promise(traversal -> traversal.next(3));
- final List<Integer> listSecond = promiseSecond.get();
- assertEquals(3, listSecond.size());
- assertThat(listSecond, hasItems(4, 5, 6));
- assertThat(t.hasNext(), is(true));
- assertThat(promiseSecond.isDone(), is(true));
-
- final CompletableFuture<List<Integer>> promiseThird = t.promise(traversal -> traversal.next(3));
- final List<Integer> listThird = promiseThird.get();
- assertEquals(1, listThird.size());
- assertThat(listThird, hasItems(7));
- assertThat(t.hasNext(), is(false));
- assertThat(promiseThird.isDone(), is(true));
-
- final CompletableFuture<Integer> promiseDead = t.promise(traversal -> (Integer) traversal.next());
- final AtomicBoolean dead = new AtomicBoolean(false);
- promiseDead.exceptionally(tossed -> {
- dead.set(tossed instanceof NoSuchElementException);
- return null;
- });
-
- try {
- promiseDead.get(10000, TimeUnit.MILLISECONDS);
- fail("Should have gotten an exception");
- } catch (Exception ex) {
- if (ex instanceof TimeoutException) {
- fail("This should not have timed out but should have gotten an exception caught above in the exceptionally() clause");
- }
-
- assertThat(ex.getCause(), instanceOf(NoSuchElementException.class));
- }
-
- assertThat(dead.get(), is(true));
- assertThat(t.hasNext(), is(false));
- assertThat(promiseDead.isDone(), is(true));
- }
-
- @Test
- public void shouldPromiseNextThreeUsingSpecificExecutor() throws Exception {
- final MockTraversal<Integer> t = new MockTraversal<>(1, 2, 3, 4, 5, 6, 7);
- final CompletableFuture<List<Integer>> promiseFirst = t.promise(traversal -> traversal.next(3), service);
- final List<Integer> listFirst = promiseFirst.get();
- assertEquals(3, listFirst.size());
- assertThat(listFirst, hasItems(1 ,2, 3));
- assertThat(t.hasNext(), is(true));
- assertThat(promiseFirst.isDone(), is(true));
-
- final CompletableFuture<List<Integer>> promiseSecond = t.promise(traversal -> traversal.next(3), service);
- final List<Integer> listSecond = promiseSecond.get();
- assertEquals(3, listSecond.size());
- assertThat(listSecond, hasItems(4, 5, 6));
- assertThat(t.hasNext(), is(true));
- assertThat(promiseSecond.isDone(), is(true));
-
- final CompletableFuture<List<Integer>> promiseThird = t.promise(traversal -> traversal.next(3), service);
- final List<Integer> listThird = promiseThird.get();
- assertEquals(1, listThird.size());
- assertThat(listThird, hasItems(7));
- assertThat(t.hasNext(), is(false));
- assertThat(promiseThird.isDone(), is(true));
-
- final CompletableFuture<Integer> promiseDead = t.promise(traversal -> (Integer) traversal.next(), service);
- final AtomicBoolean dead = new AtomicBoolean(false);
- promiseDead.exceptionally(tossed -> {
- dead.set(tossed instanceof NoSuchElementException);
- return null;
- });
-
- try {
- promiseDead.get(10000, TimeUnit.MILLISECONDS);
- fail("Should have gotten an exception");
- } catch (Exception ex) {
- if (ex instanceof TimeoutException) {
- fail("This should not have timed out but should have gotten an exception caught above in the exceptionally() clause");
- }
-
- assertThat(ex.getCause(), instanceOf(NoSuchElementException.class));
- }
-
- assertThat(dead.get(), is(true));
- assertThat(t.hasNext(), is(false));
- assertThat(promiseDead.isDone(), is(true));
- }
-
- @Test
- public void shouldInterruptTraversalFunction() throws Exception {
- final Random rand = new Random(1234567890);
-
- // infinite traversal
- final MockTraversal<Integer> t = new MockTraversal<>(IntStream.generate(rand::nextInt).iterator());
-
- // iterate a bunch of it
- final CompletableFuture<List<Integer>> promise10 = t.promise(traversal -> traversal.next(10), service);
- assertEquals(10, promise10.get(10000, TimeUnit.MILLISECONDS).size());
- final CompletableFuture<List<Integer>> promise100 = t.promise(traversal -> traversal.next(100), service);
- assertEquals(100, promise100.get(10000, TimeUnit.MILLISECONDS).size());
- final CompletableFuture<List<Integer>> promise1000 = t.promise(traversal -> traversal.next(1000), service);
- assertEquals(1000, promise1000.get(10000, TimeUnit.MILLISECONDS).size());
-
- // this is endless, so let's cancel
- final CompletableFuture<List<Integer>> promiseForevers = t.promise(traversal -> traversal.next(Integer.MAX_VALUE), service);
-
- // specify what to do on exception
- final AtomicBoolean failed = new AtomicBoolean(false);
- promiseForevers.exceptionally(ex -> {
- failed.set(true);
- return null;
- });
-
- try {
- // let it actually iterate a moment
- promiseForevers.get(500, TimeUnit.MILLISECONDS);
- fail("This should have timed out because the traversal has infinite items in it");
- } catch (TimeoutException tex) {
-
- }
-
- assertThat(promiseForevers.isDone(), is(false));
- promiseForevers.cancel(true);
- assertThat(failed.get(), is(true));
- assertThat(promiseForevers.isDone(), is(true));
- }
-
- @Test
public void shouldIterate() {
final MockTraversal<Integer> t = new MockTraversal<>(1, 2, 3, 4, 5, 6, 7);
assertThat(t.hasNext(), is(true));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee6a3589/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
index 972e838..9a2180e 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
@@ -208,7 +208,7 @@ final class Connection {
logger.debug(String.format("Write on connection %s failed", thisConnection.getConnectionInfo()), f.cause());
thisConnection.isDead = true;
thisConnection.returnToPool();
- future.completeExceptionally(f.cause());
+ cluster.executor().submit(() -> future.completeExceptionally(f.cause()));
} else {
final LinkedBlockingQueue<Result> resultLinkedBlockingQueue = new LinkedBlockingQueue<>();
final CompletableFuture<Void> readCompleted = new CompletableFuture<>();
@@ -250,8 +250,8 @@ final class Connection {
final ResultQueue handler = new ResultQueue(resultLinkedBlockingQueue, readCompleted);
pending.put(requestMessage.getRequestId(), handler);
- future.complete(new ResultSet(handler, cluster.executor(), readCompleted,
- requestMessage, pool.host));
+ cluster.executor().submit(() -> future.complete(
+ new ResultSet(handler, cluster.executor(), readCompleted, requestMessage, pool.host)));
}
});
channel.writeAndFlush(requestMessage, requestPromise);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee6a3589/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
index bb2d33d..be3fa28 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
@@ -37,6 +37,7 @@ import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import java.util.Iterator;
import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
import java.util.function.Supplier;
/**
@@ -163,6 +164,10 @@ public class DriverRemoteConnection implements RemoteConnection {
}
}
+ /**
+ * @deprecated As of release 3.2.2, replaced by {@link #submit(Bytecode)}.
+ */
+ @Deprecated
@Override
public <E> Iterator<Traverser.Admin<E>> submit(final Traversal<?, E> t) throws RemoteConnectionException {
try {
@@ -189,6 +194,15 @@ public class DriverRemoteConnection implements RemoteConnection {
}
@Override
+ public <E> CompletableFuture<RemoteTraversal<?, E>> submitAsync(final Bytecode bytecode) throws RemoteConnectionException {
+ try {
+ return client.submitAsync(bytecode).thenApply(rs -> new DriverRemoteTraversal<>(rs, client, attachElements, conf));
+ } catch (Exception ex) {
+ throw new RemoteConnectionException(ex);
+ }
+ }
+
+ @Override
public void close() throws Exception {
try {
client.close();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee6a3589/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversal.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversal.java
index 88ee794..d3f290c 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversal.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversal.java
@@ -66,28 +66,18 @@ public class DriverRemoteTraversal<S, E> extends AbstractRemoteTraversal<S, E> {
}
this.rs = rs;
- this.sideEffects = new DriverRemoteTraversalSideEffects(
- client,
+ this.sideEffects = new DriverRemoteTraversalSideEffects(client,
rs.getOriginalRequestMessage().getRequestId(),
- rs.getHost());
+ rs.getHost(), rs.allItemsAvailableAsync());
}
/**
* Gets a side-effect from the server. Do not call this method prior to completing the iteration of the
- * {@link DriverRemoteTraversal} that spawned this as the side-effect will not be ready. If this method is called
- * prior to iteration being complete, then it will block until the traversal notifies it of completion. Generally
+ * {@link DriverRemoteTraversal} that spawned this as the side-effect will not be ready. Generally
* speaking, the common user would not get side-effects this way - they would use a call to {@code cap()}.
*/
@Override
public RemoteTraversalSideEffects getSideEffects() {
- // wait for the read to complete (i.e. iteration on the server) before allowing the caller to get the
- // side-effect. calling prior to this will result in the side-effect not being found. of course, the
- // bad part here is that the method blocks indefinitely waiting for the result, but it prevents the
- // test failure problems that happen on slower systems. in practice, it's unlikely that a user would
- // try to get a side-effect prior to iteration, but since the API allows it, this at least prevents
- // the error.
- rs.allItemsAvailableAsync().join();
-
return this.sideEffects;
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee6a3589/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffects.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffects.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffects.java
index 8d6fa98..4305567 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffects.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffects.java
@@ -33,6 +33,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
/**
* Java driver implementation of {@link TraversalSideEffects}. This class is not thread safe.
@@ -50,15 +51,26 @@ public class DriverRemoteTraversalSideEffects extends AbstractRemoteTraversalSid
private boolean closed = false;
private boolean retrievedAllKeys = false;
+ private final CompletableFuture<Void> ready;
- public DriverRemoteTraversalSideEffects(final Client client, final UUID serverSideEffect, final Host host) {
+ public DriverRemoteTraversalSideEffects(final Client client, final UUID serverSideEffect, final Host host,
+ final CompletableFuture<Void> ready) {
this.client = client;
this.serverSideEffect = serverSideEffect;
this.host = host;
+ this.ready = ready;
}
@Override
public <V> V get(final String key) throws IllegalArgumentException {
+ // wait for the read to complete (i.e. iteration on the server) before allowing the caller to get the
+ // side-effect. calling prior to this will result in the side-effect not being found. of course, the
+ // bad part here is that the method blocks indefinitely waiting for the result, but it prevents the
+ // test failure problems that happen on slower systems. in practice, it's unlikely that a user would
+ // try to get a side-effect prior to iteration, but since the API allows it, this at least prevents
+ // the error.
+ ready.join();
+
if (!keys().contains(key)) throw TraversalSideEffects.Exceptions.sideEffectKeyDoesNotExist(key);
if (!sideEffects.containsKey(key)) {
@@ -91,6 +103,14 @@ public class DriverRemoteTraversalSideEffects extends AbstractRemoteTraversalSid
@Override
public Set<String> keys() {
+ // wait for the read to complete (i.e. iteration on the server) before allowing the caller to get the
+ // side-effect. calling prior to this will result in the side-effect not being found. of course, the
+ // bad part here is that the method blocks indefinitely waiting for the result, but it prevents the
+ // test failure problems that happen on slower systems. in practice, it's unlikely that a user would
+ // try to get a side-effect prior to iteration, but since the API allows it, this at least prevents
+ // the error.
+ ready.join();
+
if (closed && !retrievedAllKeys) throw new IllegalStateException("Traversal has been closed - side-effect keys cannot be retrieved");
if (!retrievedAllKeys) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee6a3589/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffectsTest.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffectsTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffectsTest.java
index 27d0079..4e6df93 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffectsTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffectsTest.java
@@ -52,7 +52,9 @@ public class DriverRemoteTraversalSideEffectsTest extends AbstractResultQueueTes
mockClientForCall(client);
final UUID sideEffectKey = UUID.fromString("31dec2c6-b214-4a6f-a68b-996608dce0d9");
- final TraversalSideEffects sideEffects = new DriverRemoteTraversalSideEffects(client, sideEffectKey, null);
+ final CompletableFuture<Void> ready = new CompletableFuture<>();
+ ready.complete(null);
+ final TraversalSideEffects sideEffects = new DriverRemoteTraversalSideEffects(client, sideEffectKey, null, ready);
assertEquals(1, sideEffects.keys().size());
sideEffects.close();
@@ -73,7 +75,9 @@ public class DriverRemoteTraversalSideEffectsTest extends AbstractResultQueueTes
mockClientForCall(client);
mockClientForCall(client);
final UUID sideEffectKey = UUID.fromString("31dec2c6-b214-4a6f-a68b-996608dce0d9");
- final TraversalSideEffects sideEffects = new DriverRemoteTraversalSideEffects(client, sideEffectKey, null);
+ final CompletableFuture<Void> ready = new CompletableFuture<>();
+ ready.complete(null);
+ final TraversalSideEffects sideEffects = new DriverRemoteTraversalSideEffects(client, sideEffectKey, null, ready);
assertNotNull(sideEffects.get("test-0"));
sideEffects.close();
@@ -93,7 +97,9 @@ public class DriverRemoteTraversalSideEffectsTest extends AbstractResultQueueTes
mockClientForCall(client);
final UUID sideEffectKey = UUID.fromString("31dec2c6-b214-4a6f-a68b-996608dce0d9");
- final TraversalSideEffects sideEffects = new DriverRemoteTraversalSideEffects(client, sideEffectKey, null);
+ final CompletableFuture<Void> ready = new CompletableFuture<>();
+ ready.complete(null);
+ final TraversalSideEffects sideEffects = new DriverRemoteTraversalSideEffects(client, sideEffectKey, null, ready);
sideEffects.close();
sideEffects.close();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee6a3589/gremlin-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index dae5e8a..b82c986 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -65,6 +65,11 @@ limitations under the License.
<artifactId>jBCrypt</artifactId>
<version>jbcrypt-0.4</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.3.1</version>
+ </dependency>
<!-- TEST -->
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee6a3589/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 b3dbe29..420bd05 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
@@ -46,12 +46,14 @@ import org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.InterpreterModeCust
import org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.SimpleSandboxExtension;
import org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.TimedInterruptCustomizerProvider;
import org.apache.tinkerpop.gremlin.process.remote.RemoteGraph;
+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.step.util.BulkSet;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.server.channel.NioChannelizer;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
import org.apache.tinkerpop.gremlin.util.Log4jRecordingAppender;
@@ -76,6 +78,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@@ -990,4 +993,26 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
final BulkSet localBSideEffects = se.get("b");
assertThat(localBSideEffects.isEmpty(), is(false));
}
+
+ @Test
+ public void shouldDoNonBlockingPromiseWithRemote() throws Exception {
+ final Graph graph = EmptyGraph.instance();
+ final GraphTraversalSource g = graph.traversal().withRemote(conf);
+ g.addV("person").property("age", 20).promise(Traversal::iterate).join();
+ g.addV("person").property("age", 10).promise(Traversal::iterate).join();
+ assertEquals(50L, g.V().hasLabel("person").map(Lambda.function("it.get().value('age') + 10")).sum().promise(t -> t.next()).join());
+ g.addV("person").property("age", 20).promise(Traversal::iterate).join();
+
+ final Traversal traversal = g.V().hasLabel("person").has("age", 20).values("age");
+ assertEquals(20, traversal.promise(t -> ((Traversal) t).next(1).get(0)).join());
+ assertEquals(20, traversal.next());
+ assertThat(traversal.hasNext(), is(false));
+
+ final Traversal traversalCloned = g.V().hasLabel("person").has("age", 20).values("age");
+ assertEquals(20, traversalCloned.next());
+ assertEquals(20, traversalCloned.promise(t -> ((Traversal) t).next(1).get(0)).join());
+ assertThat(traversalCloned.promise(t -> ((Traversal) t).hasNext()).join(), is(false));
+
+ assertEquals(3, g.V().promise(Traversal::toList).join().size());
+ }
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee6a3589/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
index 050f9de..68f8217 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
@@ -20,7 +20,6 @@ package org.apache.tinkerpop.gremlin.process.traversal;
import org.apache.tinkerpop.gremlin.ExceptionCoverage;
import org.apache.tinkerpop.gremlin.FeatureRequirement;
-import org.apache.tinkerpop.gremlin.FeatureRequirementSet;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
@@ -41,9 +40,6 @@ import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Random;
import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
@@ -311,42 +307,4 @@ public class CoreTraversalTest extends AbstractGremlinProcessTest {
}
}
-
- @Test
- @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
- public void shouldUsePromiseAndControlTransactionsIfAvailable() throws Exception {
- // this test will validate that transactional graphs can properly open/close transactions within a promise.
- // as there is a feature check, non-transactional graphs can use this to simply exercise the promise API
- final Vertex vAdded = g.addV("person").property("name", "stephen").promise(t -> (Vertex) t.next()).get(10000, TimeUnit.MILLISECONDS);
- final Vertex vRead = g.V().has("name", "stephen").next();
- assertEquals(vAdded.id(), vRead.id());
-
- // transaction should have been committed at this point so test the count in this thread to validate persistence
- assertVertexEdgeCounts(graph, 1, 0);
-
- // cancel a promise and ensure the transaction ended in failure. hold the traversal in park until it can be
- // interrupted, then the promise will have to rollback the transaction.
- final CompletableFuture promiseToCancel = g.addV("person").property("name", "marko").sideEffect(traverser -> {
- try {
- Thread.sleep(100000);
- } catch (Exception ignored) {
-
- }
- }).promise(t -> (Vertex) t.next());
-
- try {
- promiseToCancel.get(500, TimeUnit.MILLISECONDS);
- fail("Should have timed out");
- } catch (TimeoutException te) {
-
- }
-
- promiseToCancel.cancel(true);
-
- // graphs that support transactions will rollback the transaction
- if (graph.features().graph().supportsTransactions())
- assertVertexEdgeCounts(graph, 1, 0);
- else
- assertVertexEdgeCounts(graph, 2, 0);
- }
}
[15/47] tinkerpop git commit: TINKERPOP-1490 Deprecated the old
RemoteConnection submit method.
Posted by sp...@apache.org.
TINKERPOP-1490 Deprecated the old RemoteConnection submit method.
That method isn't called at all anymore - needs to be removed completely for 3.3.x.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/21663f40
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/21663f40
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/21663f40
Branch: refs/heads/TINKERPOP-1130
Commit: 21663f400e9a808b136ef6384a2ad694c20f5da4
Parents: f4bc29c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Nov 14 10:08:48 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 16 10:14:20 2016 -0500
----------------------------------------------------------------------
.../tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/21663f40/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
index ef3a0a9..d6415de 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
@@ -165,7 +165,7 @@ public class DriverRemoteConnection implements RemoteConnection {
}
/**
- * @deprecated As of release 3.2.2, replaced by {@link #submit(Bytecode)}.
+ * @deprecated As of release 3.2.2, replaced by {@link #submitAsync(Bytecode)}.
*/
@Deprecated
@Override
[20/47] tinkerpop git commit: Merge branch 'pr-514'
Posted by sp...@apache.org.
Merge branch 'pr-514'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8cbeb234
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8cbeb234
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8cbeb234
Branch: refs/heads/TINKERPOP-1130
Commit: 8cbeb2349f9937d98aafa9f62dad33d4e40fa49e
Parents: 60c7213 7720a9a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Dec 19 11:45:04 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Dec 19 11:45:04 2016 -0500
----------------------------------------------------------------------
.../gremlin/process/traversal/dsl/graph/GraphTraversal.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
[47/47] tinkerpop git commit: TINKERPOP-1130 Changed scope of
gremlin-test to "test"
Posted by sp...@apache.org.
TINKERPOP-1130 Changed scope of gremlin-test to "test"
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6dd3f10b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6dd3f10b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6dd3f10b
Branch: refs/heads/TINKERPOP-1130
Commit: 6dd3f10b66cb2a1c8c25bae000f66b06524011e7
Parents: 4610295
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Dec 16 06:56:55 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 20 15:24:52 2016 -0500
----------------------------------------------------------------------
gremlin-tools/gremlin-io-test/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6dd3f10b/gremlin-tools/gremlin-io-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/pom.xml b/gremlin-tools/gremlin-io-test/pom.xml
index 0ba73d3..8fc6278 100644
--- a/gremlin-tools/gremlin-io-test/pom.xml
+++ b/gremlin-tools/gremlin-io-test/pom.xml
@@ -25,6 +25,7 @@
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-test</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
[42/47] tinkerpop git commit: TINKERPOP-1130 Implemented many
additional IO tests.
Posted by sp...@apache.org.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-partial.json
index deaa3c6..367fc47 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "gx:ZonedDateTime",
- "@value" : "2016-12-13T06:30:34.481-05:00[America/New_York]"
+ "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v2d0-no-types.json
new file mode 100644
index 0000000..7dd6c03
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v2d0-no-types.json
@@ -0,0 +1 @@
+"normSack"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v2d0-partial.json
new file mode 100644
index 0000000..7ddccdd
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Barrier",
+ "@value" : "normSack"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-no-types.json
index 87c4e8e..03b71a0 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-no-types.json
@@ -1 +1 @@
-1481733559207
\ No newline at end of file
+1481750076295
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-partial.json
index 2923b35..cf4007a 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Date",
- "@value" : 1481733559207
+ "@value" : 1481750076295
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json
index 5c65245..0788ea4 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json
@@ -1,23 +1,23 @@
{
- "dur" : 0.254441,
+ "dur" : 0.194633,
"counts" : {
"traverserCount" : 4,
"elementCount" : 4
},
"name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
"annotations" : {
- "percentDur" : 20.94054304958422
+ "percentDur" : 18.700308704545826
},
"id" : "7.0.0()",
"metrics" : [ {
- "dur" : 0.336431,
+ "dur" : 0.277476,
"counts" : {
"traverserCount" : 13,
"elementCount" : 13
},
"name" : "VertexStep(OUT,vertex)",
"annotations" : {
- "percentDur" : 27.688335758445646
+ "percentDur" : 26.659851402909876
},
"id" : "2.0.0()"
} ]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json
index a3daaa9..55c32c1 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json
@@ -3,7 +3,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.254441
+ "@value" : 0.194633
},
"counts" : {
"traverserCount" : {
@@ -19,7 +19,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 20.94054304958422
+ "@value" : 18.700308704545826
}
},
"id" : "7.0.0()",
@@ -28,7 +28,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.336431
+ "@value" : 0.277476
},
"counts" : {
"traverserCount" : {
@@ -44,7 +44,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 27.688335758445646
+ "@value" : 26.659851402909876
}
},
"id" : "2.0.0()"
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-no-types.json
index 2021ac7..d85a355 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-no-types.json
@@ -1 +1 @@
-"2016-12-14T11:39:19.377-05:00"
\ No newline at end of file
+"2007-12-03T10:15:30+01:00"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-partial.json
index 0072625..03f45cd 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "gx:OffsetDateTime",
- "@value" : "2016-12-14T11:39:19.377-05:00"
+ "@value" : "2007-12-03T10:15:30+01:00"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-no-types.json
index 8809062..b8f08fd 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-no-types.json
@@ -1 +1 @@
-"11:39:19.381-05:00"
\ No newline at end of file
+"10:15:30+01:00"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-partial.json
index 401515f..b124953 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "gx:OffsetTime",
- "@value" : "11:39:19.381-05:00"
+ "@value" : "10:15:30+01:00"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-no-types.json
index 87c4e8e..03b71a0 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-no-types.json
@@ -1 +1 @@
-1481733559207
\ No newline at end of file
+1481750076295
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-partial.json
index 428385b..1ca0e17 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Timestamp",
- "@value" : 1481733559207
+ "@value" : 1481750076295
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json
index 6e6f699..3603f03 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json
@@ -1,47 +1,47 @@
{
- "dur" : 0.620654,
+ "dur" : 0.747595,
"metrics" : [ {
- "dur" : 0.076772,
+ "dur" : 0.099877,
"counts" : {
"traverserCount" : 4,
"elementCount" : 4
},
"name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
"annotations" : {
- "percentDur" : 12.369532783160988
+ "percentDur" : 13.359773674248757
},
"id" : "7.0.0()"
}, {
- "dur" : 0.189752,
+ "dur" : 0.210169,
"counts" : {
"traverserCount" : 13,
"elementCount" : 13
},
"name" : "VertexStep(OUT,vertex)",
"annotations" : {
- "percentDur" : 30.572911799488928
+ "percentDur" : 28.112681331469577
},
"id" : "2.0.0()"
}, {
- "dur" : 0.172385,
+ "dur" : 0.181756,
"counts" : {
"traverserCount" : 7,
"elementCount" : 7
},
"name" : "VertexStep(OUT,vertex)",
"annotations" : {
- "percentDur" : 27.77473439307569
+ "percentDur" : 24.31209411512918
},
"id" : "3.0.0()"
}, {
- "dur" : 0.181745,
+ "dur" : 0.255793,
"counts" : {
"traverserCount" : 1,
"elementCount" : 1
},
"name" : "TreeStep",
"annotations" : {
- "percentDur" : 29.282821024274394
+ "percentDur" : 34.215450879152485
},
"id" : "4.0.0()"
} ]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json
index 097b576..ea50cda 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json
@@ -3,14 +3,14 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.620654
+ "@value" : 0.747595
},
"metrics" : [ {
"@type" : "g:Metrics",
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.076772
+ "@value" : 0.099877
},
"counts" : {
"traverserCount" : {
@@ -26,7 +26,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 12.369532783160988
+ "@value" : 13.359773674248757
}
},
"id" : "7.0.0()"
@@ -36,7 +36,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.189752
+ "@value" : 0.210169
},
"counts" : {
"traverserCount" : {
@@ -52,7 +52,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 30.572911799488928
+ "@value" : 28.112681331469577
}
},
"id" : "2.0.0()"
@@ -62,7 +62,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.172385
+ "@value" : 0.181756
},
"counts" : {
"traverserCount" : {
@@ -78,7 +78,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 27.77473439307569
+ "@value" : 24.31209411512918
}
},
"id" : "3.0.0()"
@@ -88,7 +88,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.181745
+ "@value" : 0.255793
},
"counts" : {
"traverserCount" : {
@@ -104,7 +104,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 29.282821024274394
+ "@value" : 34.215450879152485
}
},
"id" : "4.0.0()"
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-no-types.json
index 975cd8d..7333537 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-no-types.json
@@ -1 +1 @@
-"2016-12-14T11:39:19.383-05:00[America/New_York]"
\ No newline at end of file
+"2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-partial.json
index 3f8f159..367fc47 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "gx:ZonedDateTime",
- "@value" : "2016-12-14T11:39:19.383-05:00[America/New_York]"
+ "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/date-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/date-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/date-v1d0.kryo
index 0221297..a86f98f 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/date-v1d0.kryo
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/date-v1d0.kryo
@@ -1 +1 @@
-\ufffd\ufffd\ufffd\u02cf+
\ No newline at end of file
+\ufffd\ufffd\ufffd\ufffd\ufffd+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/instant-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/instant-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/instant-v1d0.kryo
index b58418d..d9466cd 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/instant-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/instant-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy
index 96b13bb..8ad0f76 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy
@@ -1,4 +1,3 @@
-package org.apache.tinkerpop.gremlin.structure.io.gryo._3_2_3
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -52,12 +51,12 @@ toGryoV1d0 = { o, type, mapper, comment = "" ->
writeSupportedObjects = { mapper, toGryoFunction ->
//toGryoFunction(File, "Class", mapper)
- toGryoFunction(new Date(), "Date", mapper)
+ toGryoFunction(new Date(1481750076295L), "Date", mapper)
toGryoFunction(100.00d, "Double", mapper)
toGryoFunction(100.00f, "Float", mapper)
toGryoFunction(100, "Integer", mapper)
toGryoFunction(100L, "Long", mapper)
- //toGryoFunction(new java.sql.Timestamp(System.currentTimeMillis()), "Timestamp", mapper)
+ //toGryoFunction(new java.sql.Timestamp(1481750076295L), "Timestamp", mapper)
toGryoFunction(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786"), "UUID", mapper)
toGryoFunction(graph.edges().next(), "Edge", mapper)
@@ -71,7 +70,7 @@ writeSupportedObjects = { mapper, toGryoFunction ->
toGryoFunction(SackFunctions.Barrier.normSack, "Barrier", mapper)
toGryoFunction(new Bytecode.Binding("x", 1), "Binding", mapper)
- toGryoFunction(g.V().hasLabel('person').out().in().tree().getBytecode(), "Bytecode", mapper)
+ toGryoFunction(g.V().hasLabel('person').out().in().tree().asAdmin().getBytecode(), "Bytecode", mapper)
toGryoFunction(VertexProperty.Cardinality.list, "Cardinality", mapper)
toGryoFunction(Column.keys, "Column", mapper)
toGryoFunction(Direction.OUT, "Direction", mapper)
@@ -134,18 +133,18 @@ writeSupportedObjects = { mapper, toGryoFunction ->
toGryoFunction("x".charAt(0), "Char", mapper)
toGryoFunction(Duration.ofDays(5), "Duration", mapper)
//toGryoFunction(java.net.InetAddress.getByName("localhost"), "InetAddress", mapper)
- toGryoFunction(Instant.now(), "Instant", mapper)
+ toGryoFunction(Instant.parse("2016-12-14T16:39:19.349Z"), "Instant", mapper)
toGryoFunction(LocalDate.of(2016, 1, 1), "LocalDate", mapper)
toGryoFunction(LocalDateTime.of(2016, 1, 1, 12, 30), "LocalDateTime", mapper)
toGryoFunction(LocalTime.of(12, 30, 45), "LocalTime", mapper)
toGryoFunction(MonthDay.of(1, 1), "MonthDay", mapper)
- toGryoFunction(OffsetDateTime.now(), "OffsetDateTime", mapper)
- toGryoFunction(OffsetTime.now(), "OffsetTime", mapper)
+ toGryoFunction(OffsetDateTime.parse("2007-12-03T10:15:30+01:00"), "OffsetDateTime", mapper)
+ toGryoFunction(OffsetTime.parse("10:15:30+01:00"), "OffsetTime", mapper)
toGryoFunction(Period.of(1, 6, 15), "Period", mapper)
toGryoFunction(new Short("100"), "Short", mapper)
toGryoFunction(Year.of(2016), "Year", mapper)
toGryoFunction(YearMonth.of(2016, 6), "YearMonth", mapper)
- toGryoFunction(ZonedDateTime.now(), "ZonedDateTime", mapper)
+ toGryoFunction(ZonedDateTime.of(2016, 12, 23, 12, 12, 24, 36, ZoneId.of("GMT+2")), "ZonedDateTime", mapper)
toGryoFunction(ZoneOffset.ofHoursMinutesSeconds(3, 6, 9), "ZoneOffset", mapper)
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/metrics-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/metrics-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/metrics-v1d0.kryo
index f16832c..a160f8b 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/metrics-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/metrics-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/offsetdatetime-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/offsetdatetime-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/offsetdatetime-v1d0.kryo
index 8155941..6bb92d0 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/offsetdatetime-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/offsetdatetime-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/offsettime-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/offsettime-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/offsettime-v1d0.kryo
index 29b5c2e..d1621aa 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/offsettime-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/offsettime-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/traversalmetrics-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/traversalmetrics-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/traversalmetrics-v1d0.kryo
index de71cb1..5ac54d3 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/traversalmetrics-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/traversalmetrics-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/zoneddatetime-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/zoneddatetime-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/zoneddatetime-v1d0.kryo
index 52256c5..3ebbce5 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/zoneddatetime-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/zoneddatetime-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/date-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/date-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/date-v1d0.kryo
index 8c9dc9e..a86f98f 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/date-v1d0.kryo
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/date-v1d0.kryo
@@ -1 +1 @@
-\ufffd\ufffd\ufffd\ufffd+
\ No newline at end of file
+\ufffd\ufffd\ufffd\ufffd\ufffd+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo
index 3a9659b..057d097 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/offsetdatetime-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/offsetdatetime-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/offsetdatetime-v1d0.kryo
index 62d5cb0..6bb92d0 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/offsetdatetime-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/offsetdatetime-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/offsettime-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/offsettime-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/offsettime-v1d0.kryo
index 04bf8cb..d1621aa 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/offsettime-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/offsettime-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo
index e4fc6f7..f5f0abc 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/zoneddatetime-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/zoneddatetime-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/zoneddatetime-v1d0.kryo
index b369522..3ebbce5 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/zoneddatetime-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/zoneddatetime-v1d0.kryo differ
[24/47] tinkerpop git commit: TINKERPOP-1584 Made Gryo support a
number of classes GraphSON supported.
Posted by sp...@apache.org.
TINKERPOP-1584 Made Gryo support a number of classes GraphSON supported.
Added ByteBuffer, Timestamp, InetAddress and fixed serialization of Class (which never worked in the first place).
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5f132ebc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5f132ebc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5f132ebc
Branch: refs/heads/TINKERPOP-1130
Commit: 5f132ebc41538691f5d2f52921ad032e33ffcf78
Parents: c66bbdf
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Dec 16 08:39:59 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 20 13:23:58 2016 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +
.../structure/io/gryo/GryoClassResolver.java | 9 +++
.../gremlin/structure/io/gryo/GryoMapper.java | 9 ++-
.../structure/io/gryo/UtilSerializers.java | 62 ++++++++++++++++++++
.../structure/io/gryo/GryoMapperTest.java | 27 +++++++++
5 files changed, 107 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5f132ebc/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 60e1bb1..02531ba 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,8 @@ TinkerPop 3.2.4 (Release Date: NOT OFFICIALLY RELEASED YET)
* Lessened the severity of Gremlin Server logging when it encounters two or more serializers addressing the same mime type.
* Bumped to Netty 4.0.42.final.
+* Added `ByteBuffer`, `InetAddress`, `Timestamp` to the list of Gryo supported classes.
+* Fixed Gryo serialization of `Class`.
* Fixed a bug in Gremlin-Python around `__.__()` and `__.start()`.
* Fixed a bug around long serialization in Gremlin-Python when using Python3.
* Deprecated `TraversalSource.withBindings()` as it is no longer needed in Gremlin-Java and never was needed for other variants.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5f132ebc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolver.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolver.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolver.java
index 53f4382..1ee8612 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolver.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolver.java
@@ -44,6 +44,9 @@ import org.apache.tinkerpop.shaded.kryo.util.IdentityObjectIntMap;
import org.apache.tinkerpop.shaded.kryo.util.IntMap;
import org.apache.tinkerpop.shaded.kryo.util.ObjectMap;
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+
import static org.apache.tinkerpop.shaded.kryo.util.Util.getWrapperClass;
/**
@@ -108,6 +111,12 @@ public class GryoClassResolver implements ClassResolver {
type = Path.class;
else if (Lambda.class.isAssignableFrom(clazz))
type = Lambda.class;
+ else if (ByteBuffer.class.isAssignableFrom(clazz))
+ type = ByteBuffer.class;
+ else if (Class.class.isAssignableFrom(clazz))
+ type = Class.class;
+ else if (InetAddress.class.isAssignableFrom(clazz))
+ type = InetAddress.class;
else
type = clazz;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5f132ebc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
index fef7288..bbd3999 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
@@ -96,7 +96,9 @@ import org.javatuples.Pair;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.net.InetAddress;
import java.net.URI;
+import java.nio.ByteBuffer;
import java.time.Duration;
import java.time.Instant;
import java.time.LocalDate;
@@ -274,7 +276,7 @@ public final class GryoMapper implements Mapper<Kryo> {
add(GryoTypeReg.of(BigInteger.class, 34));
add(GryoTypeReg.of(BigDecimal.class, 35));
add(GryoTypeReg.of(Calendar.class, 39));
- add(GryoTypeReg.of(Class.class, 41));
+ add(GryoTypeReg.of(Class.class, 41, new UtilSerializers.ClassSerializer()));
add(GryoTypeReg.of(Collection.class, 37));
add(GryoTypeReg.of(Collections.EMPTY_LIST.getClass(), 51));
add(GryoTypeReg.of(Collections.EMPTY_MAP.getClass(), 52));
@@ -313,6 +315,9 @@ public final class GryoMapper implements Mapper<Kryo> {
add(GryoTypeReg.of(VertexTerminator.class, 13));
add(GryoTypeReg.of(AbstractMap.SimpleEntry.class, 120));
add(GryoTypeReg.of(AbstractMap.SimpleImmutableEntry.class, 121));
+ add(GryoTypeReg.of(java.sql.Timestamp.class, 138));
+ add(GryoTypeReg.of(InetAddress.class, 139, new UtilSerializers.InetAddressSerializer()));
+ add(GryoTypeReg.of(ByteBuffer.class, 140, new UtilSerializers.ByteBufferSerializer())); // ***LAST ID***
add(GryoTypeReg.of(ReferenceEdge.class, 81));
add(GryoTypeReg.of(ReferenceVertexProperty.class, 82));
@@ -350,7 +355,7 @@ public final class GryoMapper implements Mapper<Kryo> {
add(GryoTypeReg.of(Column.class, 132));
add(GryoTypeReg.of(Pop.class, 133));
add(GryoTypeReg.of(SackFunctions.Barrier.class, 135));
- add(GryoTypeReg.of(TraversalOptionParent.Pick.class, 137)); // ***LAST ID***
+ add(GryoTypeReg.of(TraversalOptionParent.Pick.class, 137));
add(GryoTypeReg.of(HashSetSupplier.class, 136, new UtilSerializers.HashSetSupplierSerializer()));
add(GryoTypeReg.of(TraverserSet.class, 58));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5f132ebc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UtilSerializers.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UtilSerializers.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UtilSerializers.java
index 6f0a632..958978c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UtilSerializers.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UtilSerializers.java
@@ -29,7 +29,9 @@ import org.apache.tinkerpop.shaded.kryo.io.Input;
import org.apache.tinkerpop.shaded.kryo.io.Output;
import org.javatuples.Pair;
+import java.net.InetAddress;
import java.net.URI;
+import java.nio.ByteBuffer;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.List;
@@ -60,6 +62,66 @@ final class UtilSerializers {
}
}
+ public final static class ByteBufferSerializer implements SerializerShim<ByteBuffer> {
+ @Override
+ public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final ByteBuffer bb) {
+ final byte[] b = new byte[bb.remaining()];
+ bb.get(b);
+ output.writeInt(b.length);
+ output.writeBytes(b, 0, b.length);
+ }
+
+ @Override
+ public <I extends InputShim> ByteBuffer read(final KryoShim<I, ?> kryo, final I input, final Class<ByteBuffer> clazz) {
+ final int len = input.readInt();
+ final byte[] b = input.readBytes(len);
+ final ByteBuffer bb = ByteBuffer.allocate(len);
+ bb.put(b);
+ return bb;
+ }
+ }
+
+ public final static class ClassSerializer implements SerializerShim<Class> {
+ @Override
+ public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Class object) {
+ output.writeString(object.getCanonicalName());
+ }
+
+ @Override
+ public <I extends InputShim> Class read(final KryoShim<I, ?> kryo, final I input, final Class<Class> clazz) {
+ final String name = input.readString();
+ try {
+ return Class.forName(name);
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+ }
+
+ public final static class InetAddressSerializer implements SerializerShim<InetAddress> {
+ @Override
+ public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final InetAddress addy) {
+ final String str = addy.toString().trim();
+ final int slash = str.indexOf('/');
+ if (slash >= 0) {
+ if (slash == 0) {
+ output.writeString(str.substring(1));
+ } else {
+ output.writeString(str.substring(0, slash));
+ }
+ }
+ }
+
+ @Override
+ public <I extends InputShim> InetAddress read(final KryoShim<I, ?> kryo, final I input, final Class<InetAddress> clazz) {
+ try {
+ return InetAddress.getByName(input.readString());
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+ }
+
public final static class HashSetSupplierSerializer implements SerializerShim<HashSetSupplier> {
@Override
public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final HashSetSupplier hashSetSupplier) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5f132ebc/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java
index 6f808e4..9f5ba41 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java
@@ -40,6 +40,9 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+import java.sql.Timestamp;
import java.time.Duration;
import java.time.Instant;
import java.time.LocalDate;
@@ -338,6 +341,30 @@ public class GryoMapperTest {
assertEquals(bytecode.toString(), serializeDeserialize(bytecode, Bytecode.class).toString());
}
+ @Test
+ public void shouldHandleClass() throws Exception {
+ final Class clazz = java.io.File.class;
+ assertEquals(clazz, serializeDeserialize(clazz, Class.class));
+ }
+
+ @Test
+ public void shouldHandleTimestamp() throws Exception {
+ final Timestamp ts = new java.sql.Timestamp(1481750076295L);
+ assertEquals(ts, serializeDeserialize(ts, java.sql.Timestamp.class));
+ }
+
+ @Test
+ public void shouldHandleINetAddress() throws Exception {
+ final InetAddress addy = InetAddress.getByName("localhost");
+ assertEquals(addy, serializeDeserialize(addy, InetAddress.class));
+ }
+
+ @Test
+ public void shouldHandleByteBuffer() throws Exception {
+ final ByteBuffer bb = ByteBuffer.wrap("some bytes for you".getBytes());
+ assertEquals(bb, serializeDeserialize(bb, ByteBuffer.class));
+ }
+
public <T> T serializeDeserialize(final Object o, final Class<T> clazz) throws Exception {
try (final ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
final Output out = new Output(stream);
[09/47] tinkerpop git commit: implemented promise API for
gremlin-python. side effect retrieval is problematic
Posted by sp...@apache.org.
implemented promise API for gremlin-python. side effect retrieval is problematic
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b0b93308
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b0b93308
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b0b93308
Branch: refs/heads/TINKERPOP-1130
Commit: b0b933084b38f77fcd4843796980cabe313ed1e4
Parents: f02e183
Author: davebshow <da...@gmail.com>
Authored: Wed Dec 7 13:35:42 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 16 10:03:41 2016 -0500
----------------------------------------------------------------------
.../python/TraversalSourceGenerator.groovy | 27 +++++++++
.../driver/driver_remote_connection.py | 21 +++++--
.../gremlin_python/driver/remote_connection.py | 7 +++
.../jython/gremlin_python/process/traversal.py | 28 +++++++++-
.../driver/test_driver_remote_connection.py | 59 ++++++++++++++++++++
5 files changed, 137 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0b93308/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy b/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy
index 73ffcb6..fc76b71 100644
--- a/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy
+++ b/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy
@@ -114,6 +114,28 @@ class Traversal(object):
except StopIteration: return tempList
tempList.append(temp)
return tempList
+ def promise(self, cb=None):
+ self.traversal_strategies.apply_async_strategies(self)
+ future_traversers = self.traversers
+ future = type(future_traversers)()
+ def process(f):
+ try:
+ traversers = f.result()
+ except Exception as e:
+ future.set_exception(e)
+ else:
+ self.traversers = iter(traversers)
+ if cb:
+ try:
+ result = cb(self)
+ except Exception as e:
+ future.set_exception(e)
+ else:
+ future.set_result(result)
+ else:
+ future.set_result(self)
+ future_traversers.add_done_callback(process)
+ return future
""")
@@ -223,6 +245,9 @@ class TraversalStrategies(object):
def apply_strategies(self, traversal):
for traversal_strategy in self.traversal_strategies:
traversal_strategy.apply(traversal)
+ def apply_async_strategies(self, traversal):
+ for traversal_strategy in self.traversal_strategies:
+ traversal_strategy.apply_async(traversal)
def __repr__(self):
return str(self.traversal_strategies)
@@ -233,6 +258,8 @@ class TraversalStrategy(object):
self.configuration = {} if configuration is None else configuration
def apply(self, traversal):
return
+ def apply_async(self, traversal):
+ return
def __eq__(self, other):
return isinstance(other, self.__class__)
def __hash__(self):
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0b93308/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py b/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
index d975f60..babb113 100644
--- a/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
+++ b/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
@@ -17,9 +17,11 @@ specific language governing permissions and limitations
under the License.
"""
import base64
+import functools
import json
import uuid
from tornado import gen
+from tornado import concurrent
from tornado import ioloop
from tornado import websocket
@@ -51,10 +53,15 @@ class DriverRemoteConnection(RemoteConnection):
'''
request_id = str(uuid.uuid4())
traversers = self._loop.run_sync(lambda: self.submit_traversal_bytecode(request_id, bytecode))
- side_effect_keys = lambda: self._loop.run_sync(lambda: self.submit_sideEffect_keys(request_id))
- side_effect_value = lambda key: self._loop.run_sync(lambda: self.submit_sideEffect_value(request_id, key))
- side_effect_close = lambda: self._loop.run_sync(lambda: self.submit_sideEffect_close(request_id))
- return RemoteTraversal(iter(traversers), RemoteTraversalSideEffects(side_effect_keys, side_effect_value, side_effect_close))
+ keys, value, close = self._get_side_effect_lambdas(request_id)
+ return RemoteTraversal(iter(traversers), RemoteTraversalSideEffects(keys, value, close))
+
+ def submit_async(self, bytecode):
+ request_id = str(uuid.uuid4())
+ future_traversers = self.submit_traversal_bytecode(request_id, bytecode)
+ keys, value, close = self._get_side_effect_lambdas(request_id)
+ side_effects = RemoteTraversalSideEffects(keys, value, close)
+ return RemoteTraversal(future_traversers, side_effects)
@gen.coroutine
def submit_traversal_bytecode(self, request_id, bytecode):
@@ -135,6 +142,12 @@ class DriverRemoteConnection(RemoteConnection):
result = yield self._execute_message(message)
raise gen.Return(result)
+ def _get_side_effect_lambdas(self, request_id):
+ side_effect_keys = lambda: self._loop.run_sync(lambda: self.submit_sideEffect_keys(request_id))
+ side_effect_value = lambda key: self._loop.run_sync(lambda: self.submit_sideEffect_value(request_id, key))
+ side_effect_close = lambda: self._loop.run_sync(lambda: self.submit_sideEffect_close(request_id))
+ return side_effect_keys, side_effect_value, side_effect_close
+
@gen.coroutine
def _execute_message(self, send_message):
send_message = b"".join([b"\x21",
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0b93308/gremlin-python/src/main/jython/gremlin_python/driver/remote_connection.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/driver/remote_connection.py b/gremlin-python/src/main/jython/gremlin_python/driver/remote_connection.py
index 46fb760..93c92b7 100644
--- a/gremlin-python/src/main/jython/gremlin_python/driver/remote_connection.py
+++ b/gremlin-python/src/main/jython/gremlin_python/driver/remote_connection.py
@@ -95,3 +95,10 @@ class RemoteStrategy(TraversalStrategy):
remote_traversal = self.remote_connection.submit(traversal.bytecode)
traversal.side_effects = remote_traversal.side_effects
traversal.traversers = remote_traversal.traversers
+
+ def apply_async(self, traversal):
+ if traversal.traversers is None:
+ remote_traversal = self.remote_connection.submit_async(
+ traversal.bytecode)
+ traversal.side_effects = remote_traversal.side_effects
+ traversal.traversers = remote_traversal.traversers
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0b93308/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
index a7b6118..2c2db59 100644
--- a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
@@ -77,6 +77,28 @@ class Traversal(object):
except StopIteration: return tempList
tempList.append(temp)
return tempList
+ def promise(self, cb=None):
+ self.traversal_strategies.apply_async_strategies(self)
+ future_traversers = self.traversers
+ future = type(future_traversers)()
+ def process(f):
+ try:
+ traversers = f.result()
+ except Exception as e:
+ future.set_exception(e)
+ else:
+ self.traversers = iter(traversers)
+ if cb:
+ try:
+ result = cb(self)
+ except Exception as e:
+ future.set_exception(e)
+ else:
+ future.set_result(result)
+ else:
+ future.set_result(self)
+ future_traversers.add_done_callback(process)
+ return future
Barrier = Enum('Barrier', 'normSack')
@@ -286,6 +308,9 @@ class TraversalStrategies(object):
def apply_strategies(self, traversal):
for traversal_strategy in self.traversal_strategies:
traversal_strategy.apply(traversal)
+ def apply_async_strategies(self, traversal):
+ for traversal_strategy in self.traversal_strategies:
+ traversal_strategy.apply_async(traversal)
def __repr__(self):
return str(self.traversal_strategies)
@@ -296,6 +321,8 @@ class TraversalStrategy(object):
self.configuration = {} if configuration is None else configuration
def apply(self, traversal):
return
+ def apply_async(self, traversal):
+ return
def __eq__(self, other):
return isinstance(other, self.__class__)
def __hash__(self):
@@ -379,4 +406,3 @@ class Binding(object):
return hash(self.key) + hash(self.value)
def __repr__(self):
return "binding[" + self.key + "=" + str(self.value) + "]"
-
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0b93308/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py b/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
index 6b057d5..c9e64c5 100644
--- a/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
+++ b/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
@@ -24,6 +24,8 @@ from unittest import TestCase
import pytest
+from tornado import ioloop, gen
+
from gremlin_python import statics
from gremlin_python.statics import long
from gremlin_python.driver.driver_remote_connection import DriverRemoteConnection
@@ -193,6 +195,63 @@ class TestDriverRemoteConnection(TestCase):
t.side_effects.value_lambda('b')
connection.close()
+ def test_promise(self):
+ loop = ioloop.IOLoop.current()
+ connection = DriverRemoteConnection('ws://localhost:45940/gremlin', 'g')
+ g = Graph().traversal().withRemote(connection)
+
+ @gen.coroutine
+ def go():
+ future_traversal = g.V().promise(lambda x: x.toList())
+ assert not future_traversal.done()
+ resp = yield future_traversal
+ assert future_traversal.done()
+ assert len(resp) == 6
+ count = yield g.V().count().promise(lambda x: x.next())
+ assert count == 6
+
+ loop.run_sync(go)
+
+ def test_promise_side_effects(self):
+ loop = ioloop.IOLoop.current()
+ connection = DriverRemoteConnection('ws://localhost:45940/gremlin', 'g')
+ g = Graph().traversal().withRemote(connection)
+
+ # Side effects are problematic in coroutines.
+ # Because they are designed to be synchronous (calling `run_sync`)
+ # they result in an error if called from a coroutine because
+ # the event loop is already running
+ @gen.coroutine
+ def go():
+ traversal = yield g.V().aggregate('a').promise()
+ # Trying to get side effect keys throws error - BAD
+ with pytest.raises(RuntimeError):
+ keys = traversal.side_effects.keys()
+ # IOLoop is now hosed.
+
+ loop.run_sync(go)
+
+ # Get a new IOLoop - this should happen for each test case.
+ connection.close()
+ ioloop.IOLoop.clear_instance()
+ loop.close()
+ loop = ioloop.IOLoop()
+ loop.make_current()
+
+ connection = DriverRemoteConnection('ws://localhost:45940/gremlin', 'g')
+ g = Graph().traversal().withRemote(connection)
+
+ # If we return the traversal though, we can use side effects per usual.
+ @gen.coroutine
+ def go():
+ traversal = yield g.V().aggregate('a').promise()
+ raise gen.Return(traversal) # Weird legacy Python compatible idiom
+
+ # See, normal side effects.
+ traversal = loop.run_sync(go)
+ a, = traversal.side_effects.keys()
+ assert a == 'a'
+
if __name__ == '__main__':
test = False
[36/47] tinkerpop git commit: TINKERPOP-1130 Structured the IO
compatibility tests
Posted by sp...@apache.org.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v2d0-partial.json
new file mode 100644
index 0000000..b893667
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v2d0-partial.json
@@ -0,0 +1,12 @@
+{
+ "requestId" : {
+ "@type" : "g:UUID",
+ "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
+ },
+ "op" : "authentication",
+ "processor" : "",
+ "args" : {
+ "saslMechanism" : "PLAIN",
+ "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v2d0-no-types.json
new file mode 100644
index 0000000..7914536
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v2d0-no-types.json
@@ -0,0 +1 @@
+123456789987654321123456789987654321
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v2d0-partial.json
new file mode 100644
index 0000000..475337c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:BigDecimal",
+ "@value" : 123456789987654321123456789987654321
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v2d0-no-types.json
new file mode 100644
index 0000000..7914536
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v2d0-no-types.json
@@ -0,0 +1 @@
+123456789987654321123456789987654321
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v2d0-partial.json
new file mode 100644
index 0000000..58e6114
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:BigInteger",
+ "@value" : 123456789987654321123456789987654321
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v2d0-no-types.json
new file mode 100644
index 0000000..661b153
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v2d0-no-types.json
@@ -0,0 +1,4 @@
+{
+ "key" : "x",
+ "value" : 1
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v2d0-partial.json
new file mode 100644
index 0000000..579b8c7
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v2d0-partial.json
@@ -0,0 +1,10 @@
+{
+ "@type" : "g:Binding",
+ "@value" : {
+ "key" : "x",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v2d0-no-types.json
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v2d0-no-types.json
@@ -0,0 +1 @@
+1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v2d0-partial.json
new file mode 100644
index 0000000..979625b
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Byte",
+ "@value" : 1
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v2d0-no-types.json
new file mode 100644
index 0000000..e0046e9
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v2d0-no-types.json
@@ -0,0 +1 @@
+"c29tZSBieXRlcyBmb3IgeW91"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v2d0-partial.json
new file mode 100644
index 0000000..5724115
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:ByteBuffer",
+ "@value" : "c29tZSBieXRlcyBmb3IgeW91"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v2d0-no-types.json
new file mode 100644
index 0000000..6088abf
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v2d0-no-types.json
@@ -0,0 +1,3 @@
+{
+ "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v2d0-partial.json
new file mode 100644
index 0000000..269d277
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v2d0-partial.json
@@ -0,0 +1,6 @@
+{
+ "@type" : "g:Bytecode",
+ "@value" : {
+ "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v2d0-no-types.json
new file mode 100644
index 0000000..0617890
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v2d0-no-types.json
@@ -0,0 +1 @@
+"list"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v2d0-partial.json
new file mode 100644
index 0000000..834e64e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Cardinality",
+ "@value" : "list"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v2d0-no-types.json
new file mode 100644
index 0000000..3403a0c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v2d0-no-types.json
@@ -0,0 +1 @@
+"x"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v2d0-partial.json
new file mode 100644
index 0000000..8f27e9d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Char",
+ "@value" : "x"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v2d0-no-types.json
new file mode 100644
index 0000000..2fbd64d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v2d0-no-types.json
@@ -0,0 +1 @@
+"java.io.File"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v2d0-partial.json
new file mode 100644
index 0000000..80f15a2
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Class",
+ "@value" : "java.io.File"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v2d0-no-types.json
new file mode 100644
index 0000000..02597c9
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v2d0-no-types.json
@@ -0,0 +1 @@
+"keys"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v2d0-partial.json
new file mode 100644
index 0000000..0b3a56e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Column",
+ "@value" : "keys"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-no-types.json
new file mode 100644
index 0000000..87c4e8e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-no-types.json
@@ -0,0 +1 @@
+1481733559207
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-partial.json
new file mode 100644
index 0000000..2923b35
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Date",
+ "@value" : 1481733559207
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v2d0-no-types.json
new file mode 100644
index 0000000..f6d62d7
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v2d0-no-types.json
@@ -0,0 +1 @@
+"OUT"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v2d0-partial.json
new file mode 100644
index 0000000..78cb7e4
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Direction",
+ "@value" : "OUT"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v2d0-no-types.json
new file mode 100644
index 0000000..e772e62
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v2d0-no-types.json
@@ -0,0 +1 @@
+100.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v2d0-partial.json
new file mode 100644
index 0000000..9ae4964
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Double",
+ "@value" : 100.0
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v2d0-no-types.json
new file mode 100644
index 0000000..0e15a3c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v2d0-no-types.json
@@ -0,0 +1 @@
+"PT120H"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v2d0-partial.json
new file mode 100644
index 0000000..05c0ce9
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Duration",
+ "@value" : "PT120H"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v1d0.json
new file mode 100644
index 0000000..0f7f168
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v1d0.json
@@ -0,0 +1,12 @@
+{
+ "id" : 13,
+ "label" : "develops",
+ "type" : "edge",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 1,
+ "properties" : {
+ "since" : 2009
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-no-types.json
new file mode 100644
index 0000000..8f0ecab
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-no-types.json
@@ -0,0 +1,11 @@
+{
+ "id" : 13,
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : 10,
+ "outV" : 1,
+ "properties" : {
+ "since" : 2009
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-partial.json
new file mode 100644
index 0000000..4c396f8
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-partial.json
@@ -0,0 +1,26 @@
+{
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 13
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v2d0-no-types.json
new file mode 100644
index 0000000..e772e62
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v2d0-no-types.json
@@ -0,0 +1 @@
+100.0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v2d0-partial.json
new file mode 100644
index 0000000..7179aaf
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Float",
+ "@value" : 100.0
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v2d0-no-types.json
new file mode 100644
index 0000000..e34c016
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v2d0-no-types.json
@@ -0,0 +1 @@
+"localhost"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v2d0-partial.json
new file mode 100644
index 0000000..fba98c0
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:InetAddress",
+ "@value" : "localhost"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v2d0-no-types.json
new file mode 100644
index 0000000..40f2c7c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v2d0-no-types.json
@@ -0,0 +1 @@
+"2016-12-14T16:39:19.349Z"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v2d0-partial.json
new file mode 100644
index 0000000..3749741
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Instant",
+ "@value" : "2016-12-14T16:39:19.349Z"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v2d0-no-types.json
new file mode 100644
index 0000000..105d7d9
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v2d0-no-types.json
@@ -0,0 +1 @@
+100
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v2d0-partial.json
new file mode 100644
index 0000000..750ce7a
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Int32",
+ "@value" : 100
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v2d0-no-types.json
new file mode 100644
index 0000000..c7cabbf
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v2d0-no-types.json
@@ -0,0 +1,5 @@
+{
+ "script" : "{ it.get() }",
+ "language" : "gremlin-groovy",
+ "arguments" : 1
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v2d0-partial.json
new file mode 100644
index 0000000..5be179b
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v2d0-partial.json
@@ -0,0 +1,8 @@
+{
+ "@type" : "g:Lambda",
+ "@value" : {
+ "script" : "{ it.get() }",
+ "language" : "gremlin-groovy",
+ "arguments" : 1
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v2d0-no-types.json
new file mode 100644
index 0000000..5e4fd2a
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v2d0-no-types.json
@@ -0,0 +1 @@
+"2016-01-01"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v2d0-partial.json
new file mode 100644
index 0000000..36fb81d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:LocalDate",
+ "@value" : "2016-01-01"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v2d0-no-types.json
new file mode 100644
index 0000000..4be6ada
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v2d0-no-types.json
@@ -0,0 +1 @@
+"2016-01-01T12:30"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v2d0-partial.json
new file mode 100644
index 0000000..2d83668
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:LocalDateTime",
+ "@value" : "2016-01-01T12:30"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v2d0-no-types.json
new file mode 100644
index 0000000..720616d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v2d0-no-types.json
@@ -0,0 +1 @@
+"12:30:45"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v2d0-partial.json
new file mode 100644
index 0000000..eff65a7
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:LocalTime",
+ "@value" : "12:30:45"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v2d0-no-types.json
new file mode 100644
index 0000000..105d7d9
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v2d0-no-types.json
@@ -0,0 +1 @@
+100
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v2d0-partial.json
new file mode 100644
index 0000000..84b9a23
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Int64",
+ "@value" : 100
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json
new file mode 100644
index 0000000..5c65245
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json
@@ -0,0 +1,24 @@
+{
+ "dur" : 0.254441,
+ "counts" : {
+ "traverserCount" : 4,
+ "elementCount" : 4
+ },
+ "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
+ "annotations" : {
+ "percentDur" : 20.94054304958422
+ },
+ "id" : "7.0.0()",
+ "metrics" : [ {
+ "dur" : 0.336431,
+ "counts" : {
+ "traverserCount" : 13,
+ "elementCount" : 13
+ },
+ "name" : "VertexStep(OUT,vertex)",
+ "annotations" : {
+ "percentDur" : 27.688335758445646
+ },
+ "id" : "2.0.0()"
+ } ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json
new file mode 100644
index 0000000..a3daaa9
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json
@@ -0,0 +1,54 @@
+{
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 0.254441
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ }
+ },
+ "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 20.94054304958422
+ }
+ },
+ "id" : "7.0.0()",
+ "metrics" : [ {
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 0.336431
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 13
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 13
+ }
+ },
+ "name" : "VertexStep(OUT,vertex)",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 27.688335758445646
+ }
+ },
+ "id" : "2.0.0()"
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v2d0-no-types.json
new file mode 100644
index 0000000..09813a6
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v2d0-no-types.json
@@ -0,0 +1 @@
+"--01-01"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v2d0-partial.json
new file mode 100644
index 0000000..5da5914
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:MonthDay",
+ "@value" : "--01-01"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-no-types.json
new file mode 100644
index 0000000..2021ac7
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-no-types.json
@@ -0,0 +1 @@
+"2016-12-14T11:39:19.377-05:00"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-partial.json
new file mode 100644
index 0000000..0072625
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:OffsetDateTime",
+ "@value" : "2016-12-14T11:39:19.377-05:00"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-no-types.json
new file mode 100644
index 0000000..8809062
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-no-types.json
@@ -0,0 +1 @@
+"11:39:19.381-05:00"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-partial.json
new file mode 100644
index 0000000..401515f
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:OffsetTime",
+ "@value" : "11:39:19.381-05:00"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v2d0-no-types.json
new file mode 100644
index 0000000..2571e55
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v2d0-no-types.json
@@ -0,0 +1 @@
+"sum"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v2d0-partial.json
new file mode 100644
index 0000000..14c1400
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/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/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-no-types.json
new file mode 100644
index 0000000..8f2c236
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-no-types.json
@@ -0,0 +1 @@
+"incr"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-partial.json
new file mode 100644
index 0000000..6ad66d8
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Order",
+ "@value" : "incr"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v2d0-no-types.json
new file mode 100644
index 0000000..4b9ce34
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v2d0-no-types.json
@@ -0,0 +1,4 @@
+{
+ "predicate" : "gt",
+ "value" : 0
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v2d0-partial.json
new file mode 100644
index 0000000..5bdfb3b
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v2d0-partial.json
@@ -0,0 +1,10 @@
+{
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "gt",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 0
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v2d0-no-types.json
new file mode 100644
index 0000000..194cdd0
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v2d0-no-types.json
@@ -0,0 +1,10 @@
+{
+ "predicate" : "and",
+ "value" : [ {
+ "predicate" : "gt",
+ "value" : 0
+ }, {
+ "predicate" : "lt",
+ "value" : 10
+ } ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v2d0-partial.json
new file mode 100644
index 0000000..c271958
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v2d0-partial.json
@@ -0,0 +1,25 @@
+{
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "and",
+ "value" : [ {
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "gt",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 0
+ }
+ }
+ }, {
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "lt",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ }
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v1d0.json
new file mode 100644
index 0000000..2eee883
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v1d0.json
@@ -0,0 +1,62 @@
+{
+ "labels" : [ [ ], [ ], [ ] ],
+ "objects" : [ {
+ "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
+ }
+ } ]
+ }
+ }, {
+ "id" : 10,
+ "label" : "software",
+ "type" : "vertex",
+ "properties" : {
+ "name" : [ {
+ "id" : 4,
+ "value" : "gremlin"
+ } ]
+ }
+ }, {
+ "id" : 11,
+ "label" : "software",
+ "type" : "vertex",
+ "properties" : {
+ "name" : [ {
+ "id" : 5,
+ "value" : "tinkergraph"
+ } ]
+ }
+ } ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-no-types.json
new file mode 100644
index 0000000..f271288
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-no-types.json
@@ -0,0 +1,73 @@
+{
+ "labels" : [ [ ], [ ], [ ] ],
+ "objects" : [ {
+ "id" : 1,
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : 0,
+ "value" : "marko",
+ "vertex" : 1,
+ "label" : "name"
+ } ],
+ "location" : [ {
+ "id" : 6,
+ "value" : "san diego",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 1997,
+ "endTime" : 2001
+ }
+ }, {
+ "id" : 7,
+ "value" : "santa cruz",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2001,
+ "endTime" : 2004
+ }
+ }, {
+ "id" : 8,
+ "value" : "brussels",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2004,
+ "endTime" : 2005
+ }
+ }, {
+ "id" : 9,
+ "value" : "santa fe",
+ "vertex" : 1,
+ "label" : "location",
+ "properties" : {
+ "startTime" : 2005
+ }
+ } ]
+ }
+ }, {
+ "id" : 10,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 4,
+ "value" : "gremlin",
+ "vertex" : 10,
+ "label" : "name"
+ } ]
+ }
+ }, {
+ "id" : 11,
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : 5,
+ "value" : "tinkergraph",
+ "vertex" : 11,
+ "label" : "name"
+ } ]
+ }
+ } ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-partial.json
new file mode 100644
index 0000000..1acc3ea
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-partial.json
@@ -0,0 +1,178 @@
+{
+ "@type" : "g:Path",
+ "@value" : {
+ "labels" : [ [ ], [ ], [ ] ],
+ "objects" : [ {
+ "@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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "name"
+ }
+ } ],
+ "location" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "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",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "location",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "name"
+ }
+ } ]
+ }
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v2d0-no-types.json
new file mode 100644
index 0000000..a58ce89
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v2d0-no-types.json
@@ -0,0 +1 @@
+"P1Y6M15D"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v2d0-partial.json
new file mode 100644
index 0000000..20438a1
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Period",
+ "@value" : "P1Y6M15D"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v2d0-no-types.json
new file mode 100644
index 0000000..1e74759
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v2d0-no-types.json
@@ -0,0 +1 @@
+"any"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v2d0-partial.json
new file mode 100644
index 0000000..3ca2f2e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Pick",
+ "@value" : "any"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v2d0-no-types.json
new file mode 100644
index 0000000..99a6195
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v2d0-no-types.json
@@ -0,0 +1 @@
+"all"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v2d0-partial.json
new file mode 100644
index 0000000..271515f
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v2d0-partial.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Pop",
+ "@value" : "all"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/por-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/por-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/por-v2d0-no-types.json
new file mode 100644
index 0000000..4d17d67
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/por-v2d0-no-types.json
@@ -0,0 +1,10 @@
+{
+ "predicate" : "or",
+ "value" : [ {
+ "predicate" : "gt",
+ "value" : 0
+ }, {
+ "predicate" : "within",
+ "value" : [ -1, -10, -100 ]
+ } ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/por-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/por-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/por-v2d0-partial.json
new file mode 100644
index 0000000..71fcb7d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/por-v2d0-partial.json
@@ -0,0 +1,31 @@
+{
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "or",
+ "value" : [ {
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "gt",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 0
+ }
+ }
+ }, {
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "within",
+ "value" : [ {
+ "@type" : "g:Int32",
+ "@value" : -1
+ }, {
+ "@type" : "g:Int32",
+ "@value" : -10
+ }, {
+ "@type" : "g:Int32",
+ "@value" : -100
+ } ]
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v1d0.json
new file mode 100644
index 0000000..c051c0a
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v1d0.json
@@ -0,0 +1,4 @@
+{
+ "key" : "since",
+ "value" : 2009
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-no-types.json
new file mode 100644
index 0000000..187d0ab
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-no-types.json
@@ -0,0 +1,13 @@
+{
+ "key" : "since",
+ "value" : 2009,
+ "element" : {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : 13,
+ "label" : "develops",
+ "outV" : 1,
+ "inV" : 10
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-partial.json
new file mode 100644
index 0000000..1c6afa0
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-partial.json
@@ -0,0 +1,28 @@
+{
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ },
+ "element" : {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 13
+ },
+ "label" : "develops",
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v2d0-no-types.json
new file mode 100644
index 0000000..8fde6b5
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v2d0-no-types.json
@@ -0,0 +1 @@
+"local"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v2d0-partial.json
new file mode 100644
index 0000000..4a74af0
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/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/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v1d0.json
new file mode 100644
index 0000000..e2cbb13
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/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/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v2d0-no-types.json
new file mode 100644
index 0000000..e2cbb13
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/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/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v2d0-partial.json
new file mode 100644
index 0000000..ee860ea
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v2d0-partial.json
@@ -0,0 +1,14 @@
+{
+ "requestId" : {
+ "@type" : "g:UUID",
+ "@value" : "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/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v1d0.json
new file mode 100644
index 0000000..5e6fae2
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v1d0.json
@@ -0,0 +1,16 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "eval",
+ "processor" : "session",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "session" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "bindings" : {
+ "x" : 1
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-no-types.json
new file mode 100644
index 0000000..5e6fae2
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-no-types.json
@@ -0,0 +1,16 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "eval",
+ "processor" : "session",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "session" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "bindings" : {
+ "x" : 1
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-partial.json
new file mode 100644
index 0000000..f1f2dc2
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-partial.json
@@ -0,0 +1,25 @@
+{
+ "requestId" : {
+ "@type" : "g:UUID",
+ "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
+ },
+ "op" : "eval",
+ "processor" : "session",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "session" : {
+ "@type" : "g:UUID",
+ "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
+ },
+ "bindings" : {
+ "x" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v1d0.json
new file mode 100644
index 0000000..59f0c6c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v1d0.json
@@ -0,0 +1,15 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "eval",
+ "processor" : "",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "bindings" : {
+ "x" : 1
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-no-types.json
new file mode 100644
index 0000000..59f0c6c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-no-types.json
@@ -0,0 +1,15 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "eval",
+ "processor" : "",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "bindings" : {
+ "x" : 1
+ }
+ }
+}
\ No newline at end of file
[30/47] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Conflicts:
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/863fbe87
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/863fbe87
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/863fbe87
Branch: refs/heads/TINKERPOP-1130
Commit: 863fbe87e75ec9c90b1f545a431b1f03355dfcdd
Parents: a4a059c 73b2d65
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Dec 20 15:22:31 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 20 15:22:31 2016 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../gremlin/structure/io/gryo/GryoMapper.java | 349 ++++++++++---------
.../gremlin/structure/io/gryo/GryoVersion.java | 36 ++
.../structure/io/gryo/UtilSerializers.java | 2 +-
4 files changed, 220 insertions(+), 168 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/863fbe87/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/863fbe87/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
index acf8193,cece932..fca11e6
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
@@@ -247,6 -229,148 +251,173 @@@ public final class GryoMapper implement
throw new IllegalStateException("There are duplicate kryo identifiers in use: " + duplicates);
}
+ public final static class BuilderV1d0 extends Builder {
+ @Override
+ public List<TypeRegistration<?>> initTypeRegistrations() {
+ return new ArrayList<TypeRegistration<?>>() {{
+ add(GryoTypeReg.of(byte[].class, 25));
+ add(GryoTypeReg.of(char[].class, 26));
+ add(GryoTypeReg.of(short[].class, 27));
+ add(GryoTypeReg.of(int[].class, 28));
+ add(GryoTypeReg.of(long[].class, 29));
+ add(GryoTypeReg.of(float[].class, 30));
+ add(GryoTypeReg.of(double[].class, 31));
+ add(GryoTypeReg.of(String[].class, 32));
+ add(GryoTypeReg.of(Object[].class, 33));
+ add(GryoTypeReg.of(ArrayList.class, 10));
+ add(GryoTypeReg.of(ARRAYS_AS_LIST, 134, new UtilSerializers.ArraysAsListSerializer()));
+ add(GryoTypeReg.of(BigInteger.class, 34));
+ add(GryoTypeReg.of(BigDecimal.class, 35));
+ add(GryoTypeReg.of(Calendar.class, 39));
+ add(GryoTypeReg.of(Class.class, 41, new UtilSerializers.ClassSerializer()));
+ add(GryoTypeReg.of(Collection.class, 37));
+ add(GryoTypeReg.of(Collections.EMPTY_LIST.getClass(), 51));
+ add(GryoTypeReg.of(Collections.EMPTY_MAP.getClass(), 52));
+ add(GryoTypeReg.of(Collections.EMPTY_SET.getClass(), 53));
+ add(GryoTypeReg.of(Collections.singleton(null).getClass(), 54));
+ add(GryoTypeReg.of(Collections.singletonList(null).getClass(), 24));
+ add(GryoTypeReg.of(Collections.singletonMap(null, null).getClass(), 23));
+ add(GryoTypeReg.of(Contains.class, 49));
+ add(GryoTypeReg.of(Currency.class, 40));
+ add(GryoTypeReg.of(Date.class, 38));
+ add(GryoTypeReg.of(Direction.class, 12));
+ add(GryoTypeReg.of(DetachedEdge.class, 21));
+ add(GryoTypeReg.of(DetachedVertexProperty.class, 20));
+ add(GryoTypeReg.of(DetachedProperty.class, 18));
+ add(GryoTypeReg.of(DetachedVertex.class, 19));
+ add(GryoTypeReg.of(DetachedPath.class, 60));
+ // skip 14
+ add(GryoTypeReg.of(EnumSet.class, 46));
+ add(GryoTypeReg.of(HashMap.class, 11));
+ add(GryoTypeReg.of(HashMap.Entry.class, 16));
+ add(GryoTypeReg.of(HASH_MAP_NODE, 92));
+ add(GryoTypeReg.of(KryoSerializable.class, 36));
+ add(GryoTypeReg.of(LinkedHashMap.class, 47));
+ add(GryoTypeReg.of(LinkedHashSet.class, 71));
+ add(GryoTypeReg.of(LinkedList.class, 116));
+ add(GryoTypeReg.of(LINKED_HASH_MAP_ENTRY_CLASS, 15));
+ add(GryoTypeReg.of(Locale.class, 22));
+ add(GryoTypeReg.of(StringBuffer.class, 43));
+ add(GryoTypeReg.of(StringBuilder.class, 44));
+ add(GryoTypeReg.of(T.class, 48));
+ add(GryoTypeReg.of(TimeZone.class, 42));
+ add(GryoTypeReg.of(TreeMap.class, 45));
+ add(GryoTypeReg.of(TreeSet.class, 50));
+ add(GryoTypeReg.of(UUID.class, 17, new UtilSerializers.UUIDSerializer()));
+ add(GryoTypeReg.of(URI.class, 72, new UtilSerializers.URISerializer()));
+ add(GryoTypeReg.of(VertexTerminator.class, 13));
+ add(GryoTypeReg.of(AbstractMap.SimpleEntry.class, 120));
+ add(GryoTypeReg.of(AbstractMap.SimpleImmutableEntry.class, 121));
+ add(GryoTypeReg.of(java.sql.Timestamp.class, 161));
+ add(GryoTypeReg.of(InetAddress.class, 162, new UtilSerializers.InetAddressSerializer()));
+ add(GryoTypeReg.of(ByteBuffer.class, 163, new UtilSerializers.ByteBufferSerializer())); // ***LAST ID***
+
+ add(GryoTypeReg.of(ReferenceEdge.class, 81));
+ add(GryoTypeReg.of(ReferenceVertexProperty.class, 82));
+ add(GryoTypeReg.of(ReferenceProperty.class, 83));
+ add(GryoTypeReg.of(ReferenceVertex.class, 84));
+ add(GryoTypeReg.of(ReferencePath.class, 85));
+
+ add(GryoTypeReg.of(StarGraph.class, 86, new StarGraphSerializer(Direction.BOTH, new GraphFilter())));
+
+ add(GryoTypeReg.of(Edge.class, 65, new GryoSerializers.EdgeSerializer()));
+ add(GryoTypeReg.of(Vertex.class, 66, new GryoSerializers.VertexSerializer()));
+ add(GryoTypeReg.of(Property.class, 67, new GryoSerializers.PropertySerializer()));
+ add(GryoTypeReg.of(VertexProperty.class, 68, new GryoSerializers.VertexPropertySerializer()));
+ add(GryoTypeReg.of(Path.class, 59, new GryoSerializers.PathSerializer()));
+ // skip 55
+ add(GryoTypeReg.of(B_O_Traverser.class, 75));
+ add(GryoTypeReg.of(O_Traverser.class, 76));
+ add(GryoTypeReg.of(B_LP_O_P_S_SE_SL_Traverser.class, 77));
+ add(GryoTypeReg.of(B_O_S_SE_SL_Traverser.class, 78));
+ add(GryoTypeReg.of(B_LP_O_S_SE_SL_Traverser.class, 87));
+ add(GryoTypeReg.of(O_OB_S_SE_SL_Traverser.class, 89));
+ add(GryoTypeReg.of(LP_O_OB_S_SE_SL_Traverser.class, 90));
+ add(GryoTypeReg.of(LP_O_OB_P_S_SE_SL_Traverser.class, 91));
+ add(GryoTypeReg.of(DefaultRemoteTraverser.class, 123, new GryoSerializers.DefaultRemoteTraverserSerializer()));
+
+ add(GryoTypeReg.of(Bytecode.class, 122, new GryoSerializers.BytecodeSerializer()));
+ add(GryoTypeReg.of(P.class, 124, new GryoSerializers.PSerializer()));
+ add(GryoTypeReg.of(Lambda.class, 125, new GryoSerializers.LambdaSerializer()));
+ add(GryoTypeReg.of(Bytecode.Binding.class, 126, new GryoSerializers.BindingSerializer()));
+ add(GryoTypeReg.of(Order.class, 127));
+ add(GryoTypeReg.of(Scope.class, 128));
+ add(GryoTypeReg.of(AndP.class, 129, new GryoSerializers.AndPSerializer()));
+ add(GryoTypeReg.of(OrP.class, 130, new GryoSerializers.OrPSerializer()));
+ add(GryoTypeReg.of(VertexProperty.Cardinality.class, 131));
+ add(GryoTypeReg.of(Column.class, 132));
+ add(GryoTypeReg.of(Pop.class, 133));
+ add(GryoTypeReg.of(SackFunctions.Barrier.class, 135));
+ add(GryoTypeReg.of(TraversalOptionParent.Pick.class, 137));
+ add(GryoTypeReg.of(HashSetSupplier.class, 136, new UtilSerializers.HashSetSupplierSerializer()));
+
++ add(GryoTypeReg.of(ConnectiveStrategy.class, 138));
++ add(GryoTypeReg.of(HaltedTraverserStrategy.class, 139));
++ add(GryoTypeReg.of(PartitionStrategy.class, 140, new JavaSerializer()));
++ add(GryoTypeReg.of(SubgraphStrategy.class, 141, new JavaSerializer()));
++ add(GryoTypeReg.of(VertexProgramStrategy.class, 142, new JavaSerializer()));
++ add(GryoTypeReg.of(MatchAlgorithmStrategy.class, 143));
++ add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 144));
++ add(GryoTypeReg.of(AdjacentToIncidentStrategy.class, 145));
++ add(GryoTypeReg.of(FilterRankingStrategy.class, 146));
++ add(GryoTypeReg.of(IdentityRemovalStrategy.class, 147));
++ add(GryoTypeReg.of(IncidentToAdjacentStrategy.class, 148));
++ add(GryoTypeReg.of(InlineFilterStrategy.class, 149));
++ add(GryoTypeReg.of(LazyBarrierStrategy.class, 150));
++ add(GryoTypeReg.of(MatchPredicateStrategy.class, 151));
++ add(GryoTypeReg.of(OrderLimitStrategy.class, 152));
++ add(GryoTypeReg.of(PathProcessorStrategy.class, 153));
++ add(GryoTypeReg.of(PathRetractionStrategy.class, 154));
++ add(GryoTypeReg.of(RangeByIsCountStrategy.class, 155));
++ add(GryoTypeReg.of(RepeatUnrollStrategy.class, 156));
++ add(GryoTypeReg.of(GraphFilterStrategy.class, 157));
++ add(GryoTypeReg.of(LambdaRestrictionStrategy.class, 158));
++ add(GryoTypeReg.of(ReadOnlyStrategy.class, 159));
++ add(GryoTypeReg.of(MatchStep.CountMatchAlgorithm.class, 160));
++ add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 164)); // ### LAST_ID
++
+ add(GryoTypeReg.of(TraverserSet.class, 58));
+ add(GryoTypeReg.of(Tree.class, 61));
+ add(GryoTypeReg.of(HashSet.class, 62));
+ add(GryoTypeReg.of(BulkSet.class, 64));
+ add(GryoTypeReg.of(MutableMetrics.class, 69));
+ add(GryoTypeReg.of(ImmutableMetrics.class, 115));
+ add(GryoTypeReg.of(DefaultTraversalMetrics.class, 70));
+ add(GryoTypeReg.of(MapMemory.class, 73));
+ add(GryoTypeReg.of(MapReduce.NullObject.class, 74));
+ add(GryoTypeReg.of(AtomicLong.class, 79));
+ add(GryoTypeReg.of(Pair.class, 88, new UtilSerializers.PairSerializer()));
+ add(GryoTypeReg.of(TraversalExplanation.class, 106, new JavaSerializer()));
+
+ add(GryoTypeReg.of(Duration.class, 93, new JavaTimeSerializers.DurationSerializer()));
+ add(GryoTypeReg.of(Instant.class, 94, new JavaTimeSerializers.InstantSerializer()));
+ add(GryoTypeReg.of(LocalDate.class, 95, new JavaTimeSerializers.LocalDateSerializer()));
+ add(GryoTypeReg.of(LocalDateTime.class, 96, new JavaTimeSerializers.LocalDateTimeSerializer()));
+ add(GryoTypeReg.of(LocalTime.class, 97, new JavaTimeSerializers.LocalTimeSerializer()));
+ add(GryoTypeReg.of(MonthDay.class, 98, new JavaTimeSerializers.MonthDaySerializer()));
+ add(GryoTypeReg.of(OffsetDateTime.class, 99, new JavaTimeSerializers.OffsetDateTimeSerializer()));
+ add(GryoTypeReg.of(OffsetTime.class, 100, new JavaTimeSerializers.OffsetTimeSerializer()));
+ add(GryoTypeReg.of(Period.class, 101, new JavaTimeSerializers.PeriodSerializer()));
+ add(GryoTypeReg.of(Year.class, 102, new JavaTimeSerializers.YearSerializer()));
+ add(GryoTypeReg.of(YearMonth.class, 103, new JavaTimeSerializers.YearMonthSerializer()));
+ add(GryoTypeReg.of(ZonedDateTime.class, 104, new JavaTimeSerializers.ZonedDateTimeSerializer()));
+ add(GryoTypeReg.of(ZoneOffset.class, 105, new JavaTimeSerializers.ZoneOffsetSerializer()));
+
+ add(GryoTypeReg.of(Operator.class, 107));
+ add(GryoTypeReg.of(FoldStep.FoldBiOperator.class, 108));
+ add(GryoTypeReg.of(GroupCountStep.GroupCountBiOperator.class, 109));
+ add(GryoTypeReg.of(GroupStep.GroupBiOperator.class, 117, new JavaSerializer())); // because they contain traversals
+ add(GryoTypeReg.of(MeanGlobalStep.MeanGlobalBiOperator.class, 110));
+ add(GryoTypeReg.of(MeanGlobalStep.MeanNumber.class, 111));
+ add(GryoTypeReg.of(TreeStep.TreeBiOperator.class, 112));
+ add(GryoTypeReg.of(GroupStepV3d0.GroupBiOperatorV3d0.class, 113));
+ add(GryoTypeReg.of(RangeGlobalStep.RangeBiOperator.class, 114));
+ add(GryoTypeReg.of(OrderGlobalStep.OrderBiOperator.class, 118, new JavaSerializer())); // because they contain traversals
+ add(GryoTypeReg.of(ProfileStep.ProfileBiOperator.class, 119));
+ }};
+ }
+ }
+
/**
* A builder to construct a {@link GryoMapper} instance.
*/
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/863fbe87/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UtilSerializers.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UtilSerializers.java
index 958978c,958978c..c7095d6
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UtilSerializers.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UtilSerializers.java
@@@ -84,7 -84,7 +84,7 @@@ final class UtilSerializers
public final static class ClassSerializer implements SerializerShim<Class> {
@Override
public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Class object) {
-- output.writeString(object.getCanonicalName());
++ output.writeString(object.getName());
}
@Override
[31/47] tinkerpop git commit: Don't use the canonical name when
serializing to gryo.
Posted by sp...@apache.org.
Don't use the canonical name when serializing to gryo.
The canonical name won't recognize the inner classes when deserializing with Class.forName() CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/34d9e584
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/34d9e584
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/34d9e584
Branch: refs/heads/TINKERPOP-1130
Commit: 34d9e584ac074f765ab99df64e94179f01a19a2e
Parents: 73b2d65
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Dec 20 15:22:58 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 20 15:22:58 2016 -0500
----------------------------------------------------------------------
.../tinkerpop/gremlin/structure/io/gryo/UtilSerializers.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/34d9e584/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UtilSerializers.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UtilSerializers.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UtilSerializers.java
index 958978c..c7095d6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UtilSerializers.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UtilSerializers.java
@@ -84,7 +84,7 @@ final class UtilSerializers {
public final static class ClassSerializer implements SerializerShim<Class> {
@Override
public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Class object) {
- output.writeString(object.getCanonicalName());
+ output.writeString(object.getName());
}
@Override
[17/47] tinkerpop git commit: Add a note to dev docs on python
environment CTR
Posted by sp...@apache.org.
Add a note to dev docs on python environment CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d1568f00
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d1568f00
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d1568f00
Branch: refs/heads/TINKERPOP-1130
Commit: d1568f006c9c54e5a6ce16fb9cd7ae62730eca56
Parents: 79dac23
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Dec 19 07:04:50 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Dec 19 07:04:50 2016 -0500
----------------------------------------------------------------------
docs/src/dev/developer/development-environment.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d1568f00/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index 6b5324d..01ef4bd 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -65,7 +65,7 @@ Python Environment
As of TinkerPop 3.2.2, the build optionally requires link:https://www.python.org/[Python 2.x] to work with the
`gremlin-python` module. If Python is not installed, TinkerPop will still build with Maven, but native Python tests and
Java tests that require Python code will be skipped. Developers should also install link:https://pypi.python.org/pypi/pip[pip]
-and link:https://virtualenv.pypa.io/en/stable/[virtualenv].
+and link:https://virtualenv.pypa.io/en/stable/[virtualenv] (version 15.0.2 - older versions may cause build failures).
Once the Python environment is established, the full building and testing of `gremlin-python` may commence. It can be
done manually from the command line with:
[07/47] tinkerpop git commit: TINKERPOP-1490 Implemented promise API
for Traversal
Posted by sp...@apache.org.
TINKERPOP-1490 Implemented promise API for Traversal
Added two promise() methods that return CompletableFuture on Traversal. Provided an override on DefaultTraversal for those methods because the function that transforms the Traversal is executed in a different thread and therefore requires Graph transaction management (or else we would orphan transactions). Did not update gremlin-python with the promise API because it seemed to beg discussion on the "right" way to do that (i.e. what library to use to support promises?, just use futures from the core lib?, etc).
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/eb089764
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/eb089764
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/eb089764
Branch: refs/heads/TINKERPOP-1130
Commit: eb089764acb91c24023353a2220e7c84febdec8d
Parents: 347a0a9
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Nov 1 09:30:28 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 16 10:00:40 2016 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../upgrade/release-3.2.x-incubating.asciidoc | 20 +
gremlin-core/pom.xml | 5 +
.../gremlin/process/traversal/Traversal.java | 50 ++
.../traversal/util/DefaultTraversal.java | 37 ++
.../process/traversal/TraversalTest.java | 473 +++++++++++++++++++
gremlin-groovy/pom.xml | 5 -
.../gremlin/python/jsr223/PythonProvider.java | 1 +
.../process/traversal/CoreTraversalTest.java | 42 ++
.../TinkerGraphGroovyTranslatorProvider.java | 1 +
.../TinkerGraphJavaTranslatorProvider.java | 1 +
11 files changed, 631 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eb089764/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8e01ce0..24c75a7 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -52,6 +52,7 @@ TinkerPop 3.2.4 (Release Date: NOT OFFICIALLY RELEASED YET)
* Factored `GremlinPlugin` functionality out of gremlin-groovy and into gremlin-core - related classes were deprecated.
* Added a `force` option for killing sessions without waiting for transaction close or timeout of a currently running job or multiple jobs.
* Deprecated `Session.kill()` and `Session.manualKill()`.
+* Added `Traversal.promise()` methods to allow for asynchronous traversal processing.
* Added `choose(predicate,traversal)` and `choose(traversal,traversal)` to effect if/then-semantics (no else). Equivalent to `choose(x,y,identity())`.
* Removed `ImmutablePath.TailPath` as it is no longer required with new recursion model.
* Removed call stack recursion in `ImmutablePath`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eb089764/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 8a184b4..34ff427 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -32,6 +32,26 @@ Please see the link:https://github.com/apache/tinkerpop/blob/3.2.4/CHANGELOG.asc
Upgrading for Users
~~~~~~~~~~~~~~~~~~~
+Traversal Promises
+^^^^^^^^^^^^^^^^^^
+
+The `Traversal` API now has two `promise()` method overloads. These methods return a promise in the form of a
+`CompleteableFuture`. Usage is as follows:
+
+[source,groovy]
+----
+gremlin> promise = g.V().out().promise{it.next()}
+==>java.util.concurrent.CompletableFuture@4aa3d36[Completed normally]
+gremlin> promise.join()
+==>v[3]
+gremlin> promise.isDone()
+==>true
+gremlin> g.V().out().promise{it.toList()}.thenApply{it.size()}.get()
+==>6
+----
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1490[TINKERPOP-1490]
+
If/Then-Semantics with Choose Step
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eb089764/gremlin-core/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index e8f3a34..0594448 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -61,6 +61,11 @@ limitations under the License.
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.3.1</version>
+ </dependency>
<!-- LOGGING -->
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eb089764/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java
index edc18e0..e4ba5a6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java
@@ -18,6 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal;
+import org.apache.commons.lang3.concurrent.BasicThreadFactory;
import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
@@ -42,7 +43,13 @@ import java.util.Optional;
import java.util.Set;
import java.util.Spliterator;
import java.util.Spliterators;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
import java.util.function.Consumer;
+import java.util.function.Function;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
@@ -140,6 +147,43 @@ public interface Traversal<S, E> extends Iterator<E>, Serializable, Cloneable, A
}
/**
+ * Starts a promise to execute a function on the current {@code Traversal} that will be completed in the future.
+ * This implementation uses {@link Admin#traversalExecutorService} to execute the supplied
+ * {@code traversalFunction}.
+ */
+ public default <T> CompletableFuture<T> promise(final Function<Traversal, T> traversalFunction) {
+ return promise(traversalFunction, Admin.traversalExecutorService);
+ }
+
+ /**
+ * Starts a promise to execute a function on the current {@code Traversal} that will be completed in the future.
+ * This implementation uses the caller supplied {@code ExecutorService} to execute the {@code traversalFunction}.
+ */
+ public default <T> CompletableFuture<T> promise(final Function<Traversal, T> traversalFunction, final ExecutorService service) {
+ final CompletableFuture<T> promise = new CompletableFuture<>();
+ final Future iterationFuture = service.submit(() -> {
+ try {
+ promise.complete(traversalFunction.apply(this));
+ } catch (Exception ex) {
+ // the promise may have been cancelled by the caller, in which case, there is no need to attempt
+ // another write on completion
+ if (!promise.isDone()) promise.completeExceptionally(ex);
+ }
+ });
+
+ // if the user cancels the promise then attempt to kill the iteration.
+ promise.exceptionally(t -> {
+ if (t instanceof CancellationException) {
+ iterationFuture.cancel(true);
+ }
+
+ return null;
+ });
+
+ return promise;
+ }
+
+ /**
* Add all the results of the traversal to the provided collection.
*
* @param collection the collection to fill
@@ -253,6 +297,12 @@ public interface Traversal<S, E> extends Iterator<E>, Serializable, Cloneable, A
public interface Admin<S, E> extends Traversal<S, E> {
/**
+ * Service that handles promises.
+ */
+ static final ExecutorService traversalExecutorService = Executors.newCachedThreadPool(
+ new BasicThreadFactory.Builder().namingPattern("traversal-executor-%d").build());
+
+ /**
* Get the {@link Bytecode} associated with the construction of this traversal.
*
* @return the byte code representation of the traversal
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eb089764/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
index 3c21e37..6ce6dfe 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
@@ -43,6 +43,9 @@ import java.util.List;
import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Function;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -325,6 +328,40 @@ public class DefaultTraversal<S, E> implements Traversal.Admin<S, E> {
this.graph = graph;
}
+ /**
+ * Override of {@link Traversal#promise(Function)} that is aware of graph transactions.
+ */
+ @Override
+ public <T2> CompletableFuture<T2> promise(final Function<Traversal, T2> traversalFunction) {
+ return this.promise(traversalFunction, Traversal.Admin.traversalExecutorService);
+ }
+
+ /**
+ * Override of {@link Traversal#promise(Function)} that is aware of graph transactions. In a transactional graph
+ * a promise represents the full scope of a transaction, even if the graph is only partially iterated.
+ */
+ @Override
+ public <T2> CompletableFuture<T2> promise(final Function<Traversal, T2> traversalFunction, final ExecutorService service) {
+ if (graph != null && graph.features().graph().supportsTransactions()) {
+ final Function<Traversal, T2> transactionAware = traversal -> {
+
+ try {
+ if (graph.tx().isOpen()) graph.tx().rollback();
+ final T2 obj = traversalFunction.apply(traversal);
+ if (graph.tx().isOpen()) graph.tx().commit();
+ return obj;
+ } catch (Exception ex) {
+ if (graph.tx().isOpen()) graph.tx().rollback();
+ throw ex;
+ }
+ };
+
+ return Traversal.Admin.super.promise(transactionAware, service);
+ } else {
+ return Traversal.Admin.super.promise(traversalFunction, service);
+ }
+ }
+
@Override
public boolean equals(final Object other) {
return other != null && other.getClass().equals(this.getClass()) && this.equals(((Traversal.Admin) other));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eb089764/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalTest.java
new file mode 100644
index 0000000..aa1b99b
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalTest.java
@@ -0,0 +1,473 @@
+/*
+ * 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.process.traversal;
+
+import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalInterruptedException;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsCollectionContaining.hasItems;
+import static org.hamcrest.core.IsInstanceOf.instanceOf;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class TraversalTest {
+
+ private final ExecutorService service = Executors.newFixedThreadPool(2);
+
+ @Test
+ public void shouldTryNext() {
+ final MockTraversal<Integer> t = new MockTraversal<>(1, 2, 3);
+ final Optional<Integer> optFirst = t.tryNext();
+ assertEquals(1, optFirst.get().intValue());
+ final Optional<Integer> optSecond = t.tryNext();
+ assertEquals(2, optSecond.get().intValue());
+ final Optional<Integer> optThird = t.tryNext();
+ assertEquals(3, optThird.get().intValue());
+
+ IntStream.range(0, 100).forEach(i -> {
+ assertThat(t.tryNext().isPresent(), is(false));
+ });
+ }
+
+ @Test
+ public void shouldGetTwoAtATime() {
+ final MockTraversal<Integer> t = new MockTraversal<>(1, 2, 3, 4, 5, 6, 7);
+ final List<Integer> batchOne = t.next(2);
+ assertEquals(2, batchOne.size());
+ assertThat(batchOne, hasItems(1 ,2));
+
+ final List<Integer> batchTwo = t.next(2);
+ assertEquals(2, batchTwo.size());
+ assertThat(batchTwo, hasItems(3 ,4));
+
+ final List<Integer> batchThree = t.next(2);
+ assertEquals(2, batchThree.size());
+ assertThat(batchThree, hasItems(5, 6));
+
+ final List<Integer> batchFour = t.next(2);
+ assertEquals(1, batchFour.size());
+ assertThat(batchFour, hasItems(7));
+
+ final List<Integer> batchFive = t.next(2);
+ assertEquals(0, batchFive.size());
+ }
+
+ @Test
+ public void shouldFillList() {
+ final MockTraversal<Integer> t = new MockTraversal<>(1, 2, 3, 4, 5, 6, 7);
+ final List<Integer> listToFill = new ArrayList<>();
+ final List<Integer> batch = t.fill(listToFill);
+ assertEquals(7, batch.size());
+ assertThat(batch, hasItems(1 ,2, 3, 4, 5, 6, 7));
+ assertThat(t.hasNext(), is(false));
+ assertSame(listToFill, batch);
+ }
+
+ @Test
+ public void shouldStream() {
+ final MockTraversal<Integer> t = new MockTraversal<>(1, 2, 3, 4, 5, 6, 7);
+ final List<Integer> batch = t.toStream().collect(Collectors.toList());
+ assertEquals(7, batch.size());
+ assertThat(batch, hasItems(1 ,2, 3, 4, 5, 6, 7));
+ assertThat(t.hasNext(), is(false));
+ }
+
+ @Test
+ public void shouldPromiseNextThreeUsingForkJoin() throws Exception {
+ final MockTraversal<Integer> t = new MockTraversal<>(1, 2, 3, 4, 5, 6, 7);
+ final CompletableFuture<List<Integer>> promiseFirst = t.promise(traversal -> traversal.next(3));
+ final List<Integer> listFirst = promiseFirst.get();
+ assertEquals(3, listFirst.size());
+ assertThat(listFirst, hasItems(1 ,2, 3));
+ assertThat(t.hasNext(), is(true));
+ assertThat(promiseFirst.isDone(), is(true));
+
+ final CompletableFuture<List<Integer>> promiseSecond = t.promise(traversal -> traversal.next(3));
+ final List<Integer> listSecond = promiseSecond.get();
+ assertEquals(3, listSecond.size());
+ assertThat(listSecond, hasItems(4, 5, 6));
+ assertThat(t.hasNext(), is(true));
+ assertThat(promiseSecond.isDone(), is(true));
+
+ final CompletableFuture<List<Integer>> promiseThird = t.promise(traversal -> traversal.next(3));
+ final List<Integer> listThird = promiseThird.get();
+ assertEquals(1, listThird.size());
+ assertThat(listThird, hasItems(7));
+ assertThat(t.hasNext(), is(false));
+ assertThat(promiseThird.isDone(), is(true));
+
+ final CompletableFuture<Integer> promiseDead = t.promise(traversal -> (Integer) traversal.next());
+ final AtomicBoolean dead = new AtomicBoolean(false);
+ promiseDead.exceptionally(tossed -> {
+ dead.set(tossed instanceof NoSuchElementException);
+ return null;
+ });
+
+ try {
+ promiseDead.get(10000, TimeUnit.MILLISECONDS);
+ fail("Should have gotten an exception");
+ } catch (Exception ex) {
+ if (ex instanceof TimeoutException) {
+ fail("This should not have timed out but should have gotten an exception caught above in the exceptionally() clause");
+ }
+
+ assertThat(ex.getCause(), instanceOf(NoSuchElementException.class));
+ }
+
+ assertThat(dead.get(), is(true));
+ assertThat(t.hasNext(), is(false));
+ assertThat(promiseDead.isDone(), is(true));
+ }
+
+ @Test
+ public void shouldPromiseNextThreeUsingSpecificExecutor() throws Exception {
+ final MockTraversal<Integer> t = new MockTraversal<>(1, 2, 3, 4, 5, 6, 7);
+ final CompletableFuture<List<Integer>> promiseFirst = t.promise(traversal -> traversal.next(3), service);
+ final List<Integer> listFirst = promiseFirst.get();
+ assertEquals(3, listFirst.size());
+ assertThat(listFirst, hasItems(1 ,2, 3));
+ assertThat(t.hasNext(), is(true));
+ assertThat(promiseFirst.isDone(), is(true));
+
+ final CompletableFuture<List<Integer>> promiseSecond = t.promise(traversal -> traversal.next(3), service);
+ final List<Integer> listSecond = promiseSecond.get();
+ assertEquals(3, listSecond.size());
+ assertThat(listSecond, hasItems(4, 5, 6));
+ assertThat(t.hasNext(), is(true));
+ assertThat(promiseSecond.isDone(), is(true));
+
+ final CompletableFuture<List<Integer>> promiseThird = t.promise(traversal -> traversal.next(3), service);
+ final List<Integer> listThird = promiseThird.get();
+ assertEquals(1, listThird.size());
+ assertThat(listThird, hasItems(7));
+ assertThat(t.hasNext(), is(false));
+ assertThat(promiseThird.isDone(), is(true));
+
+ final CompletableFuture<Integer> promiseDead = t.promise(traversal -> (Integer) traversal.next(), service);
+ final AtomicBoolean dead = new AtomicBoolean(false);
+ promiseDead.exceptionally(tossed -> {
+ dead.set(tossed instanceof NoSuchElementException);
+ return null;
+ });
+
+ try {
+ promiseDead.get(10000, TimeUnit.MILLISECONDS);
+ fail("Should have gotten an exception");
+ } catch (Exception ex) {
+ if (ex instanceof TimeoutException) {
+ fail("This should not have timed out but should have gotten an exception caught above in the exceptionally() clause");
+ }
+
+ assertThat(ex.getCause(), instanceOf(NoSuchElementException.class));
+ }
+
+ assertThat(dead.get(), is(true));
+ assertThat(t.hasNext(), is(false));
+ assertThat(promiseDead.isDone(), is(true));
+ }
+
+ @Test
+ public void shouldInterruptTraversalFunction() throws Exception {
+ final Random rand = new Random(1234567890);
+
+ // infinite traversal
+ final MockTraversal<Integer> t = new MockTraversal<>(IntStream.generate(rand::nextInt).iterator());
+
+ // iterate a bunch of it
+ final CompletableFuture<List<Integer>> promise10 = t.promise(traversal -> traversal.next(10), service);
+ assertEquals(10, promise10.get(10000, TimeUnit.MILLISECONDS).size());
+ final CompletableFuture<List<Integer>> promise100 = t.promise(traversal -> traversal.next(100), service);
+ assertEquals(100, promise100.get(10000, TimeUnit.MILLISECONDS).size());
+ final CompletableFuture<List<Integer>> promise1000 = t.promise(traversal -> traversal.next(1000), service);
+ assertEquals(1000, promise1000.get(10000, TimeUnit.MILLISECONDS).size());
+
+ // this is endless, so let's cancel
+ final CompletableFuture<List<Integer>> promiseForevers = t.promise(traversal -> traversal.next(Integer.MAX_VALUE), service);
+
+ // specify what to do on exception
+ final AtomicBoolean failed = new AtomicBoolean(false);
+ promiseForevers.exceptionally(ex -> {
+ failed.set(true);
+ return null;
+ });
+
+ try {
+ // let it actually iterate a moment
+ promiseForevers.get(500, TimeUnit.MILLISECONDS);
+ fail("This should have timed out because the traversal has infinite items in it");
+ } catch (TimeoutException tex) {
+
+ }
+
+ assertThat(promiseForevers.isDone(), is(false));
+ promiseForevers.cancel(true);
+ assertThat(failed.get(), is(true));
+ assertThat(promiseForevers.isDone(), is(true));
+ }
+
+ @Test
+ public void shouldIterate() {
+ final MockTraversal<Integer> t = new MockTraversal<>(1, 2, 3, 4, 5, 6, 7);
+ assertThat(t.hasNext(), is(true));
+ t.iterate();
+ assertThat(t.hasNext(), is(false));
+ }
+
+ private static class MockStep<E> implements Step<E,E> {
+
+ private final Iterator<E> itty;
+
+ MockStep(final Iterator<E> itty) {
+ this.itty = itty;
+ }
+
+ @Override
+ public void addStarts(final Iterator starts) {
+
+ }
+
+ @Override
+ public void addStart(final Traverser.Admin start) {
+
+ }
+
+ @Override
+ public void setPreviousStep(final Step step) {
+
+ }
+
+ @Override
+ public Step getPreviousStep() {
+ return null;
+ }
+
+ @Override
+ public void setNextStep(final Step step) {
+
+ }
+
+ @Override
+ public Step getNextStep() {
+ return null;
+ }
+
+ @Override
+ public Traversal.Admin getTraversal() {
+ return null;
+ }
+
+ @Override
+ public void setTraversal(final Traversal.Admin traversal) {
+
+ }
+
+ @Override
+ public void reset() {
+
+ }
+
+ @Override
+ public Step clone() {
+ return null;
+ }
+
+ @Override
+ public Set<String> getLabels() {
+ return null;
+ }
+
+ @Override
+ public void addLabel(final String label) {
+
+ }
+
+ @Override
+ public void removeLabel(final String label) {
+
+ }
+
+ @Override
+ public void setId(final String id) {
+
+ }
+
+ @Override
+ public String getId() {
+ return null;
+ }
+
+ @Override
+ public boolean hasNext() {
+ return itty.hasNext();
+ }
+
+ @Override
+ public Traverser.Admin<E> next() {
+ return new DefaultRemoteTraverser<>(itty.next(), 1L);
+ }
+ }
+
+
+ private static class MockTraversal<T> implements Traversal.Admin<T,T> {
+
+ private Iterator<T> itty;
+
+ private Step mockEndStep;
+
+ private List<Step> steps;
+
+ MockTraversal(final T... objects) {
+ this(Arrays.asList(objects));
+ }
+
+ MockTraversal(final List<T> list) {
+ this(list.iterator());
+ }
+
+ MockTraversal(final Iterator<T> itty) {
+ this.itty = itty;
+ mockEndStep = new MockStep<>(itty);
+ steps = Collections.singletonList(mockEndStep);
+ }
+
+ @Override
+ public Bytecode getBytecode() {
+ return null;
+ }
+
+ @Override
+ public List<Step> getSteps() {
+ return steps;
+ }
+
+ @Override
+ public <S2, E2> Admin<S2, E2> addStep(final int index, final Step<?, ?> step) throws IllegalStateException {
+ return null;
+ }
+
+ @Override
+ public <S2, E2> Admin<S2, E2> removeStep(final int index) throws IllegalStateException {
+ return null;
+ }
+
+ @Override
+ public void applyStrategies() throws IllegalStateException {
+
+ }
+
+ @Override
+ public TraverserGenerator getTraverserGenerator() {
+ return null;
+ }
+
+ @Override
+ public Set<TraverserRequirement> getTraverserRequirements() {
+ return null;
+ }
+
+ @Override
+ public void setSideEffects(final TraversalSideEffects sideEffects) {
+
+ }
+
+ @Override
+ public TraversalSideEffects getSideEffects() {
+ return null;
+ }
+
+ @Override
+ public void setStrategies(final TraversalStrategies strategies) {
+
+ }
+
+ @Override
+ public TraversalStrategies getStrategies() {
+ return null;
+ }
+
+ @Override
+ public void setParent(final TraversalParent step) {
+
+ }
+
+ @Override
+ public TraversalParent getParent() {
+ return null;
+ }
+
+ @Override
+ public Admin<T, T> clone() {
+ return null;
+ }
+
+ @Override
+ public boolean isLocked() {
+ return false;
+ }
+
+ @Override
+ public Optional<Graph> getGraph() {
+ return null;
+ }
+
+ @Override
+ public void setGraph(final Graph graph) {
+
+ }
+
+ @Override
+ public boolean hasNext() {
+ return itty.hasNext();
+ }
+
+ @Override
+ public T next() {
+ if (Thread.interrupted()) throw new TraversalInterruptedException();
+ return itty.next();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eb089764/gremlin-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index acc51b7..dae5e8a 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -61,11 +61,6 @@ limitations under the License.
<classifier>indy</classifier>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.3.1</version>
- </dependency>
- <dependency>
<groupId>com.github.jeremyh</groupId>
<artifactId>jBCrypt</artifactId>
<version>jbcrypt-0.4</version>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eb089764/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
----------------------------------------------------------------------
diff --git a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
index 9e03884..5dd9c28 100644
--- a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
+++ b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
@@ -69,6 +69,7 @@ public class PythonProvider extends AbstractGraphProvider {
"shouldNeverPropagateANullValuedTraverser",
"shouldHidePartitionKeyForValues",
"g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
+ "shouldUsePromiseAndControlTransactionsIfAvailable",
//
ProgramTest.Traversals.class.getCanonicalName(),
TraversalInterruptionTest.class.getCanonicalName(),
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eb089764/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
index 68f8217..050f9de 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.traversal;
import org.apache.tinkerpop.gremlin.ExceptionCoverage;
import org.apache.tinkerpop.gremlin.FeatureRequirement;
+import org.apache.tinkerpop.gremlin.FeatureRequirementSet;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
@@ -40,6 +41,9 @@ import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Random;
import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
@@ -307,4 +311,42 @@ public class CoreTraversalTest extends AbstractGremlinProcessTest {
}
}
+
+ @Test
+ @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
+ public void shouldUsePromiseAndControlTransactionsIfAvailable() throws Exception {
+ // this test will validate that transactional graphs can properly open/close transactions within a promise.
+ // as there is a feature check, non-transactional graphs can use this to simply exercise the promise API
+ final Vertex vAdded = g.addV("person").property("name", "stephen").promise(t -> (Vertex) t.next()).get(10000, TimeUnit.MILLISECONDS);
+ final Vertex vRead = g.V().has("name", "stephen").next();
+ assertEquals(vAdded.id(), vRead.id());
+
+ // transaction should have been committed at this point so test the count in this thread to validate persistence
+ assertVertexEdgeCounts(graph, 1, 0);
+
+ // cancel a promise and ensure the transaction ended in failure. hold the traversal in park until it can be
+ // interrupted, then the promise will have to rollback the transaction.
+ final CompletableFuture promiseToCancel = g.addV("person").property("name", "marko").sideEffect(traverser -> {
+ try {
+ Thread.sleep(100000);
+ } catch (Exception ignored) {
+
+ }
+ }).promise(t -> (Vertex) t.next());
+
+ try {
+ promiseToCancel.get(500, TimeUnit.MILLISECONDS);
+ fail("Should have timed out");
+ } catch (TimeoutException te) {
+
+ }
+
+ promiseToCancel.cancel(true);
+
+ // graphs that support transactions will rollback the transaction
+ if (graph.features().graph().supportsTransactions())
+ assertVertexEdgeCounts(graph, 1, 0);
+ else
+ assertVertexEdgeCounts(graph, 2, 0);
+ }
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eb089764/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
index dd118d7..a595c34 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
@@ -51,6 +51,7 @@ public class TinkerGraphGroovyTranslatorProvider extends TinkerGraphProvider {
"g_VX1X_out_injectXv2X_name",
"shouldNeverPropagateANoBulkTraverser",
"shouldNeverPropagateANullValuedTraverser",
+ "shouldUsePromiseAndControlTransactionsIfAvailable",
GraphComputerTest.class.getCanonicalName(),
ProgramTest.Traversals.class.getCanonicalName(),
TraversalInterruptionTest.class.getCanonicalName(),
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eb089764/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java
index f40a8c7..15a6c0b 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java
@@ -49,6 +49,7 @@ public class TinkerGraphJavaTranslatorProvider extends TinkerGraphProvider {
TraversalInterruptionComputerTest.class.getCanonicalName(),
"shouldNeverPropagateANoBulkTraverser",
"shouldNeverPropagateANullValuedTraverser",
+ "shouldUsePromiseAndControlTransactionsIfAvailable",
ElementIdStrategyProcessTest.class.getCanonicalName(),
EventStrategyProcessTest.class.getCanonicalName(),
ProgramTest.Traversals.class.getCanonicalName()));
[26/47] tinkerpop git commit: Minor code cleanup and formatting.
Posted by sp...@apache.org.
Minor code cleanup and formatting.
Fixed some issues related to a pull request that had some unintended copyright comments and bad source formatting that was missed during review. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/49668ce2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/49668ce2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/49668ce2
Branch: refs/heads/TINKERPOP-1130
Commit: 49668ce2e17b2e31d86594404c843e5321fe7879
Parents: 5f132eb
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Dec 20 13:49:11 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 20 13:49:11 2016 -0500
----------------------------------------------------------------------
.../structure/io/gryo/kryoshim/InputShim.java | 2 ++
.../structure/io/gryo/kryoshim/OutputShim.java | 2 ++
.../kryoshim/shaded/ShadedInputAdapter.java | 5 +++
.../kryoshim/shaded/ShadedOutputAdapter.java | 8 +++--
.../io/gryo/IoRegistryAwareKryoSerializer.java | 6 ----
.../kryoshim/unshaded/UnshadedInputAdapter.java | 32 +++++++-----------
.../kryoshim/unshaded/UnshadedKryoAdapter.java | 30 +++++------------
.../unshaded/UnshadedKryoShimService.java | 6 ----
.../unshaded/UnshadedOutputAdapter.java | 35 ++++++++------------
.../unshaded/UnshadedSerializerAdapter.java | 9 +----
10 files changed, 49 insertions(+), 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49668ce2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/InputShim.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/InputShim.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/InputShim.java
index 424b1bf..246fc7f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/InputShim.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/InputShim.java
@@ -34,5 +34,7 @@ public interface InputShim {
public int readInt();
+ public short readShort();
+
public double readDouble();
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49668ce2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/OutputShim.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/OutputShim.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/OutputShim.java
index e3647f3..85cba71 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/OutputShim.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/OutputShim.java
@@ -36,5 +36,7 @@ public interface OutputShim {
public void writeDouble(final double d);
+ public void writeShort(final int s);
+
public void flush();
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49668ce2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/shaded/ShadedInputAdapter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/shaded/ShadedInputAdapter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/shaded/ShadedInputAdapter.java
index 29524b9..0647e0b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/shaded/ShadedInputAdapter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/shaded/ShadedInputAdapter.java
@@ -60,6 +60,11 @@ public class ShadedInputAdapter implements InputShim {
}
@Override
+ public short readShort() {
+ return shadedInput.readShort();
+ }
+
+ @Override
public double readDouble() {
return shadedInput.readDouble();
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49668ce2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/shaded/ShadedOutputAdapter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/shaded/ShadedOutputAdapter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/shaded/ShadedOutputAdapter.java
index b05f528..5ecc0fc 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/shaded/ShadedOutputAdapter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/shaded/ShadedOutputAdapter.java
@@ -30,8 +30,7 @@ public class ShadedOutputAdapter implements OutputShim {
}
@Override
- public void writeByte(final byte b)
- {
+ public void writeByte(final byte b) {
shadedOutput.writeByte(b);
}
@@ -61,6 +60,11 @@ public class ShadedOutputAdapter implements OutputShim {
}
@Override
+ public void writeShort(int s) {
+ shadedOutput.writeShort(s);
+ }
+
+ @Override
public void flush() {
shadedOutput.flush();
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49668ce2/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/IoRegistryAwareKryoSerializer.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/IoRegistryAwareKryoSerializer.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/IoRegistryAwareKryoSerializer.java
index bf71fae..ec30124 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/IoRegistryAwareKryoSerializer.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/IoRegistryAwareKryoSerializer.java
@@ -16,12 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-/**
- * Copyright DataStax, Inc.
- * <p>
- * Please see the included license file for details.
- */
package org.apache.tinkerpop.gremlin.spark.structure.io.gryo;
import com.esotericsoftware.kryo.Kryo;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49668ce2/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedInputAdapter.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedInputAdapter.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedInputAdapter.java
index 0f13bb2..f8177e3 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedInputAdapter.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedInputAdapter.java
@@ -16,35 +16,25 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-/**
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
package org.apache.tinkerpop.gremlin.spark.structure.io.gryo.kryoshim.unshaded;
import com.esotericsoftware.kryo.io.Input;
import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.InputShim;
-public class UnshadedInputAdapter implements InputShim
-{
+public class UnshadedInputAdapter implements InputShim {
private final Input unshadedInput;
- public UnshadedInputAdapter(final Input unshadedInput)
- {
+ public UnshadedInputAdapter(final Input unshadedInput) {
this.unshadedInput = unshadedInput;
}
- Input getUnshadedInput()
- {
+ Input getUnshadedInput() {
return unshadedInput;
}
@Override
- public byte readByte()
- {
+ public byte readByte() {
return unshadedInput.readByte();
}
@@ -54,14 +44,12 @@ public class UnshadedInputAdapter implements InputShim
}
@Override
- public String readString()
- {
+ public String readString() {
return unshadedInput.readString();
}
@Override
- public long readLong()
- {
+ public long readLong() {
return unshadedInput.readLong();
}
@@ -71,8 +59,12 @@ public class UnshadedInputAdapter implements InputShim
}
@Override
- public double readDouble()
- {
+ public short readShort() {
+ return unshadedInput.readShort();
+ }
+
+ @Override
+ public double readDouble() {
return unshadedInput.readDouble();
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49668ce2/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedKryoAdapter.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedKryoAdapter.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedKryoAdapter.java
index 94918a3..f0a41eb 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedKryoAdapter.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedKryoAdapter.java
@@ -16,59 +16,45 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-/**
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
package org.apache.tinkerpop.gremlin.spark.structure.io.gryo.kryoshim.unshaded;
import com.esotericsoftware.kryo.Kryo;
import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShim;
-public class UnshadedKryoAdapter implements KryoShim<UnshadedInputAdapter, UnshadedOutputAdapter>
-{
+public class UnshadedKryoAdapter implements KryoShim<UnshadedInputAdapter, UnshadedOutputAdapter> {
private final Kryo unshadedKryo;
- public UnshadedKryoAdapter(final Kryo unshadedKryo)
- {
+ public UnshadedKryoAdapter(final Kryo unshadedKryo) {
this.unshadedKryo = unshadedKryo;
}
@Override
- public <T> T readObject(final UnshadedInputAdapter input, final Class<T> type)
- {
+ public <T> T readObject(final UnshadedInputAdapter input, final Class<T> type) {
return unshadedKryo.readObject(input.getUnshadedInput(), type);
}
@Override
- public Object readClassAndObject(final UnshadedInputAdapter input)
- {
+ public Object readClassAndObject(final UnshadedInputAdapter input) {
return unshadedKryo.readClassAndObject(input.getUnshadedInput());
}
@Override
- public void writeObject(final UnshadedOutputAdapter output, final Object object)
- {
+ public void writeObject(final UnshadedOutputAdapter output, final Object object) {
unshadedKryo.writeObject(output.getUnshadedOutput(), object);
}
@Override
- public void writeClassAndObject(final UnshadedOutputAdapter output, final Object object)
- {
+ public void writeClassAndObject(final UnshadedOutputAdapter output, final Object object) {
unshadedKryo.writeClassAndObject(output.getUnshadedOutput(), object);
}
@Override
- public <T> T readObjectOrNull(final UnshadedInputAdapter input, final Class<T> type)
- {
+ public <T> T readObjectOrNull(final UnshadedInputAdapter input, final Class<T> type) {
return unshadedKryo.readObjectOrNull(input.getUnshadedInput(), type);
}
@Override
- public void writeObjectOrNull(final UnshadedOutputAdapter output, final Object object, final Class type)
- {
+ public void writeObjectOrNull(final UnshadedOutputAdapter output, final Object object, final Class type) {
unshadedKryo.writeObjectOrNull(output.getUnshadedOutput(), object, type);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49668ce2/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedKryoShimService.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedKryoShimService.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedKryoShimService.java
index 41e0001..1d327b2 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedKryoShimService.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedKryoShimService.java
@@ -16,12 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-/**
- * Copyright DataStax, Inc.
- * <p>
- * Please see the included license file for details.
- */
package org.apache.tinkerpop.gremlin.spark.structure.io.gryo.kryoshim.unshaded;
import com.esotericsoftware.kryo.Kryo;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49668ce2/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedOutputAdapter.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedOutputAdapter.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedOutputAdapter.java
index 8dd8eb3..3799ee4 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedOutputAdapter.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedOutputAdapter.java
@@ -16,34 +16,24 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-/**
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
package org.apache.tinkerpop.gremlin.spark.structure.io.gryo.kryoshim.unshaded;
import com.esotericsoftware.kryo.io.Output;
import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.OutputShim;
-public class UnshadedOutputAdapter implements OutputShim
-{
+public class UnshadedOutputAdapter implements OutputShim {
private final Output unshadedOutput;
- public UnshadedOutputAdapter(final Output unshadedOutput)
- {
+ public UnshadedOutputAdapter(final Output unshadedOutput) {
this.unshadedOutput = unshadedOutput;
}
- Output getUnshadedOutput()
- {
+ Output getUnshadedOutput() {
return unshadedOutput;
}
@Override
- public void writeByte(final byte b)
- {
+ public void writeByte(final byte b) {
unshadedOutput.writeByte(b);
}
@@ -53,14 +43,17 @@ public class UnshadedOutputAdapter implements OutputShim
}
@Override
- public void writeString(final String s)
- {
+ public void writeShort(int s) {
+ unshadedOutput.writeShort(s);
+ }
+
+ @Override
+ public void writeString(final String s) {
unshadedOutput.writeString(s);
}
@Override
- public void writeLong(final long l)
- {
+ public void writeLong(final long l) {
unshadedOutput.writeLong(l);
}
@@ -70,14 +63,12 @@ public class UnshadedOutputAdapter implements OutputShim
}
@Override
- public void writeDouble(final double d)
- {
+ public void writeDouble(final double d) {
unshadedOutput.writeDouble(d);
}
@Override
- public void flush()
- {
+ public void flush() {
unshadedOutput.flush();
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49668ce2/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedSerializerAdapter.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedSerializerAdapter.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedSerializerAdapter.java
index a5f8b05..f2a9e0b 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedSerializerAdapter.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/kryoshim/unshaded/UnshadedSerializerAdapter.java
@@ -16,12 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-/**
- * Copyright DataStax, Inc.
- *
- * Please see the included license file for details.
- */
package org.apache.tinkerpop.gremlin.spark.structure.io.gryo.kryoshim.unshaded;
import com.esotericsoftware.kryo.Kryo;
@@ -48,8 +42,7 @@ public class UnshadedSerializerAdapter<T> extends Serializer<T>
}
@Override
- public T read(final Kryo kryo, final Input input, final Class<T> aClass)
- {
+ public T read(final Kryo kryo, final Input input, final Class<T> aClass) {
UnshadedKryoAdapter shadedKryoAdapter = new UnshadedKryoAdapter(kryo);
UnshadedInputAdapter shadedInputAdapter = new UnshadedInputAdapter(input);
return serializer.read(shadedKryoAdapter, shadedInputAdapter, aClass);
[12/47] tinkerpop git commit: TINKERPOP-1490 Restructured
Traversal.promise()
Posted by sp...@apache.org.
TINKERPOP-1490 Restructured Traversal.promise()
No longer uses an ExecutorService and is only applicable to "remote" traversals. Moved the commons-lang dependency back to gremlin-groovy for now.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9bbf0252
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9bbf0252
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9bbf0252
Branch: refs/heads/TINKERPOP-1130
Commit: 9bbf0252572201b305236b21f6d4fc60c4db2294
Parents: 6c4cbc8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Nov 11 12:51:40 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 16 10:12:08 2016 -0500
----------------------------------------------------------------------
gremlin-core/pom.xml | 5 ---
.../traversal/util/DefaultTraversal.java | 37 -----------------
.../driver/remote/DriverRemoteConnection.java | 2 +-
.../process/traversal/CoreTraversalTest.java | 42 --------------------
4 files changed, 1 insertion(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9bbf0252/gremlin-core/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index 0594448..e8f3a34 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -61,11 +61,6 @@ limitations under the License.
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.3.1</version>
- </dependency>
<!-- LOGGING -->
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9bbf0252/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
index 6ce6dfe..3c21e37 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
@@ -43,9 +43,6 @@ import java.util.List;
import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Function;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -328,40 +325,6 @@ public class DefaultTraversal<S, E> implements Traversal.Admin<S, E> {
this.graph = graph;
}
- /**
- * Override of {@link Traversal#promise(Function)} that is aware of graph transactions.
- */
- @Override
- public <T2> CompletableFuture<T2> promise(final Function<Traversal, T2> traversalFunction) {
- return this.promise(traversalFunction, Traversal.Admin.traversalExecutorService);
- }
-
- /**
- * Override of {@link Traversal#promise(Function)} that is aware of graph transactions. In a transactional graph
- * a promise represents the full scope of a transaction, even if the graph is only partially iterated.
- */
- @Override
- public <T2> CompletableFuture<T2> promise(final Function<Traversal, T2> traversalFunction, final ExecutorService service) {
- if (graph != null && graph.features().graph().supportsTransactions()) {
- final Function<Traversal, T2> transactionAware = traversal -> {
-
- try {
- if (graph.tx().isOpen()) graph.tx().rollback();
- final T2 obj = traversalFunction.apply(traversal);
- if (graph.tx().isOpen()) graph.tx().commit();
- return obj;
- } catch (Exception ex) {
- if (graph.tx().isOpen()) graph.tx().rollback();
- throw ex;
- }
- };
-
- return Traversal.Admin.super.promise(transactionAware, service);
- } else {
- return Traversal.Admin.super.promise(traversalFunction, service);
- }
- }
-
@Override
public boolean equals(final Object other) {
return other != null && other.getClass().equals(this.getClass()) && this.equals(((Traversal.Admin) other));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9bbf0252/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
index d6415de..ef3a0a9 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
@@ -165,7 +165,7 @@ public class DriverRemoteConnection implements RemoteConnection {
}
/**
- * @deprecated As of release 3.2.2, replaced by {@link #submitAsync(Bytecode)}.
+ * @deprecated As of release 3.2.2, replaced by {@link #submit(Bytecode)}.
*/
@Deprecated
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9bbf0252/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
index 050f9de..68f8217 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
@@ -20,7 +20,6 @@ package org.apache.tinkerpop.gremlin.process.traversal;
import org.apache.tinkerpop.gremlin.ExceptionCoverage;
import org.apache.tinkerpop.gremlin.FeatureRequirement;
-import org.apache.tinkerpop.gremlin.FeatureRequirementSet;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
@@ -41,9 +40,6 @@ import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Random;
import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
@@ -311,42 +307,4 @@ public class CoreTraversalTest extends AbstractGremlinProcessTest {
}
}
-
- @Test
- @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
- public void shouldUsePromiseAndControlTransactionsIfAvailable() throws Exception {
- // this test will validate that transactional graphs can properly open/close transactions within a promise.
- // as there is a feature check, non-transactional graphs can use this to simply exercise the promise API
- final Vertex vAdded = g.addV("person").property("name", "stephen").promise(t -> (Vertex) t.next()).get(10000, TimeUnit.MILLISECONDS);
- final Vertex vRead = g.V().has("name", "stephen").next();
- assertEquals(vAdded.id(), vRead.id());
-
- // transaction should have been committed at this point so test the count in this thread to validate persistence
- assertVertexEdgeCounts(graph, 1, 0);
-
- // cancel a promise and ensure the transaction ended in failure. hold the traversal in park until it can be
- // interrupted, then the promise will have to rollback the transaction.
- final CompletableFuture promiseToCancel = g.addV("person").property("name", "marko").sideEffect(traverser -> {
- try {
- Thread.sleep(100000);
- } catch (Exception ignored) {
-
- }
- }).promise(t -> (Vertex) t.next());
-
- try {
- promiseToCancel.get(500, TimeUnit.MILLISECONDS);
- fail("Should have timed out");
- } catch (TimeoutException te) {
-
- }
-
- promiseToCancel.cancel(true);
-
- // graphs that support transactions will rollback the transaction
- if (graph.features().graph().supportsTransactions())
- assertVertexEdgeCounts(graph, 1, 0);
- else
- assertVertexEdgeCounts(graph, 2, 0);
- }
}
[11/47] tinkerpop git commit: TINKERPOP-1490 Remove some dead tests
from ignores.
Posted by sp...@apache.org.
TINKERPOP-1490 Remove some dead tests from ignores.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f4bc29c0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f4bc29c0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f4bc29c0
Branch: refs/heads/TINKERPOP-1130
Commit: f4bc29c0a5a5ef26e182765bd3d8d6d2780925d0
Parents: 9bbf025
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Nov 11 13:39:40 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 16 10:12:08 2016 -0500
----------------------------------------------------------------------
.../org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java | 1 -
.../process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java | 1 -
.../process/jsr223/TinkerGraphJavaTranslatorProvider.java | 1 -
3 files changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f4bc29c0/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
----------------------------------------------------------------------
diff --git a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
index 5dd9c28..9e03884 100644
--- a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
+++ b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
@@ -69,7 +69,6 @@ public class PythonProvider extends AbstractGraphProvider {
"shouldNeverPropagateANullValuedTraverser",
"shouldHidePartitionKeyForValues",
"g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
- "shouldUsePromiseAndControlTransactionsIfAvailable",
//
ProgramTest.Traversals.class.getCanonicalName(),
TraversalInterruptionTest.class.getCanonicalName(),
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f4bc29c0/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
index a595c34..dd118d7 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
@@ -51,7 +51,6 @@ public class TinkerGraphGroovyTranslatorProvider extends TinkerGraphProvider {
"g_VX1X_out_injectXv2X_name",
"shouldNeverPropagateANoBulkTraverser",
"shouldNeverPropagateANullValuedTraverser",
- "shouldUsePromiseAndControlTransactionsIfAvailable",
GraphComputerTest.class.getCanonicalName(),
ProgramTest.Traversals.class.getCanonicalName(),
TraversalInterruptionTest.class.getCanonicalName(),
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f4bc29c0/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java
index 15a6c0b..f40a8c7 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java
@@ -49,7 +49,6 @@ public class TinkerGraphJavaTranslatorProvider extends TinkerGraphProvider {
TraversalInterruptionComputerTest.class.getCanonicalName(),
"shouldNeverPropagateANoBulkTraverser",
"shouldNeverPropagateANullValuedTraverser",
- "shouldUsePromiseAndControlTransactionsIfAvailable",
ElementIdStrategyProcessTest.class.getCanonicalName(),
EventStrategyProcessTest.class.getCanonicalName(),
ProgramTest.Traversals.class.getCanonicalName()));
[46/47] tinkerpop git commit: TINKERPOP-1130 Completed tests for
typed IO
Posted by sp...@apache.org.
TINKERPOP-1130 Completed tests for typed IO
Still need some asserts and found lots of inconsistencies that were handled in the Model class with Compatibility assignments.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f0144ddd
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f0144ddd
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f0144ddd
Branch: refs/heads/TINKERPOP-1130
Commit: f0144dddb7903026d00b248c0c55eebe236c4e8a
Parents: 7e47771
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Dec 15 11:55:16 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 20 15:24:52 2016 -0500
----------------------------------------------------------------------
.../tinkerpop/gremlin/structure/io/Model.java | 22 +-
.../structure/io/gryo/GryoCompatibility.java | 20 +
.../io/AbstractTypedCompatibilityTest.java | 487 ++++++++++++++++++-
.../_3_2_3/manual-graphson-generator.groovy | 8 +-
.../io/graphson/_3_2_3/sessioneval-v1d0.json | 5 +-
.../_3_2_3/sessioneval-v2d0-no-types.json | 5 +-
.../_3_2_3/sessioneval-v2d0-partial.json | 5 +-
.../_3_2_3/sessionevalaliased-v1d0.json | 16 +
.../sessionevalaliased-v2d0-no-types.json | 16 +
.../_3_2_3/sessionevalaliased-v2d0-partial.json | 25 +
.../graphson/_3_2_3/sessionlesseval-v1d0.json | 5 +-
.../_3_2_3/sessionlesseval-v2d0-no-types.json | 5 +-
.../_3_2_3/sessionlesseval-v2d0-partial.json | 5 +-
.../_3_2_3/sessionlessevalaliased-v1d0.json | 15 +
.../sessionlessevalaliased-v2d0-no-types.json | 15 +
.../sessionlessevalaliased-v2d0-partial.json | 21 +
.../graphson/_3_3_0/metrics-v2d0-no-types.json | 8 +-
.../graphson/_3_3_0/metrics-v2d0-partial.json | 8 +-
.../io/graphson/_3_3_0/sessioneval-v1d0.json | 5 +-
.../_3_3_0/sessioneval-v2d0-no-types.json | 5 +-
.../_3_3_0/sessioneval-v2d0-partial.json | 5 +-
.../_3_3_0/sessionevalaliased-v1d0.json | 16 +
.../sessionevalaliased-v2d0-no-types.json | 16 +
.../_3_3_0/sessionevalaliased-v2d0-partial.json | 25 +
.../graphson/_3_3_0/sessionlesseval-v1d0.json | 5 +-
.../_3_3_0/sessionlesseval-v2d0-no-types.json | 5 +-
.../_3_3_0/sessionlesseval-v2d0-partial.json | 5 +-
.../_3_3_0/sessionlessevalaliased-v1d0.json | 15 +
.../sessionlessevalaliased-v2d0-no-types.json | 15 +
.../sessionlessevalaliased-v2d0-partial.json | 21 +
.../_3_3_0/traversalmetrics-v2d0-no-types.json | 18 +-
.../_3_3_0/traversalmetrics-v2d0-partial.json | 18 +-
.../io/gryo/_3_2_3/manual-gryo-generator.groovy | 4 +-
.../structure/io/gryo/_3_3_0/metrics-v1d0.kryo | Bin 185 -> 185 bytes
.../io/gryo/_3_3_0/traversalmetrics-v1d0.kryo | Bin 429 -> 429 bytes
35 files changed, 776 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
index aea3340..26f70bc 100644
--- a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
+++ b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
@@ -122,9 +122,9 @@ public class Model {
addGraphStructureEntry(graph.edges().next(), "Edge");
addGraphStructureEntry(g.V().out().out().path().next(), "Path");
addGraphStructureEntry(graph.edges().next().properties().next(), "Property");
- addGraphStructureEntry(StarGraph.of(graph.vertices().next()), "StarGraph");
- addGraphStructureEntry(graph, "TinkerGraph", "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`.");
- addGraphStructureEntry(g.V().out().out().tree().next(), "Tree");
+ addEntry("Graph Structure", StarGraph.of(graph.vertices().next()), "StarGraph", "", GRYO_ONLY);
+ addEntry("Graph Structure", graph, "TinkerGraph", "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`.", Collections.emptyList());
+ addEntry("Graph Structure", g.V().out().out().tree().next(), "Tree", "", GRYO_ONLY);
addGraphStructureEntry(graph.vertices().next(), "Vertex");
addGraphStructureEntry(graph.vertices().next().properties().next(), "VertexProperty");
@@ -135,7 +135,7 @@ public class Model {
addGraphProcessEntry(Column.keys, "Column", "", GRYO_ONLY);
addGraphProcessEntry(Direction.OUT, "Direction");
addGraphProcessEntry(Operator.sum, "Operator", "", GRYO_ONLY);
- addGraphProcessEntry(Order.incr, "Order");
+ addGraphProcessEntry(Order.incr, "Order", "", GRYO_ONLY);
addGraphProcessEntry(TraversalOptionParent.Pick.any, "Pick");
addGraphProcessEntry(Pop.all, "Pop");
addGraphProcessEntry(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda");
@@ -144,10 +144,10 @@ public class Model {
metrics.addNested(new MutableMetrics(tm.getMetrics(1)));
addGraphProcessEntry(metrics, "Metrics");
addGraphProcessEntry(P.gt(0), "P");
- addGraphProcessEntry(P.gt(0).and(P.lt(10)), "P and");
- addGraphProcessEntry(P.gt(0).or(P.within(-1, -10, -100)), "P or");
+ addGraphProcessEntry(P.gt(0).and(P.lt(10)), "P and", "", GRAPHSON_ONLY);
+ addGraphProcessEntry(P.gt(0).or(P.within(-1, -10, -100)), "P or", "", GRAPHSON_ONLY);
addGraphProcessEntry(Scope.local, "Scope");
- addGraphProcessEntry(T.label, "T");
+ addGraphProcessEntry(T.label, "T", "", GRYO_ONLY);
addGraphProcessEntry(g.V().hasLabel("person").out().out().tree().profile().next(), "TraversalMetrics");
addGraphProcessEntry(g.V().hasLabel("person").asAdmin().nextTraverser(), "Traverser");
@@ -170,7 +170,7 @@ public class Model {
requestMessage = RequestMessage.build("eval").processor("session").
overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
add("gremlin", "social.V(x)", "bindings", requestBindings, "language", "gremlin-groovy", "aliases", requestAliases, "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create();
- addRequestMessageEntry(requestMessage, "Session Eval", "The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\".");
+ addRequestMessageEntry(requestMessage, "Session Eval Aliased", "The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\".");
requestMessage = RequestMessage.build("close").processor("session").
overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
add("session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create();
@@ -182,15 +182,15 @@ public class Model {
requestMessage = RequestMessage.build("eval").
overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
add("gremlin", "social.V(x)", "bindings", requestBindings, "language", "gremlin-groovy", "aliases", requestAliases).create();
- addRequestMessageEntry(requestMessage, "Sessionless Eval", "The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\".");
+ addRequestMessageEntry(requestMessage, "Sessionless Eval Aliased", "The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\".");
ResponseMessage responseMessage = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create();
- addResponseMessageEntry(responseMessage, "Authentication Challenge", "When authentication is enabled, an initial request to the server will result in an authentication challenge. The typical response message will appear as follows, but handling it could be different dependending on the SASL implementation (e.g. multiple challenges maybe requested in some cases, but no in the default provided by Gremlin Server).");
+ addResponseMessageEntry(responseMessage, "Authentication Challenge", "When authentication is enabled, an initial request to the server will result in an authentication challenge. The typical response message will appear as follows, but handling it could be different dependending on the SASL implementation (e.g. multiple challenges maybe requested in some cases, but no in the default provided by Gremlin Server).", ALL.toArray(new Compatibility[ALL.size()]));
responseMessage = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.SUCCESS).
result(Collections.singletonList(graph.vertices().next())).create();
- addResponseMessageEntry(responseMessage, "Standard Result", "The following `ResponseMessage` is a typical example of the typical successful response Gremlin Server will return when returning results from a script.");
+ addResponseMessageEntry(responseMessage, "Standard Result", "The following `ResponseMessage` is a typical example of the typical successful response Gremlin Server will return when returning results from a script.", ALL.toArray(new Compatibility[ALL.size()]));
addExtendedEntry(new BigDecimal(new java.math.BigInteger("123456789987654321123456789987654321")), "BigDecimal", "", UNTYPED_GRAPHSON_ONLY.toArray(new Compatibility[UNTYPED_GRAPHSON_ONLY.size()]));
addExtendedEntry(new BigInteger("123456789987654321123456789987654321"), "BigInteger", "", UNTYPED_GRAPHSON_ONLY.toArray(new Compatibility[UNTYPED_GRAPHSON_ONLY.size()]));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibility.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibility.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibility.java
index e4e47a2..09faf87 100644
--- a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibility.java
+++ b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibility.java
@@ -19,13 +19,23 @@
package org.apache.tinkerpop.gremlin.structure.io.gryo;
import org.apache.commons.io.IOUtils;
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.B_O_Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.io.Compatibility;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedPath;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
import java.io.File;
import java.io.IOException;
@@ -61,8 +71,18 @@ public enum GryoCompatibility implements Compatibility {
return DetachedEdge.class;
else if (clazz.equals(Vertex.class))
return DetachedVertex.class;
+ else if (clazz.equals(Property.class))
+ return DetachedProperty.class;
+ else if (clazz.equals(VertexProperty.class))
+ return DetachedVertexProperty.class;
+ else if (clazz.equals(Path.class))
+ return DetachedPath.class;
+ else if (clazz.equals(TraversalMetrics.class))
+ return DefaultTraversalMetrics.class;
else if (clazz.equals(Metrics.class))
return MutableMetrics.class;
+ else if (clazz.equals(Traverser.class))
+ return B_O_Traverser.class;
else
return clazz;
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
index bede370..8db93f6 100644
--- a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
+++ b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
@@ -22,14 +22,28 @@ import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.Operator;
+import org.apache.tinkerpop.gremlin.process.traversal.Order;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Pop;
import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
import org.apache.tinkerpop.gremlin.structure.Column;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
import org.apache.tinkerpop.gremlin.util.function.Lambda;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.junit.Test;
import java.math.BigDecimal;
@@ -45,10 +59,17 @@ import java.time.LocalTime;
import java.time.MonthDay;
import java.time.OffsetDateTime;
import java.time.OffsetTime;
+import java.time.Period;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneOffset;
import java.time.ZonedDateTime;
+import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import java.util.UUID;
import java.util.concurrent.TimeUnit;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -66,7 +87,6 @@ public abstract class AbstractTypedCompatibilityTest extends AbstractCompatibili
public abstract byte[] write(final Object o, final Class<?> clazz) throws Exception;
@Test
- @org.junit.Ignore
public void shouldReadWriteAuthenticationChallenge() throws Exception {
final String resourceName = "authenticationchallenge";
assumeCompatibility(resourceName);
@@ -319,6 +339,22 @@ public abstract class AbstractTypedCompatibilityTest extends AbstractCompatibili
assertEquals(fromStatic, recycled);
assertEquals(resource, fromStatic);
assertEquals(resource, recycled);
+ assertEquals(resource.id(), recycled.id());
+ assertEquals(resource.label(), recycled.label());
+ assertEquals(resource.inVertex().id(), recycled.inVertex().id());
+ assertEquals(resource.outVertex().id(), recycled.outVertex().id());
+ assertEquals(resource.inVertex().label(), recycled.inVertex().label());
+ assertEquals(resource.outVertex().label(), recycled.outVertex().label());
+ assertEquals(IteratorUtils.count(resource.properties()), IteratorUtils.count(recycled.properties()));
+ assertEquals((int) resource.value("since"), (int) recycled.value("since"));
+ assertEquals(resource.id(), fromStatic.id());
+ assertEquals(resource.label(), fromStatic.label());
+ assertEquals(resource.inVertex().id(), fromStatic.inVertex().id());
+ assertEquals(resource.outVertex().id(), fromStatic.outVertex().id());
+ assertEquals(resource.inVertex().label(), fromStatic.inVertex().label());
+ assertEquals(resource.outVertex().label(), fromStatic.outVertex().label());
+ assertEquals(IteratorUtils.count(resource.properties()), IteratorUtils.count(fromStatic.properties()));
+ assertEquals((int) resource.value("since"), (int) fromStatic.value("since"));
}
@Test
@@ -515,13 +551,306 @@ public abstract class AbstractTypedCompatibilityTest extends AbstractCompatibili
assertEquals(resource, recycled);
}
+ @Test
+ public void shouldReadWriteOrder() throws Exception {
+ final String resourceName = "order";
+ assumeCompatibility(resourceName);
+
+ final Order resource = findModelEntryObject(resourceName);
+ final Order fromStatic = read(getCompatibility().readFromResource(resourceName), Order.class);
+ final Order recycled = read(write(fromStatic, Order.class), Order.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteP() throws Exception {
+ final String resourceName = "p";
+ assumeCompatibility(resourceName);
+
+ final P resource = findModelEntryObject(resourceName);
+ final P fromStatic = read(getCompatibility().readFromResource(resourceName), P.class);
+ final P recycled = read(write(fromStatic, P.class), P.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWritePAnd() throws Exception {
+ final String resourceName = "pand";
+ assumeCompatibility(resourceName);
+
+ final P resource = findModelEntryObject(resourceName);
+ final P fromStatic = read(getCompatibility().readFromResource(resourceName), P.class);
+ final P recycled = read(write(fromStatic, P.class), P.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWritePath() throws Exception {
+ final String resourceName = "path";
+ assumeCompatibility(resourceName);
+
+ final Path resource = findModelEntryObject(resourceName);
+ final Path fromStatic = read(getCompatibility().readFromResource(resourceName), Path.class);
+ final Path recycled = (Path) read(write(fromStatic, Path.class), getCompatibility().resolve(Path.class));
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWritePeriod() throws Exception {
+ final String resourceName = "period";
+ assumeCompatibility(resourceName);
+
+ final Period resource = findModelEntryObject(resourceName);
+ final Period fromStatic = read(getCompatibility().readFromResource(resourceName), Period.class);
+ final Period recycled = read(write(fromStatic, Period.class), Period.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWritePop() throws Exception {
+ final String resourceName = "pop";
+ assumeCompatibility(resourceName);
+
+ final Pop resource = findModelEntryObject(resourceName);
+ final Pop fromStatic = read(getCompatibility().readFromResource(resourceName), Pop.class);
+ final Pop recycled = read(write(fromStatic, Pop.class), Pop.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWritePOr() throws Exception {
+ final String resourceName = "por";
+ assumeCompatibility(resourceName);
+
+ final P resource = findModelEntryObject(resourceName);
+ final P fromStatic = read(getCompatibility().readFromResource(resourceName), P.class);
+ final P recycled = read(write(fromStatic, P.class), P.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteProperty() throws Exception {
+ final String resourceName = "property";
+ assumeCompatibility(resourceName);
+
+ final Property resource = findModelEntryObject(resourceName);
+ final Property fromStatic = read(getCompatibility().readFromResource(resourceName), Property.class);
+ final Property recycled = (Property) read(write(fromStatic, Property.class), getCompatibility().resolve(Property.class));
+ assertNotSame(fromStatic, recycled);
+ assertEquals(resource.key(), recycled.key());
+ assertEquals(resource.value(), recycled.value());
+ assertEquals(resource.key(), fromStatic.key());
+ assertEquals(resource.value(), fromStatic.value());
+ }
+ @Test
+ public void shouldReadWriteScope() throws Exception {
+ final String resourceName = "scope";
+ assumeCompatibility(resourceName);
+ final Scope resource = findModelEntryObject(resourceName);
+ final Scope fromStatic = read(getCompatibility().readFromResource(resourceName), Scope.class);
+ final Scope recycled = read(write(fromStatic, Scope.class), Scope.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+ @Test
+ public void shouldReadWriteSessionClose() throws Exception {
+ final String resourceName = "sessionclose";
+ assumeCompatibility(resourceName);
+ final RequestMessage resource = findModelEntryObject(resourceName);
+ final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
+ final HashMap recycled = read(write(fromStatic, HashMap.class), HashMap.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(resource.getRequestId(), recycled.get("requestId"));
+ assertEquals(resource.getOp(), recycled.get("op"));
+ assertEquals(resource.getProcessor(), recycled.get("processor"));
+ assertEquals(resource.getArgs().get("session"), ((Map) recycled.get("args")).get("session"));
+ assertEquals(resource.getRequestId(), fromStatic.get("requestId"));
+ assertEquals(resource.getOp(), fromStatic.get("op"));
+ assertEquals(resource.getProcessor(), fromStatic.get("processor"));
+ assertEquals(resource.getArgs().get("session"), ((Map) fromStatic.get("args")).get("session"));
+ }
+ @Test
+ public void shouldReadWriteSessionEval() throws Exception {
+ final String resourceName = "sessioneval";
+ assumeCompatibility(resourceName);
+ final RequestMessage resource = findModelEntryObject(resourceName);
+ final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
+ final HashMap recycled = read(write(fromStatic, HashMap.class), HashMap.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(resource.getRequestId(), recycled.get("requestId"));
+ assertEquals(resource.getOp(), recycled.get("op"));
+ assertEquals(resource.getProcessor(), recycled.get("processor"));
+ assertEquals(resource.getArgs().get("session"), ((Map) recycled.get("args")).get("session"));
+ assertEquals(resource.getArgs().get("language"), ((Map) recycled.get("args")).get("language"));
+ assertEquals(resource.getArgs().get("gremlin"), ((Map) recycled.get("args")).get("gremlin"));
+ assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) ((Map) recycled.get("args")).get("bindings")).get("x"));
+ assertEquals(resource.getRequestId(), fromStatic.get("requestId"));
+ assertEquals(resource.getOp(), fromStatic.get("op"));
+ assertEquals(resource.getArgs().get("session"), ((Map) fromStatic.get("args")).get("session"));
+ assertEquals(resource.getArgs().get("language"), ((Map) fromStatic.get("args")).get("language"));
+ assertEquals(resource.getArgs().get("gremlin"), ((Map) fromStatic.get("args")).get("gremlin"));
+ assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) ((Map) fromStatic.get("args")).get("bindings")).get("x"));
+ }
+ @Test
+ public void shouldReadWriteSessionEvalAliased() throws Exception {
+ final String resourceName = "sessionevalaliased";
+ assumeCompatibility(resourceName);
+
+ final RequestMessage resource = findModelEntryObject(resourceName);
+ final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
+ final HashMap recycled = read(write(fromStatic, HashMap.class), HashMap.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(resource.getRequestId(), recycled.get("requestId"));
+ assertEquals(resource.getOp(), recycled.get("op"));
+ assertEquals(resource.getProcessor(), recycled.get("processor"));
+ assertEquals(resource.getArgs().get("session"), ((Map) recycled.get("args")).get("session"));
+ assertEquals(resource.getArgs().get("language"), ((Map) recycled.get("args")).get("language"));
+ assertEquals(resource.getArgs().get("gremlin"), ((Map) recycled.get("args")).get("gremlin"));
+ assertEquals(((Map) resource.getArgs().get("aliases")).get("g"), ((Map) ((Map) recycled.get("args")).get("aliases")).get("g"));
+ assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) ((Map) recycled.get("args")).get("bindings")).get("x"));
+ assertEquals(resource.getRequestId(), fromStatic.get("requestId"));
+ assertEquals(resource.getOp(), fromStatic.get("op"));
+ assertEquals(resource.getArgs().get("session"), ((Map) fromStatic.get("args")).get("session"));
+ assertEquals(resource.getArgs().get("language"), ((Map) fromStatic.get("args")).get("language"));
+ assertEquals(resource.getArgs().get("gremlin"), ((Map) fromStatic.get("args")).get("gremlin"));
+ assertEquals(((Map) resource.getArgs().get("aliases")).get("g"), ((Map) ((Map) fromStatic.get("args")).get("aliases")).get("g"));
+ assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) ((Map) fromStatic.get("args")).get("bindings")).get("x"));
+ }
+
+ @Test
+ public void shouldReadWriteSessionlessEval() throws Exception {
+ final String resourceName = "sessionlesseval";
+ assumeCompatibility(resourceName);
+
+ final RequestMessage resource = findModelEntryObject(resourceName);
+ final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
+ final HashMap recycled = read(write(fromStatic, HashMap.class), HashMap.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(resource.getRequestId(), recycled.get("requestId"));
+ assertEquals(resource.getOp(), recycled.get("op"));
+ assertEquals(resource.getProcessor(), recycled.get("processor"));
+ assertEquals(resource.getArgs().get("language"), ((Map) recycled.get("args")).get("language"));
+ assertEquals(resource.getArgs().get("gremlin"), ((Map) recycled.get("args")).get("gremlin"));
+ assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) ((Map) recycled.get("args")).get("bindings")).get("x"));
+ assertEquals(resource.getRequestId(), fromStatic.get("requestId"));
+ assertEquals(resource.getOp(), fromStatic.get("op"));
+ assertEquals(resource.getArgs().get("language"), ((Map) fromStatic.get("args")).get("language"));
+ assertEquals(resource.getArgs().get("gremlin"), ((Map) fromStatic.get("args")).get("gremlin"));
+ assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) ((Map) fromStatic.get("args")).get("bindings")).get("x"));
+ }
+
+ @Test
+ public void shouldReadWriteSessionlessEvalAliased() throws Exception {
+ final String resourceName = "sessionlessevalaliased";
+ assumeCompatibility(resourceName);
+
+ final RequestMessage resource = findModelEntryObject(resourceName);
+ final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
+ final HashMap recycled = read(write(fromStatic, HashMap.class), HashMap.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(resource.getRequestId(), recycled.get("requestId"));
+ assertEquals(resource.getOp(), recycled.get("op"));
+ assertEquals(resource.getProcessor(), recycled.get("processor"));
+ assertEquals(resource.getArgs().get("language"), ((Map) recycled.get("args")).get("language"));
+ assertEquals(resource.getArgs().get("gremlin"), ((Map) recycled.get("args")).get("gremlin"));
+ assertEquals(((Map) resource.getArgs().get("aliases")).get("g"), ((Map) ((Map) recycled.get("args")).get("aliases")).get("g"));
+ assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) ((Map) recycled.get("args")).get("bindings")).get("x"));
+ assertEquals(resource.getRequestId(), fromStatic.get("requestId"));
+ assertEquals(resource.getOp(), fromStatic.get("op"));
+ assertEquals(resource.getArgs().get("language"), ((Map) fromStatic.get("args")).get("language"));
+ assertEquals(resource.getArgs().get("gremlin"), ((Map) fromStatic.get("args")).get("gremlin"));
+ assertEquals(((Map) resource.getArgs().get("aliases")).get("g"), ((Map) ((Map) fromStatic.get("args")).get("aliases")).get("g"));
+ assertEquals(((Map) resource.getArgs().get("bindings")).get("x"), ((Map) ((Map) fromStatic.get("args")).get("bindings")).get("x"));
+ }
+
+ @Test
+ public void shouldReadWriteShort() throws Exception {
+ final String resourceName = "short";
+ assumeCompatibility(resourceName);
+
+ final Short resource = findModelEntryObject(resourceName);
+ final Short fromStatic = read(getCompatibility().readFromResource(resourceName), Short.class);
+ final Short recycled = read(write(fromStatic, Short.class), Short.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteStandardResult() throws Exception {
+ final String resourceName = "standardresult";
+ assumeCompatibility(resourceName);
+
+ // todo: incomplete asserts - none of this is consistent right now
+ final ResponseMessage resource = findModelEntryObject(resourceName);
+ final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
+ final HashMap recycled = read(write(fromStatic, HashMap.class), HashMap.class);
+ assertNotSame(fromStatic, recycled);
+ final List<DetachedVertex> resourceVertices = (List<DetachedVertex>) resource.getResult().getData();
+ assertEquals(resource.getRequestId(), recycled.get("requestId"));
+ assertEquals(resource.getStatus().getCode().getValue(), ((Map) recycled.get("status")).get("code"));
+ assertEquals(resourceVertices.size(), ((List) ((Map) recycled.get("result"))).size());
+ assertEquals(resource.getRequestId(), fromStatic.get("requestId"));
+ assertEquals(resource.getStatus().getCode().getValue(), ((Map) fromStatic.get("status")).get("code"));
+ }
+
+ @Test
+ public void shouldReadWriteStarGraph() throws Exception {
+ final String resourceName = "stargraph";
+ assumeCompatibility(resourceName);
+
+ // todo: more asserts
+ final StarGraph resource = findModelEntryObject(resourceName);
+ final StarGraph fromStatic = read(getCompatibility().readFromResource(resourceName), StarGraph.class);
+ final StarGraph recycled = read(write(fromStatic, StarGraph.class), StarGraph.class);
+ assertNotSame(fromStatic.getStarVertex(), recycled.getStarVertex());
+ assertEquals(fromStatic.getStarVertex(), recycled.getStarVertex());
+ assertEquals(resource.getStarVertex(), fromStatic.getStarVertex());
+ assertEquals(resource.getStarVertex(), recycled.getStarVertex());
+ assertEquals(fromStatic.getStarVertex().label(), recycled.getStarVertex().label());
+ assertEquals(fromStatic.getStarVertex().id(), recycled.getStarVertex().id());
+ assertEquals(IteratorUtils.count(fromStatic.getStarVertex().properties()), IteratorUtils.count(recycled.getStarVertex().properties()));
+ assertEquals(fromStatic.getStarVertex().property("name").value(), recycled.getStarVertex().property("name").value());
+ assertEquals(fromStatic.getStarVertex().property("name").id(), recycled.getStarVertex().property("name").id());
+ assertEquals(IteratorUtils.count(fromStatic.getStarVertex().edges(Direction.BOTH)), IteratorUtils.count(recycled.getStarVertex().edges(Direction.BOTH)));
+ }
+
+ @Test
+ public void shouldReadWriteT() throws Exception {
+ final String resourceName = "t";
+ assumeCompatibility(resourceName);
+
+ final T resource = findModelEntryObject(resourceName);
+ final T fromStatic = read(getCompatibility().readFromResource(resourceName), T.class);
+ final T recycled = read(write(fromStatic, T.class), T.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
@Test
public void shouldReadWriteTimestamp() throws Exception {
@@ -538,6 +867,146 @@ public abstract class AbstractTypedCompatibilityTest extends AbstractCompatibili
}
@Test
+ public void shouldReadWriteTinkerGraph() throws Exception {
+ final String resourceName = "tinkergraph";
+ assumeCompatibility(resourceName);
+
+ final TinkerGraph fromStatic = read(getCompatibility().readFromResource(resourceName), TinkerGraph.class);
+ final TinkerGraph recycled = read(write(fromStatic, TinkerGraph.class), TinkerGraph.class);
+ assertNotSame(fromStatic, recycled);
+
+ IoTest.assertCrewGraph(fromStatic, false);
+ IoTest.assertCrewGraph(recycled, false);
+ }
+
+ @Test
+ public void shouldReadWriteTraversalMetrics() throws Exception {
+ final String resourceName = "traversalmetrics";
+ assumeCompatibility(resourceName);
+
+ final TraversalMetrics resource = findModelEntryObject(resourceName);
+ final TraversalMetrics fromStatic = (TraversalMetrics) read(getCompatibility().readFromResource(resourceName), getCompatibility().resolve(TraversalMetrics.class));
+ final TraversalMetrics recycled = (TraversalMetrics) read(write(fromStatic, TraversalMetrics.class), getCompatibility().resolve(TraversalMetrics.class));
+ assertNotSame(fromStatic, recycled);
+
+ // need to assert against each other since the model version can change between test runs as it is dyncamically
+ // generated
+ assertEquals(recycled.getDuration(TimeUnit.MILLISECONDS), fromStatic.getDuration(TimeUnit.MILLISECONDS));
+ final Collection<? extends Metrics> resourceMetrics = resource.getMetrics();
+ resourceMetrics.forEach(m -> {
+ assertEquals(recycled.getMetrics(m.getId()).getAnnotations(), fromStatic.getMetrics(m.getId()).getAnnotations());
+ assertEquals(recycled.getMetrics(m.getId()).getName(), fromStatic.getMetrics(m.getId()).getName());
+ assertEquals(recycled.getMetrics(m.getId()).getCounts(), fromStatic.getMetrics(m.getId()).getCounts());
+ });
+ }
+
+ @Test
+ public void shouldReadWriteTraverser() throws Exception {
+ final String resourceName = "traverser";
+ assumeCompatibility(resourceName);
+
+ final Traverser resource = findModelEntryObject(resourceName);
+ final Traverser fromStatic = (Traverser) read(getCompatibility().readFromResource(resourceName), getCompatibility().resolve(Traverser.class));
+ final Traverser recycled = (Traverser) read(write(fromStatic, Traverser.class), getCompatibility().resolve(Traverser.class));
+ assertNotSame(fromStatic, recycled);
+ assertEquals(resource.bulk(), recycled.bulk());
+ assertEquals(resource.bulk(), fromStatic.bulk());
+ assertEquals(resource.get(), recycled.get());
+ assertEquals(resource.get(), fromStatic.get());
+
+ // todo: more asserts on object itself
+ }
+
+ @Test
+ public void shouldReadWriteTree() throws Exception {
+ final String resourceName = "tree";
+ assumeCompatibility(resourceName);
+
+ final Tree resource = findModelEntryObject(resourceName);
+ final Tree fromStatic = read(getCompatibility().readFromResource(resourceName), Tree.class);
+ final Tree recycled = read(write(fromStatic, Tree.class), Tree.class);
+ assertNotSame(fromStatic, recycled);
+
+ // todo: more asserts on objects in three themselves
+ }
+
+ @Test
+ public void shouldReadWriteUUID() throws Exception {
+ final String resourceName = "uuid";
+ assumeCompatibility(resourceName);
+
+ final UUID resource = findModelEntryObject(resourceName);
+ final UUID fromStatic = read(getCompatibility().readFromResource(resourceName), UUID.class);
+ final UUID recycled = read(write(fromStatic, UUID.class), UUID.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteVertex() throws Exception {
+ final String resourceName = "vertex";
+ assumeCompatibility(resourceName);
+
+ final Vertex resource = findModelEntryObject(resourceName);
+ final Vertex fromStatic = read(getCompatibility().readFromResource(resourceName), Vertex.class);
+ final Vertex recycled = (Vertex) read(write(fromStatic, Vertex.class), getCompatibility().resolve(Vertex.class));
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ assertEquals(resource.id(), recycled.id());
+ assertEquals(resource.label(), recycled.label());
+ // todo: more asserts
+ }
+
+ @Test
+ public void shouldReadWriteVertexProperty() throws Exception {
+ final String resourceName = "vertexproperty";
+ assumeCompatibility(resourceName);
+
+ final VertexProperty resource = findModelEntryObject(resourceName);
+ final VertexProperty fromStatic = read(getCompatibility().readFromResource(resourceName), VertexProperty.class);
+ final VertexProperty recycled = (VertexProperty) read(write(fromStatic, VertexProperty.class), getCompatibility().resolve(VertexProperty.class));
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ assertEquals(resource.id(), recycled.id());
+ assertEquals(resource.label(), recycled.label());
+ // todo: more asserts
+ }
+
+ @Test
+ public void shouldReadWriteYear() throws Exception {
+ final String resourceName = "year";
+ assumeCompatibility(resourceName);
+
+ final Year resource = findModelEntryObject(resourceName);
+ final Year fromStatic = read(getCompatibility().readFromResource(resourceName), Year.class);
+ final Year recycled = read(write(fromStatic, Year.class), Year.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteYearMonth() throws Exception {
+ final String resourceName = "yearmonth";
+ assumeCompatibility(resourceName);
+
+ final YearMonth resource = findModelEntryObject(resourceName);
+ final YearMonth fromStatic = read(getCompatibility().readFromResource(resourceName), YearMonth.class);
+ final YearMonth recycled = read(write(fromStatic, YearMonth.class), YearMonth.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
public void shouldReadWriteZoneDateTime() throws Exception {
final String resourceName = "zoneddatetime";
assumeCompatibility(resourceName);
@@ -550,4 +1019,18 @@ public abstract class AbstractTypedCompatibilityTest extends AbstractCompatibili
assertEquals(resource, fromStatic);
assertEquals(resource, recycled);
}
+
+ @Test
+ public void shouldReadWriteZoneOffset() throws Exception {
+ final String resourceName = "zoneoffset";
+ assumeCompatibility(resourceName);
+
+ final ZoneOffset resource = findModelEntryObject(resourceName);
+ final ZoneOffset fromStatic = read(getCompatibility().readFromResource(resourceName), ZoneOffset.class);
+ final ZoneOffset recycled = read(write(fromStatic, ZoneOffset.class), ZoneOffset.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
index bc41355..a3117c7 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
@@ -83,7 +83,7 @@ writeSupportedV1Objects = { writer, mapper ->
msg = RequestMessage.build("eval").processor("session").
overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"], "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
- writer.write(toJsonV1d0NoTypes(msg, "Session Eval", mapper, "The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
+ writer.write(toJsonV1d0NoTypes(msg, "Session Eval Aliased", mapper, "The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
msg = RequestMessage.build("close").processor("session").
overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
add("session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
@@ -95,7 +95,7 @@ writeSupportedV1Objects = { writer, mapper ->
msg = RequestMessage.build("eval").
overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"]).create()
- writer.write(toJsonV1d0NoTypes(msg, "Sessionless Eval", mapper, "The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
+ writer.write(toJsonV1d0NoTypes(msg, "Sessionless Eval Aliased", mapper, "The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
writer.write("\n")
writer.write("ResponseMessage\n")
@@ -207,7 +207,7 @@ writeSupportedV2Objects = { writer, mapper, toJsonFunction ->
msg = RequestMessage.build("eval").processor("session").
overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"], "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
- writer.write(toJsonFunction(msg, "Session Eval", mapper, "The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
+ writer.write(toJsonFunction(msg, "Session Eval Aliased", mapper, "The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
msg = RequestMessage.build("close").processor("session").
overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
add("session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
@@ -219,7 +219,7 @@ writeSupportedV2Objects = { writer, mapper, toJsonFunction ->
msg = RequestMessage.build("eval").
overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"]).create()
- writer.write(toJsonFunction(msg, "Sessionless Eval", mapper, "The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
+ writer.write(toJsonFunction(msg, "Sessionless Eval Aliased", mapper, "The following `RequestMessage` is an example of a sessionless request for a script evaluation with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
writer.write("\n")
writer.write("ResponseMessage\n")
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v1d0.json
index 5e6fae2..ffedd7d 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v1d0.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v1d0.json
@@ -3,11 +3,8 @@
"op" : "eval",
"processor" : "session",
"args" : {
- "gremlin" : "social.V(x)",
+ "gremlin" : "g.V(x)",
"language" : "gremlin-groovy",
- "aliases" : {
- "g" : "social"
- },
"session" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
"bindings" : {
"x" : 1
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-no-types.json
index 5e6fae2..ffedd7d 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-no-types.json
@@ -3,11 +3,8 @@
"op" : "eval",
"processor" : "session",
"args" : {
- "gremlin" : "social.V(x)",
+ "gremlin" : "g.V(x)",
"language" : "gremlin-groovy",
- "aliases" : {
- "g" : "social"
- },
"session" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
"bindings" : {
"x" : 1
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-partial.json
index f1f2dc2..8d1d535 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-partial.json
@@ -6,11 +6,8 @@
"op" : "eval",
"processor" : "session",
"args" : {
- "gremlin" : "social.V(x)",
+ "gremlin" : "g.V(x)",
"language" : "gremlin-groovy",
- "aliases" : {
- "g" : "social"
- },
"session" : {
"@type" : "g:UUID",
"@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v1d0.json
new file mode 100644
index 0000000..5e6fae2
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v1d0.json
@@ -0,0 +1,16 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "eval",
+ "processor" : "session",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "session" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "bindings" : {
+ "x" : 1
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v2d0-no-types.json
new file mode 100644
index 0000000..5e6fae2
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v2d0-no-types.json
@@ -0,0 +1,16 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "eval",
+ "processor" : "session",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "session" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "bindings" : {
+ "x" : 1
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v2d0-partial.json
new file mode 100644
index 0000000..f1f2dc2
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionevalaliased-v2d0-partial.json
@@ -0,0 +1,25 @@
+{
+ "requestId" : {
+ "@type" : "g:UUID",
+ "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
+ },
+ "op" : "eval",
+ "processor" : "session",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "session" : {
+ "@type" : "g:UUID",
+ "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
+ },
+ "bindings" : {
+ "x" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v1d0.json
index 59f0c6c..8c9a807 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v1d0.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v1d0.json
@@ -3,11 +3,8 @@
"op" : "eval",
"processor" : "",
"args" : {
- "gremlin" : "social.V(x)",
+ "gremlin" : "g.V(x)",
"language" : "gremlin-groovy",
- "aliases" : {
- "g" : "social"
- },
"bindings" : {
"x" : 1
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-no-types.json
index 59f0c6c..8c9a807 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-no-types.json
@@ -3,11 +3,8 @@
"op" : "eval",
"processor" : "",
"args" : {
- "gremlin" : "social.V(x)",
+ "gremlin" : "g.V(x)",
"language" : "gremlin-groovy",
- "aliases" : {
- "g" : "social"
- },
"bindings" : {
"x" : 1
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-partial.json
index 761b71a..b01e98f 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-partial.json
@@ -6,11 +6,8 @@
"op" : "eval",
"processor" : "",
"args" : {
- "gremlin" : "social.V(x)",
+ "gremlin" : "g.V(x)",
"language" : "gremlin-groovy",
- "aliases" : {
- "g" : "social"
- },
"bindings" : {
"x" : {
"@type" : "g:Int32",
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v1d0.json
new file mode 100644
index 0000000..59f0c6c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v1d0.json
@@ -0,0 +1,15 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "eval",
+ "processor" : "",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "bindings" : {
+ "x" : 1
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v2d0-no-types.json
new file mode 100644
index 0000000..59f0c6c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v2d0-no-types.json
@@ -0,0 +1,15 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "eval",
+ "processor" : "",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "bindings" : {
+ "x" : 1
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v2d0-partial.json
new file mode 100644
index 0000000..761b71a
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlessevalaliased-v2d0-partial.json
@@ -0,0 +1,21 @@
+{
+ "requestId" : {
+ "@type" : "g:UUID",
+ "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
+ },
+ "op" : "eval",
+ "processor" : "",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "bindings" : {
+ "x" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json
index 0788ea4..10495e1 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-no-types.json
@@ -1,23 +1,23 @@
{
- "dur" : 0.194633,
+ "dur" : 0.206618,
"counts" : {
"traverserCount" : 4,
"elementCount" : 4
},
"name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
"annotations" : {
- "percentDur" : 18.700308704545826
+ "percentDur" : 18.82133676326716
},
"id" : "7.0.0()",
"metrics" : [ {
- "dur" : 0.277476,
+ "dur" : 0.274299,
"counts" : {
"traverserCount" : 13,
"elementCount" : 13
},
"name" : "VertexStep(OUT,vertex)",
"annotations" : {
- "percentDur" : 26.659851402909876
+ "percentDur" : 24.9865638658172
},
"id" : "2.0.0()"
} ]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json
index 55c32c1..54a034a 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v2d0-partial.json
@@ -3,7 +3,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.194633
+ "@value" : 0.206618
},
"counts" : {
"traverserCount" : {
@@ -19,7 +19,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 18.700308704545826
+ "@value" : 18.82133676326716
}
},
"id" : "7.0.0()",
@@ -28,7 +28,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.277476
+ "@value" : 0.274299
},
"counts" : {
"traverserCount" : {
@@ -44,7 +44,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 26.659851402909876
+ "@value" : 24.9865638658172
}
},
"id" : "2.0.0()"
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v1d0.json
index 5e6fae2..ffedd7d 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v1d0.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v1d0.json
@@ -3,11 +3,8 @@
"op" : "eval",
"processor" : "session",
"args" : {
- "gremlin" : "social.V(x)",
+ "gremlin" : "g.V(x)",
"language" : "gremlin-groovy",
- "aliases" : {
- "g" : "social"
- },
"session" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
"bindings" : {
"x" : 1
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-no-types.json
index 5e6fae2..ffedd7d 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-no-types.json
@@ -3,11 +3,8 @@
"op" : "eval",
"processor" : "session",
"args" : {
- "gremlin" : "social.V(x)",
+ "gremlin" : "g.V(x)",
"language" : "gremlin-groovy",
- "aliases" : {
- "g" : "social"
- },
"session" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
"bindings" : {
"x" : 1
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-partial.json
index f1f2dc2..8d1d535 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-partial.json
@@ -6,11 +6,8 @@
"op" : "eval",
"processor" : "session",
"args" : {
- "gremlin" : "social.V(x)",
+ "gremlin" : "g.V(x)",
"language" : "gremlin-groovy",
- "aliases" : {
- "g" : "social"
- },
"session" : {
"@type" : "g:UUID",
"@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v1d0.json
new file mode 100644
index 0000000..5e6fae2
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v1d0.json
@@ -0,0 +1,16 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "eval",
+ "processor" : "session",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "session" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "bindings" : {
+ "x" : 1
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v2d0-no-types.json
new file mode 100644
index 0000000..5e6fae2
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v2d0-no-types.json
@@ -0,0 +1,16 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "eval",
+ "processor" : "session",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "session" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "bindings" : {
+ "x" : 1
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v2d0-partial.json
new file mode 100644
index 0000000..f1f2dc2
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v2d0-partial.json
@@ -0,0 +1,25 @@
+{
+ "requestId" : {
+ "@type" : "g:UUID",
+ "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
+ },
+ "op" : "eval",
+ "processor" : "session",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "session" : {
+ "@type" : "g:UUID",
+ "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
+ },
+ "bindings" : {
+ "x" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v1d0.json
index 59f0c6c..8c9a807 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v1d0.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v1d0.json
@@ -3,11 +3,8 @@
"op" : "eval",
"processor" : "",
"args" : {
- "gremlin" : "social.V(x)",
+ "gremlin" : "g.V(x)",
"language" : "gremlin-groovy",
- "aliases" : {
- "g" : "social"
- },
"bindings" : {
"x" : 1
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-no-types.json
index 59f0c6c..8c9a807 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-no-types.json
@@ -3,11 +3,8 @@
"op" : "eval",
"processor" : "",
"args" : {
- "gremlin" : "social.V(x)",
+ "gremlin" : "g.V(x)",
"language" : "gremlin-groovy",
- "aliases" : {
- "g" : "social"
- },
"bindings" : {
"x" : 1
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-partial.json
index 761b71a..b01e98f 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-partial.json
@@ -6,11 +6,8 @@
"op" : "eval",
"processor" : "",
"args" : {
- "gremlin" : "social.V(x)",
+ "gremlin" : "g.V(x)",
"language" : "gremlin-groovy",
- "aliases" : {
- "g" : "social"
- },
"bindings" : {
"x" : {
"@type" : "g:Int32",
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v1d0.json
new file mode 100644
index 0000000..59f0c6c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v1d0.json
@@ -0,0 +1,15 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "eval",
+ "processor" : "",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "bindings" : {
+ "x" : 1
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v2d0-no-types.json
new file mode 100644
index 0000000..59f0c6c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v2d0-no-types.json
@@ -0,0 +1,15 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "eval",
+ "processor" : "",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "bindings" : {
+ "x" : 1
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v2d0-partial.json
new file mode 100644
index 0000000..761b71a
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v2d0-partial.json
@@ -0,0 +1,21 @@
+{
+ "requestId" : {
+ "@type" : "g:UUID",
+ "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
+ },
+ "op" : "eval",
+ "processor" : "",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "bindings" : {
+ "x" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json
index 3603f03..5b4cd6f 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-no-types.json
@@ -1,47 +1,47 @@
{
- "dur" : 0.747595,
+ "dur" : 0.599635,
"metrics" : [ {
- "dur" : 0.099877,
+ "dur" : 0.095118,
"counts" : {
"traverserCount" : 4,
"elementCount" : 4
},
"name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
"annotations" : {
- "percentDur" : 13.359773674248757
+ "percentDur" : 15.862649778615324
},
"id" : "7.0.0()"
}, {
- "dur" : 0.210169,
+ "dur" : 0.168285,
"counts" : {
"traverserCount" : 13,
"elementCount" : 13
},
"name" : "VertexStep(OUT,vertex)",
"annotations" : {
- "percentDur" : 28.112681331469577
+ "percentDur" : 28.064572615007464
},
"id" : "2.0.0()"
}, {
- "dur" : 0.181756,
+ "dur" : 0.142567,
"counts" : {
"traverserCount" : 7,
"elementCount" : 7
},
"name" : "VertexStep(OUT,vertex)",
"annotations" : {
- "percentDur" : 24.31209411512918
+ "percentDur" : 23.77563017502314
},
"id" : "3.0.0()"
}, {
- "dur" : 0.255793,
+ "dur" : 0.193665,
"counts" : {
"traverserCount" : 1,
"elementCount" : 1
},
"name" : "TreeStep",
"annotations" : {
- "percentDur" : 34.215450879152485
+ "percentDur" : 32.29714743135408
},
"id" : "4.0.0()"
} ]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json
index ea50cda..ed6d4cb 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v2d0-partial.json
@@ -3,14 +3,14 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.747595
+ "@value" : 0.599635
},
"metrics" : [ {
"@type" : "g:Metrics",
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.099877
+ "@value" : 0.095118
},
"counts" : {
"traverserCount" : {
@@ -26,7 +26,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 13.359773674248757
+ "@value" : 15.862649778615324
}
},
"id" : "7.0.0()"
@@ -36,7 +36,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.210169
+ "@value" : 0.168285
},
"counts" : {
"traverserCount" : {
@@ -52,7 +52,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 28.112681331469577
+ "@value" : 28.064572615007464
}
},
"id" : "2.0.0()"
@@ -62,7 +62,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.181756
+ "@value" : 0.142567
},
"counts" : {
"traverserCount" : {
@@ -78,7 +78,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 24.31209411512918
+ "@value" : 23.77563017502314
}
},
"id" : "3.0.0()"
@@ -88,7 +88,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.255793
+ "@value" : 0.193665
},
"counts" : {
"traverserCount" : {
@@ -104,7 +104,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 34.215450879152485
+ "@value" : 32.29714743135408
}
},
"id" : "4.0.0()"
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy
index 8ad0f76..2d9f967 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy
@@ -103,7 +103,7 @@ writeSupportedObjects = { mapper, toGryoFunction ->
msg = RequestMessage.build("eval").processor("session").
overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"], "session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
- toGryoFunction(msg, "Session Eval", mapper)
+ toGryoFunction(msg, "Session Eval Aliased", mapper)
msg = RequestMessage.build("close").processor("session").
overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
add("session", UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
@@ -115,7 +115,7 @@ writeSupportedObjects = { mapper, toGryoFunction ->
msg = RequestMessage.build("eval").
overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
add("gremlin", "social.V(x)", "bindings", [x: 1], "language", "gremlin-groovy", "aliases", [g: "social"]).create()
- toGryoFunction(msg, "Sessionless Eval", mapper)
+ toGryoFunction(msg, "Sessionless Eval Aliased", mapper)
msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create()
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo
index 057d097..a46801c 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f0144ddd/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo
index f5f0abc..e29154a 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo differ
[22/47] tinkerpop git commit: Merge branch 'TINKERPOP-1584' into tp32
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1584' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/98f69f94
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/98f69f94
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/98f69f94
Branch: refs/heads/TINKERPOP-1130
Commit: 98f69f9419ea1220223f1c27111ea0bd0993bf92
Parents: d1568f0 d818010
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Dec 20 13:22:44 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 20 13:22:44 2016 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +
.../structure/io/gryo/GryoClassResolver.java | 9 +++
.../gremlin/structure/io/gryo/GryoMapper.java | 9 ++-
.../structure/io/gryo/UtilSerializers.java | 62 ++++++++++++++++++++
.../structure/io/gryo/GryoMapperTest.java | 27 +++++++++
5 files changed, 107 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/98f69f94/CHANGELOG.asciidoc
----------------------------------------------------------------------
[33/47] tinkerpop git commit: TINKERPOP-1130 Structured the IO
compatibility tests
Posted by sp...@apache.org.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/char-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/char-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/char-v1d0.kryo
new file mode 100644
index 0000000..718882c
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/char-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/column-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/column-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/column-v1d0.kryo
new file mode 100644
index 0000000..40fdece
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/column-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/date-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/date-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/date-v1d0.kryo
new file mode 100644
index 0000000..8c9dc9e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/date-v1d0.kryo
@@ -0,0 +1 @@
+\ufffd\ufffd\ufffd\ufffd+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/direction-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/direction-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/direction-v1d0.kryo
new file mode 100644
index 0000000..40fdece
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/direction-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/double-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/double-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/double-v1d0.kryo
new file mode 100644
index 0000000..36506ac
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/double-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/duration-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/duration-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/duration-v1d0.kryo
new file mode 100644
index 0000000..d640ae0
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/duration-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/edge-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/edge-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/edge-v1d0.kryo
new file mode 100644
index 0000000..d2a2492
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/edge-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/float-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/float-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/float-v1d0.kryo
new file mode 100644
index 0000000..19a8865
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/float-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/instant-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/instant-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/instant-v1d0.kryo
new file mode 100644
index 0000000..d9466cd
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/instant-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/integer-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/integer-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/integer-v1d0.kryo
new file mode 100644
index 0000000..ff28336
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/integer-v1d0.kryo
@@ -0,0 +1 @@
+\ufffd
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/lambda-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/lambda-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/lambda-v1d0.kryo
new file mode 100644
index 0000000..463661d
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/lambda-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/localdate-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/localdate-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/localdate-v1d0.kryo
new file mode 100644
index 0000000..f82dd16
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/localdate-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/localdatetime-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/localdatetime-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/localdatetime-v1d0.kryo
new file mode 100644
index 0000000..97eae64
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/localdatetime-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/localtime-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/localtime-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/localtime-v1d0.kryo
new file mode 100644
index 0000000..1b5bfa4
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/localtime-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/long-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/long-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/long-v1d0.kryo
new file mode 100644
index 0000000..ff28336
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/long-v1d0.kryo
@@ -0,0 +1 @@
+\ufffd
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo
new file mode 100644
index 0000000..3a9659b
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/metrics-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/monthday-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/monthday-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/monthday-v1d0.kryo
new file mode 100644
index 0000000..5acab8f
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/monthday-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/offsetdatetime-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/offsetdatetime-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/offsetdatetime-v1d0.kryo
new file mode 100644
index 0000000..62d5cb0
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/offsetdatetime-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/offsettime-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/offsettime-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/offsettime-v1d0.kryo
new file mode 100644
index 0000000..04bf8cb
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/offsettime-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/operator-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/operator-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/operator-v1d0.kryo
new file mode 100644
index 0000000..40fdece
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/operator-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/order-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/order-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/order-v1d0.kryo
new file mode 100644
index 0000000..40fdece
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/order-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/p-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/p-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/p-v1d0.kryo
new file mode 100644
index 0000000..3c676a8
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/p-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/pand-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/pand-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/pand-v1d0.kryo
new file mode 100644
index 0000000..d5d9f37
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/pand-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/path-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/path-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/path-v1d0.kryo
new file mode 100644
index 0000000..bac203d
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/path-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/period-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/period-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/period-v1d0.kryo
new file mode 100644
index 0000000..f04e9c8
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/period-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/pick-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/pick-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/pick-v1d0.kryo
new file mode 100644
index 0000000..40fdece
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/pick-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/pop-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/pop-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/pop-v1d0.kryo
new file mode 100644
index 0000000..c8c7811
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/pop-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/por-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/por-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/por-v1d0.kryo
new file mode 100644
index 0000000..2589271
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/por-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/property-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/property-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/property-v1d0.kryo
new file mode 100644
index 0000000..133ac6f
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/property-v1d0.kryo
@@ -0,0 +1 @@
+sinc\ufffd\ufffd
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/scope-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/scope-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/scope-v1d0.kryo
new file mode 100644
index 0000000..71bd63e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/scope-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/short-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/short-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/short-v1d0.kryo
new file mode 100644
index 0000000..6060b89
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/short-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/stargraph-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/stargraph-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/stargraph-v1d0.kryo
new file mode 100644
index 0000000..9947842
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/stargraph-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/t-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/t-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/t-v1d0.kryo
new file mode 100644
index 0000000..40fdece
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/t-v1d0.kryo
@@ -0,0 +1 @@
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/tinkergraph-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/tinkergraph-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/tinkergraph-v1d0.kryo
new file mode 100644
index 0000000..5789986
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/tinkergraph-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo
new file mode 100644
index 0000000..e4fc6f7
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traversalmetrics-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traverser-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traverser-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traverser-v1d0.kryo
new file mode 100644
index 0000000..cc019f0
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/traverser-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/tree-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/tree-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/tree-v1d0.kryo
new file mode 100644
index 0000000..997b6e9
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/tree-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/uuid-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/uuid-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/uuid-v1d0.kryo
new file mode 100644
index 0000000..34fc35d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/uuid-v1d0.kryo
@@ -0,0 +1 @@
+A\ufffd\ufffd \ufffdJ\ufffd\ufffdy\ufffd\ufffd\ufffd7\ufffd
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/vertex-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/vertex-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/vertex-v1d0.kryo
new file mode 100644
index 0000000..c58ac46
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/vertex-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/vertexproperty-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/vertexproperty-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/vertexproperty-v1d0.kryo
new file mode 100644
index 0000000..3b74daa
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/vertexproperty-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/year-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/year-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/year-v1d0.kryo
new file mode 100644
index 0000000..2ec2ef9
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/year-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/yearmonth-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/yearmonth-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/yearmonth-v1d0.kryo
new file mode 100644
index 0000000..47e3a3e
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/yearmonth-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/zoneddatetime-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/zoneddatetime-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/zoneddatetime-v1d0.kryo
new file mode 100644
index 0000000..b369522
Binary files /dev/null and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/zoneddatetime-v1d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/zoneoffset-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/zoneoffset-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/zoneoffset-v1d0.kryo
new file mode 100644
index 0000000..4d34f9c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/zoneoffset-v1d0.kryo
@@ -0,0 +1 @@
++03:06:0\ufffd
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87cbb3ef/gremlin-tools/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-tools/pom.xml b/gremlin-tools/pom.xml
index 98857bb..864bb95 100644
--- a/gremlin-tools/pom.xml
+++ b/gremlin-tools/pom.xml
@@ -15,6 +15,7 @@
<modules>
<module>gremlin-benchmark</module>
<module>gremlin-coverage</module>
+ <module>gremlin-io-test</module>
</modules>
<build>
[03/47] tinkerpop git commit: TINKERPOP-1490 Deprecated the old
RemoteConnection submit method.
Posted by sp...@apache.org.
TINKERPOP-1490 Deprecated the old RemoteConnection submit method.
That method isn't called at all anymore - needs to be removed completely for 3.3.x.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f02e1833
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f02e1833
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f02e1833
Branch: refs/heads/TINKERPOP-1130
Commit: f02e18336aefd540000ecaacd157349537f1f94f
Parents: 460f124
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Nov 14 10:08:48 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 16 10:00:40 2016 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../gremlin/process/remote/RemoteConnection.java | 18 ++++++++++++++++--
.../process/remote/traversal/RemoteTraversal.java | 6 +++---
.../driver/remote/DriverRemoteConnection.java | 6 +++++-
4 files changed, 25 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f02e1833/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index b637552..60e1bb1 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -53,6 +53,7 @@ TinkerPop 3.2.4 (Release Date: NOT OFFICIALLY RELEASED YET)
* Added a `force` option for killing sessions without waiting for transaction close or timeout of a currently running job or multiple jobs.
* Deprecated `Session.kill()` and `Session.manualKill()`.
* Added `Traversal.promise()` method to allow for asynchronous traversal processing on "remote" traversals.
+* Deprecated `RemoteConnection.submit(Bytecode)` in favor of `submitAsync(Bytecode)`.
* Added `choose(predicate,traversal)` and `choose(traversal,traversal)` to effect if/then-semantics (no else). Equivalent to `choose(x,y,identity())`.
* Removed `ImmutablePath.TailPath` as it is no longer required with new recursion model.
* Removed call stack recursion in `ImmutablePath`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f02e1833/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteConnection.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteConnection.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteConnection.java
index f4e3976..1831276 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteConnection.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteConnection.java
@@ -38,7 +38,7 @@ import java.util.concurrent.CompletableFuture;
public interface RemoteConnection extends AutoCloseable {
/**
- * @deprecated As of release 3.2.2, replaced by {@link #submit(Bytecode)}.
+ * @deprecated As of release 3.2.2, replaced by {@link #submitAsync(Bytecode)}.
*/
@Deprecated
public <E> Iterator<Traverser.Admin<E>> submit(final Traversal<?, E> traversal) throws RemoteConnectionException;
@@ -47,13 +47,27 @@ public interface RemoteConnection extends AutoCloseable {
* Submits {@link Traversal} {@link Bytecode} to a server and returns a {@link RemoteTraversal}.
* The {@link RemoteTraversal} is an abstraction over two types of results that can be returned as part of the
* response from the server: the results of the {@link Traversal} itself and the side-effects that it produced.
+ *
+ * @deprecated As of release 3.2.4, replaced by {@link #submitAsync(Bytecode)}.
*/
+ @Deprecated
public <E> RemoteTraversal<?,E> submit(final Bytecode bytecode) throws RemoteConnectionException;
/**
* Submits {@link Traversal} {@link Bytecode} to a server and returns a promise of a {@link RemoteTraversal}.
* The {@link RemoteTraversal} is an abstraction over two types of results that can be returned as part of the
* response from the server: the results of the {@link Traversal} itself and the side-effects that it produced.
+ * <p/>
+ * The default implementation calls the {@link #submit(Bytecode)} method for backward compatibility, but generally
+ * speaking this method should be implemented directly as {@link #submit(Bytecode)} is not called directly by
+ * any part of TinkerPop. Even if the {@code RemoteConnection} itself is not capable of asynchronous behaviour, it
+ * should simply implement this method in a blocking form.
*/
- public <E> CompletableFuture<RemoteTraversal<?, E>> submitAsync(final Bytecode bytecode) throws RemoteConnectionException;
+ public default <E> CompletableFuture<RemoteTraversal<?, E>> submitAsync(final Bytecode bytecode) throws RemoteConnectionException {
+ // default implementation for backward compatibility to 3.2.4 - this method will probably just become
+ // the new submit() in 3.3.x when the deprecation is removed
+ final CompletableFuture<RemoteTraversal<?, E>> promise = new CompletableFuture<>();
+ promise.complete(submit(bytecode));
+ return promise;
+ }
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f02e1833/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversal.java
index 57b0cda..70ec27f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversal.java
@@ -25,9 +25,9 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep;
/**
- * A {@link RemoteTraversal} is returned from {@link RemoteConnection#submit(Bytecode)}. It is iterated from within
- * {@link RemoteStep} using {@link #nextTraverser()}. Implementations should typically be given a "result" from a
- * remote source where the traversal was executed. The "result" should be an iterator which preferably has its data
+ * A {@link RemoteTraversal} is returned from {@link RemoteConnection#submitAsync(Bytecode)}. It is iterated from
+ * within {@link RemoteStep} using {@link #nextTraverser()}. Implementations should typically be given a "result" from
+ * a remote source where the traversal was executed. The "result" should be an iterator which preferably has its data
* bulked.
* <p/>
* Note that internally {@link #nextTraverser()} is called from within a loop (specifically in
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f02e1833/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
index be3fa28..d6415de 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
@@ -165,7 +165,7 @@ public class DriverRemoteConnection implements RemoteConnection {
}
/**
- * @deprecated As of release 3.2.2, replaced by {@link #submit(Bytecode)}.
+ * @deprecated As of release 3.2.2, replaced by {@link #submitAsync(Bytecode)}.
*/
@Deprecated
@Override
@@ -183,6 +183,10 @@ public class DriverRemoteConnection implements RemoteConnection {
}
}
+ /**
+ * @deprecated As of release 3.2.4, replaced by {@link #submitAsync(Bytecode)}.
+ */
+ @Deprecated
@Override
public <E> RemoteTraversal<?,E> submit(final Bytecode bytecode) throws RemoteConnectionException {
try {
[21/47] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d14459ad
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d14459ad
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d14459ad
Branch: refs/heads/TINKERPOP-1130
Commit: d14459adc7a1ed4baabb89bf2d067972a736a918
Parents: 8cbeb23 c66bbdf
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Dec 20 07:55:52 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 20 07:55:52 2016 -0500
----------------------------------------------------------------------
.../structure/io/graphson/GraphSONModule.java | 4 ++++
.../io/graphson/GraphSONSerializersV2d0.java | 24 ++++++++++++++++++++
2 files changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d14459ad/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
----------------------------------------------------------------------
[02/47] tinkerpop git commit: TINKERPOP-1584 Made Gryo support a
number of classes GraphSON supported.
Posted by sp...@apache.org.
TINKERPOP-1584 Made Gryo support a number of classes GraphSON supported.
Added ByteBuffer, Timestamp, InetAddress and fixed serialization of Class (which never worked in the first place).
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d8180109
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d8180109
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d8180109
Branch: refs/heads/TINKERPOP-1130
Commit: d8180109b88872702ae169333d92bb3700103e87
Parents: 347a0a9
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Dec 16 08:39:59 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 16 08:39:59 2016 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +
.../structure/io/gryo/GryoClassResolver.java | 9 +++
.../gremlin/structure/io/gryo/GryoMapper.java | 9 ++-
.../structure/io/gryo/UtilSerializers.java | 62 ++++++++++++++++++++
.../structure/io/gryo/GryoMapperTest.java | 27 +++++++++
5 files changed, 107 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d8180109/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8e01ce0..edbec16 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,8 @@ TinkerPop 3.2.4 (Release Date: NOT OFFICIALLY RELEASED YET)
* Lessened the severity of Gremlin Server logging when it encounters two or more serializers addressing the same mime type.
* Bumped to Netty 4.0.42.final.
+* Added `ByteBuffer`, `InetAddress`, `Timestamp` to the list of Gryo supported classes.
+* Fixed Gryo serialization of `Class`.
* Fixed a bug in Gremlin-Python around `__.__()` and `__.start()`.
* Fixed a bug around long serialization in Gremlin-Python when using Python3.
* Deprecated `TraversalSource.withBindings()` as it is no longer needed in Gremlin-Java and never was needed for other variants.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d8180109/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolver.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolver.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolver.java
index 53f4382..1ee8612 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolver.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolver.java
@@ -44,6 +44,9 @@ import org.apache.tinkerpop.shaded.kryo.util.IdentityObjectIntMap;
import org.apache.tinkerpop.shaded.kryo.util.IntMap;
import org.apache.tinkerpop.shaded.kryo.util.ObjectMap;
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+
import static org.apache.tinkerpop.shaded.kryo.util.Util.getWrapperClass;
/**
@@ -108,6 +111,12 @@ public class GryoClassResolver implements ClassResolver {
type = Path.class;
else if (Lambda.class.isAssignableFrom(clazz))
type = Lambda.class;
+ else if (ByteBuffer.class.isAssignableFrom(clazz))
+ type = ByteBuffer.class;
+ else if (Class.class.isAssignableFrom(clazz))
+ type = Class.class;
+ else if (InetAddress.class.isAssignableFrom(clazz))
+ type = InetAddress.class;
else
type = clazz;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d8180109/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
index fef7288..bbd3999 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
@@ -96,7 +96,9 @@ import org.javatuples.Pair;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.net.InetAddress;
import java.net.URI;
+import java.nio.ByteBuffer;
import java.time.Duration;
import java.time.Instant;
import java.time.LocalDate;
@@ -274,7 +276,7 @@ public final class GryoMapper implements Mapper<Kryo> {
add(GryoTypeReg.of(BigInteger.class, 34));
add(GryoTypeReg.of(BigDecimal.class, 35));
add(GryoTypeReg.of(Calendar.class, 39));
- add(GryoTypeReg.of(Class.class, 41));
+ add(GryoTypeReg.of(Class.class, 41, new UtilSerializers.ClassSerializer()));
add(GryoTypeReg.of(Collection.class, 37));
add(GryoTypeReg.of(Collections.EMPTY_LIST.getClass(), 51));
add(GryoTypeReg.of(Collections.EMPTY_MAP.getClass(), 52));
@@ -313,6 +315,9 @@ public final class GryoMapper implements Mapper<Kryo> {
add(GryoTypeReg.of(VertexTerminator.class, 13));
add(GryoTypeReg.of(AbstractMap.SimpleEntry.class, 120));
add(GryoTypeReg.of(AbstractMap.SimpleImmutableEntry.class, 121));
+ add(GryoTypeReg.of(java.sql.Timestamp.class, 138));
+ add(GryoTypeReg.of(InetAddress.class, 139, new UtilSerializers.InetAddressSerializer()));
+ add(GryoTypeReg.of(ByteBuffer.class, 140, new UtilSerializers.ByteBufferSerializer())); // ***LAST ID***
add(GryoTypeReg.of(ReferenceEdge.class, 81));
add(GryoTypeReg.of(ReferenceVertexProperty.class, 82));
@@ -350,7 +355,7 @@ public final class GryoMapper implements Mapper<Kryo> {
add(GryoTypeReg.of(Column.class, 132));
add(GryoTypeReg.of(Pop.class, 133));
add(GryoTypeReg.of(SackFunctions.Barrier.class, 135));
- add(GryoTypeReg.of(TraversalOptionParent.Pick.class, 137)); // ***LAST ID***
+ add(GryoTypeReg.of(TraversalOptionParent.Pick.class, 137));
add(GryoTypeReg.of(HashSetSupplier.class, 136, new UtilSerializers.HashSetSupplierSerializer()));
add(GryoTypeReg.of(TraverserSet.class, 58));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d8180109/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UtilSerializers.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UtilSerializers.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UtilSerializers.java
index 6f0a632..958978c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UtilSerializers.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/UtilSerializers.java
@@ -29,7 +29,9 @@ import org.apache.tinkerpop.shaded.kryo.io.Input;
import org.apache.tinkerpop.shaded.kryo.io.Output;
import org.javatuples.Pair;
+import java.net.InetAddress;
import java.net.URI;
+import java.nio.ByteBuffer;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.List;
@@ -60,6 +62,66 @@ final class UtilSerializers {
}
}
+ public final static class ByteBufferSerializer implements SerializerShim<ByteBuffer> {
+ @Override
+ public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final ByteBuffer bb) {
+ final byte[] b = new byte[bb.remaining()];
+ bb.get(b);
+ output.writeInt(b.length);
+ output.writeBytes(b, 0, b.length);
+ }
+
+ @Override
+ public <I extends InputShim> ByteBuffer read(final KryoShim<I, ?> kryo, final I input, final Class<ByteBuffer> clazz) {
+ final int len = input.readInt();
+ final byte[] b = input.readBytes(len);
+ final ByteBuffer bb = ByteBuffer.allocate(len);
+ bb.put(b);
+ return bb;
+ }
+ }
+
+ public final static class ClassSerializer implements SerializerShim<Class> {
+ @Override
+ public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final Class object) {
+ output.writeString(object.getCanonicalName());
+ }
+
+ @Override
+ public <I extends InputShim> Class read(final KryoShim<I, ?> kryo, final I input, final Class<Class> clazz) {
+ final String name = input.readString();
+ try {
+ return Class.forName(name);
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+ }
+
+ public final static class InetAddressSerializer implements SerializerShim<InetAddress> {
+ @Override
+ public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final InetAddress addy) {
+ final String str = addy.toString().trim();
+ final int slash = str.indexOf('/');
+ if (slash >= 0) {
+ if (slash == 0) {
+ output.writeString(str.substring(1));
+ } else {
+ output.writeString(str.substring(0, slash));
+ }
+ }
+ }
+
+ @Override
+ public <I extends InputShim> InetAddress read(final KryoShim<I, ?> kryo, final I input, final Class<InetAddress> clazz) {
+ try {
+ return InetAddress.getByName(input.readString());
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+ }
+
public final static class HashSetSupplierSerializer implements SerializerShim<HashSetSupplier> {
@Override
public <O extends OutputShim> void write(final KryoShim<?, O> kryo, final O output, final HashSetSupplier hashSetSupplier) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d8180109/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java
index 6f808e4..9f5ba41 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapperTest.java
@@ -40,6 +40,9 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+import java.sql.Timestamp;
import java.time.Duration;
import java.time.Instant;
import java.time.LocalDate;
@@ -338,6 +341,30 @@ public class GryoMapperTest {
assertEquals(bytecode.toString(), serializeDeserialize(bytecode, Bytecode.class).toString());
}
+ @Test
+ public void shouldHandleClass() throws Exception {
+ final Class clazz = java.io.File.class;
+ assertEquals(clazz, serializeDeserialize(clazz, Class.class));
+ }
+
+ @Test
+ public void shouldHandleTimestamp() throws Exception {
+ final Timestamp ts = new java.sql.Timestamp(1481750076295L);
+ assertEquals(ts, serializeDeserialize(ts, java.sql.Timestamp.class));
+ }
+
+ @Test
+ public void shouldHandleINetAddress() throws Exception {
+ final InetAddress addy = InetAddress.getByName("localhost");
+ assertEquals(addy, serializeDeserialize(addy, InetAddress.class));
+ }
+
+ @Test
+ public void shouldHandleByteBuffer() throws Exception {
+ final ByteBuffer bb = ByteBuffer.wrap("some bytes for you".getBytes());
+ assertEquals(bb, serializeDeserialize(bb, ByteBuffer.class));
+ }
+
public <T> T serializeDeserialize(final Object o, final Class<T> clazz) throws Exception {
try (final ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
final Output out = new Output(stream);
[43/47] tinkerpop git commit: TINKERPOP-1130 Implemented many
additional IO tests.
Posted by sp...@apache.org.
TINKERPOP-1130 Implemented many additional IO tests.
Cleaned up inconsistencies in how static files are stored. Improved asserts.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7e477711
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7e477711
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7e477711
Branch: refs/heads/TINKERPOP-1130
Commit: 7e477711bb7cb783601bc8bcdc0ec8b63d87613d
Parents: 87cbb3e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Dec 14 17:41:30 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 20 15:24:52 2016 -0500
----------------------------------------------------------------------
.../gremlin/structure/io/Compatibility.java | 4 +
.../tinkerpop/gremlin/structure/io/Model.java | 44 +-
.../structure/io/gryo/GryoCompatibility.java | 19 +
.../structure/io/AbstractCompatibilityTest.java | 4 +
.../io/AbstractTypedCompatibilityTest.java | 501 ++++++++++++++++++-
.../io/gryo/GryoCompatibilityTest.java | 4 +
.../_3_2_3/bytebuffer-v2d0-no-types.json | 2 +-
.../_3_2_3/bytebuffer-v2d0-partial.json | 2 +-
.../io/graphson/_3_2_3/date-v2d0-no-types.json | 2 +-
.../io/graphson/_3_2_3/date-v2d0-partial.json | 2 +-
.../io/graphson/_3_2_3/instant-v1d0.json | 2 +-
.../graphson/_3_2_3/instant-v2d0-no-types.json | 2 +-
.../graphson/_3_2_3/instant-v2d0-partial.json | 2 +-
.../_3_2_3/manual-graphson-generator.groovy | 27 +-
.../graphson/_3_2_3/metrics-v2d0-no-types.json | 8 +-
.../graphson/_3_2_3/metrics-v2d0-partial.json | 8 +-
.../io/graphson/_3_2_3/offsetdatetime-v1d0.json | 2 +-
.../_3_2_3/offsetdatetime-v2d0-no-types.json | 2 +-
.../_3_2_3/offsetdatetime-v2d0-partial.json | 2 +-
.../io/graphson/_3_2_3/offsettime-v1d0.json | 2 +-
.../_3_2_3/offsettime-v2d0-no-types.json | 2 +-
.../_3_2_3/offsettime-v2d0-partial.json | 2 +-
.../io/graphson/_3_2_3/sessionclose-v1d0.json | 2 +-
.../_3_2_3/sessionclose-v2d0-no-types.json | 2 +-
.../_3_2_3/sessionclose-v2d0-partial.json | 2 +-
.../io/graphson/_3_2_3/sessioneval-v1d0.json | 2 +-
.../_3_2_3/sessioneval-v2d0-no-types.json | 2 +-
.../_3_2_3/sessioneval-v2d0-partial.json | 2 +-
.../graphson/_3_2_3/sessionlesseval-v1d0.json | 2 +-
.../_3_2_3/sessionlesseval-v2d0-no-types.json | 2 +-
.../_3_2_3/sessionlesseval-v2d0-partial.json | 2 +-
.../_3_2_3/timestamp-v2d0-no-types.json | 2 +-
.../graphson/_3_2_3/timestamp-v2d0-partial.json | 2 +-
.../_3_2_3/traversalmetrics-v2d0-no-types.json | 18 +-
.../_3_2_3/traversalmetrics-v2d0-partial.json | 18 +-
.../io/graphson/_3_2_3/zoneddatetime-v1d0.json | 2 +-
.../_3_2_3/zoneddatetime-v2d0-no-types.json | 2 +-
.../_3_2_3/zoneddatetime-v2d0-partial.json | 2 +-
.../graphson/_3_3_0/barrier-v2d0-no-types.json | 1 +
.../graphson/_3_3_0/barrier-v2d0-partial.json | 4 +
.../io/graphson/_3_3_0/date-v2d0-no-types.json | 2 +-
.../io/graphson/_3_3_0/date-v2d0-partial.json | 2 +-
.../graphson/_3_3_0/metrics-v2d0-no-types.json | 8 +-
.../graphson/_3_3_0/metrics-v2d0-partial.json | 8 +-
.../_3_3_0/offsetdatetime-v2d0-no-types.json | 2 +-
.../_3_3_0/offsetdatetime-v2d0-partial.json | 2 +-
.../_3_3_0/offsettime-v2d0-no-types.json | 2 +-
.../_3_3_0/offsettime-v2d0-partial.json | 2 +-
.../_3_3_0/timestamp-v2d0-no-types.json | 2 +-
.../graphson/_3_3_0/timestamp-v2d0-partial.json | 2 +-
.../_3_3_0/traversalmetrics-v2d0-no-types.json | 18 +-
.../_3_3_0/traversalmetrics-v2d0-partial.json | 18 +-
.../_3_3_0/zoneddatetime-v2d0-no-types.json | 2 +-
.../_3_3_0/zoneddatetime-v2d0-partial.json | 2 +-
.../structure/io/gryo/_3_2_3/date-v1d0.kryo | 2 +-
.../structure/io/gryo/_3_2_3/instant-v1d0.kryo | Bin 13 -> 13 bytes
.../io/gryo/_3_2_3/manual-gryo-generator.groovy | 15 +-
.../structure/io/gryo/_3_2_3/metrics-v1d0.kryo | Bin 185 -> 185 bytes
.../io/gryo/_3_2_3/offsetdatetime-v1d0.kryo | Bin 37 -> 37 bytes
.../io/gryo/_3_2_3/offsettime-v1d0.kryo | Bin 17 -> 17 bytes
.../io/gryo/_3_2_3/traversalmetrics-v1d0.kryo | Bin 429 -> 429 bytes
.../io/gryo/_3_2_3/zoneddatetime-v1d0.kryo | Bin 45 -> 38 bytes
.../structure/io/gryo/_3_3_0/date-v1d0.kryo | 2 +-
.../structure/io/gryo/_3_3_0/metrics-v1d0.kryo | Bin 185 -> 185 bytes
.../io/gryo/_3_3_0/offsetdatetime-v1d0.kryo | Bin 37 -> 37 bytes
.../io/gryo/_3_3_0/offsettime-v1d0.kryo | Bin 17 -> 17 bytes
.../io/gryo/_3_3_0/traversalmetrics-v1d0.kryo | Bin 429 -> 429 bytes
.../io/gryo/_3_3_0/zoneddatetime-v1d0.kryo | Bin 45 -> 38 bytes
68 files changed, 658 insertions(+), 147 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Compatibility.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Compatibility.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Compatibility.java
index 7b9a5fe..2bbe7b5 100644
--- a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Compatibility.java
+++ b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Compatibility.java
@@ -25,4 +25,8 @@ import java.io.IOException;
*/
public interface Compatibility {
public byte[] readFromResource(final String resource) throws IOException;
+
+ public default Class resolve(final Class clazz) {
+ return clazz;
+ }
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
index 51d44b6..aea3340 100644
--- a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
+++ b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
@@ -57,6 +57,7 @@ import java.time.OffsetTime;
import java.time.Period;
import java.time.Year;
import java.time.YearMonth;
+import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.util.ArrayList;
@@ -74,6 +75,8 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
+ * Defines the supported types for IO and the versions (and configurations) to which they apply and are tested.
+ *
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class Model {
@@ -105,14 +108,15 @@ public class Model {
private Model() {
final Graph graph = TinkerFactory.createTheCrew();
final GraphTraversalSource g = graph.traversal();
-
+
+ // IMPORTANT - the "title" or name of the Entry needs to be unique
addCoreEntry(File.class, "Class", GryoCompatibility.V1D0_3_2_3, GryoCompatibility.V1D0_3_3_0);
- addCoreEntry(new Date(), "Date");
- addCoreEntry(100.00d, "Double");
+ addCoreEntry(new Date(1481750076295L), "Date");
+ addCoreEntry(100.00d, "Double", GraphSONCompatibility.V2D0_PARTIAL_3_2_3, GraphSONCompatibility.V2D0_PARTIAL_3_3_0);
addCoreEntry(100.00f, "Float");
- addCoreEntry(100, "Integer");
+ addCoreEntry(100, "Integer", GraphSONCompatibility.V2D0_PARTIAL_3_2_3, GraphSONCompatibility.V2D0_PARTIAL_3_3_0);
addCoreEntry(100L, "Long");
- addCoreEntry(new java.sql.Timestamp(System.currentTimeMillis()), "Timestamp", GryoCompatibility.V1D0_3_2_3, GryoCompatibility.V1D0_3_3_0);
+ addCoreEntry(new java.sql.Timestamp(1481750076295L), "Timestamp", GryoCompatibility.V1D0_3_2_3, GryoCompatibility.V1D0_3_3_0);
addCoreEntry(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786"), "UUID");
addGraphStructureEntry(graph.edges().next(), "Edge");
@@ -124,13 +128,13 @@ public class Model {
addGraphStructureEntry(graph.vertices().next(), "Vertex");
addGraphStructureEntry(graph.vertices().next().properties().next(), "VertexProperty");
- addEntry("Process", SackFunctions.Barrier.normSack, "Barrier", "", GRYO_ONLY);
+ addGraphProcessEntry(SackFunctions.Barrier.normSack, "Barrier", "", GRYO_ONLY);
addGraphProcessEntry(new Bytecode.Binding("x", 1), "Binding", "A \"Binding\" refers to a `Bytecode.Binding`.");
- addGraphProcessEntry(g.V().hasLabel("person").out().in().tree(), "Bytecode", "The following `Bytecode` example represents the traversal of `g.V().hasLabel('person').out().in().tree()`. Obviously the serialized `Bytecode` woudl be quite different for the endless variations of commands that could be used together in the Gremlin language.");
+ addGraphProcessEntry(g.V().hasLabel("person").out().in().tree().asAdmin().getBytecode(), "Bytecode", "The following `Bytecode` example represents the traversal of `g.V().hasLabel('person').out().in().tree()`. Obviously the serialized `Bytecode` woudl be quite different for the endless variations of commands that could be used together in the Gremlin language.");
addGraphProcessEntry(VertexProperty.Cardinality.list, "Cardinality");
- addGraphProcessEntry(Column.keys, "Column");
+ addGraphProcessEntry(Column.keys, "Column", "", GRYO_ONLY);
addGraphProcessEntry(Direction.OUT, "Direction");
- addGraphProcessEntry(Operator.sum, "Operator");
+ addGraphProcessEntry(Operator.sum, "Operator", "", GRYO_ONLY);
addGraphProcessEntry(Order.incr, "Order");
addGraphProcessEntry(TraversalOptionParent.Pick.any, "Pick");
addGraphProcessEntry(Pop.all, "Pop");
@@ -203,18 +207,18 @@ public class Model {
} catch (Exception ex) {
throw new RuntimeException(ex);
}
- addExtendedEntry(Instant.now(), "Instant");
+ addExtendedEntry(Instant.parse("2016-12-14T16:39:19.349Z"), "Instant");
addExtendedEntry(LocalDate.of(2016, 1, 1), "LocalDate");
addExtendedEntry(LocalDateTime.of(2016, 1, 1, 12, 30), "LocalDateTime");
addExtendedEntry(LocalTime.of(12, 30, 45), "LocalTime");
addExtendedEntry(MonthDay.of(1, 1), "MonthDay");
- addExtendedEntry(OffsetDateTime.now(), "OffsetDateTime");
- addExtendedEntry(OffsetTime.now(), "OffsetTime");
+ addExtendedEntry(OffsetDateTime.parse("2007-12-03T10:15:30+01:00"), "OffsetDateTime");
+ addExtendedEntry(OffsetTime.parse("10:15:30+01:00"), "OffsetTime");
addExtendedEntry(Period.of(1, 6, 15), "Period", "The following example is a `Period` of one year, six months and fifteen days.");
addExtendedEntry(new Short("100"), "Short", "", UNTYPED_GRAPHSON_ONLY.toArray(new Compatibility[UNTYPED_GRAPHSON_ONLY.size()]));
addExtendedEntry(Year.of(2016), "Year", "The following example is of the `Year` \"2016\".");
addExtendedEntry(YearMonth.of(2016, 6), "YearMonth", "The following example is a `YearMonth` of \"June 2016\"");
- addExtendedEntry(ZonedDateTime.now(), "ZonedDateTime");
+ addExtendedEntry(ZonedDateTime.of(2016, 12, 23, 12, 12, 24, 36, ZoneId.of("GMT+2")), "ZonedDateTime");
addExtendedEntry(ZoneOffset.ofHoursMinutesSeconds(3, 6, 9), "ZoneOffset", "The following example is a `ZoneOffset` of three hours, six minutes, and nine seconds.");
}
@@ -262,6 +266,10 @@ public class Model {
addEntry("Graph Process", obj, title, description);
}
+ private void addGraphProcessEntry(final Object obj, final String title, final String description, final List<Compatibility> compatibleWith) {
+ addEntry("Graph Process", obj, title, description, compatibleWith);
+ }
+
private void addRequestMessageEntry(final Object obj, final String title, final String description) {
addEntry("RequestMessage", obj, title, description, GRAPHSON_ONLY);
}
@@ -348,13 +356,13 @@ public class Model {
public static class Entry {
private final String title;
- private final Object obj;
+ private final Object object;
private final String description;
private final List<Compatibility> compatibleWith;
- public Entry(final String title, final Object obj, final String description, final List<Compatibility> compatibleWith) {
+ public Entry(final String title, final Object object, final String description, final List<Compatibility> compatibleWith) {
this.title = title;
- this.obj = obj;
+ this.object = object;
this.description = description;
this.compatibleWith = compatibleWith;
}
@@ -367,8 +375,8 @@ public class Model {
return title.replace(" ", "").toLowerCase();
}
- public Object getObject() {
- return obj;
+ public <T> T getObject() {
+ return (T) object;
}
public String getDescription() {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibility.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibility.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibility.java
index 11a89b9..e4e47a2 100644
--- a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibility.java
+++ b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibility.java
@@ -19,7 +19,13 @@
package org.apache.tinkerpop.gremlin.structure.io.gryo;
import org.apache.commons.io.IOUtils;
+import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.io.Compatibility;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
import java.io.File;
import java.io.IOException;
@@ -43,12 +49,25 @@ public enum GryoCompatibility implements Compatibility {
this.configuration = configuration;
}
+ @Override
public byte[] readFromResource(final String resource) throws IOException {
final String testResource = "_" + tinkerpopVersion.replace(".", "_") + SEP + resource + "-" + configuration + ".kryo";
return IOUtils.toByteArray(getClass().getResourceAsStream(testResource));
}
@Override
+ public Class resolve(final Class clazz) {
+ if (clazz.equals(Edge.class))
+ return DetachedEdge.class;
+ else if (clazz.equals(Vertex.class))
+ return DetachedVertex.class;
+ else if (clazz.equals(Metrics.class))
+ return MutableMetrics.class;
+ else
+ return clazz;
+ }
+
+ @Override
public String toString() {
return tinkerpopVersion + "-" + configuration;
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java
index b0d7961..c2bb304 100644
--- a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java
+++ b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractCompatibilityTest.java
@@ -33,4 +33,8 @@ public abstract class AbstractCompatibilityTest {
final Model.Entry e = model.find(resource).orElseThrow(() -> new IllegalStateException("Could not find model"));
assumeThat("Test model is not compatible with IO", e.isCompatibleWith(getCompatibility()), is(true));
}
+
+ protected <T> T findModelEntryObject(final String resourceName) {
+ return model.find(resourceName).orElseThrow(() -> new IllegalStateException("Could not find requested model entry")).getObject();
+ }
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
index bb174be..bede370 100644
--- a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
+++ b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
@@ -18,14 +18,41 @@
*/
package org.apache.tinkerpop.gremlin.structure.io;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.Operator;
import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
+import org.apache.tinkerpop.gremlin.structure.Column;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.util.function.Lambda;
import org.junit.Test;
import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+import java.sql.Timestamp;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.ZonedDateTime;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
@@ -39,46 +66,488 @@ public abstract class AbstractTypedCompatibilityTest extends AbstractCompatibili
public abstract byte[] write(final Object o, final Class<?> clazz) throws Exception;
@Test
+ @org.junit.Ignore
public void shouldReadWriteAuthenticationChallenge() throws Exception {
- assumeCompatibility("authenticationchallenge");
+ final String resourceName = "authenticationchallenge";
+ assumeCompatibility(resourceName);
- final HashMap fromStatic = read(getCompatibility().readFromResource("authenticationchallenge"), HashMap.class);
+ final ResponseMessage resource = findModelEntryObject(resourceName);
+ final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
final HashMap recycled = read(write(fromStatic, HashMap.class), HashMap.class);
assertNotSame(fromStatic, recycled);
- assertEquals("41d2e28a-20a4-4ab0-b379-d810dede3786", recycled.get("requestId"));
- assertEquals(ResponseStatusCode.AUTHENTICATE.getValue(), ((Map) recycled.get("status")).get("code"));
+ assertEquals(resource.getRequestId(), recycled.get("requestId"));
+ assertEquals(resource.getStatus().getCode().getValue(), ((Map) recycled.get("status")).get("code"));
+ assertEquals(resource.getRequestId(), fromStatic.get("requestId"));
+ assertEquals(resource.getStatus().getCode().getValue(), ((Map) fromStatic.get("status")).get("code"));
}
@Test
public void shouldReadWriteAuthenticationResponse() throws Exception {
- assumeCompatibility("authenticationresponse");
+ final String resourceName = "authenticationresponse";
+ assumeCompatibility(resourceName);
- final HashMap fromStatic = read(getCompatibility().readFromResource("authenticationresponse"), HashMap.class);
+ final RequestMessage resource = findModelEntryObject(resourceName);
+ final HashMap fromStatic = read(getCompatibility().readFromResource(resourceName), HashMap.class);
final HashMap recycled = read(write(fromStatic, HashMap.class), HashMap.class);
assertNotSame(fromStatic, recycled);
- assertEquals("cb682578-9d92-4499-9ebc-5c6aa73c5397", recycled.get("requestId"));
- assertEquals("authentication", recycled.get("op"));
- assertEquals("", recycled.get("processor"));
- assertEquals("PLAIN", ((Map) recycled.get("args")).get("saslMechanism"));
- assertEquals("AHN0ZXBocGhlbgBwYXNzd29yZA==", ((Map) recycled.get("args")).get("sasl"));
+ assertEquals(resource.getRequestId(), recycled.get("requestId"));
+ assertEquals(resource.getOp(), recycled.get("op"));
+ assertEquals(resource.getProcessor(), recycled.get("processor"));
+ assertEquals(resource.getArgs().get("saslMechanism"), ((Map) recycled.get("args")).get("saslMechanism"));
+ assertEquals(resource.getArgs().get("sasl"), ((Map) recycled.get("args")).get("sasl"));
+ assertEquals(resource.getRequestId(), fromStatic.get("requestId"));
+ assertEquals(resource.getOp(), fromStatic.get("op"));
+ assertEquals(resource.getProcessor(), fromStatic.get("processor"));
+ assertEquals(resource.getArgs().get("saslMechanism"), ((Map) fromStatic.get("args")).get("saslMechanism"));
+ assertEquals(resource.getArgs().get("sasl"), ((Map) fromStatic.get("args")).get("sasl"));
}
@Test
public void shouldReadWriteBarrier() throws Exception {
- assumeCompatibility("barrier");
+ final String resourceName = "barrier";
+ assumeCompatibility(resourceName);
- final SackFunctions.Barrier fromStatic = read(getCompatibility().readFromResource("barrier"), SackFunctions.Barrier.class);
+ final SackFunctions.Barrier resource = findModelEntryObject(resourceName);
+ final SackFunctions.Barrier fromStatic = read(getCompatibility().readFromResource(resourceName), SackFunctions.Barrier.class);
final SackFunctions.Barrier recycled = read(write(fromStatic, SackFunctions.Barrier.class), SackFunctions.Barrier.class);
assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
}
@Test
public void shouldReadWriteBigDecimal() throws Exception {
- assumeCompatibility("bigdecimal");
+ final String resourceName = "bigdecimal";
+ assumeCompatibility(resourceName);
- final BigDecimal fromStatic = read(getCompatibility().readFromResource("bigdecimal"), BigDecimal.class);
+ final BigDecimal resource = findModelEntryObject(resourceName);
+ final BigDecimal fromStatic = read(getCompatibility().readFromResource(resourceName), BigDecimal.class);
final BigDecimal recycled = read(write(fromStatic, BigDecimal.class), BigDecimal.class);
assertNotSame(fromStatic, recycled);
assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteBigInteger() throws Exception {
+ final String resourceName = "biginteger";
+ assumeCompatibility(resourceName);
+
+ final BigInteger resource = findModelEntryObject(resourceName);
+ final BigInteger fromStatic = read(getCompatibility().readFromResource(resourceName), BigInteger.class);
+ final BigInteger recycled = read(write(fromStatic, BigInteger.class), BigInteger.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteBinding() throws Exception {
+ final String resourceName = "binding";
+ assumeCompatibility(resourceName);
+
+ final Bytecode.Binding resource = findModelEntryObject(resourceName);
+ final Bytecode.Binding fromStatic = read(getCompatibility().readFromResource(resourceName), Bytecode.Binding.class);
+ final Bytecode.Binding recycled = read(write(fromStatic, Bytecode.Binding.class), Bytecode.Binding.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteByte() throws Exception {
+ final String resourceName = "byte";
+ assumeCompatibility(resourceName);
+
+ final Byte resource = findModelEntryObject(resourceName);
+ final Byte fromStatic = read(getCompatibility().readFromResource(resourceName), Byte.class);
+ final Byte recycled = read(write(fromStatic, Byte.class), Byte.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteByteBuffer() throws Exception {
+ final String resourceName = "bytebuffer";
+ assumeCompatibility(resourceName);
+
+ final ByteBuffer resource = findModelEntryObject(resourceName);
+ final ByteBuffer fromStatic = read(getCompatibility().readFromResource(resourceName), ByteBuffer.class);
+ final ByteBuffer recycled = read(write(fromStatic, ByteBuffer.class), ByteBuffer.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteBytecode() throws Exception {
+ final String resourceName = "bytecode";
+ assumeCompatibility(resourceName);
+
+ final Bytecode fromStatic = read(getCompatibility().readFromResource(resourceName), Bytecode.class);
+ final Bytecode recycled = read(write(fromStatic, Bytecode.class), Bytecode.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ // can't reasonably assert the bytecode against the original model as changes to strategies over time might
+ // alter the bytecode form and then break the test. the assertions as they are ensure that the core of
+ // serialization is correct by ensuring the contents of bytecode (whether they are valid for a specific version
+ // or not). it seems beyond the scope of these tests to validate that bytecode itself is unchanging and fully
+ // backward compatible (at least for now).
+ }
+
+ @Test
+ public void shouldReadWriteCardinality() throws Exception {
+ final String resourceName = "cardinality";
+ assumeCompatibility(resourceName);
+
+ final VertexProperty.Cardinality resource = findModelEntryObject(resourceName);
+ final VertexProperty.Cardinality fromStatic = read(getCompatibility().readFromResource(resourceName), VertexProperty.Cardinality.class);
+ final VertexProperty.Cardinality recycled = read(write(fromStatic, VertexProperty.Cardinality.class), VertexProperty.Cardinality.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteChar() throws Exception {
+ final String resourceName = "char";
+ assumeCompatibility(resourceName);
+
+ final Character resource = findModelEntryObject(resourceName);
+ final Character fromStatic = read(getCompatibility().readFromResource(resourceName), Character.class);
+ final Character recycled = read(write(fromStatic, Character.class), Character.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteClass() throws Exception {
+ final String resourceName = "class";
+ assumeCompatibility(resourceName);
+
+ final Class resource = findModelEntryObject(resourceName);
+ final Class fromStatic = read(getCompatibility().readFromResource(resourceName), Class.class);
+ final Class recycled = read(write(fromStatic, Class.class), Class.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteColumn() throws Exception {
+ final String resourceName = "column";
+ assumeCompatibility(resourceName);
+
+ final Column resource = findModelEntryObject(resourceName);
+ final Column fromStatic = read(getCompatibility().readFromResource(resourceName), Column.class);
+ final Column recycled = read(write(fromStatic, Column.class), Column.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteDate() throws Exception {
+ final String resourceName = "date";
+ assumeCompatibility(resourceName);
+
+ final Date resource = findModelEntryObject(resourceName);
+ final Date fromStatic = read(getCompatibility().readFromResource(resourceName), Date.class);
+ final Date recycled = read(write(fromStatic, Date.class), Date.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteDirection() throws Exception {
+ final String resourceName = "direction";
+ assumeCompatibility(resourceName);
+
+ final Direction resource = findModelEntryObject(resourceName);
+ final Direction fromStatic = read(getCompatibility().readFromResource(resourceName), Direction.class);
+ final Direction recycled = read(write(fromStatic, Direction.class), Direction.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteDouble() throws Exception {
+ final String resourceName = "double";
+ assumeCompatibility(resourceName);
+
+ final Double resource = findModelEntryObject(resourceName);
+ final Double fromStatic = read(getCompatibility().readFromResource(resourceName), Double.class);
+ final Double recycled = read(write(fromStatic, Double.class), Double.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteDuration() throws Exception {
+ final String resourceName = "duration";
+ assumeCompatibility(resourceName);
+
+ final Duration resource = findModelEntryObject(resourceName);
+ final Duration fromStatic = read(getCompatibility().readFromResource(resourceName), Duration.class);
+ final Duration recycled = read(write(fromStatic, Duration.class), Duration.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteEdge() throws Exception {
+ final String resourceName = "edge";
+ assumeCompatibility(resourceName);
+
+ final Edge resource = findModelEntryObject(resourceName);
+ final Edge fromStatic = read(getCompatibility().readFromResource(resourceName), Edge.class);
+ final Edge recycled = (Edge) read(write(fromStatic, Edge.class), getCompatibility().resolve(Edge.class));
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteFloat() throws Exception {
+ final String resourceName = "float";
+ assumeCompatibility(resourceName);
+
+ final Float resource = findModelEntryObject(resourceName);
+ final Float fromStatic = read(getCompatibility().readFromResource(resourceName), Float.class);
+ final Float recycled = read(write(fromStatic, Float.class), Float.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteINetAddress() throws Exception {
+ final String resourceName = "inetaddress";
+ assumeCompatibility(resourceName);
+
+ final InetAddress resource = findModelEntryObject(resourceName);
+ final InetAddress fromStatic = read(getCompatibility().readFromResource(resourceName), InetAddress.class);
+ final InetAddress recycled = read(write(fromStatic, Float.class), InetAddress.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteInstant() throws Exception {
+ final String resourceName = "instant";
+ assumeCompatibility(resourceName);
+
+ final Instant resource = findModelEntryObject(resourceName);
+ final Instant fromStatic = read(getCompatibility().readFromResource(resourceName), Instant.class);
+ final Instant recycled = read(write(fromStatic, Instant.class), Instant.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteInteger() throws Exception {
+ final String resourceName = "integer";
+ assumeCompatibility(resourceName);
+
+ final Integer resource = findModelEntryObject(resourceName);
+ final Integer fromStatic = read(getCompatibility().readFromResource(resourceName), Integer.class);
+ final Integer recycled = read(write(fromStatic, Integer.class), Integer.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteLambda() throws Exception {
+ final String resourceName = "lambda";
+ assumeCompatibility(resourceName);
+
+ final Lambda resource = findModelEntryObject(resourceName);
+ final Lambda fromStatic = read(getCompatibility().readFromResource(resourceName), Lambda.class);
+ final Lambda recycled = read(write(fromStatic, Lambda.class), Lambda.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteLocalDate() throws Exception {
+ final String resourceName = "localdate";
+ assumeCompatibility(resourceName);
+
+ final LocalDate resource = findModelEntryObject(resourceName);
+ final LocalDate fromStatic = read(getCompatibility().readFromResource(resourceName), LocalDate.class);
+ final LocalDate recycled = read(write(fromStatic, LocalDate.class), LocalDate.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteLocalDateTime() throws Exception {
+ final String resourceName = "localdatetime";
+ assumeCompatibility(resourceName);
+
+ final LocalDateTime resource = findModelEntryObject(resourceName);
+ final LocalDateTime fromStatic = read(getCompatibility().readFromResource(resourceName), LocalDateTime.class);
+ final LocalDateTime recycled = read(write(fromStatic, LocalDateTime.class), LocalDateTime.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteLocalTime() throws Exception {
+ final String resourceName = "localtime";
+ assumeCompatibility(resourceName);
+
+ final LocalTime resource = findModelEntryObject(resourceName);
+ final LocalTime fromStatic = read(getCompatibility().readFromResource(resourceName), LocalTime.class);
+ final LocalTime recycled = read(write(fromStatic, LocalTime.class), LocalTime.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteLong() throws Exception {
+ final String resourceName = "long";
+ assumeCompatibility(resourceName);
+
+ final Long resource = findModelEntryObject(resourceName);
+ final Long fromStatic = read(getCompatibility().readFromResource(resourceName), Long.class);
+ final Long recycled = read(write(fromStatic, Long.class), Long.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteMetrics() throws Exception {
+ final String resourceName = "metrics";
+ assumeCompatibility(resourceName);
+
+ final Metrics fromStatic = (Metrics) read(getCompatibility().readFromResource(resourceName), getCompatibility().resolve(Metrics.class));
+ final Metrics recycled = (Metrics) read(write(fromStatic, Metrics.class), getCompatibility().resolve(Metrics.class));
+ assertNotSame(fromStatic, recycled);
+ // have to do compares on the object read from resources because it has statically calculated values. the
+ // "new" one from Model is generated dynamically from a traversal and thus has variations in properties that
+ // are based on time
+ assertEquals(fromStatic.getAnnotations(), recycled.getAnnotations());
+ assertEquals(fromStatic.getCounts(), recycled.getCounts());
+ assertEquals(fromStatic.getDuration(TimeUnit.MILLISECONDS), recycled.getDuration(TimeUnit.MILLISECONDS));
+ }
+
+ @Test
+ public void shouldReadWriteMonthDay() throws Exception {
+ final String resourceName = "monthday";
+ assumeCompatibility(resourceName);
+
+ final MonthDay resource = findModelEntryObject(resourceName);
+ final MonthDay fromStatic = read(getCompatibility().readFromResource(resourceName), MonthDay.class);
+ final MonthDay recycled = read(write(fromStatic, MonthDay.class), MonthDay.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteOffsetDateTime() throws Exception {
+ final String resourceName = "offsetdatetime";
+ assumeCompatibility(resourceName);
+
+ final OffsetDateTime resource = findModelEntryObject(resourceName);
+ final OffsetDateTime fromStatic = read(getCompatibility().readFromResource(resourceName), OffsetDateTime.class);
+ final OffsetDateTime recycled = read(write(fromStatic, OffsetDateTime.class), OffsetDateTime.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteOffsetTime() throws Exception {
+ final String resourceName = "offsettime";
+ assumeCompatibility(resourceName);
+
+ final OffsetTime resource = findModelEntryObject(resourceName);
+ final OffsetTime fromStatic = read(getCompatibility().readFromResource(resourceName), OffsetTime.class);
+ final OffsetTime recycled = read(write(fromStatic, OffsetTime.class), OffsetTime.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteOperator() throws Exception {
+ final String resourceName = "operator";
+ assumeCompatibility(resourceName);
+
+ final Operator resource = findModelEntryObject(resourceName);
+ final Operator fromStatic = read(getCompatibility().readFromResource(resourceName), Operator.class);
+ final Operator recycled = read(write(fromStatic, Operator.class), Operator.class);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+
+
+
+
+
+
+
+
+ @Test
+ public void shouldReadWriteTimestamp() throws Exception {
+ final String resourceName = "timestamp";
+ assumeCompatibility(resourceName);
+
+ final Timestamp resource = findModelEntryObject(resourceName);
+ final Timestamp fromStatic = read(getCompatibility().readFromResource(resourceName), Timestamp.class);
+ final Timestamp recycled = read(write(fromStatic, Timestamp.class), Timestamp.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
+ }
+
+ @Test
+ public void shouldReadWriteZoneDateTime() throws Exception {
+ final String resourceName = "zoneddatetime";
+ assumeCompatibility(resourceName);
+
+ final ZonedDateTime resource = findModelEntryObject(resourceName);
+ final ZonedDateTime fromStatic = read(getCompatibility().readFromResource(resourceName), ZonedDateTime.class);
+ final ZonedDateTime recycled = read(write(fromStatic, ZonedDateTime.class), ZonedDateTime.class);
+ assertNotSame(fromStatic, recycled);
+ assertEquals(fromStatic, recycled);
+ assertEquals(resource, fromStatic);
+ assertEquals(resource, recycled);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibilityTest.java
index 50c0853..fe86e0a 100644
--- a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibilityTest.java
+++ b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoCompatibilityTest.java
@@ -19,8 +19,12 @@
package org.apache.tinkerpop.gremlin.structure.io.gryo;
import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.io.AbstractTypedCompatibilityTest;
import org.apache.tinkerpop.gremlin.structure.io.Compatibility;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0;
import org.apache.tinkerpop.shaded.kryo.Kryo;
import org.apache.tinkerpop.shaded.kryo.io.Input;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-no-types.json
index 2d341b1..e0046e9 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-no-types.json
@@ -1 +1 @@
-"AQIDBAU="
\ No newline at end of file
+"c29tZSBieXRlcyBmb3IgeW91"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-partial.json
index eef472e..5724115 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/bytebuffer-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "gx:ByteBuffer",
- "@value" : "AQIDBAU="
+ "@value" : "c29tZSBieXRlcyBmb3IgeW91"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-no-types.json
index 5eadd3a..03b71a0 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-no-types.json
@@ -1 +1 @@
-1481628637175
\ No newline at end of file
+1481750076295
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-partial.json
index 7b6d985..cf4007a 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/date-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Date",
- "@value" : 1481628634371
+ "@value" : 1481750076295
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v1d0.json
index 9d9579c..40f2c7c 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v1d0.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v1d0.json
@@ -1 +1 @@
-"2016-12-13T11:30:29.506Z"
\ No newline at end of file
+"2016-12-14T16:39:19.349Z"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-no-types.json
index dc5353a..40f2c7c 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-no-types.json
@@ -1 +1 @@
-"2016-12-13T11:30:37.207Z"
\ No newline at end of file
+"2016-12-14T16:39:19.349Z"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-partial.json
index b71b3f7..3749741 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/instant-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "gx:Instant",
- "@value" : "2016-12-13T11:30:34.474Z"
+ "@value" : "2016-12-14T16:39:19.349Z"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
index c21a488..bc41355 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy
@@ -1,4 +1,3 @@
-package org.apache.tinkerpop.gremlin.structure.io.graphson._3_2_3
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -31,7 +30,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent
import org.apache.tinkerpop.gremlin.structure.io.gryo.*
new File("dev-docs/").mkdirs()
-new File("test-case-data/io/").mkdirs()
+new File("test-case-data/io/graphson").mkdirs()
graph = TinkerFactory.createTheCrew()
g = graph.traversal()
@@ -113,17 +112,17 @@ writeSupportedV1Objects = { writer, mapper ->
writer.write("Time\n")
writer.write("~~~~\n\n")
writer.write(toJsonV1d0NoTypes(Duration.ofDays(5), "Duration", mapper, "The following example is a `Duration` of five days."))
- writer.write(toJsonV1d0NoTypes(Instant.now(), "Instant", mapper))
+ writer.write(toJsonV1d0NoTypes(Instant.parse("2016-12-14T16:39:19.349Z"), "Instant", mapper))
writer.write(toJsonV1d0NoTypes(LocalDate.of(2016, 1, 1), "LocalDate", mapper))
writer.write(toJsonV1d0NoTypes(LocalDateTime.of(2016, 1, 1, 12, 30), "LocalDateTime", mapper))
writer.write(toJsonV1d0NoTypes(LocalTime.of(12, 30, 45), "LocalTime", mapper))
writer.write(toJsonV1d0NoTypes(MonthDay.of(1, 1), "MonthDay", mapper))
- writer.write(toJsonV1d0NoTypes(OffsetDateTime.now(), "OffsetDateTime", mapper))
- writer.write(toJsonV1d0NoTypes(OffsetTime.now(), "OffsetTime", mapper))
+ writer.write(toJsonV1d0NoTypes(OffsetDateTime.parse("2007-12-03T10:15:30+01:00"), "OffsetDateTime", mapper))
+ writer.write(toJsonV1d0NoTypes(OffsetTime.parse("10:15:30+01:00"), "OffsetTime", mapper))
writer.write(toJsonV1d0NoTypes(Period.of(1, 6, 15), "Period", mapper, "The following example is a `Period` of one year, six months and fifteen days."))
writer.write(toJsonV1d0NoTypes(Year.of(2016), "Year", mapper, "The following example is of the `Year` \"2016\"."))
writer.write(toJsonV1d0NoTypes(YearMonth.of(2016, 6), "YearMonth", mapper, "The following example is a `YearMonth` of \"June 2016\""))
- writer.write(toJsonV1d0NoTypes(ZonedDateTime.now(), "ZonedDateTime", mapper))
+ writer.write(toJsonV1d0NoTypes(ZonedDateTime.of(2016, 12, 23, 12, 12, 24, 36, ZoneId.of("GMT+2")), "ZonedDateTime", mapper))
writer.write(toJsonV1d0NoTypes(ZoneOffset.ofHoursMinutesSeconds(3, 6, 9), "ZoneOffset", mapper, "The following example is a `ZoneOffset` of three hours, six minutes, and nine seconds."))
}
@@ -148,12 +147,12 @@ writeSupportedV2Objects = { writer, mapper, toJsonFunction ->
writer.write("Core\n")
writer.write("~~~~\n\n")
writer.write(toJsonFunction(File, "Class", mapper))
- writer.write(toJsonFunction(new Date(), "Date", mapper))
+ writer.write(toJsonFunction(new Date(1481750076295L), "Date", mapper))
writer.write(toJsonFunction(100.00d, "Double", mapper))
writer.write(toJsonFunction(100.00f, "Float", mapper))
writer.write(toJsonFunction(100, "Integer", mapper))
writer.write(toJsonFunction(100L, "Long", mapper))
- writer.write(toJsonFunction(new java.sql.Timestamp(System.currentTimeMillis()), "Timestamp", mapper))
+ writer.write(toJsonFunction(new java.sql.Timestamp(1481750076295L), "Timestamp", mapper))
writer.write(toJsonFunction(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786"), "UUID", mapper))
writer.write("\n")
@@ -173,7 +172,7 @@ writeSupportedV2Objects = { writer, mapper, toJsonFunction ->
writer.write("~~~~~~~~~~~~~\n\n")
writer.write(toJsonFunction(SackFunctions.Barrier.normSack, "Barrier", mapper))
writer.write(toJsonFunction(new Bytecode.Binding("x", 1), "Binding", mapper, "A \"Binding\" refers to a `Bytecode.Binding`."))
- writer.write(toJsonFunction(g.V().hasLabel('person').out().in().tree(), "Bytecode", mapper, "The following `Bytecode` example represents the traversal of `g.V().hasLabel('person').out().in().tree()`. Obviously the serialized `Bytecode` woudl be quite different for the endless variations of commands that could be used together in the Gremlin language."))
+ writer.write(toJsonFunction(g.V().hasLabel('person').out().in().tree().asAdmin().getBytecode(), "Bytecode", mapper, "The following `Bytecode` example represents the traversal of `g.V().hasLabel('person').out().in().tree()`. Obviously the serialized `Bytecode` woudl be quite different for the endless variations of commands that could be used together in the Gremlin language."))
writer.write(toJsonFunction(VertexProperty.Cardinality.list, "Cardinality", mapper))
writer.write(toJsonFunction(Column.keys, "Column", mapper))
writer.write(toJsonFunction(Direction.OUT, "Direction", mapper))
@@ -248,22 +247,22 @@ mapper = GraphSONMapper.build().
writer.write(toJsonFunction(new java.math.BigDecimal(new java.math.BigInteger("123456789987654321123456789987654321")), "BigDecimal", mapper))
writer.write(toJsonFunction(new java.math.BigInteger("123456789987654321123456789987654321"), "BigInteger", mapper))
writer.write(toJsonFunction(new Byte("1"), "Byte", mapper))
- writer.write(toJsonFunction(java.nio.ByteBuffer.wrap([1,2,3,4,5] as byte[]), "ByteBuffer", mapper))
+ writer.write(toJsonFunction(java.nio.ByteBuffer.wrap("some bytes for you".getBytes()), "ByteBuffer", mapper))
writer.write(toJsonFunction("x".charAt(0), "Char", mapper))
writer.write(toJsonFunction(Duration.ofDays(5), "Duration", mapper,"The following example is a `Duration` of five days."))
writer.write(toJsonFunction(java.net.InetAddress.getByName("localhost"), "InetAddress", mapper))
- writer.write(toJsonFunction(Instant.now(), "Instant", mapper))
+ writer.write(toJsonFunction(Instant.parse("2016-12-14T16:39:19.349Z"), "Instant", mapper))
writer.write(toJsonFunction(LocalDate.of(2016, 1, 1), "LocalDate", mapper))
writer.write(toJsonFunction(LocalDateTime.of(2016, 1, 1, 12, 30), "LocalDateTime", mapper))
writer.write(toJsonFunction(LocalTime.of(12, 30, 45), "LocalTime", mapper))
writer.write(toJsonFunction(MonthDay.of(1, 1), "MonthDay", mapper))
- writer.write(toJsonFunction(OffsetDateTime.now(), "OffsetDateTime", mapper))
- writer.write(toJsonFunction(OffsetTime.now(), "OffsetTime", mapper))
+ writer.write(toJsonFunction(OffsetDateTime.parse("2007-12-03T10:15:30+01:00"), "OffsetDateTime", mapper))
+ writer.write(toJsonFunction(OffsetTime.parse("10:15:30+01:00"), "OffsetTime", mapper))
writer.write(toJsonFunction(Period.of(1, 6, 15), "Period", mapper, "The following example is a `Period` of one year, six months and fifteen days."))
writer.write(toJsonFunction(new Short("100"), "Short", mapper))
writer.write(toJsonFunction(Year.of(2016), "Year", mapper, "The following example is of the `Year` \"2016\"."))
writer.write(toJsonFunction(YearMonth.of(2016, 6), "YearMonth", mapper, "The following example is a `YearMonth` of \"June 2016\""))
- writer.write(toJsonFunction(ZonedDateTime.now(), "ZonedDateTime", mapper))
+ writer.write(toJsonFunction(ZonedDateTime.of(2016, 12, 23, 12, 12, 24, 36, ZoneId.of("GMT+2")), "ZonedDateTime", mapper))
writer.write(toJsonFunction(ZoneOffset.ofHoursMinutesSeconds(3, 6, 9), "ZoneOffset", mapper, "The following example is a `ZoneOffset` of three hours, six minutes, and nine seconds."))
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-no-types.json
index 570b31d..9d647f0 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-no-types.json
@@ -1,23 +1,23 @@
{
- "dur" : 0.079689,
+ "dur" : 0.112874,
"counts" : {
"traverserCount" : 4,
"elementCount" : 4
},
"name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
"annotations" : {
- "percentDur" : 11.133713822660305
+ "percentDur" : 12.93474299884718
},
"id" : "7.0.0()",
"metrics" : [ {
- "dur" : 0.174724,
+ "dur" : 0.2619,
"counts" : {
"traverserCount" : 13,
"elementCount" : 13
},
"name" : "VertexStep(OUT,vertex)",
"annotations" : {
- "percentDur" : 24.411487331381988
+ "percentDur" : 30.012307452540675
},
"id" : "2.0.0()"
} ]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-partial.json
index f123b72..5d2a919 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/metrics-v2d0-partial.json
@@ -3,7 +3,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.164766
+ "@value" : 0.173382
},
"counts" : {
"traverserCount" : {
@@ -19,7 +19,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 15.940165606833242
+ "@value" : 17.538702446366866
}
},
"id" : "7.0.0()",
@@ -28,7 +28,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.275414
+ "@value" : 0.259902
},
"counts" : {
"traverserCount" : {
@@ -44,7 +44,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 26.64472506730982
+ "@value" : 26.29075592169684
}
},
"id" : "2.0.0()"
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v1d0.json
index cd60d26..d85a355 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v1d0.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v1d0.json
@@ -1 +1 @@
-"2016-12-13T06:30:29.545-05:00"
\ No newline at end of file
+"2007-12-03T10:15:30+01:00"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-no-types.json
index b5b5427..d85a355 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-no-types.json
@@ -1 +1 @@
-"2016-12-13T06:30:37.209-05:00"
\ No newline at end of file
+"2007-12-03T10:15:30+01:00"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-partial.json
index ec7559d..03f45cd 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsetdatetime-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "gx:OffsetDateTime",
- "@value" : "2016-12-13T06:30:34.477-05:00"
+ "@value" : "2007-12-03T10:15:30+01:00"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v1d0.json
index 4b43fb2..b8f08fd 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v1d0.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v1d0.json
@@ -1 +1 @@
-"06:30:29.551-05:00"
\ No newline at end of file
+"10:15:30+01:00"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-no-types.json
index c57977d..b8f08fd 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-no-types.json
@@ -1 +1 @@
-"06:30:37.209-05:00"
\ No newline at end of file
+"10:15:30+01:00"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-partial.json
index efeec46..b124953 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/offsettime-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "gx:OffsetTime",
- "@value" : "06:30:34.477-05:00"
+ "@value" : "10:15:30+01:00"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v1d0.json
index 883d7d1..e2cbb13 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v1d0.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v1d0.json
@@ -1,5 +1,5 @@
{
- "requestId" : "4b39e6aa-363b-4f1d-91d2-c173dc81bea5",
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
"op" : "close",
"processor" : "session",
"args" : {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/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_3/sessionclose-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v2d0-no-types.json
index 0640bd3..e2cbb13 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v2d0-no-types.json
@@ -1,5 +1,5 @@
{
- "requestId" : "cca7f0f0-0c51-4e9d-90d8-2ef1b7b1c6ca",
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
"op" : "close",
"processor" : "session",
"args" : {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v2d0-partial.json
index 4605a98..ee860ea 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionclose-v2d0-partial.json
@@ -1,7 +1,7 @@
{
"requestId" : {
"@type" : "g:UUID",
- "@value" : "4a422689-0f01-457f-8963-b6f07aefb106"
+ "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
},
"op" : "close",
"processor" : "session",
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v1d0.json
index 94a00ae..5e6fae2 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v1d0.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v1d0.json
@@ -1,5 +1,5 @@
{
- "requestId" : "8479fb7d-620e-44e2-99bb-5625b54fb518",
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
"op" : "eval",
"processor" : "session",
"args" : {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-no-types.json
index bd23835..5e6fae2 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-no-types.json
@@ -1,5 +1,5 @@
{
- "requestId" : "80259836-35b0-4399-a0d7-f1d0bf956cbc",
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
"op" : "eval",
"processor" : "session",
"args" : {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-partial.json
index a1dee0c..f1f2dc2 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessioneval-v2d0-partial.json
@@ -1,7 +1,7 @@
{
"requestId" : {
"@type" : "g:UUID",
- "@value" : "8a9b4c19-bd79-4470-a73d-ac54b7937c65"
+ "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
},
"op" : "eval",
"processor" : "session",
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v1d0.json
index 47d2314..59f0c6c 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v1d0.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v1d0.json
@@ -1,5 +1,5 @@
{
- "requestId" : "3f905713-9534-43ff-b6e8-2e2aa4f82451",
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
"op" : "eval",
"processor" : "",
"args" : {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-no-types.json
index d6c3b67..59f0c6c 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-no-types.json
@@ -1,5 +1,5 @@
{
- "requestId" : "7bee05b0-1bca-4560-8f8d-45fce3d07fd8",
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
"op" : "eval",
"processor" : "",
"args" : {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-partial.json
index ecc5b9d..761b71a 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/sessionlesseval-v2d0-partial.json
@@ -1,7 +1,7 @@
{
"requestId" : {
"@type" : "g:UUID",
- "@value" : "fe49a49e-7552-4c5f-ae33-5f4783926919"
+ "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
},
"op" : "eval",
"processor" : "",
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-no-types.json
index 139952d..03b71a0 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-no-types.json
@@ -1 +1 @@
-1481628637178
\ No newline at end of file
+1481750076295
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-partial.json
index 8097011..1ca0e17 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/timestamp-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Timestamp",
- "@value" : 1481628634377
+ "@value" : 1481750076295
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-no-types.json
index b1598bb..604a166 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-no-types.json
@@ -1,47 +1,47 @@
{
- "dur" : 0.661531,
+ "dur" : 1.101297,
"metrics" : [ {
- "dur" : 0.114389,
+ "dur" : 0.224678,
"counts" : {
"traverserCount" : 4,
"elementCount" : 4
},
"name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
"annotations" : {
- "percentDur" : 17.291555497777125
+ "percentDur" : 20.401217836786987
},
"id" : "7.0.0()"
}, {
- "dur" : 0.244496,
+ "dur" : 0.323779,
"counts" : {
"traverserCount" : 13,
"elementCount" : 13
},
"name" : "VertexStep(OUT,vertex)",
"annotations" : {
- "percentDur" : 36.95911453885003
+ "percentDur" : 29.399789520901265
},
"id" : "2.0.0()"
}, {
- "dur" : 0.162661,
+ "dur" : 0.276658,
"counts" : {
"traverserCount" : 7,
"elementCount" : 7
},
"name" : "VertexStep(OUT,vertex)",
"annotations" : {
- "percentDur" : 24.588568033848755
+ "percentDur" : 25.121107203597212
},
"id" : "3.0.0()"
}, {
- "dur" : 0.139985,
+ "dur" : 0.276182,
"counts" : {
"traverserCount" : 1,
"elementCount" : 1
},
"name" : "TreeStep",
"annotations" : {
- "percentDur" : 21.16076192952409
+ "percentDur" : 25.077885438714535
},
"id" : "4.0.0()"
} ]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-partial.json
index 967e743..b40c565 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/traversalmetrics-v2d0-partial.json
@@ -3,14 +3,14 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.583377
+ "@value" : 0.701505
},
"metrics" : [ {
"@type" : "g:Metrics",
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.084061
+ "@value" : 0.100826
},
"counts" : {
"traverserCount" : {
@@ -26,7 +26,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 14.409378497952439
+ "@value" : 14.372812738326884
}
},
"id" : "7.0.0()"
@@ -36,7 +36,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.163463
+ "@value" : 0.169312
},
"counts" : {
"traverserCount" : {
@@ -52,7 +52,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 28.0201310644746
+ "@value" : 24.135537166520553
}
},
"id" : "2.0.0()"
@@ -62,7 +62,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.175719
+ "@value" : 0.268548
},
"counts" : {
"traverserCount" : {
@@ -78,7 +78,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 30.12100237067968
+ "@value" : 38.28169435713217
}
},
"id" : "3.0.0()"
@@ -88,7 +88,7 @@
"@value" : {
"dur" : {
"@type" : "g:Double",
- "@value" : 0.160134
+ "@value" : 0.162819
},
"counts" : {
"traverserCount" : {
@@ -104,7 +104,7 @@
"annotations" : {
"percentDur" : {
"@type" : "g:Double",
- "@value" : 27.449488066893277
+ "@value" : 23.209955738020398
}
},
"id" : "4.0.0()"
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v1d0.json
index aa7c22e..7333537 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v1d0.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v1d0.json
@@ -1 +1 @@
-"2016-12-13T06:30:29.567-05:00[America/New_York]"
\ No newline at end of file
+"2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e477711/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-no-types.json
index 6fe8540..7333537 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/zoneddatetime-v2d0-no-types.json
@@ -1 +1 @@
-"2016-12-13T06:30:37.210-05:00[America/New_York]"
\ No newline at end of file
+"2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
\ No newline at end of file
[23/47] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f7d5fc75
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f7d5fc75
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f7d5fc75
Branch: refs/heads/TINKERPOP-1130
Commit: f7d5fc758eff051b1b1e42ac7673ee06a4bf524e
Parents: d14459a 98f69f9
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Dec 20 13:23:00 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 20 13:23:00 2016 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +
.../structure/io/gryo/GryoClassResolver.java | 9 +++
.../gremlin/structure/io/gryo/GryoMapper.java | 7 ++-
.../structure/io/gryo/UtilSerializers.java | 62 ++++++++++++++++++++
.../structure/io/gryo/GryoMapperTest.java | 27 +++++++++
5 files changed, 106 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f7d5fc75/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f7d5fc75/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
----------------------------------------------------------------------
[10/47] tinkerpop git commit: TINKERPOP-1490 Implemented promise API
for Traversal
Posted by sp...@apache.org.
TINKERPOP-1490 Implemented promise API for Traversal
Added two promise() methods that return CompletableFuture on Traversal. Provided an override on DefaultTraversal for those methods because the function that transforms the Traversal is executed in a different thread and therefore requires Graph transaction management (or else we would orphan transactions). Did not update gremlin-python with the promise API because it seemed to beg discussion on the "right" way to do that (i.e. what library to use to support promises?, just use futures from the core lib?, etc).
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6c4cbc84
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6c4cbc84
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6c4cbc84
Branch: refs/heads/TINKERPOP-1130
Commit: 6c4cbc849f83b9ed44d3c5bbef5e59d67b702593
Parents: b0b9330
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Nov 1 09:30:28 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 16 10:10:14 2016 -0500
----------------------------------------------------------------------
gremlin-core/pom.xml | 5 +++
.../traversal/util/DefaultTraversal.java | 37 +++++++++++++++++
.../gremlin/python/jsr223/PythonProvider.java | 1 +
.../process/traversal/CoreTraversalTest.java | 42 ++++++++++++++++++++
.../TinkerGraphGroovyTranslatorProvider.java | 1 +
.../TinkerGraphJavaTranslatorProvider.java | 1 +
6 files changed, 87 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6c4cbc84/gremlin-core/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index e8f3a34..0594448 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -61,6 +61,11 @@ limitations under the License.
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.3.1</version>
+ </dependency>
<!-- LOGGING -->
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6c4cbc84/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
index 3c21e37..6ce6dfe 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
@@ -43,6 +43,9 @@ import java.util.List;
import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Function;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -325,6 +328,40 @@ public class DefaultTraversal<S, E> implements Traversal.Admin<S, E> {
this.graph = graph;
}
+ /**
+ * Override of {@link Traversal#promise(Function)} that is aware of graph transactions.
+ */
+ @Override
+ public <T2> CompletableFuture<T2> promise(final Function<Traversal, T2> traversalFunction) {
+ return this.promise(traversalFunction, Traversal.Admin.traversalExecutorService);
+ }
+
+ /**
+ * Override of {@link Traversal#promise(Function)} that is aware of graph transactions. In a transactional graph
+ * a promise represents the full scope of a transaction, even if the graph is only partially iterated.
+ */
+ @Override
+ public <T2> CompletableFuture<T2> promise(final Function<Traversal, T2> traversalFunction, final ExecutorService service) {
+ if (graph != null && graph.features().graph().supportsTransactions()) {
+ final Function<Traversal, T2> transactionAware = traversal -> {
+
+ try {
+ if (graph.tx().isOpen()) graph.tx().rollback();
+ final T2 obj = traversalFunction.apply(traversal);
+ if (graph.tx().isOpen()) graph.tx().commit();
+ return obj;
+ } catch (Exception ex) {
+ if (graph.tx().isOpen()) graph.tx().rollback();
+ throw ex;
+ }
+ };
+
+ return Traversal.Admin.super.promise(transactionAware, service);
+ } else {
+ return Traversal.Admin.super.promise(traversalFunction, service);
+ }
+ }
+
@Override
public boolean equals(final Object other) {
return other != null && other.getClass().equals(this.getClass()) && this.equals(((Traversal.Admin) other));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6c4cbc84/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
----------------------------------------------------------------------
diff --git a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
index 9e03884..5dd9c28 100644
--- a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
+++ b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
@@ -69,6 +69,7 @@ public class PythonProvider extends AbstractGraphProvider {
"shouldNeverPropagateANullValuedTraverser",
"shouldHidePartitionKeyForValues",
"g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
+ "shouldUsePromiseAndControlTransactionsIfAvailable",
//
ProgramTest.Traversals.class.getCanonicalName(),
TraversalInterruptionTest.class.getCanonicalName(),
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6c4cbc84/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
index 68f8217..050f9de 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.traversal;
import org.apache.tinkerpop.gremlin.ExceptionCoverage;
import org.apache.tinkerpop.gremlin.FeatureRequirement;
+import org.apache.tinkerpop.gremlin.FeatureRequirementSet;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
@@ -40,6 +41,9 @@ import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Random;
import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
@@ -307,4 +311,42 @@ public class CoreTraversalTest extends AbstractGremlinProcessTest {
}
}
+
+ @Test
+ @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
+ public void shouldUsePromiseAndControlTransactionsIfAvailable() throws Exception {
+ // this test will validate that transactional graphs can properly open/close transactions within a promise.
+ // as there is a feature check, non-transactional graphs can use this to simply exercise the promise API
+ final Vertex vAdded = g.addV("person").property("name", "stephen").promise(t -> (Vertex) t.next()).get(10000, TimeUnit.MILLISECONDS);
+ final Vertex vRead = g.V().has("name", "stephen").next();
+ assertEquals(vAdded.id(), vRead.id());
+
+ // transaction should have been committed at this point so test the count in this thread to validate persistence
+ assertVertexEdgeCounts(graph, 1, 0);
+
+ // cancel a promise and ensure the transaction ended in failure. hold the traversal in park until it can be
+ // interrupted, then the promise will have to rollback the transaction.
+ final CompletableFuture promiseToCancel = g.addV("person").property("name", "marko").sideEffect(traverser -> {
+ try {
+ Thread.sleep(100000);
+ } catch (Exception ignored) {
+
+ }
+ }).promise(t -> (Vertex) t.next());
+
+ try {
+ promiseToCancel.get(500, TimeUnit.MILLISECONDS);
+ fail("Should have timed out");
+ } catch (TimeoutException te) {
+
+ }
+
+ promiseToCancel.cancel(true);
+
+ // graphs that support transactions will rollback the transaction
+ if (graph.features().graph().supportsTransactions())
+ assertVertexEdgeCounts(graph, 1, 0);
+ else
+ assertVertexEdgeCounts(graph, 2, 0);
+ }
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6c4cbc84/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
index dd118d7..a595c34 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
@@ -51,6 +51,7 @@ public class TinkerGraphGroovyTranslatorProvider extends TinkerGraphProvider {
"g_VX1X_out_injectXv2X_name",
"shouldNeverPropagateANoBulkTraverser",
"shouldNeverPropagateANullValuedTraverser",
+ "shouldUsePromiseAndControlTransactionsIfAvailable",
GraphComputerTest.class.getCanonicalName(),
ProgramTest.Traversals.class.getCanonicalName(),
TraversalInterruptionTest.class.getCanonicalName(),
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6c4cbc84/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java
index f40a8c7..15a6c0b 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java
@@ -49,6 +49,7 @@ public class TinkerGraphJavaTranslatorProvider extends TinkerGraphProvider {
TraversalInterruptionComputerTest.class.getCanonicalName(),
"shouldNeverPropagateANoBulkTraverser",
"shouldNeverPropagateANullValuedTraverser",
+ "shouldUsePromiseAndControlTransactionsIfAvailable",
ElementIdStrategyProcessTest.class.getCanonicalName(),
EventStrategyProcessTest.class.getCanonicalName(),
ProgramTest.Traversals.class.getCanonicalName()));