You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by da...@apache.org on 2016/12/07 21:37:53 UTC

[8/9] tinkerpop git commit: rebased

rebased


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/522960c3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/522960c3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/522960c3

Branch: refs/heads/TINKERPOP-1490
Commit: 522960c345c1d684151d3996607bd3778e1156b5
Parents: 54fac51 77b3416
Author: davebshow <da...@gmail.com>
Authored: Wed Dec 7 15:15:27 2016 -0500
Committer: davebshow <da...@gmail.com>
Committed: Wed Dec 7 15:15:27 2016 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  19 +
 docker/build.sh                                 |   2 +-
 docker/scripts/build.sh                         |   7 +
 .../developer/development-environment.asciidoc  |  18 +-
 docs/src/dev/io/graphson.asciidoc               |   4 +-
 .../src/reference/gremlin-applications.asciidoc |   6 +-
 docs/src/reference/gremlin-variants.asciidoc    |   5 -
 .../reference/implementations-neo4j.asciidoc    |   2 +-
 .../gremlin-language-variants/index.asciidoc    |   3 -
 .../upgrade/release-3.2.x-incubating.asciidoc   |  38 +-
 .../src/test/resources/giraph-site.xml          |  12 +
 .../archetype-resources/src/main/java/App.java  |   2 +-
 .../src/main/java/Service.java                  |   2 +-
 .../src/test/java/ServiceTest.java              |   2 +-
 .../SingleGremlinScriptEngineManager.java       |   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     | 130 +++++--
 .../dsl/graph/GraphTraversalSource.java         |   4 +-
 .../gremlin/process/traversal/dsl/graph/__.java |  43 ++-
 .../traversal/step/map/GroupStepV3d0.java       |   2 +-
 .../step/map/LambdaCollectingBarrierStep.java   |   2 +-
 .../traversal/step/util/HasContainer.java       |  26 +-
 .../strategy/decoration/SubgraphStrategy.java   |   4 +-
 .../optimization/FilterRankingStrategy.java     |  43 ++-
 .../IncidentToAdjacentStrategy.java             |   4 +-
 .../optimization/InlineFilterStrategy.java      |  20 +-
 .../process/traversal/util/TraversalHelper.java |  19 +-
 .../process/traversal/util/TraversalRing.java   |   8 +-
 .../gremlin/structure/io/IoRegistry.java        |   2 +-
 .../GraphSONTraversalSerializersV2d0.java       |   9 +-
 .../gremlin/structure/io/gryo/GryoPool.java     |  23 +-
 .../gremlin/structure/util/StringFactory.java   |  19 +-
 .../optimization/GraphFilterStrategyTest.java   |   2 +-
 .../gremlin/process/traversal/BytecodeTest.java |  32 +-
 .../traversal/step/filter/HasStepTest.java      |  12 +-
 .../optimization/FilterRankingStrategyTest.java |  27 +-
 .../optimization/InlineFilterStrategyTest.java  |  12 +-
 .../gremlin/structure/io/IoXIoRegistry.java     |   2 +-
 .../gremlin/structure/io/IoYIoRegistry.java     |   2 +-
 .../structure/io/gryo/GryoMapperTest.java       |  12 +-
 .../ser/AbstractGryoMessageSerializerV1d0.java  |   4 +-
 .../driver/ser/AbstractMessageSerializer.java   |  26 +-
 .../ser/GryoBaseMessageSerializerV1d0Test.java  |  93 +++++
 .../step/filter/GroovyWhereTest.groovy          |  11 +
 .../traversal/step/map/GroovyPathTest.groovy    |   5 +
 .../groovy/util/DependencyGrabber.groovy        |  55 +--
 .../util/DependencyGrabberIntegrateTest.java    |   2 +-
 .../python/GraphTraversalSourceGenerator.groovy |  15 +-
 .../python/TraversalSourceGenerator.groovy      |   6 +
 .../gremlin_python/process/graph_traversal.py   |  19 +-
 .../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/process/ProcessComputerSuite.java   |   6 +-
 .../gremlin/process/ProcessStandardSuite.java   |   4 +-
 .../TraversalInterruptionComputerTest.java      |  15 +-
 .../process/traversal/step/ComplexTest.java     | 205 +++++++++++
 .../traversal/step/filter/WhereTest.java        |  31 ++
 .../process/traversal/step/map/PathTest.java    |  35 +-
 .../hadoop/structure/HadoopConfiguration.java   |   4 +-
 .../step/sideEffect/Neo4jGraphStep.java         |  11 +-
 .../Neo4jGraphStepStrategyTest.java             |  12 +-
 pom.xml                                         |   2 +-
 .../SparkGraphComputerProcessIntegrateTest.java |  32 ++
 .../computer/SparkGraphComputerProcessTest.java |  32 --
 ...GraphComputerGroovyProcessIntegrateTest.java |  33 ++
 .../SparkGraphComputerGroovyProcessTest.java    |  33 --
 .../PersistedInputOutputRDDIntegrateTest.java   | 358 +++++++++++++++++++
 .../io/PersistedInputOutputRDDTest.java         | 358 -------------------
 .../step/sideEffect/TinkerGraphStep.java        |   9 +-
 .../tinkergraph/structure/TinkerGraph.java      |   2 +-
 .../tinkergraph/structure/TinkerIoRegistry.java |   8 +
 .../structure/TinkerIoRegistryV2d0.java         |   8 +
 .../TinkerGraphStepStrategyTest.java            |  10 +-
 .../TinkerGraphGraphSONSerializerV2d0Test.java  |   4 +-
 .../tinkergraph/structure/TinkerGraphTest.java  |   2 +-
 82 files changed, 1487 insertions(+), 683 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/522960c3/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
----------------------------------------------------------------------
diff --cc gremlin-python/src/main/jython/gremlin_python/process/traversal.py
index 3fdd50c,07afeac..61f8aee
--- a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
@@@ -396,3 -400,10 +396,9 @@@ class Binding(object)
      def __init__(self,key,value):
          self.key = key
          self.value = value
+     def __eq__(self, other):
+         return isinstance(other, self.__class__) and self.key == other.key and self.value == other.value
+     def __hash__(self):
+         return hash(self.key) + hash(self.value)
+     def __repr__(self):
+         return "binding[" + self.key + "=" + str(self.value) + "]"
 -