tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [tinkerpop] 02/02: Merge branch 'TINKERPOP-1959' into TINKERPOP-1959-tp33
Date Mon, 08 Oct 2018 18:58:53 GMT
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch TINKERPOP-1959-tp33
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 6c7a8cd49ae5132470beb999de68822b7c79136c
Merge: 93bb752 6132b7a
Author: Stephen Mallette <spmva@genoprime.com>
AuthorDate: Mon Oct 8 14:50:55 2018 -0400

    Merge branch 'TINKERPOP-1959' into TINKERPOP-1959-tp33

 CHANGELOG.asciidoc                                 |  2 +
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 41 ++++++++++
 .../main/javascript/gremlin-javascript/index.js    |  6 +-
 .../gremlin-javascript/lib/driver/client.js        | 87 ++++++++++++++++++++
 .../lib/driver/driver-remote-connection.js         | 32 +++++---
 .../lib/driver/remote-connection.js                |  6 +-
 .../gremlin-javascript/lib/process/bytecode.js     |  4 +-
 .../gremlin-javascript/lib/process/translator.js   | 93 ++++++++++++++++++++++
 .../javascript/gremlin-javascript/test/helper.js   |  5 ++
 .../test/integration/client-tests.js               | 73 +++++++++++++++++
 .../gremlin-javascript/test/unit/graphson-test.js  |  4 +
 .../test/unit/translator-test.js                   | 68 ++++++++++++++++
 .../gremlin/server/gremlin-server-integration.yaml |  1 +
 13 files changed, 403 insertions(+), 19 deletions(-)

diff --cc gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
index 4e6cf9a,ac360a0..ddaaa95
--- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
+++ b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
@@@ -25,23 -25,23 +25,24 @@@ graphs: 
    crew: conf/tinkergraph-empty.properties,
    grateful: conf/tinkergraph-empty.properties,
    sink: conf/tinkergraph-empty.properties}
 -plugins:
 -  - tinkerpop.tinkergraph
  scriptEngines: {
    gremlin-groovy: {
 -    imports: [java.lang.Math],
 -    staticImports: [java.lang.Math.PI],
 -    scripts: [scripts/generate-all.groovy]}}
 +    plugins: { org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
 +               org.apache.tinkerpop.gremlin.tinkergraph.jsr223.TinkerGraphGremlinPlugin:
{},
 +               org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math],
methodImports: [java.lang.Math#*]},
 +               org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}}}
  serializers:
    - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config:
{ ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0],
custom: [groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer]}}
 +  - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config:
{ ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0],
custom: [groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer]}}
    - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0,
config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0],
custom: [groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer]}}
    - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config:
{ serializeResultToString: true}}
 +  - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config:
{ serializeResultToString: true}}
    - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0,
config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0]
}}
    - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0,
config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0]
}}
 -  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0,
config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0]
}}
 +  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0,
config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0]
}}
  processors:
    - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config:
{ sessionTimeout: 28800000 }}
+   - { className: org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor, config:
{}}
  metrics: {
    slf4jReporter: {enabled: true, interval: 180000}}
  strictTransactionManagement: false


Mime
View raw message