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/27 15:46:12 UTC
[16/27] tinkerpop git commit: TINKERPOP-1130 Added test support for
ConjunctiveP in Gryo
TINKERPOP-1130 Added test support for ConjunctiveP in Gryo
This is now possible given fixes on tp32/master.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/66896af8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/66896af8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/66896af8
Branch: refs/heads/TINKERPOP-1130
Commit: 66896af879b7aa26997b201bae1d99dc81a50641
Parents: 6fb6ac7
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Dec 23 08:34:40 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Dec 27 10:37:54 2016 -0500
----------------------------------------------------------------------
.../gremlin/structure/io/gryo/GryoVersion.java | 2 --
.../apache/tinkerpop/gremlin/structure/io/Model.java | 8 ++++++--
.../gremlin/structure/io/gryo/_3_2_3/pand-v1d0.kryo | Bin 17 -> 0 bytes
.../gremlin/structure/io/gryo/_3_2_3/por-v1d0.kryo | Bin 30 -> 0 bytes
.../gremlin/structure/io/gryo/_3_3_0/pand-v1d0.kryo | Bin 17 -> 23 bytes
.../gremlin/structure/io/gryo/_3_3_0/pand-v3d0.kryo | Bin 0 -> 23 bytes
.../gremlin/structure/io/gryo/_3_3_0/por-v1d0.kryo | Bin 30 -> 35 bytes
.../gremlin/structure/io/gryo/_3_3_0/por-v3d0.kryo | Bin 0 -> 35 bytes
8 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/66896af8/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 26ea1d0..837095b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@ -278,8 +278,6 @@ public enum GryoVersion {
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));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/66896af8/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 bab3128..962e4db 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
@@ -146,8 +146,8 @@ public class Model {
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(P.gt(0).and(P.lt(10)), "P and", "", GryoCompatibility.V1D0_3_2_3, GryoCompatibility.V1D0_3_3_0);
+ addGraphProcessEntry(P.gt(0).or(P.within(-1, -10, -100)), "P or", "", GryoCompatibility.V1D0_3_2_3, GryoCompatibility.V1D0_3_3_0);
addGraphProcessEntry(Scope.local, "Scope");
addGraphProcessEntry(T.label, "T", "");
addGraphProcessEntry(createStaticTraversalMetrics(), "TraversalMetrics");
@@ -309,6 +309,10 @@ public class Model {
addEntry("Graph Process", obj, title, description);
}
+ private void addGraphProcessEntry(final Object obj, final String title, final String description, final Compatibility... incompatibleWith) {
+ addEntry("Graph Process", obj, title, description, incompatibleWith);
+ }
+
private void addGraphProcessEntry(final Object obj, final String title, final String description, final List<Compatibility> compatibleWith) {
addEntry("Graph Process", obj, title, description, compatibleWith);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/66896af8/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
deleted file mode 100644
index d5d9f37..0000000
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/pand-v1d0.kryo and /dev/null differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/66896af8/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
deleted file mode 100644
index 2589271..0000000
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/por-v1d0.kryo and /dev/null differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/66896af8/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
index d5d9f37..5477e40 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/pand-v1d0.kryo 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/66896af8/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/pand-v3d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/pand-v3d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/pand-v3d0.kryo
new file mode 100644
index 0000000..5477e40
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-v3d0.kryo differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/66896af8/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
index 2589271..8b8ebb4 100644
Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/por-v1d0.kryo 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/66896af8/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/por-v3d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/por-v3d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/por-v3d0.kryo
new file mode 100644
index 0000000..8b8ebb4
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-v3d0.kryo differ