This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-1682
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 05ee2818ff8354e72ac239830c98617549c55f0c
Author: Daniel Kuppitz <daniel_kupp...@hotmail.com>
AuthorDate: Thu Jul 6 19:31:28 2017 +0200
Registered ByModulatorOptimizationStrategy in GraphSON and Gryo serializers
and added it to the core imports. Thanks @okram for pointing that out.
---
.../org/apache/tinkerpop/gremlin/jsr223/CoreImports.java | 4 +++-
.../gremlin/structure/io/graphson/GraphSONModule.java | 13 +++++++++----
.../tinkerpop/gremlin/structure/io/gryo/GryoVersion.java | 11 +++++++----
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
index 6f0378e..9adf03b 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
@@ -82,6 +82,7 @@ import
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.Subgra
import
org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.MatchAlgorithmStrategy;
import
org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ProfileStrategy;
import
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.AdjacentToIncidentStrategy;
+import
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ByModulatorOptimizationStrategy;
import
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.EarlyLimitStrategy;
import
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.FilterRankingStrategy;
import
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IdentityRemovalStrategy;
@@ -239,6 +240,8 @@ public final class CoreImports {
CLASS_IMPORTS.add(MatchAlgorithmStrategy.class);
CLASS_IMPORTS.add(ProfileStrategy.class);
CLASS_IMPORTS.add(AdjacentToIncidentStrategy.class);
+ CLASS_IMPORTS.add(ByModulatorOptimizationStrategy.class);
+ CLASS_IMPORTS.add(CountStrategy.class);
CLASS_IMPORTS.add(FilterRankingStrategy.class);
CLASS_IMPORTS.add(IdentityRemovalStrategy.class);
CLASS_IMPORTS.add(IncidentToAdjacentStrategy.class);
@@ -246,7 +249,6 @@ public final class CoreImports {
CLASS_IMPORTS.add(EarlyLimitStrategy.class);
CLASS_IMPORTS.add(OrderLimitStrategy.class);
CLASS_IMPORTS.add(PathProcessorStrategy.class);
- CLASS_IMPORTS.add(CountStrategy.class);
CLASS_IMPORTS.add(ComputerVerificationStrategy.class);
CLASS_IMPORTS.add(LambdaRestrictionStrategy.class);
CLASS_IMPORTS.add(ReadOnlyStrategy.class);
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 cb0eeaf..5d3c806 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
@@ -44,6 +44,7 @@ import
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.Partit
import
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
import
org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.MatchAlgorithmStrategy;
import
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.AdjacentToIncidentStrategy;
+import
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ByModulatorOptimizationStrategy;
import
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.EarlyLimitStrategy;
import
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.FilterRankingStrategy;
import
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IdentityRemovalStrategy;
@@ -188,6 +189,8 @@ abstract class GraphSONModule extends
TinkerPopJacksonModule {
LazyBarrierStrategy.class,
MatchAlgorithmStrategy.class,
AdjacentToIncidentStrategy.class,
+ ByModulatorOptimizationStrategy.class,
+ CountStrategy.class,
FilterRankingStrategy.class,
IdentityRemovalStrategy.class,
IncidentToAdjacentStrategy.class,
@@ -197,7 +200,6 @@ abstract class GraphSONModule extends
TinkerPopJacksonModule {
OptionsStrategy.class,
PathProcessorStrategy.class,
PathRetractionStrategy.class,
- CountStrategy.class,
RepeatUnrollStrategy.class,
ComputerVerificationStrategy.class,
LambdaRestrictionStrategy.class,
@@ -314,6 +316,8 @@ abstract class GraphSONModule extends
TinkerPopJacksonModule {
LazyBarrierStrategy.class,
MatchAlgorithmStrategy.class,
AdjacentToIncidentStrategy.class,
+ ByModulatorOptimizationStrategy.class,
+ CountStrategy.class,
FilterRankingStrategy.class,
IdentityRemovalStrategy.class,
IncidentToAdjacentStrategy.class,
@@ -323,7 +327,6 @@ abstract class GraphSONModule extends
TinkerPopJacksonModule {
OptionsStrategy.class,
PathProcessorStrategy.class,
PathRetractionStrategy.class,
- CountStrategy.class,
RepeatUnrollStrategy.class,
ComputerVerificationStrategy.class,
LambdaRestrictionStrategy.class,
@@ -420,6 +423,8 @@ abstract class GraphSONModule extends
TinkerPopJacksonModule {
LazyBarrierStrategy.class,
MatchAlgorithmStrategy.class,
AdjacentToIncidentStrategy.class,
+ ByModulatorOptimizationStrategy.class,
+ CountStrategy.class,
FilterRankingStrategy.class,
IdentityRemovalStrategy.class,
IncidentToAdjacentStrategy.class,
@@ -429,7 +434,6 @@ abstract class GraphSONModule extends
TinkerPopJacksonModule {
OptionsStrategy.class,
PathProcessorStrategy.class,
PathRetractionStrategy.class,
- CountStrategy.class,
RepeatUnrollStrategy.class,
ComputerVerificationStrategy.class,
LambdaRestrictionStrategy.class,
@@ -536,6 +540,8 @@ abstract class GraphSONModule extends
TinkerPopJacksonModule {
LazyBarrierStrategy.class,
MatchAlgorithmStrategy.class,
AdjacentToIncidentStrategy.class,
+ ByModulatorOptimizationStrategy.class,
+ CountStrategy.class,
FilterRankingStrategy.class,
IdentityRemovalStrategy.class,
IncidentToAdjacentStrategy.class,
@@ -545,7 +551,6 @@ abstract class GraphSONModule extends
TinkerPopJacksonModule {
OptionsStrategy.class,
PathProcessorStrategy.class,
PathRetractionStrategy.class,
- CountStrategy.class,
RepeatUnrollStrategy.class,
ComputerVerificationStrategy.class,
LambdaRestrictionStrategy.class,
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 3138488..41e6e27 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
@@ -53,6 +53,7 @@ import
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.Partit
import
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
import
org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.MatchAlgorithmStrategy;
import
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.AdjacentToIncidentStrategy;
+import
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ByModulatorOptimizationStrategy;
import
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.EarlyLimitStrategy;
import
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.FilterRankingStrategy;
import
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IdentityRemovalStrategy;
@@ -337,6 +338,8 @@ public enum GryoVersion {
add(GryoTypeReg.of(MatchAlgorithmStrategy.class, 143));
add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 144));
add(GryoTypeReg.of(AdjacentToIncidentStrategy.class, 145));
+ add(GryoTypeReg.of(ByModulatorOptimizationStrategy.class, 191));
// ***LAST ID***
+ add(GryoTypeReg.of(CountStrategy.class, 155));
add(GryoTypeReg.of(FilterRankingStrategy.class, 146));
add(GryoTypeReg.of(IdentityRemovalStrategy.class, 147));
add(GryoTypeReg.of(IncidentToAdjacentStrategy.class, 148));
@@ -347,7 +350,6 @@ public enum GryoVersion {
add(GryoTypeReg.of(OptionsStrategy.class, 187, new
JavaSerializer()));
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));
@@ -356,7 +358,7 @@ public enum GryoVersion {
add(GryoTypeReg.of(MatchStep.CountMatchAlgorithm.class, 160));
add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 164));
add(GryoTypeReg.of(EdgeLabelVerificationStrategy.class, 189));
- add(GryoTypeReg.of(ReservedKeysVerificationStrategy.class, 190));
// ***LAST ID***
+ add(GryoTypeReg.of(ReservedKeysVerificationStrategy.class, 190));
add(GryoTypeReg.of(TraverserSet.class, 58));
add(GryoTypeReg.of(Tree.class, 61));
@@ -574,6 +576,8 @@ public enum GryoVersion {
add(GryoTypeReg.of(MatchAlgorithmStrategy.class, 143));
add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 144));
add(GryoTypeReg.of(AdjacentToIncidentStrategy.class, 145));
+ add(GryoTypeReg.of(ByModulatorOptimizationStrategy.class, 191));
// ***LAST ID***
+ add(GryoTypeReg.of(CountStrategy.class, 155));
add(GryoTypeReg.of(FilterRankingStrategy.class, 146));
add(GryoTypeReg.of(IdentityRemovalStrategy.class, 147));
add(GryoTypeReg.of(IncidentToAdjacentStrategy.class, 148));
@@ -584,7 +588,6 @@ public enum GryoVersion {
add(GryoTypeReg.of(OptionsStrategy.class, 187, new
JavaSerializer()));
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));
@@ -593,7 +596,7 @@ public enum GryoVersion {
add(GryoTypeReg.of(MatchStep.CountMatchAlgorithm.class, 160));
add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 167));
add(GryoTypeReg.of(EdgeLabelVerificationStrategy.class, 189));
- add(GryoTypeReg.of(ReservedKeysVerificationStrategy.class, 190));
// ***LAST ID***
+ add(GryoTypeReg.of(ReservedKeysVerificationStrategy.class, 190));
// skip 171, 172 to sync with the 3.3.x
add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
