Registered ByModulatorOptimizationStrategy in GraphSON and Gryo serializers and added it to the core imports. Thanks @okram for pointing that out.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8a4102c9 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8a4102c9 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8a4102c9 Branch: refs/heads/TINKERPOP-1682 Commit: 8a4102c9770862538a2ea5e8b90c7ac8abebb242 Parents: 4fefdf6 Author: Daniel Kuppitz <[email protected]> Authored: Thu Jul 6 19:31:28 2017 +0200 Committer: Daniel Kuppitz <[email protected]> Committed: Wed Mar 21 13:01:46 2018 -0700 ---------------------------------------------------------------------- .../apache/tinkerpop/gremlin/jsr223/CoreImports.java | 4 +++- .../gremlin/structure/io/graphson/GraphSONModule.java | 13 +++++++++---- .../gremlin/structure/io/gryo/GryoVersion.java | 7 +++++-- 3 files changed, 17 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8a4102c9/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java ---------------------------------------------------------------------- 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 8839dcd..5d9bb0c 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 @@ -73,6 +73,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.FilterRankingStrategy; import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IdentityRemovalStrategy; import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IncidentToAdjacentStrategy; @@ -225,13 +226,14 @@ 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); CLASS_IMPORTS.add(MatchPredicateStrategy.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); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8a4102c9/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 2e795a5..e1359cf 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 @@ -41,6 +41,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.FilterRankingStrategy; import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IdentityRemovalStrategy; import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IncidentToAdjacentStrategy; @@ -166,6 +167,8 @@ abstract class GraphSONModule extends TinkerPopJacksonModule { LazyBarrierStrategy.class, MatchAlgorithmStrategy.class, AdjacentToIncidentStrategy.class, + ByModulatorOptimizationStrategy.class, + CountStrategy.class, FilterRankingStrategy.class, IdentityRemovalStrategy.class, IncidentToAdjacentStrategy.class, @@ -174,7 +177,6 @@ abstract class GraphSONModule extends TinkerPopJacksonModule { OrderLimitStrategy.class, PathProcessorStrategy.class, PathRetractionStrategy.class, - CountStrategy.class, RepeatUnrollStrategy.class, ComputerVerificationStrategy.class, LambdaRestrictionStrategy.class, @@ -282,6 +284,8 @@ abstract class GraphSONModule extends TinkerPopJacksonModule { LazyBarrierStrategy.class, MatchAlgorithmStrategy.class, AdjacentToIncidentStrategy.class, + ByModulatorOptimizationStrategy.class, + CountStrategy.class, FilterRankingStrategy.class, IdentityRemovalStrategy.class, IncidentToAdjacentStrategy.class, @@ -290,7 +294,6 @@ abstract class GraphSONModule extends TinkerPopJacksonModule { OrderLimitStrategy.class, PathProcessorStrategy.class, PathRetractionStrategy.class, - CountStrategy.class, RepeatUnrollStrategy.class, ComputerVerificationStrategy.class, LambdaRestrictionStrategy.class, @@ -380,6 +383,8 @@ abstract class GraphSONModule extends TinkerPopJacksonModule { LazyBarrierStrategy.class, MatchAlgorithmStrategy.class, AdjacentToIncidentStrategy.class, + ByModulatorOptimizationStrategy.class, + CountStrategy.class, FilterRankingStrategy.class, IdentityRemovalStrategy.class, IncidentToAdjacentStrategy.class, @@ -388,7 +393,6 @@ abstract class GraphSONModule extends TinkerPopJacksonModule { OrderLimitStrategy.class, PathProcessorStrategy.class, PathRetractionStrategy.class, - CountStrategy.class, RepeatUnrollStrategy.class, ComputerVerificationStrategy.class, LambdaRestrictionStrategy.class, @@ -488,6 +492,8 @@ abstract class GraphSONModule extends TinkerPopJacksonModule { LazyBarrierStrategy.class, MatchAlgorithmStrategy.class, AdjacentToIncidentStrategy.class, + ByModulatorOptimizationStrategy.class, + CountStrategy.class, FilterRankingStrategy.class, IdentityRemovalStrategy.class, IncidentToAdjacentStrategy.class, @@ -496,7 +502,6 @@ abstract class GraphSONModule extends TinkerPopJacksonModule { OrderLimitStrategy.class, PathProcessorStrategy.class, PathRetractionStrategy.class, - CountStrategy.class, RepeatUnrollStrategy.class, ComputerVerificationStrategy.class, LambdaRestrictionStrategy.class, http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8a4102c9/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 6bb7b34..65ae4b1 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 @@ -51,6 +51,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.FilterRankingStrategy; import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IdentityRemovalStrategy; import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IncidentToAdjacentStrategy; @@ -319,6 +320,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, 170)); // ***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)); @@ -328,7 +331,6 @@ public enum GryoVersion { 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)); @@ -535,6 +537,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, 170)); // ***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)); @@ -544,7 +548,6 @@ public enum GryoVersion { 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));
