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 2018/09/12 16:37:01 UTC
[5/7] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0eeeb0d0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0eeeb0d0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0eeeb0d0
Branch: refs/heads/TINKERPOP-2033
Commit: 0eeeb0d0c79358b346ef0b8859bcdcb2d16ddbd9
Parents: 8ac4577 ec0e685
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 12 10:29:29 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 12 10:29:29 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 ++
.../gremlin/structure/io/gryo/GryoVersion.java | 14 ++++++++-
.../structure/io/gryo/UtilSerializers.java | 33 ++++++++++++++++++++
3 files changed, 48 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0eeeb0d0/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0eeeb0d0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 6bb7b34,5f973e3..1cdcde7
--- 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
@@@ -526,33 -310,8 +529,33 @@@ public enum GryoVersion
add(GryoTypeReg.of(RangeGlobalStep.RangeBiOperator.class, 114));
add(GryoTypeReg.of(OrderGlobalStep.OrderBiOperator.class, 118, new JavaSerializer()));
add(GryoTypeReg.of(ProfileStep.ProfileBiOperator.class, 119));
+
+ 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(CountStrategy.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, 167));
// skip 171, 172 to sync with tp33
- add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173)); // ***LAST ID***
+ add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
}};
}
@@@ -608,8 -352,13 +613,15 @@@
} catch (Exception ex) {
throw new RuntimeException("Could not access " + className, ex);
}
+
+ className = Collections.class.getName() + "$SynchronizedMap";
+ try {
+ COLLECTIONS_SYNCHRONIZED_MAP = Class.forName(className);
+ } catch (Exception ex) {
+ throw new RuntimeException("Could not access " + className, ex);
+ }
}
+
+ private Types() {}
}
}