You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2017/07/06 17:32:02 UTC
tinkerpop git commit: Registered ByModulatorOptimizationStrategy in
GraphSON and Gryo serializers and added it to the core imports. Thanks @okram
for pointing that out.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1682 de5306301 -> f68b36c44
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/f68b36c4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f68b36c4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f68b36c4
Branch: refs/heads/TINKERPOP-1682
Commit: f68b36c44ee7febfa2b2698889c977b11a3e8f49
Parents: de53063
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Jul 6 19:31:28 2017 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Jul 6 19:31:28 2017 +0200
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/jsr223/CoreImports.java | 4 +++-
.../gremlin/structure/io/graphson/GraphSONModule.java | 13 +++++++++----
.../gremlin/structure/io/gryo/GryoVersion.java | 11 +++++++----
3 files changed, 19 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f68b36c4/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 1296cfe..33c7365 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;
@@ -222,13 +223,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/f68b36c4/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 019112b..1c8a605 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;
@@ -159,6 +160,8 @@ abstract class GraphSONModule extends TinkerPopJacksonModule {
LazyBarrierStrategy.class,
MatchAlgorithmStrategy.class,
AdjacentToIncidentStrategy.class,
+ ByModulatorOptimizationStrategy.class,
+ CountStrategy.class,
FilterRankingStrategy.class,
IdentityRemovalStrategy.class,
IncidentToAdjacentStrategy.class,
@@ -167,7 +170,6 @@ abstract class GraphSONModule extends TinkerPopJacksonModule {
OrderLimitStrategy.class,
PathProcessorStrategy.class,
PathRetractionStrategy.class,
- CountStrategy.class,
RepeatUnrollStrategy.class,
ComputerVerificationStrategy.class,
LambdaRestrictionStrategy.class,
@@ -267,6 +269,8 @@ abstract class GraphSONModule extends TinkerPopJacksonModule {
LazyBarrierStrategy.class,
MatchAlgorithmStrategy.class,
AdjacentToIncidentStrategy.class,
+ ByModulatorOptimizationStrategy.class,
+ CountStrategy.class,
FilterRankingStrategy.class,
IdentityRemovalStrategy.class,
IncidentToAdjacentStrategy.class,
@@ -275,7 +279,6 @@ abstract class GraphSONModule extends TinkerPopJacksonModule {
OrderLimitStrategy.class,
PathProcessorStrategy.class,
PathRetractionStrategy.class,
- CountStrategy.class,
RepeatUnrollStrategy.class,
ComputerVerificationStrategy.class,
LambdaRestrictionStrategy.class,
@@ -365,6 +368,8 @@ abstract class GraphSONModule extends TinkerPopJacksonModule {
LazyBarrierStrategy.class,
MatchAlgorithmStrategy.class,
AdjacentToIncidentStrategy.class,
+ ByModulatorOptimizationStrategy.class,
+ CountStrategy.class,
FilterRankingStrategy.class,
IdentityRemovalStrategy.class,
IncidentToAdjacentStrategy.class,
@@ -373,7 +378,6 @@ abstract class GraphSONModule extends TinkerPopJacksonModule {
OrderLimitStrategy.class,
PathProcessorStrategy.class,
PathRetractionStrategy.class,
- CountStrategy.class,
RepeatUnrollStrategy.class,
ComputerVerificationStrategy.class,
LambdaRestrictionStrategy.class,
@@ -473,6 +477,8 @@ abstract class GraphSONModule extends TinkerPopJacksonModule {
LazyBarrierStrategy.class,
MatchAlgorithmStrategy.class,
AdjacentToIncidentStrategy.class,
+ ByModulatorOptimizationStrategy.class,
+ CountStrategy.class,
FilterRankingStrategy.class,
IdentityRemovalStrategy.class,
IncidentToAdjacentStrategy.class,
@@ -481,7 +487,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/f68b36c4/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 b524cbc..dfd8922 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
@@ -52,6 +52,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;
@@ -296,6 +297,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));
@@ -305,7 +308,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));
@@ -358,7 +360,7 @@ public enum GryoVersion {
tryAddDynamicType(this, "org.apache.tinkerpop.gremlin.driver.message.RequestMessage",
"org.apache.tinkerpop.gremlin.driver.ser.RequestMessageGryoSerializer", 167);
tryAddDynamicType(this, "org.apache.tinkerpop.gremlin.driver.message.ResponseMessage",
- "org.apache.tinkerpop.gremlin.driver.ser.ResponseMessageGryoSerializer", 169); // ***LAST ID***
+ "org.apache.tinkerpop.gremlin.driver.ser.ResponseMessageGryoSerializer", 169);
}};
}
@@ -508,6 +510,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));
@@ -517,13 +521,12 @@ 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));
add(GryoTypeReg.of(ReadOnlyStrategy.class, 159));
add(GryoTypeReg.of(MatchStep.CountMatchAlgorithm.class, 160));
- add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 167)); // ***LAST ID***
+ add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 167));
}};
}