tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ok...@apache.org
Subject [10/12] incubator-tinkerpop git commit: merge master
Date Thu, 03 Mar 2016 17:03:33 GMT
merge master


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

Branch: refs/heads/TINKERPOP-1192
Commit: 7013a9746cc04da32bb63fe0e6932a468c47ff0d
Parents: 50c5656 d23c960
Author: rjbriody <bob.briody@datastax.com>
Authored: Tue Mar 1 08:50:37 2016 -0500
Committer: rjbriody <bob.briody@datastax.com>
Committed: Tue Mar 1 08:50:37 2016 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  11 +-
 appveyor.yml                                    |   2 +-
 docs/src/dev/developer/contributing.asciidoc    |  22 +-
 docs/src/dev/provider/index.asciidoc            | 911 +++++++++++++++++++
 .../src/reference/gremlin-applications.asciidoc | 369 +-------
 .../reference/implementations-intro.asciidoc    | 528 +----------
 .../tutorials/getting-started/index.asciidoc    |   2 +-
 .../the-gremlin-console/index.asciidoc          |   2 +-
 .../upgrade/release-3.1.x-incubating.asciidoc   |  27 +-
 .../gremlin-archetype-server/pom.xml            |  59 ++
 .../META-INF/maven/archetype-metadata.xml       |  47 +
 .../archetype-resources/README.asciidoc         |  71 ++
 .../conf/log4j-test.properties                  |  21 +
 .../archetype-resources/conf/log4j.properties   |  21 +
 .../conf/tinkergraph-empty.properties           |  18 +
 .../main/resources/archetype-resources/pom.xml  |  79 ++
 .../scripts/generate-modern.groovy              |  33 +
 .../archetype-resources/src/main/java/App.java  |  42 +
 .../src/main/java/Service.java                  |  70 ++
 .../src/test/java/ServiceTest.java              |  84 ++
 .../src/test/resources/gremlin-server.yaml      |  45 +
 .../projects/standard/archetype.properties      |  21 +
 .../test/resources/projects/standard/goal.txt   |   1 +
 .../gremlin-archetype-tinkergraph/pom.xml       |  59 ++
 .../META-INF/maven/archetype-metadata.xml       |  38 +
 .../archetype-resources/README.asciidoc         |  35 +
 .../main/resources/archetype-resources/pom.xml  |  58 ++
 .../archetype-resources/src/main/java/App.java  |  78 ++
 .../src/test/java/AppTest.java                  |  40 +
 .../projects/standard/archetype.properties      |  21 +
 .../test/resources/projects/standard/goal.txt   |   1 +
 gremlin-archetype/pom.xml                       |  70 ++
 gremlin-console/src/main/static/NOTICE          |   3 -
 .../traversal/util/TraversalExplanation.java    |  12 +-
 .../structure/io/graphson/GraphSONModule.java   |   2 +
 .../io/graphson/GraphSONSerializers.java        |  52 ++
 .../structure/io/graphson/GraphSONTokens.java   |   9 +
 .../gremlin/structure/io/gryo/GryoMapper.java   |   3 +-
 .../structure/io/gryo/GryoSerializers.java      |   1 -
 .../util/TraversalExplanationTest.java          |  38 +
 .../io/graphson/GraphSONMapperTest.java         |   9 +
 .../structure/io/gryo/GryoMapperTest.java       |   8 +
 gremlin-driver/pom.xml                          |   2 +-
 .../gremlin/driver/ConnectionPool.java          |   7 +-
 .../gremlin/driver/LoadBalancingStrategy.java   |  10 +-
 .../groovy/jsr223/ast/InterpreterMode.groovy    |  30 +
 .../ast/InterpreterModeASTTransformation.groovy | 115 +++
 .../gremlin/groovy/engine/ScriptEngines.java    |   2 +-
 .../jsr223/GremlinGroovyScriptEngine.java       |  41 +-
 .../InterpreterModeCustomizerProvider.java      |  37 +
 .../groovy/engine/GremlinExecutorTest.java      |  10 +-
 .../jsr223/GremlinGroovyScriptEngineTest.java   |  52 ++
 .../handler/HttpGremlinEndpointHandler.java     |   2 +-
 gremlin-server/src/main/static/NOTICE           |   3 -
 .../server/GremlinDriverIntegrateTest.java      | 114 ++-
 .../server/GremlinResultSetIntegrateTest.java   |  13 +-
 .../server/GremlinServerIntegrateTest.java      |  57 ++
 .../util/detached/DetachedVertexTest.java       |  24 +-
 pom.xml                                         |  32 +-
 spark-gremlin/pom.xml                           |  30 +-
 60 files changed, 2649 insertions(+), 955 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7013a974/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
index a722497,c20655e..8b89446
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
@@@ -297,7 -297,7 +298,7 @@@ public final class GryoMapper implement
              add(Triplet.<Class, Function<Kryo, Serializer>, Integer>with(AtomicLong.class,
null, 79));
              add(Triplet.<Class, Function<Kryo, Serializer>, Integer>with(DependantMutableMetrics.class,
null, 80));
              add(Triplet.<Class, Function<Kryo, Serializer>, Integer>with(Pair.class,
kryo -> new PairSerializer(), 88));
-             add(Triplet.<Class, Function<Kryo, Serializer>, Integer>with(TraversalExplanation.class,
null, 106));
 -            add(Triplet.<Class, Function<Kryo, Serializer>, Integer>with(TraversalExplanation.class,
kryo -> new JavaSerializer(), 106)); // ***LAST ID**
++            add(Triplet.<Class, Function<Kryo, Serializer>, Integer>with(TraversalExplanation.class,
kryo -> new JavaSerializer(), 106));
  
              add(Triplet.<Class, Function<Kryo, Serializer>, Integer>with(Duration.class,
kryo -> new JavaTimeSerializers.DurationSerializer(), 93));
              add(Triplet.<Class, Function<Kryo, Serializer>, Integer>with(Instant.class,
kryo -> new JavaTimeSerializers.InstantSerializer(), 94));


Mime
View raw message