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 2016/01/05 18:14:32 UTC

[3/4] incubator-tinkerpop git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop into TINKERPOP3-432

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop into TINKERPOP3-432


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

Branch: refs/heads/TINKERPOP3-432
Commit: eb50570f9512b4621ecd9cf32e9ad655a42f9d80
Parents: caebf26 46c7189
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Jan 5 15:20:51 2016 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Jan 5 15:20:51 2016 +0100

----------------------------------------------------------------------
 .travis.yml                                     |   5 +-
 CHANGELOG.asciidoc                              | 254 +++++-----
 README.asciidoc                                 |  12 +-
 bin/validate-distribution.sh                    |   4 +-
 docs/src/dev/developer/contributing.asciidoc    |  54 ++-
 docs/src/dev/developer/meetings.asciidoc        | 194 ++++----
 docs/src/dev/developer/release.asciidoc         |   5 +-
 .../src/reference/gremlin-applications.asciidoc | 139 +++++-
 docs/src/reference/implementations.asciidoc     |  37 +-
 docs/src/reference/intro.asciidoc               |  23 +-
 docs/src/reference/the-graph.asciidoc           |  68 +--
 docs/src/reference/the-graphcomputer.asciidoc   |  11 +-
 docs/src/reference/the-traversal.asciidoc       |  38 +-
 .../tutorials/getting-started/index.asciidoc    |  52 +-
 .../upgrade/release-3.0.x-incubating.asciidoc   |  28 +-
 .../upgrade/release-3.1.x-incubating.asciidoc   | 149 ++++--
 docs/static/images/business-gremlin.png         | Bin 0 -> 412520 bytes
 .../images/modern-edge-1-to-3-1-gremlin.png     | Bin 11607 -> 12720 bytes
 docs/static/images/modern-edge-1-to-3-1.png     | Bin 3210 -> 3887 bytes
 .../images/modern-edge-1-to-3-2-gremlin.png     | Bin 17029 -> 18052 bytes
 docs/static/images/modern-edge-1-to-3-2.png     | Bin 4420 -> 3784 bytes
 .../images/modern-edge-1-to-3-3-gremlin.png     | Bin 20948 -> 22258 bytes
 docs/static/images/modern-edge-1-to-3-3.png     | Bin 7372 -> 5800 bytes
 docs/static/images/quantum-gremlin-full.png     | Bin 0 -> 1877990 bytes
 giraph-gremlin/pom.xml                          |  18 +-
 .../groovy/plugin/GiraphGremlinPlugin.java      |   1 -
 .../process/computer/GiraphGraphComputer.java   |  11 +-
 .../src/test/resources/log4j-silent.properties  |  23 +
 .../src/test/resources/log4j-test.properties    |  23 +
 gremlin-console/conf/log4j-console.properties   |  15 +-
 gremlin-console/pom.xml                         |   6 +
 .../tinkerpop/gremlin/console/Console.groovy    |  20 +-
 .../src/test/resources/log4j-silent.properties  |  23 +
 .../src/test/resources/log4j-test.properties    |  21 +
 gremlin-core/pom.xml                            |   6 +
 .../computer/bulkloading/BulkLoader.java        |   8 +-
 .../bulkloading/BulkLoaderVertexProgram.java    |  11 +-
 .../bulkloading/IncrementalBulkLoader.java      |   8 +-
 .../computer/bulkloading/OneTimeBulkLoader.java | 109 +++++
 .../peerpressure/PeerPressureVertexProgram.java |   5 +-
 .../gremlin/process/traversal/Order.java        |  28 +-
 .../gremlin/process/traversal/Traverser.java    |   9 +
 .../traversal/dsl/graph/GraphTraversal.java     |  20 +-
 .../process/traversal/step/map/MatchStep.java   |  56 ++-
 .../traversal/step/map/SelectColumnStep.java    |  68 ---
 .../traversal/step/util/ComputerAwareStep.java  |   2 +-
 .../traversal/step/util/FunctionComparator.java |  56 +++
 .../IncidentToAdjacentStrategy.java             |   8 +-
 .../traversal/traverser/O_Traverser.java        |  37 ++
 .../traverser/util/EmptyTraverser.java          |   6 +
 .../tinkerpop/gremlin/structure/Column.java     |  42 +-
 .../tinkerpop/gremlin/structure/Element.java    |   2 +-
 .../structure/io/gryo/GryoClassResolver.java    |   2 +-
 .../gremlin/structure/io/gryo/GryoMapper.java   |  25 +-
 .../apache/tinkerpop/gremlin/TestHelper.java    |  76 ++-
 .../traversal/step/map/MatchStepTest.java       |  15 +-
 .../sideEffect/LambdaSideEffectStepTest.java    |   7 +-
 .../tinkerpop/gremlin/structure/io/IoX.java     |   5 +
 .../gremlin/structure/io/IoXIoRegistry.java     |  57 +++
 .../tinkerpop/gremlin/structure/io/IoY.java     |   5 +
 .../gremlin/structure/io/IoYIoRegistry.java     |  39 ++
 .../structure/io/gryo/GryoMapperTest.java       | 113 +++++
 .../src/test/resources/log4j-silent.properties  |  23 +
 .../src/test/resources/log4j-test.properties    |  21 +
 .../tinkerpop/gremlin/driver/Cluster.java       |  24 +
 .../tinkerpop/gremlin/driver/Settings.java      |  17 +-
 .../AbstractGraphSONMessageSerializerV1d0.java  |   5 +-
 .../driver/ser/AbstractMessageSerializer.java   |  82 ++++
 .../driver/ser/GryoMessageSerializerV1d0.java   |  49 +-
 ...raphSONMessageSerializerGremlinV1d0Test.java |   5 +-
 .../ser/GraphSONMessageSerializerV1d0Test.java  |  60 +++
 .../ser/GryoMessageSerializerV1d0Test.java      | 115 ++++-
 .../src/test/resources/log4j-silent.properties  |  23 +
 .../src/test/resources/log4j-test.properties    |  21 +
 .../step/branch/GroovyLocalTest.groovy          |   2 +-
 .../traversal/step/map/GroovyOrderTest.groovy   |   8 +-
 .../traversal/step/map/GroovySelectTest.groovy  |   2 +-
 .../gremlin/groovy/GroovyEnvironmentSuite.java  |   2 +
 ...remlinGroovyScriptEngineFileSandboxTest.java | 117 +++++
 .../GremlinGroovyScriptEngineIntegrateTest.java |  11 +-
 .../GremlinGroovyScriptEngineOverGraphTest.java |   7 +-
 .../process/GroovyProcessComputerSuite.java     |   6 +-
 .../process/GroovyProcessStandardSuite.java     |   2 +
 .../gremlin/groovy/jsr223/sandbox.yaml          |  58 +++
 .../customizer/AbstractSandboxExtension.groovy  |  90 ++++
 .../customizer/FileSandboxExtension.groovy      | 107 ++++
 .../PropertyExpressionEvaluator.groovy          |  66 +++
 .../jsr223/customizer/SandboxExtension.groovy   |   3 +
 .../jsr223/customizer/SandboxHelper.groovy      |  57 +++
 .../customizer/SimpleSandboxExtension.groovy    |  30 +-
 .../customizer/TinkerPopSandboxExtension.groovy |  44 +-
 .../gremlin/groovy/engine/GremlinExecutor.java  |   4 +-
 .../gremlin/groovy/engine/ScriptEngines.java    |  24 +-
 .../jsr223/GremlinGroovyScriptEngine.java       |  19 +-
 .../jsr223/ScriptEnginePluginAcceptor.java      |  26 +-
 .../groovy/engine/GremlinExecutorTest.java      |   8 +-
 .../groovy/engine/ScriptEnginesTest.java        |  99 ++++
 .../jsr223/GremlinGroovyScriptEngineTest.java   |  93 ++--
 .../groovy/util/DependencyGrabberTest.java      |   3 +-
 .../src/test/resources/log4j-silent.properties  |  23 +
 .../src/test/resources/log4j-test.properties    |  21 +
 gremlin-server/conf/gremlin-server-classic.yaml |   1 +
 gremlin-server/conf/gremlin-server-min.yaml     |   1 +
 .../conf/gremlin-server-modern-readonly.yaml    |   1 +
 gremlin-server/conf/gremlin-server-modern.yaml  |   1 +
 gremlin-server/conf/gremlin-server-neo4j.yaml   |   1 +
 .../conf/gremlin-server-rest-modern.yaml        |   1 +
 .../conf/gremlin-server-rest-secure.yaml        |   1 +
 gremlin-server/conf/gremlin-server-secure.yaml  |   1 +
 gremlin-server/conf/gremlin-server-spark.yaml   |   1 +
 gremlin-server/conf/gremlin-server.yaml         |   1 +
 gremlin-server/conf/log4j-server.properties     |  17 +-
 .../scripts/empty-sample-secure.groovy          |   4 +-
 .../tinkerpop/gremlin/server/GraphManager.java  |  46 ++
 .../tinkerpop/gremlin/server/GremlinServer.java |   8 +-
 .../tinkerpop/gremlin/server/Settings.java      |   9 +
 .../server/auth/AllowAllAuthenticator.java      |  10 +
 .../gremlin/server/auth/Authenticator.java      |  27 +-
 .../server/auth/SimpleAuthenticator.java        |  11 +-
 .../gremlin/server/channel/HttpChannelizer.java |   2 +-
 .../handler/HttpGremlinEndpointHandler.java     |  37 +-
 .../server/handler/OpSelectorHandler.java       |   2 +-
 .../handler/SaslAuthenticationHandler.java      |  22 +-
 .../server/op/AbstractEvalOpProcessor.java      |  92 +++-
 .../server/op/control/ControlOpProcessor.java   |  18 +-
 .../gremlin/server/op/session/Session.java      |   1 -
 .../server/op/session/SessionOpProcessor.java   |   7 +-
 .../server/op/standard/StandardOpProcessor.java |  31 +-
 .../AbstractGremlinServerIntegrationTest.java   |   7 +-
 .../server/GremlinAdditionPerformanceTest.java  |   5 +-
 .../server/GremlinDriverIntegrateTest.java      | 117 ++++-
 .../GremlinServerAuthIntegrateOldTest.java      | 235 ---------
 .../GremlinServerAuthOldIntegrateTest.java      | 235 +++++++++
 .../server/GremlinServerHttpIntegrateTest.java  |  36 ++
 .../server/GremlinServerIntegrateTest.java      |  90 ++--
 .../src/test/resources/log4j-silent.properties  |  23 +
 .../src/test/resources/log4j-test.properties    |  21 +
 .../server/gremlin-server-integration.yaml      |   1 +
 .../server/gremlin-server-performance.yaml      |   1 +
 gremlin-test/pom.xml                            |   6 +
 .../gremlin/AbstractGraphProvider.java          |  14 +-
 .../tinkerpop/gremlin/AbstractGremlinSuite.java |  32 +-
 .../tinkerpop/gremlin/AbstractGremlinTest.java  |  26 +-
 .../apache/tinkerpop/gremlin/GraphManager.java  | 115 ++++-
 .../apache/tinkerpop/gremlin/GraphProvider.java |  10 +
 .../apache/tinkerpop/gremlin/TestHelper.java    |  51 +-
 .../generator/CommunityGeneratorTest.java       |   5 +-
 .../process/AbstractGremlinProcessTest.java     |   7 +-
 .../gremlin/process/GremlinProcessRunner.java   |   6 +-
 .../gremlin/process/ProcessComputerSuite.java   |   4 +-
 .../BulkLoaderVertexProgramTest.java            |  49 +-
 .../PeerPressureVertexProgramTest.java          |  63 +++
 .../ranking/PageRankVertexProgramTest.java      |  78 ---
 .../pagerank/PageRankVertexProgramTest.java     |  83 ++++
 .../process/traversal/step/filter/TailTest.java |   2 +-
 .../process/traversal/step/map/FlatMapTest.java |   2 +-
 .../process/traversal/step/map/MapTest.java     |   2 +-
 .../process/traversal/step/map/OrderTest.java   |  11 +-
 .../process/traversal/step/map/SelectTest.java  |   6 +-
 .../ElementIdStrategyProcessTest.java           |   7 +-
 .../gremlin/structure/FeatureSupportTest.java   |   7 +-
 .../tinkerpop/gremlin/structure/GraphTest.java  |  16 +-
 .../gremlin/structure/PropertyTest.java         |   4 +-
 .../gremlin/structure/TransactionTest.java      |   3 +
 .../tinkerpop/gremlin/structure/VertexTest.java |  18 +-
 .../gremlin/structure/io/IoGraphTest.java       |   4 +-
 .../gremlin/structure/io/IoIntegrateTest.java   |  10 +-
 .../tinkerpop/gremlin/structure/io/IoTest.java  |  87 ++--
 .../structure/ExceptionCoverageTest.java        |   5 +-
 .../src/test/resources/log4j-silent.properties  |  26 +
 .../src/test/resources/log4j-test.properties    |  24 +
 hadoop-gremlin/conf/hadoop-gryo.properties      |   3 +
 hadoop-gremlin/pom.xml                          |  18 +-
 .../groovy/plugin/HadoopGremlinPlugin.java      |   8 -
 .../computer/util/ComputerSubmissionHelper.java |  80 +++
 .../structure/hdfs/HadoopEdgeIterator.java      |   4 -
 .../structure/hdfs/HadoopElementIterator.java   |  35 +-
 .../structure/hdfs/HadoopVertexIterator.java    |   4 -
 .../structure/io/script/ScriptRecordReader.java |   3 +-
 .../structure/io/script/ScriptRecordWriter.java |   3 +-
 .../gremlin/hadoop/HadoopGraphProvider.java     |   2 +-
 .../groovy/plugin/HadoopGremlinPluginCheck.java | 181 +++++++
 .../groovy/plugin/HadoopGremlinPluginTest.java  | 173 -------
 .../hadoop/groovy/plugin/HadoopPluginSuite.java |   2 +-
 .../HadoopGraphStructureStandardTest.java       |  35 ++
 .../io/HadoopGraphStructureStandardTest.java    |  35 --
 .../structure/io/RecordReaderWriterTest.java    |   7 +-
 .../src/test/resources/log4j-silent.properties  |  23 +
 .../src/test/resources/log4j-test.properties    |  21 +
 neo4j-gremlin/pom.xml                           |   6 +
 .../gremlin/neo4j/NativeNeo4jSuite.java         |  18 +-
 .../neo4j/process/NativeNeo4jCypherCheck.java   | 214 ++++++++
 .../neo4j/process/NativeNeo4jCypherTest.java    | 211 --------
 .../neo4j/structure/NativeNeo4jIndexCheck.java  | 371 ++++++++++++++
 .../neo4j/structure/NativeNeo4jIndexTest.java   | 368 --------------
 .../structure/NativeNeo4jStructureCheck.java    | 483 +++++++++++++++++++
 .../structure/NativeNeo4jStructureTest.java     | 483 -------------------
 .../src/test/resources/log4j-silent.properties  |  23 +
 .../src/test/resources/log4j-test.properties    |  21 +
 pom.xml                                         |  54 +--
 spark-gremlin/pom.xml                           |  18 +-
 .../spark/groovy/plugin/SparkLoader.groovy      |  68 +++
 .../spark/groovy/plugin/SparkGremlinPlugin.java |   9 +-
 .../spark/process/computer/SparkExecutor.java   |  37 +-
 .../process/computer/SparkGraphComputer.java    |  59 ++-
 .../computer/payload/MessagePayload.java        |   5 +-
 .../computer/payload/ViewIncomingPayload.java   |   8 +-
 .../computer/payload/ViewOutgoingPayload.java   |  12 +-
 .../gremlin/spark/structure/Spark.java          | 114 +++++
 .../spark/structure/io/InputFormatRDD.java      |   3 +-
 .../spark/structure/io/InputOutputHelper.java   |   2 +
 .../spark/structure/io/InputRDDFormat.java      | 137 ++++++
 .../spark/structure/io/PersistedInputRDD.java   |  23 +-
 .../spark/structure/io/PersistedOutputRDD.java  |  13 +
 .../spark/structure/io/gryo/GryoSerializer.java |   6 +
 .../io/gryo/WrappedArraySerializer.java         |  46 ++
 .../gremlin/spark/AbstractSparkTest.java        |  49 ++
 .../process/computer/LocalPropertyTest.java     |  14 +-
 .../computer/SparkHadoopGraphProvider.java      |  16 +-
 .../groovy/SparkHadoopGremlinPluginTest.java    |  33 --
 .../groovy/plugin/SparkGremlinPluginTest.java   | 126 +++++
 .../plugin/SparkHadoopGremlinPluginTest.java    |  33 ++
 .../gremlin/spark/structure/SparkTest.java      | 108 +++++
 .../spark/structure/io/InputOutputRDDTest.java  |  11 +-
 .../spark/structure/io/InputRDDTest.java        |  31 +-
 .../spark/structure/io/OutputRDDTest.java       |  10 +-
 .../io/PersistedInputOutputRDDTest.java         | 138 ++++--
 .../spark/structure/io/ToyGraphInputRDD.java    |  73 +++
 .../src/test/resources/log4j-silent.properties  |  23 +
 .../src/test/resources/log4j-test.properties    |  25 +
 .../structure/TinkerGraphPlayTest.java          |  60 +--
 .../tinkergraph/structure/TinkerGraphTest.java  |  18 +-
 .../src/test/resources/log4j-silent.properties  |  23 +
 .../src/test/resources/log4j-test.properties    |  21 +
 234 files changed, 6793 insertions(+), 2812 deletions(-)
----------------------------------------------------------------------