You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/04/14 19:58:09 UTC
[1/2] incubator-tinkerpop git commit: Provide a way to bind
TraversalSource objects to Gremlin Server. TINKERPOP3-594
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master e0574a3e5 -> 60c2e70c4
Provide a way to bind TraversalSource objects to Gremlin Server. TINKERPOP3-594
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/b1a51379
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b1a51379
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b1a51379
Branch: refs/heads/master
Commit: b1a513792089b06a35a0d7da906af5955e583e0e
Parents: fe7c56c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Apr 14 13:56:54 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 14 13:56:54 2015 -0400
----------------------------------------------------------------------
.../gremlin/groovy/engine/GremlinExecutor.java | 8 +++++---
gremlin-server/conf/gremlin-server-classic.yaml | 2 +-
gremlin-server/conf/gremlin-server-min.yaml | 2 +-
gremlin-server/conf/gremlin-server-modern.yaml | 2 +-
gremlin-server/conf/gremlin-server-rest-modern.yaml | 2 +-
gremlin-server/conf/gremlin-server.yaml | 5 +++--
gremlin-server/scripts/empty-sample.groovy | 4 ++++
gremlin-server/scripts/generate-classic.groovy | 6 +++++-
gremlin-server/scripts/generate-modern.groovy | 6 +++++-
gremlin-server/scripts/load-sample.groovy | 7 ++++++-
.../org/apache/tinkerpop/gremlin/server/Graphs.java | 13 ++++++++++---
.../apache/tinkerpop/gremlin/server/GremlinServer.java | 9 +++++++++
.../gremlin/server/GremlinDriverIntegrateTest.java | 8 ++++----
.../gremlin/server/GremlinServerHttpIntegrateTest.java | 6 +++---
.../gremlin/server/GremlinServerIntegrateTest.java | 2 +-
.../server/GremlinTraversalPerformanceTest.java | 10 +++++-----
.../gremlin/server/gremlin-server-integration.yaml | 2 +-
.../gremlin/server/gremlin-server-performance.yaml | 2 +-
18 files changed, 66 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b1a51379/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
index 8fcd776..5d87fc5 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.groovy.engine;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine;
import org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.commons.lang3.concurrent.BasicThreadFactory;
import org.javatuples.Pair;
@@ -358,10 +359,11 @@ public class GremlinExecutor implements AutoCloseable {
se.eval(p.getValue1(), bindings, language);
- // re-assign graph bindings back to global bindings. prevent assignment of non-graph
- // implementations just in case someone tries to overwrite them in the init
+ // re-assign graph bindings back to global bindings and grab TraversalSource creations.
+ // prevent assignment of non-graph implementations just in case someone tries to overwrite
+ // them in the init
bindings.entrySet().stream()
- .filter(kv -> kv.getValue() instanceof Graph)
+ .filter(kv -> kv.getValue() instanceof Graph || kv.getValue() instanceof TraversalSource)
.forEach(kv -> this.globalBindings.put(kv.getKey(), kv.getValue()));
logger.info("Initialized {} ScriptEngine with {}", language, p.getValue0());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b1a51379/gremlin-server/conf/gremlin-server-classic.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-classic.yaml b/gremlin-server/conf/gremlin-server-classic.yaml
index e216c1b..ea0fd7f 100644
--- a/gremlin-server/conf/gremlin-server-classic.yaml
+++ b/gremlin-server/conf/gremlin-server-classic.yaml
@@ -22,7 +22,7 @@ gremlinPool: 8
scriptEvaluationTimeout: 30000
serializedResponseTimeout: 30000
graphs: {
- g: conf/tinkergraph-empty.properties}
+ graph: conf/tinkergraph-empty.properties}
plugins:
- tinkerpop.tinkergraph
scriptEngines: {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b1a51379/gremlin-server/conf/gremlin-server-min.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-min.yaml b/gremlin-server/conf/gremlin-server-min.yaml
index 24bdc95..90b1f19 100644
--- a/gremlin-server/conf/gremlin-server-min.yaml
+++ b/gremlin-server/conf/gremlin-server-min.yaml
@@ -22,7 +22,7 @@ gremlinPool: 8
scriptEvaluationTimeout: 30000
serializedResponseTimeout: 30000
graphs: {
- g: conf/tinkergraph-empty.properties}
+ graph: conf/tinkergraph-empty.properties}
plugins:
- tinkerpop.tinkergraph
scriptEngines: {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b1a51379/gremlin-server/conf/gremlin-server-modern.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-modern.yaml b/gremlin-server/conf/gremlin-server-modern.yaml
index 940b48d..9909388 100644
--- a/gremlin-server/conf/gremlin-server-modern.yaml
+++ b/gremlin-server/conf/gremlin-server-modern.yaml
@@ -22,7 +22,7 @@ gremlinPool: 8
scriptEvaluationTimeout: 30000
serializedResponseTimeout: 30000
graphs: {
- g: conf/tinkergraph-empty.properties}
+ graph: conf/tinkergraph-empty.properties}
plugins:
- tinkerpop.tinkergraph
scriptEngines: {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b1a51379/gremlin-server/conf/gremlin-server-rest-modern.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-rest-modern.yaml b/gremlin-server/conf/gremlin-server-rest-modern.yaml
index ee1ac1d..4260add 100644
--- a/gremlin-server/conf/gremlin-server-rest-modern.yaml
+++ b/gremlin-server/conf/gremlin-server-rest-modern.yaml
@@ -23,7 +23,7 @@ scriptEvaluationTimeout: 30000
serializedResponseTimeout: 30000
channelizer: org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer
graphs: {
- g: conf/tinkergraph-empty.properties}
+ graph: conf/tinkergraph-empty.properties}
plugins:
- tinkerpop.tinkergraph
scriptEngines: {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b1a51379/gremlin-server/conf/gremlin-server.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server.yaml b/gremlin-server/conf/gremlin-server.yaml
index 40f2c88..de2effe 100644
--- a/gremlin-server/conf/gremlin-server.yaml
+++ b/gremlin-server/conf/gremlin-server.yaml
@@ -23,13 +23,14 @@ scriptEvaluationTimeout: 30000
serializedResponseTimeout: 30000
channelizer: org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer
graphs: {
- g: conf/tinkergraph-empty.properties}
+ graph: conf/tinkergraph-empty.properties}
plugins:
- tinkerpop.tinkergraph
scriptEngines: {
gremlin-groovy: {
imports: [java.lang.Math],
- staticImports: [java.lang.Math.PI]},
+ staticImports: [java.lang.Math.PI],
+ scripts: [scripts/empty-sample.groovy]},
nashorn: {
imports: [java.lang.Math],
staticImports: [java.lang.Math.PI]}}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b1a51379/gremlin-server/scripts/empty-sample.groovy
----------------------------------------------------------------------
diff --git a/gremlin-server/scripts/empty-sample.groovy b/gremlin-server/scripts/empty-sample.groovy
index f57e758..2be5e55 100644
--- a/gremlin-server/scripts/empty-sample.groovy
+++ b/gremlin-server/scripts/empty-sample.groovy
@@ -16,6 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
+
+// define the default TraversalSource to bind queries to.
+g = graph.traversal()
+
// An example of an initialization script that can be configured to run in Gremlin Server.
// Functions defined here will go into global cache and will not be removed from there
// unless there is a reset of the ScriptEngine.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b1a51379/gremlin-server/scripts/generate-classic.groovy
----------------------------------------------------------------------
diff --git a/gremlin-server/scripts/generate-classic.groovy b/gremlin-server/scripts/generate-classic.groovy
index 39c45e6..b169fa2 100644
--- a/gremlin-server/scripts/generate-classic.groovy
+++ b/gremlin-server/scripts/generate-classic.groovy
@@ -16,5 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
+
// Generates the classic graph into an "empty" TinkerGraph
-TinkerFactory.generateClassic(g)
\ No newline at end of file
+TinkerFactory.generateClassic(graph)
+
+// define the default TraversalSource to bind queries to.
+g = graph.traversal()
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b1a51379/gremlin-server/scripts/generate-modern.groovy
----------------------------------------------------------------------
diff --git a/gremlin-server/scripts/generate-modern.groovy b/gremlin-server/scripts/generate-modern.groovy
index 730e62a..d23bee6 100644
--- a/gremlin-server/scripts/generate-modern.groovy
+++ b/gremlin-server/scripts/generate-modern.groovy
@@ -16,5 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
+
// Generates the modern graph into an "empty" TinkerGraph
-TinkerFactory.generateModern(g)
\ No newline at end of file
+TinkerFactory.generateModern(graph)
+
+// define the default TraversalSource to bind queries to.
+g = graph.traversal()
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b1a51379/gremlin-server/scripts/load-sample.groovy
----------------------------------------------------------------------
diff --git a/gremlin-server/scripts/load-sample.groovy b/gremlin-server/scripts/load-sample.groovy
index a327f4e..23ed1c4 100644
--- a/gremlin-server/scripts/load-sample.groovy
+++ b/gremlin-server/scripts/load-sample.groovy
@@ -16,8 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
+
// An example of an initialization script that can be configured to run in Gremlin Server.
// Functions defined here will go into global cache and will not be removed from there
// unless there is a reset of the ScriptEngine.
-g.io().readGryo('data/sample.kryo')
+graph.io().readGryo('data/sample.kryo')
+
+// define the default TraversalSource to bind queries to.
+g = graph.traversal()
+
def addItUp(x, y) { x + y }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b1a51379/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Graphs.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Graphs.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Graphs.java
index 971d48e..a19015a 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Graphs.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Graphs.java
@@ -18,6 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.server;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
import org.slf4j.Logger;
@@ -29,14 +30,15 @@ import java.util.HashMap;
import java.util.Map;
/**
- * Traverser of {@link Graph} instances configured for the server to be passed to sessionless bindings. The
+ * {@link Graph} instances configured for the server to be passed to script engine bindings. The
* {@link Graph} instances are read from the {@link Settings} for Gremlin Server as defined in the configuration
- * file.
+ * file. Also holds any {@link TraversalSource} objects as constructed in the server.
*/
public class Graphs {
private static final Logger logger = LoggerFactory.getLogger(GremlinServer.class);
private final Map<String, Graph> graphs = new HashMap<>();
+ private final Map<String, TraversalSource> traversalSources = new HashMap<>();
/**
* Create a new instance using the {@link Settings} from Gremlin Server.
@@ -65,12 +67,17 @@ public class Graphs {
return graphs;
}
+ public Map<String, TraversalSource> getTraversalSources() {
+ return traversalSources;
+ }
+
/**
- * Get the graphs list as a set of bindings.
+ * Get the {@link Graph} and {@link TraversalSource} list as a set of bindings.
*/
public Bindings getGraphsAsBindings() {
final Bindings bindings = new SimpleBindings();
graphs.forEach(bindings::put);
+ traversalSources.forEach(bindings::put);
return bindings;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b1a51379/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
index b2a4c22..5b75d58 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.server;
import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.server.util.MetricManager;
import org.apache.tinkerpop.gremlin.structure.Graph;
import io.netty.bootstrap.ServerBootstrap;
@@ -186,6 +187,14 @@ public class GremlinServer {
.filter(kv -> kv.getValue() instanceof Graph)
.forEach(kv -> graphs.get().getGraphs().put(kv.getKey(), (Graph) kv.getValue()));
+ // script engine init may have constructed the TraversalSource bindings - store them in Graphs object
+ gremlinExecutor.getGlobalBindings().entrySet().stream()
+ .filter(kv -> kv.getValue() instanceof TraversalSource)
+ .forEach(kv -> {
+ logger.info("A {} is now bound to [{}] with {}", kv.getValue().getClass().getSimpleName(), kv.getKey(), kv.getValue());
+ graphs.get().getTraversalSources().put(kv.getKey(), (TraversalSource) kv.getValue());
+ });
+
return gremlinExecutor;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b1a51379/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 5ab7cc7..967f215 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -177,7 +177,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
final Cluster cluster = Cluster.open();
final Client client = cluster.connect();
- final ResultSet results = client.submit("h=g.traversal();h.V().drop().iterate();null");
+ final ResultSet results = client.submit("g.V().drop().iterate();null");
assertNull(results.all().get().get(0).getObject());
cluster.close();
@@ -342,16 +342,16 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
final Cluster cluster = Cluster.build().create();
final Client client = cluster.connect(name.getMethodName());
- final Vertex vertexBeforeTx = client.submit("v=g.addVertex(\"name\",\"stephen\")").all().get().get(0).getVertex();
+ final Vertex vertexBeforeTx = client.submit("v=graph.addVertex(\"name\",\"stephen\")").all().get().get(0).getVertex();
assertEquals("stephen", vertexBeforeTx.values("name").next());
- final Vertex vertexFromV = client.submit("g.vertices().next()").all().get().get(0).getVertex();
+ final Vertex vertexFromV = client.submit("graph.vertices().next()").all().get().get(0).getVertex();
assertEquals("stephen", vertexFromV.values("name").next());
final Vertex vertexFromBinding = client.submit("v").all().get().get(0).getVertex();
assertEquals("stephen", vertexFromBinding.values("name").next());
- final Vertex vertexAfterTx = client.submit("v.property(\"color\",\"blue\"); g.tx().commit(); v").all().get().get(0).getVertex();
+ final Vertex vertexAfterTx = client.submit("v.property(\"color\",\"blue\"); graph.tx().commit(); v").all().get().get(0).getVertex();
assertEquals("stephen", vertexAfterTx.values("name").next());
assertEquals("blue", vertexAfterTx.values("color").next());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b1a51379/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
index 4062f0d..788974e 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
@@ -81,7 +81,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnGETWithGremlinQueryStringArgumentWithIteratorResult() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet("http://localhost:8182?gremlin=g.traversal().V()");
+ final HttpGet httpget = new HttpGet("http://localhost:8182?gremlin=g.V()");
try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
assertEquals(200, response.getStatusLine().getStatusCode());
@@ -109,7 +109,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
@Test
public void should200OnGETWithGremlinQueryStringArgumentReturningVertex() throws Exception {
final CloseableHttpClient httpclient = HttpClients.createDefault();
- final HttpGet httpget = new HttpGet("http://localhost:8182?gremlin=g.addVertex('name','stephen')");
+ final HttpGet httpget = new HttpGet("http://localhost:8182?gremlin=graph.addVertex('name','stephen')");
try (final CloseableHttpResponse response = httpclient.execute(httpget)) {
assertEquals(200, response.getStatusLine().getStatusCode());
@@ -191,7 +191,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
final CloseableHttpClient httpclient = HttpClients.createDefault();
final HttpPost httppost = new HttpPost("http://localhost:8182");
httppost.addHeader("Content-Type", "application/json");
- httppost.setEntity(new StringEntity("{\"gremlin\":\"h=g.traversal();h.V()\"}", Consts.UTF_8));
+ httppost.setEntity(new StringEntity("{\"gremlin\":\"g.V()\"}", Consts.UTF_8));
try (final CloseableHttpResponse response = httpclient.execute(httppost)) {
assertEquals(200, response.getStatusLine().getStatusCode());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b1a51379/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index 277e50e..4db56e2 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@ -187,7 +187,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
try {
// this should return "nothing" - there should be no exception
- assertNull(client.submit("h=g.traversal();h.V().has('name','kadfjaldjfla')").one());
+ assertNull(client.submit("g.V().has('name','kadfjaldjfla')").one());
} finally {
cluster.close();
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b1a51379/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinTraversalPerformanceTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinTraversalPerformanceTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinTraversalPerformanceTest.java
index 7b712aa..27e3d39 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinTraversalPerformanceTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinTraversalPerformanceTest.java
@@ -90,11 +90,11 @@ public class GremlinTraversalPerformanceTest extends AbstractGremlinServerPerfor
final Map<String, Object> params = new HashMap<>();
params.put("x", 16384l);
- final CompletableFuture<ResultSet> future1 = client.get().submitAsync("h=g.traversal();h.V(x).out().out().next(512)", params);
- final CompletableFuture<ResultSet> future2 = client.get().submitAsync("h=g.traversal();h.V(x).out().next(7)", params);
- final CompletableFuture<ResultSet> future3 = client.get().submitAsync("h=g.traversal();h.V(16384l).out().out().next(10)");
- final CompletableFuture<ResultSet> future4 = client.get().submitAsync("h=g.traversal();h.V(16432l).out().out().next(10)");
- final CompletableFuture<ResultSet> future5 = client.get().submitAsync("h=g.traversal();h.V(14l).out().next(1)");
+ final CompletableFuture<ResultSet> future1 = client.get().submitAsync("g.V(x).out().out().next(512)", params);
+ final CompletableFuture<ResultSet> future2 = client.get().submitAsync("g.V(x).out().next(7)", params);
+ final CompletableFuture<ResultSet> future3 = client.get().submitAsync("g.V(16384l).out().out().next(10)");
+ final CompletableFuture<ResultSet> future4 = client.get().submitAsync("g.V(16432l).out().out().next(10)");
+ final CompletableFuture<ResultSet> future5 = client.get().submitAsync("g.V(14l).out().next(1)");
assertEquals(512, future1.get().stream().count());
assertEquals(7, future2.get().stream().count());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b1a51379/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
----------------------------------------------------------------------
diff --git 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
index f513fdd..83bf6df 100644
--- 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
@@ -22,7 +22,7 @@ gremlinPool: 8
scriptEvaluationTimeout: 30000
serializedResponseTimeout: 30000
graphs: {
- g: conf/tinkergraph-empty.properties}
+ graph: conf/tinkergraph-empty.properties}
plugins:
- tinkerpop.tinkergraph
scriptEngines: {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b1a51379/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml
index 0469d36..f11f109 100644
--- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml
+++ b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml
@@ -22,7 +22,7 @@ gremlinPool: 8
scriptEvaluationTimeout: 30000
serializedResponseTimeout: 30000
graphs: {
- g: conf/tinkergraph-empty.properties}
+ graph: conf/tinkergraph-empty.properties}
plugins:
- tinkerpop.tinkergraph
scriptEngines: {
[2/2] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/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/60c2e70c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/60c2e70c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/60c2e70c
Branch: refs/heads/master
Commit: 60c2e70c4a0687585b34cdce2599d9bc8ccc8f8d
Parents: b1a5137 e0574a3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Apr 14 13:57:56 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 14 13:57:56 2015 -0400
----------------------------------------------------------------------
hadoop-gremlin/conf/hadoop-gryo.properties | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------