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 2017/01/19 22:56:01 UTC
[13/31] tinkerpop git commit: conflicts in GryoVersion -- repeated
values. fixed.
conflicts in GryoVersion -- repeated values. fixed.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1bc66ab0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1bc66ab0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1bc66ab0
Branch: refs/heads/TINKERPOP-1565
Commit: 1bc66ab06e6eae4afa88eeaddfb6e367d4ba153b
Parents: 66f1b23
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Jan 19 10:23:17 2017 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Jan 19 10:23:17 2017 -0700
----------------------------------------------------------------------
.../gremlin/structure/io/gryo/GryoVersion.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1bc66ab0/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 0657bc0..49bf3f4 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
@@ -270,6 +270,7 @@ public enum GryoVersion {
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(ProjectedTraverser.class, 168)); // ***LAST ID***
add(GryoTypeReg.of(DefaultRemoteTraverser.class, 123, new GryoSerializers.DefaultRemoteTraverserSerializer()));
add(GryoTypeReg.of(Bytecode.class, 122, new GryoSerializers.BytecodeSerializer()));
@@ -284,6 +285,7 @@ public enum GryoVersion {
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(MultiComparator.class, 167));
add(GryoTypeReg.of(ConnectiveStrategy.class, 138));
add(GryoTypeReg.of(HaltedTraverserStrategy.class, 139));
@@ -340,13 +342,13 @@ public enum GryoVersion {
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(GroupStep.GroupBiOperator.class, 117));
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(OrderGlobalStep.OrderBiOperator.class, 118));
add(GryoTypeReg.of(ProfileStep.ProfileBiOperator.class, 119));
// placeholder serializers for classes that don't live here in core. this will allow them to be used if
@@ -355,7 +357,7 @@ public enum GryoVersion {
tryAddDynamicType(this, "org.apache.tinkerpop.gremlin.driver.message.RequestMessage",
"org.apache.tinkerpop.gremlin.driver.ser.RequestMessageGryoSerializer", 165);
tryAddDynamicType(this, "org.apache.tinkerpop.gremlin.driver.message.ResponseMessage",
- "org.apache.tinkerpop.gremlin.driver.ser.ResponseMessageGryoSerializer", 166); // ### LAST_ID
+ "org.apache.tinkerpop.gremlin.driver.ser.ResponseMessageGryoSerializer", 166);
}};
}
@@ -440,7 +442,7 @@ public enum GryoVersion {
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(ProjectedTraverser.class, 164));
+ add(GryoTypeReg.of(ProjectedTraverser.class, 165));
add(GryoTypeReg.of(DefaultRemoteTraverser.class, 123, new GryoSerializers.DefaultRemoteTraverserSerializer()));
add(GryoTypeReg.of(Bytecode.class, 122, new GryoSerializers.BytecodeSerializer()));
@@ -455,7 +457,7 @@ public enum GryoVersion {
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(MultiComparator.class, 165)); // ***LAST ID***
+ add(GryoTypeReg.of(MultiComparator.class, 166)); // ***LAST ID***
add(GryoTypeReg.of(ConnectiveStrategy.class, 138));
add(GryoTypeReg.of(HaltedTraverserStrategy.class, 139));
@@ -480,7 +482,7 @@ public enum GryoVersion {
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(MatchStep.GreedyMatchAlgorithm.class, 164));
add(GryoTypeReg.of(TraverserSet.class, 58));
add(GryoTypeReg.of(Tree.class, 61));