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 2015/05/05 20:57:43 UTC
[5/9] incubator-tinkerpop git commit: Merge branch 'master' into
TINKERPOP3-654
Merge branch 'master' into TINKERPOP3-654
Resolved Conflicts:
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/5602f7a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/5602f7a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/5602f7a5
Branch: refs/heads/master
Commit: 5602f7a546fa27ea1fba3aecf96d325145894455
Parents: d20151f dda3936
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue May 5 19:34:24 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue May 5 19:34:24 2015 +0200
----------------------------------------------------------------------
CHANGELOG.asciidoc | 4 +
README.asciidoc | 2 +-
docs/src/gremlin-applications.asciidoc | 30 ++--
docs/src/the-traversal.asciidoc | 77 ++++++----
.../process/traversal/TraversalEngine.java | 54 ++++++-
.../process/traversal/TraversalStrategies.java | 56 +++----
.../process/traversal/TraversalStrategy.java | 105 ++++++++++++-
.../dsl/graph/GraphTraversalSource.java | 26 ++--
.../engine/ComputerTraversalEngine.java | 44 +++++-
.../engine/StandardTraversalEngine.java | 5 -
.../traversal/lambda/HasNextTraversal.java | 9 +-
.../traversal/step/branch/BranchStep.java | 2 +-
.../traversal/step/map/OrderGlobalStep.java | 25 +++-
.../traversal/step/map/OrderLocalStep.java | 2 +
.../step/util/TraversalComparator.java | 4 +
.../strategy/AbstractTraversalStrategy.java | 2 +-
.../decoration/ConjunctionStrategy.java | 83 +++++++++++
.../strategy/decoration/ElementIdStrategy.java | 28 +++-
.../strategy/decoration/EventStrategy.java | 3 +-
.../decoration/LabeledEndStepStrategy.java | 51 +++++++
.../strategy/decoration/PartitionStrategy.java | 3 +-
.../strategy/decoration/SubgraphStrategy.java | 3 +-
.../finalization/EngineDependentStrategy.java | 46 ++++++
.../strategy/finalization/ProfileStrategy.java | 91 ++++++++++++
.../ComparatorHolderRemovalStrategy.java | 55 +++++++
.../optimization/ConjunctionStrategy.java | 83 -----------
.../optimization/DedupBijectionStrategy.java | 76 ++++++++++
.../optimization/DedupOptimizerStrategy.java | 75 ----------
.../optimization/IdentityRemovalStrategy.java | 3 +-
.../optimization/MatchWhereStrategy.java | 6 +-
.../strategy/optimization/ProfileStrategy.java | 115 ---------------
.../optimization/RangeByIsCountStrategy.java | 4 +-
.../ComparatorHolderRemovalStrategy.java | 54 -------
.../ComputerVerificationStrategy.java | 75 ++++++++++
.../verification/EngineDependentStrategy.java | 46 ------
.../verification/LabeledEndStepStrategy.java | 50 -------
.../verification/LambdaRestrictionStrategy.java | 3 +-
.../strategy/verification/ReadOnlyStrategy.java | 3 +-
.../TraversalVerificationStrategy.java | 72 ---------
.../traversal/util/DefaultTraversal.java | 6 +-
.../util/DefaultTraversalStrategies.java | 12 +-
.../util/EmptyTraversalStrategies.java | 4 +-
.../tinkerpop/gremlin/structure/Graph.java | 4 +
.../gremlin/structure/io/gryo/GryoPool.java | 63 +++++++-
.../gremlin/structure/util/GraphFactory.java | 2 +-
.../gremlin/structure/util/star/StarGraph.java | 2 +
.../process/TraversalStrategiesTest.java | 111 +++++++++++---
.../gremlin/structure/io/gryo/GryoPoolTest.java | 147 +++++++++++++++++++
.../tinkerpop/gremlin/driver/Handler.java | 12 +-
.../driver/message/ResponseStatusCode.java | 23 +--
.../gremlin/server/handler/IteratorHandler.java | 6 +-
.../handler/NioGremlinResponseEncoder.java | 29 +---
.../handler/WsGremlinResponseEncoder.java | 25 +---
.../server/op/AbstractEvalOpProcessor.java | 18 ++-
.../server/GremlinServerIntegrateTest.java | 42 ++----
.../hadoop/structure/io/VertexWritable.java | 10 +-
.../io/graphson/GraphSONRecordReader.java | 13 +-
.../structure/io/gryo/GryoRecordReader.java | 15 +-
.../gremlin/hadoop/HadoopGraphProvider.java | 10 +-
.../optimization/TinkerGraphStepStrategy.java | 20 ++-
60 files changed, 1263 insertions(+), 786 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/5602f7a5/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
index 1a8fec1,2e59d72..2cad898
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
@@@ -19,11 -19,16 +19,12 @@@
package org.apache.tinkerpop.gremlin.process.traversal;
import org.apache.tinkerpop.gremlin.process.computer.util.ShellGraph;
+ import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ConjunctionStrategy;
+ import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.LabeledEndStepStrategy;
+ import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.EngineDependentStrategy;
+ import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ProfileStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ComparatorHolderRemovalStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.DedupBijectionStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IdentityRemovalStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.MatchWhereStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.RangeByIsCountStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.*;
- import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ComparatorHolderRemovalStrategy;
- import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.EngineDependentStrategy;
- import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.LabeledEndStepStrategy;
- import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.TraversalVerificationStrategy;
+ import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ComputerVerificationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserGeneratorFactory;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@@ -147,18 -158,18 +148,19 @@@ public interface TraversalStrategies ex
static {
final TraversalStrategies coreStrategies = new DefaultTraversalStrategies();
coreStrategies.addStrategies(
- DedupOptimizerStrategy.instance(),
- RangeByIsCountStrategy.instance(),
+ ConjunctionStrategy.instance(),
+ HalfStepTraversalStrategy.instance(),
- IdentityRemovalStrategy.instance(),
- MatchWhereStrategy.instance(),
- ComparatorHolderRemovalStrategy.instance(),
LabeledEndStepStrategy.instance(),
- //LambdaRestrictionStrategy.instance(),
EngineDependentStrategy.instance(),
ProfileStrategy.instance(),
- TraversalVerificationStrategy.instance(),
- ConjunctionStrategy.instance());
+ ComparatorHolderRemovalStrategy.instance(),
+ DedupBijectionStrategy.instance(),
+ IdentityRemovalStrategy.instance(),
+ MatchWhereStrategy.instance(),
+ RangeByIsCountStrategy.instance(),
+ ComputerVerificationStrategy.instance());
+ //LambdaRestrictionStrategy.instance(),
+
CACHE.put(Graph.class, coreStrategies.clone());
CACHE.put(EmptyGraph.class, new DefaultTraversalStrategies());
}