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 2015/10/30 00:29:52 UTC

[31/50] incubator-tinkerpop git commit: Merge branch 'master' into TINKERPOP3-857

Merge branch 'master' into TINKERPOP3-857


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

Branch: refs/heads/TINKERPOP3-925
Commit: ee6074f8753df97b0356c96560ffc50ce301fed9
Parents: 2150b33 45bf33d
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Oct 28 13:20:11 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Oct 28 13:20:11 2015 -0600

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  41 +-
 CONTRIBUTING.asciidoc                           | 218 +-----
 RELEASE.asciidoc                                | 160 -----
 bin/validate-distribution.sh                    |   8 +-
 docs/preprocessor/awk/init-code-blocks.awk      |   2 +
 docs/preprocessor/preprocess-file.sh            |   2 +-
 docs/preprocessor/preprocess.sh                 |   6 +
 docs/src/acknowledgements.asciidoc              |  19 +-
 docs/src/conclusion.asciidoc                    |   6 +-
 docs/src/developer-contributing.asciidoc        | 268 +++++++
 docs/src/developer-release.asciidoc             | 172 +++++
 docs/src/developer.asciidoc                     |  29 +
 docs/src/gremlin-applications.asciidoc          | 703 +++++++++++++++----
 docs/src/implementations.asciidoc               | 660 ++++++++++++++---
 docs/src/intro.asciidoc                         | 173 ++++-
 docs/src/preface.asciidoc                       |  42 +-
 docs/src/the-graph.asciidoc                     | 245 +++++--
 docs/src/the-graphcomputer.asciidoc             | 222 +++++-
 docs/src/the-traversal.asciidoc                 | 644 ++++++++++++-----
 .../upgrade-release-3.0.x-incubating.asciidoc   |   6 +-
 .../upgrade-release-3.1.x-incubating.asciidoc   |  87 ++-
 docs/static/images/grateful-gremlin.png         | Bin 0 -> 59084 bytes
 .../images/keep-on-traversin-tiedye-title.png   | Bin 0 -> 943206 bytes
 docs/static/images/keep-on-traversin-tiedye.png | Bin 0 -> 581914 bytes
 docs/static/images/keep-on-traversin-title.png  | Bin 0 -> 669529 bytes
 docs/static/images/keep-on-traversin.png        | Bin 0 -> 400941 bytes
 docs/static/images/not-tinkerpop3-gremlin.png   | Bin 0 -> 186676 bytes
 docs/static/images/provider-integration.png     | Bin 372429 -> 226464 bytes
 docs/static/images/quantum-gremlin.png          | Bin 0 -> 69142 bytes
 docs/static/images/tinkerpop3.graffle           | 236 +++----
 giraph-gremlin/pom.xml                          |  21 +
 .../groovy/plugin/HadoopGremlinPluginTest.java  | 163 -----
 .../giraph/groovy/plugin/HadoopPluginSuite.java |  36 -
 ...GiraphGraphComputerProcessIntegrateTest.java |   2 +-
 .../computer/GiraphHadoopGraphProvider.java     |  64 ++
 .../computer/HadoopGiraphGraphProvider.java     | 170 -----
 ...GraphComputerGroovyProcessIntegrateTest.java |   4 +-
 .../GiraphHadoopGremlinPluginIntegrateTest.java |   6 +-
 .../conf/neo4j-standalone.properties            |  22 +
 .../conf/tinkergraph-gryo.properties            |  21 +
 .../bulkloading/BulkLoaderVertexProgram.java    |  13 +-
 .../gremlin/process/traversal/NumberHelper.java | 280 ++++++++
 .../gremlin/process/traversal/Operator.java     |  78 +-
 .../gremlin/process/traversal/Traversal.java    |  10 +
 .../process/traversal/TraversalStrategies.java  |   4 +-
 .../traversal/dsl/graph/GraphTraversal.java     |   4 +-
 .../dsl/graph/GraphTraversalSource.java         |  49 +-
 .../lambda/AbstractLambdaTraversal.java         |   7 +
 .../process/traversal/lambda/LoopTraversal.java |   4 +
 .../traversal/step/branch/RepeatStep.java       |   8 +
 .../process/traversal/step/filter/AndStep.java  |   2 +-
 .../traversal/step/filter/ConjunctionStep.java  |  81 ---
 .../traversal/step/filter/ConnectiveStep.java   |  81 +++
 .../process/traversal/step/filter/OrStep.java   |   2 +-
 .../step/filter/WherePredicateStep.java         |  10 +-
 .../step/filter/WhereTraversalStep.java         |   6 +-
 .../process/traversal/step/map/MatchStep.java   |  40 +-
 .../traversal/step/util/PathIdentityStep.java   |  48 --
 .../decoration/ConjunctionStrategy.java         | 114 ---
 .../strategy/decoration/ConnectiveStrategy.java | 114 +++
 .../AdjacentToIncidentStrategy.java             |   4 +-
 .../optimization/RangeByIsCountStrategy.java    |   6 +-
 .../B_LP_O_P_S_SE_SL_TraverserGenerator.java    |   8 +-
 .../B_LP_O_S_SE_SL_TraverserGenerator.java      |   8 +-
 .../B_O_S_SE_SL_TraverserGenerator.java         |   8 +-
 .../traverser/B_O_TraverserGenerator.java       |   6 +-
 .../traverser/LP_O_OB_P_S_SE_SL_Traverser.java  |  98 +++
 .../LP_O_OB_P_S_SE_SL_TraverserGenerator.java   |  62 ++
 .../traverser/LP_O_OB_S_SE_SL_Traverser.java    |  99 +++
 .../LP_O_OB_S_SE_SL_TraverserGenerator.java     |  61 ++
 .../traverser/O_OB_S_SE_SL_Traverser.java       | 137 ++++
 .../O_OB_S_SE_SL_TraverserGenerator.java        |  59 ++
 .../traverser/O_TraverserGenerator.java         |   2 +-
 .../traverser/TraverserRequirement.java         |   8 +-
 .../util/DefaultTraverserGeneratorFactory.java  |  34 +-
 .../gremlin/process/traversal/util/AndP.java    |   3 +-
 .../process/traversal/util/ConjunctionP.java    | 117 ---
 .../process/traversal/util/ConnectiveP.java     | 115 +++
 .../traversal/util/DefaultTraversal.java        |  27 +
 .../process/traversal/util/EmptyTraversal.java  |   5 +
 .../gremlin/process/traversal/util/OrP.java     |   2 +-
 .../process/traversal/util/TraversalHelper.java |   4 +-
 .../gremlin/structure/io/gryo/GryoMapper.java   |  10 +-
 .../traversal/OperatorExceptionTest.java        |  39 +-
 .../gremlin/process/traversal/OperatorTest.java | 100 ++-
 .../traversal/step/map/MatchStepTest.java       |   6 +-
 .../decoration/ConjunctionStrategyTest.java     | 183 -----
 .../decoration/ConnectiveStrategyTest.java      | 183 +++++
 .../DefaultTraverserGeneratorFactoryTest.java   |  85 +++
 .../driver/ser/GryoMessageSerializerV1d0.java   |  13 +-
 .../gremlin/driver/AbstractResultQueueTest.java |  23 +
 .../gremlin/driver/ResultQueueTest.java         |  15 +-
 .../ser/GryoMessageSerializerV1d0Test.java      |  55 ++
 .../step/sideEffect/GroovySackTest.groovy       |   9 +-
 .../gremlin/groovy/loaders/StepLoader.groovy    |  24 +-
 .../groovy/util/DependencyGrabber.groovy        |  73 +-
 .../groovy/function/GBinaryOperator.java        |   2 +
 .../gremlin/groovy/function/GComparator.java    |   2 +
 .../gremlin/groovy/function/GFunction.java      |   2 +
 .../gremlin/groovy/function/GSupplier.java      |   2 +
 .../gremlin/groovy/function/GUnaryOperator.java |   2 +
 ...linGroovyScriptEngineTimedInterruptTest.java |  12 +-
 .../groovy/util/DependencyGrabberTest.java      | 101 +++
 gremlin-server/pom.xml                          |  25 +
 .../tinkerpop/gremlin/server/GremlinServer.java |  53 +-
 .../tinkerpop/gremlin/server/Settings.java      |   5 +
 .../handler/NioGremlinBinaryRequestDecoder.java |   5 +
 .../handler/WsGremlinBinaryRequestDecoder.java  |   5 +
 .../handler/WsGremlinCloseRequestDecoder.java   |   5 +
 .../handler/WsGremlinTextRequestDecoder.java    |   5 +
 .../AbstractGremlinServerIntegrationTest.java   |   7 +-
 .../server/GremlinDriverIntegrateTest.java      |  72 +-
 .../server/GremlinServerIntegrateTest.java      | 100 +++
 .../BulkLoaderVertexProgramTest.java            | 123 +++-
 .../process/traversal/step/filter/HasTest.java  |   7 +-
 .../traversal/step/sideEffect/SackTest.java     |  41 +-
 .../conf/hadoop-grateful-gryo.properties        |  49 ++
 hadoop-gremlin/pom.xml                          |  12 +
 .../groovy/plugin/HadoopGremlinPlugin.java      |   3 +-
 .../hadoop/structure/io/HadoopPools.java        |   2 +-
 .../gremlin/hadoop/HadoopGraphProvider.java     |   2 +-
 .../groovy/plugin/HadoopGremlinPluginTest.java  |  33 +-
 .../hadoop/groovy/plugin/HadoopPluginSuite.java |   3 +-
 pom.xml                                         |  29 +-
 spark-gremlin/pom.xml                           |  57 ++
 .../groovy/plugin/HadoopGremlinPluginTest.java  | 162 -----
 .../spark/groovy/plugin/HadoopPluginSuite.java  |  36 -
 .../computer/HadoopSparkGraphProvider.java      | 159 -----
 .../SparkGraphComputerProcessIntegrateTest.java |   2 +-
 .../computer/SparkHadoopGraphProvider.java      |  53 ++
 ...GraphComputerGroovyProcessIntegrateTest.java |   4 +-
 .../groovy/SparkHadoopGremlinPluginTest.java    |   6 +-
 .../process/computer/io/OutputRDDTest.java      |   4 +-
 .../tinkergraph/structure/TinkerFactory.java    |   8 +-
 .../tinkergraph/structure/TinkerGraph.java      |  58 +-
 .../tinkergraph/TinkerGraphProvider.java        |  14 +-
 .../TinkerGraphNoStrategyComputerProvider.java  |   4 +-
 .../process/TinkerGraphNoStrategyProvider.java  |   4 +-
 .../structure/TinkerGraphIdManagerTest.java     |  18 +-
 .../tinkergraph/structure/TinkerGraphTest.java  |  16 +-
 140 files changed, 5711 insertions(+), 2707 deletions(-)
----------------------------------------------------------------------