You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/12/08 22:54:16 UTC
[50/50] tinkerpop git commit: Merge branch 'master' into
TINKERPOP-1564
Merge branch 'master' into TINKERPOP-1564
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4a2a870d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4a2a870d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4a2a870d
Branch: refs/heads/TINKERPOP-1564
Commit: 4a2a870dbf89952959125db3998160d827bfec60
Parents: 3b472e1 69b314c
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Dec 8 15:53:11 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Dec 8 15:53:11 2016 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 7 +
docker/Dockerfile | 5 +-
docker/build/Dockerfile.template | 1 -
docker/resources/groovy/grapeConfig.xml | 15 +-
docker/scripts/build.sh | 14 +-
docs/preprocessor/install-plugins.sh | 6 +-
docs/site/home/index.html | 4 +-
.../src/reference/gremlin-applications.asciidoc | 46 +++--
docs/src/reference/gremlin-variants.asciidoc | 5 -
.../gremlin-language-variants/index.asciidoc | 3 -
docs/src/upgrade/release-3.3.x.asciidoc | 7 +
.../gremlin/process/traversal/Bindings.java | 39 +++-
.../gremlin/process/traversal/Bytecode.java | 19 +-
.../process/traversal/TraversalEngine.java | 2 +-
.../process/traversal/TraversalSideEffects.java | 8 +-
.../process/traversal/TraversalSource.java | 7 +-
.../traversal/dsl/graph/GraphTraversal.java | 2 +-
.../dsl/graph/GraphTraversalSource.java | 8 +-
.../gremlin/process/traversal/dsl/graph/__.java | 2 +-
.../traversal/step/map/GroupStepV3d0.java | 2 +-
.../step/map/LambdaCollectingBarrierStep.java | 2 +-
.../traversal/step/map/PropertyMapStep.java | 21 +-
.../strategy/decoration/SubgraphStrategy.java | 4 +-
.../process/traversal/util/TraversalHelper.java | 2 +-
.../GraphSONTraversalSerializersV2d0.java | 9 +-
.../optimization/GraphFilterStrategyTest.java | 2 +-
.../gremlin/process/traversal/BytecodeTest.java | 32 ++-
.../step/filter/GroovyWhereTest.groovy | 6 +
.../step/map/GroovyValueMapTest.groovy | 5 +
.../groovy/util/DependencyGrabber.groovy | 55 ++---
.../util/DependencyGrabberIntegrateTest.java | 2 +-
.../python/GraphTraversalSourceGenerator.groovy | 13 +-
.../python/TraversalSourceGenerator.groovy | 6 +
.../gremlin_python/process/graph_traversal.py | 17 +-
.../jython/gremlin_python/process/traversal.py | 6 +
.../gremlin_python/structure/io/graphson.py | 10 +
.../driver/test_driver_remote_connection.py | 5 +
.../main/jython/tests/process/test_traversal.py | 26 +++
.../jython/tests/structure/io/test_graphson.py | 10 +
.../gremlin/server/op/AbstractOpProcessor.java | 9 +-
.../op/traversal/TraversalOpProcessor.java | 2 +-
.../server/gremlin-server-performance.yaml | 51 -----
.../gremlin/process/ProcessComputerSuite.java | 6 +-
.../gremlin/process/ProcessStandardSuite.java | 4 +-
.../process/computer/GraphComputerTest.java | 7 +-
.../process/traversal/step/ComplexTest.java | 205 +++++++++++++++++++
.../traversal/step/filter/WhereTest.java | 15 ++
.../traversal/step/map/ValueMapTest.java | 34 +++
.../hadoop/structure/HadoopConfiguration.java | 4 +-
pom.xml | 2 +-
50 files changed, 581 insertions(+), 193 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4a2a870d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4a2a870d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index 33c9cae,af78add..81a72d3
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@@ -134,12 -132,8 +133,11 @@@ public class GraphTraversalSource imple
return (GraphTraversalSource) TraversalSource.super.withoutStrategies(traversalStrategyClasses);
}
-- @Override
+ public GraphTraversalSource withPartitioner(final Partitioner partitioner) {
+ return (GraphTraversalSource) TraversalSource.super.withPartitioner(partitioner);
+ }
-
- @Override
++
+ @Deprecated
public GraphTraversalSource withBindings(final Bindings bindings) {
return (GraphTraversalSource) TraversalSource.super.withBindings(bindings);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4a2a870d/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4a2a870d/pom.xml
----------------------------------------------------------------------