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 2018/08/09 11:28:20 UTC
[01/20] tinkerpop git commit: TINKERPOP-2005 Reject multiple final
responses in AbstractEvalOpProcessor [Forced Update!]
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1976 5b9ee78cf -> 8c2313ed4 (forced update)
TINKERPOP-2005 Reject multiple final responses in AbstractEvalOpProcessor
Add isFinalResponse() getter to ResponseStatusCode
Introduce ResponseHandlerContext to allow tracking the final response
status per request message.
Update AbstractOpProcessor, AbstractEvalOpProcessor and related classes
to write response messages through ResponseHandlerContext methods as
opposed to ChannelHandlerContext methods.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f592e344
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f592e344
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f592e344
Branch: refs/heads/TINKERPOP-1976
Commit: f592e3446c84e9398e242a072cdfec64025e9566
Parents: f9ad72a
Author: Dmitri Bourlatchkov <dm...@datastax.com>
Authored: Fri Jul 27 15:54:06 2018 -0400
Committer: Dmitri Bourlatchkov <dm...@datastax.com>
Committed: Fri Jul 27 15:54:06 2018 -0400
----------------------------------------------------------------------
.../driver/message/ResponseStatusCode.java | 7 ++
.../driver/message/ResponseStatusCodeTest.java | 35 ++++++
.../gremlin/server/ResponseHandlerContext.java | 80 ++++++++++++++
.../server/op/AbstractEvalOpProcessor.java | 17 +--
.../gremlin/server/op/AbstractOpProcessor.java | 34 +++++-
.../AbstractGremlinServerIntegrationTest.java | 9 +-
.../server/GremlinServerIntegrateTest.java | 51 +++++++++
.../server/ResponseHandlerContextTest.java | 110 +++++++++++++++++++
.../server/op/AbstractOpProcessorTest.java | 73 ++++++++++++
9 files changed, 401 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f592e344/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCode.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCode.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCode.java
index 3348107..f4e7f65 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCode.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCode.java
@@ -123,4 +123,11 @@ public enum ResponseStatusCode {
public boolean isSuccess() {
return String.valueOf(this.value).startsWith("2");
}
+
+ /**
+ * Indicates whether the status code can only be used in the last response for a particular request.
+ */
+ public boolean isFinalResponse() {
+ return this != PARTIAL_CONTENT && this != AUTHENTICATE;
+ }
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f592e344/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCodeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCodeTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCodeTest.java
new file mode 100644
index 0000000..a231489
--- /dev/null
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCodeTest.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tinkerpop.gremlin.driver.message;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class ResponseStatusCodeTest {
+
+ @Test
+ public void shouldIndicateFinalMessagesStatusCodes() {
+ assertFalse(ResponseStatusCode.AUTHENTICATE.isFinalResponse());
+ assertFalse(ResponseStatusCode.PARTIAL_CONTENT.isFinalResponse());
+ assertTrue(ResponseStatusCode.SUCCESS.isFinalResponse());
+ assertTrue(ResponseStatusCode.SERVER_ERROR_TIMEOUT.isFinalResponse());
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f592e344/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContext.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContext.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContext.java
new file mode 100644
index 0000000..fff4480
--- /dev/null
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContext.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server;
+
+import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * A context for asynchronously writing response messages related to a particular request.
+ * <p>The "write" methods of this class ensure that at most one {@link ResponseStatusCode#isFinalResponse() final}
+ * response message is written to the underlying channel. Attempts to write more than one final response message will
+ * result in an {@link IllegalStateException}.</p>
+ * <p>Note: an object of this class should be used instead of writing to the channel directly when multiple threads
+ * are expected to produce final response messages concurrently. Callers must ensure that the same
+ * {@link ResponseHandlerContext} is used by all threads writing response messages for the same request.</p>
+ *
+ * @author Dmitri Bourlatchkov
+ */
+public class ResponseHandlerContext {
+
+ private final Context context;
+ private final AtomicBoolean finalResponseWritten = new AtomicBoolean();
+
+ public ResponseHandlerContext(Context context) {
+ this.context = context;
+ }
+
+ public Context getContext() {
+ return context;
+ }
+
+ /**
+ * Writes a response message to the underlying channel while ensuring that at most one
+ * {@link ResponseStatusCode#isFinalResponse() final} response is written.
+ * <p>Note: this method should be used instead of writing to the channel directly when multiple threads
+ * are expected to produce response messages concurrently.</p>
+ * <p>Attempts to write more than one final response message will result in an {@link IllegalStateException}.</p>
+ * @see #writeAndFlush(ResponseStatusCode, Object)
+ */
+ public void writeAndFlush(ResponseMessage message) {
+ writeAndFlush(message.getStatus().getCode(), message);
+ }
+
+ /**
+ * Writes a response message to the underlying channel while ensuring that at most one
+ * {@link ResponseStatusCode#isFinalResponse() final} response is written.
+ * <p>The caller must make sure that the provided response status code matches the content of the message.</p>
+ * <p>Note: this method should be used instead of writing to the channel directly when multiple threads
+ * are expected to produce response messages concurrently.</p>
+ * <p>Attempts to write more than one final response message will result in an {@link IllegalStateException}.</p>
+ * @see #writeAndFlush(ResponseMessage)
+ */
+ public void writeAndFlush(ResponseStatusCode code, Object responseMessage) {
+ final boolean messageIsFinal = code.isFinalResponse();
+ if(!finalResponseWritten.compareAndSet(false, messageIsFinal)) {
+ final String errorMessage = String.format("Another final response message was already written for request %s", context.getRequestMessage().getRequestId());
+ throw new IllegalStateException(errorMessage);
+ }
+
+ context.getChannelHandlerContext().writeAndFlush(responseMessage);
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f592e344/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
index 5c43b4d..6ff0452 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
@@ -36,6 +36,7 @@ import org.apache.tinkerpop.gremlin.structure.Column;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.server.Context;
import org.apache.tinkerpop.gremlin.server.GremlinServer;
+import org.apache.tinkerpop.gremlin.server.ResponseHandlerContext;
import org.apache.tinkerpop.gremlin.server.Settings;
import org.apache.tinkerpop.gremlin.server.util.MetricManager;
import org.apache.tinkerpop.gremlin.util.function.ThrowingConsumer;
@@ -245,6 +246,8 @@ public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor {
final long seto = args.containsKey(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT) ?
Long.parseLong(args.get(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT).toString()) : settings.scriptEvaluationTimeout;
+ ResponseHandlerContext rhc = new ResponseHandlerContext(context);
+
final GremlinExecutor.LifeCycle lifeCycle = GremlinExecutor.LifeCycle.build()
.scriptEvaluationTimeoutOverride(seto)
.afterFailure((b,t) -> {
@@ -265,7 +268,7 @@ public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor {
logger.debug("Preparing to iterate results from - {} - in thread [{}]", msg, Thread.currentThread().getName());
try {
- handleIterator(context, itty);
+ handleIterator(rhc, itty);
} catch (Exception ex) {
if (managedTransactionsForRequest) attemptRollback(msg, context.getGraphManager(), settings.strictTransactionManagement);
@@ -282,25 +285,25 @@ public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor {
if (t != null) {
if (t instanceof OpProcessorException) {
- ctx.writeAndFlush(((OpProcessorException) t).getResponseMessage());
+ rhc.writeAndFlush(((OpProcessorException) t).getResponseMessage());
} else if (t instanceof TimedInterruptTimeoutException) {
// occurs when the TimedInterruptCustomizerProvider is in play
final String errorMessage = String.format("A timeout occurred within the script during evaluation of [%s] - consider increasing the limit given to TimedInterruptCustomizerProvider", msg);
logger.warn(errorMessage);
- ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT)
+ rhc.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT)
.statusMessage("Timeout during script evaluation triggered by TimedInterruptCustomizerProvider")
.statusAttributeException(t).create());
} else if (t instanceof org.apache.tinkerpop.gremlin.groovy.jsr223.TimedInterruptTimeoutException) {
// occurs when the TimedInterruptCustomizerProvider is in play
final String errorMessage = String.format("A timeout occurred within the script during evaluation of [%s] - consider increasing the limit given to TimedInterruptCustomizerProvider", msg);
logger.warn(errorMessage);
- ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT)
+ rhc.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT)
.statusMessage("Timeout during script evaluation triggered by TimedInterruptCustomizerProvider")
.statusAttributeException(t).create());
} else if (t instanceof TimeoutException) {
final String errorMessage = String.format("Script evaluation exceeded the configured threshold for request [%s]", msg);
logger.warn(errorMessage, t);
- ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT)
+ rhc.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT)
.statusMessage(t.getMessage())
.statusAttributeException(t).create());
} else {
@@ -314,12 +317,12 @@ public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor {
((MultipleCompilationErrorsException) t).getErrorCollector().getErrorCount() == 1) {
final String errorMessage = String.format("The Gremlin statement that was submitted exceed the maximum compilation size allowed by the JVM, please split it into multiple smaller statements - %s", trimMessage(msg));
logger.warn(errorMessage);
- ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_SCRIPT_EVALUATION)
+ rhc.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_SCRIPT_EVALUATION)
.statusMessage(errorMessage)
.statusAttributeException(t).create());
} else {
logger.warn(String.format("Exception processing a script on request [%s].", msg), t);
- ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_SCRIPT_EVALUATION)
+ rhc.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_SCRIPT_EVALUATION)
.statusMessage(t.getMessage())
.statusAttributeException(t).create());
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f592e344/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
index 8899bb5..1263c81 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
@@ -29,6 +29,7 @@ import org.apache.tinkerpop.gremlin.driver.ser.MessageTextSerializer;
import org.apache.tinkerpop.gremlin.server.Context;
import org.apache.tinkerpop.gremlin.server.GraphManager;
import org.apache.tinkerpop.gremlin.server.OpProcessor;
+import org.apache.tinkerpop.gremlin.server.ResponseHandlerContext;
import org.apache.tinkerpop.gremlin.server.Settings;
import org.apache.tinkerpop.gremlin.server.handler.Frame;
import org.apache.tinkerpop.gremlin.server.handler.StateKey;
@@ -72,8 +73,19 @@ public abstract class AbstractOpProcessor implements OpProcessor {
* @param context The Gremlin Server {@link Context} object containing settings, request message, etc.
* @param itty The result to iterator
* @throws TimeoutException if the time taken to serialize the entire result set exceeds the allowable time.
+ * @see #handleIterator(ResponseHandlerContext, Iterator)
*/
protected void handleIterator(final Context context, final Iterator itty) throws TimeoutException, InterruptedException {
+ handleIterator(new ResponseHandlerContext(context), itty);
+ }
+
+ /**
+ * A variant of {@link #handleIterator(Context, Iterator)} that is suitable for use in situations when mutiple
+ * threads may produce {@link ResponseStatusCode#isFinalResponse() final} response messages concurrently.
+ * @see #handleIterator(Context, Iterator)
+ */
+ protected void handleIterator(final ResponseHandlerContext rhc, final Iterator itty) throws TimeoutException, InterruptedException {
+ final Context context = rhc.getContext();
final ChannelHandlerContext ctx = context.getChannelHandlerContext();
final RequestMessage msg = context.getRequestMessage();
final Settings settings = context.getSettings();
@@ -90,7 +102,7 @@ public abstract class AbstractOpProcessor implements OpProcessor {
// as there is nothing left to iterate if we are transaction managed then we should execute a
// commit here before we send back a NO_CONTENT which implies success
if (managedTransactionsForRequest) attemptCommit(msg, context.getGraphManager(), settings.strictTransactionManagement);
- ctx.writeAndFlush(ResponseMessage.build(msg)
+ rhc.writeAndFlush(ResponseMessage.build(msg)
.code(ResponseStatusCode.NO_CONTENT)
.create());
return;
@@ -143,7 +155,7 @@ public abstract class AbstractOpProcessor implements OpProcessor {
// thread that processed the eval of the script so, we have to push serialization down into that
Frame frame = null;
try {
- frame = makeFrame(ctx, msg, serializer, useBinary, aggregate, code, generateMetaData(ctx, msg, code, itty));
+ frame = makeFrame(rhc, msg, serializer, useBinary, aggregate, code, generateMetaData(ctx, msg, code, itty));
} catch (Exception ex) {
// a frame may use a Bytebuf which is a countable release - if it does not get written
// downstream it needs to be released here
@@ -191,7 +203,7 @@ public abstract class AbstractOpProcessor implements OpProcessor {
// required then it will be 100% complete before the client receives it. the "frame" at this point
// should have completely detached objects from the transaction (i.e. serialization has occurred)
// so a new one should not be opened on the flush down the netty pipeline
- ctx.writeAndFlush(frame);
+ rhc.writeAndFlush(code, frame);
}
} else {
// don't keep triggering this warning over and over again for the same request
@@ -252,15 +264,29 @@ public abstract class AbstractOpProcessor implements OpProcessor {
/**
* @deprecated As of release 3.2.2, replaced by {@link #makeFrame(ChannelHandlerContext, RequestMessage, MessageSerializer, boolean, List, ResponseStatusCode, Map)}.
*/
+ @Deprecated
protected static Frame makeFrame(final ChannelHandlerContext ctx, final RequestMessage msg,
final MessageSerializer serializer, final boolean useBinary, final List<Object> aggregate,
final ResponseStatusCode code) throws Exception {
return makeFrame(ctx, msg, serializer, useBinary, aggregate, code, Collections.emptyMap());
}
+ /**
+ * Caution: {@link #makeFrame(ResponseHandlerContext, RequestMessage, MessageSerializer, boolean, List, ResponseStatusCode, Map)}
+ * should be used instead of this method whenever a {@link ResponseHandlerContext} is available.
+ */
protected static Frame makeFrame(final ChannelHandlerContext ctx, final RequestMessage msg,
final MessageSerializer serializer, final boolean useBinary, final List<Object> aggregate,
final ResponseStatusCode code, final Map<String,Object> responseMetaData) throws Exception {
+ Context context = new Context(msg, ctx, null, null, null, null); // dummy context, good only for writing response messages to the channel
+ ResponseHandlerContext rhc = new ResponseHandlerContext(context);
+ return makeFrame(rhc, msg, serializer, useBinary, aggregate, code, responseMetaData);
+ }
+
+ protected static Frame makeFrame(final ResponseHandlerContext rhc, final RequestMessage msg,
+ final MessageSerializer serializer, final boolean useBinary, final List<Object> aggregate,
+ final ResponseStatusCode code, final Map<String,Object> responseMetaData) throws Exception {
+ final ChannelHandlerContext ctx = rhc.getContext().getChannelHandlerContext();
try {
if (useBinary) {
return new Frame(serializer.serializeResponseAsBinary(ResponseMessage.build(msg)
@@ -283,7 +309,7 @@ public abstract class AbstractOpProcessor implements OpProcessor {
.statusMessage(errorMessage)
.statusAttributeException(ex)
.code(ResponseStatusCode.SERVER_ERROR_SERIALIZATION).create();
- ctx.writeAndFlush(error);
+ rhc.writeAndFlush(error);
throw ex;
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f592e344/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
index 7c124f0..a8a8853 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
@@ -39,6 +39,7 @@ import static org.junit.Assume.assumeThat;
*/
public abstract class AbstractGremlinServerIntegrationTest {
protected GremlinServer server;
+ protected Settings overriddenSettings;
private final static String epollOption = "gremlin.server.epoll";
private static final boolean GREMLIN_SERVER_EPOLL = "true".equalsIgnoreCase(System.getProperty(epollOption));
private static final Logger logger = LoggerFactory.getLogger(AbstractGremlinServerIntegrationTest.class);
@@ -87,13 +88,13 @@ public abstract class AbstractGremlinServerIntegrationTest {
public void startServer() throws Exception {
final InputStream stream = getSettingsInputStream();
final Settings settings = Settings.read(stream);
- final Settings overridenSettings = overrideSettings(settings);
- ServerTestHelper.rewritePathsInGremlinServerSettings(overridenSettings);
+ overriddenSettings = overrideSettings(settings);
+ ServerTestHelper.rewritePathsInGremlinServerSettings(overriddenSettings);
if (GREMLIN_SERVER_EPOLL) {
- overridenSettings.useEpollEventLoop = true;
+ overriddenSettings.useEpollEventLoop = true;
}
- this.server = new GremlinServer(overridenSettings);
+ this.server = new GremlinServer(overriddenSettings);
server.start().join();
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f592e344/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 1db7a50..9256458 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
@@ -66,6 +66,7 @@ import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
import org.apache.tinkerpop.gremlin.util.Log4jRecordingAppender;
import org.apache.tinkerpop.gremlin.util.function.Lambda;
import org.hamcrest.CoreMatchers;
+import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -75,6 +76,7 @@ import java.nio.channels.ClosedChannelException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -376,6 +378,40 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
}
@Test
+ public void shouldProduceProperExceptionOnTimeout() throws Exception {
+ final Cluster cluster = TestClientFactory.open();
+ final Client client = cluster.connect(name.getMethodName());
+
+ boolean success = false;
+ // Run a short test script a few times with progressively longer timeouts.
+ // Each submissions should either succeed or fail with a timeout.
+ // Note: the range of timeouts is intended to cover the case when the script finishes at about the
+ // same time when the timeout occurs. In this situation either a timeout response or a successful
+ // response is acceptable, however no other processing errors should occur.
+ // Note: the timeout of 30 ms is generally sufficient for running a simple groovy script, so using longer
+ // timeouts are not likely to results in a success/timeout response collision, which is the purpose
+ // of this test.
+ // Note: this test may have a false negative result, but a failure would indicate a real problem.
+ for(int i = 0; i < 30; i++) {
+ int timeout = 1 + i;
+ overriddenSettings.scriptEvaluationTimeout = timeout;
+
+ try {
+ client.submit("x = 1 + 1").all().get().get(0).getInt();
+ success = true;
+ } catch (Exception ex) {
+ final Throwable t = ex.getCause();
+ assertThat("Unexpected exception with script evaluation timeout: " + timeout, t, instanceOf(ResponseException.class));
+ assertEquals(ResponseStatusCode.SERVER_ERROR_TIMEOUT, ((ResponseException) t).getResponseStatusCode());
+ }
+ }
+
+ assertTrue("Some script submissions should succeed", success);
+
+ cluster.close();
+ }
+
+ @Test
public void shouldUseBaseScript() throws Exception {
final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect(name.getMethodName());
@@ -985,6 +1021,21 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
}
@Test
+ public void shouldHavePartialContentWithLongResultsCollection() throws Exception {
+ try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
+ final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
+ .addArg(Tokens.ARGS_GREMLIN, "new String[100]").create();
+ final List<ResponseMessage> responses = client.submit(request);
+ assertThat(responses.size(), Matchers.greaterThan(1));
+ for (Iterator<ResponseMessage> it = responses.iterator(); it.hasNext(); ) {
+ ResponseMessage msg = it.next();
+ ResponseStatusCode expected = it.hasNext() ? ResponseStatusCode.PARTIAL_CONTENT : ResponseStatusCode.SUCCESS;
+ assertEquals(expected, msg.getStatus().getCode());
+ }
+ }
+ }
+
+ @Test
public void shouldFailWithBadScriptEval() throws Exception {
try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
final RequestMessage request = RequestMessage.build(Tokens.OPS_EVAL)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f592e344/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java
new file mode 100644
index 0000000..bea318b
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server;
+
+import io.netty.channel.ChannelHandlerContext;
+import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.hamcrest.CoreMatchers;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.mockito.Mockito;
+
+import java.util.Arrays;
+import java.util.UUID;
+import java.util.function.BiFunction;
+
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+@RunWith(Parameterized.class)
+public class ResponseHandlerContextTest {
+
+ @Parameterized.Parameter(value = 0)
+ public BiFunction<ResponseHandlerContext, ResponseStatusCode, Void> writeInvoker;
+
+ private final ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
+ private final RequestMessage request = RequestMessage.build("test").create();
+ private final Context context = new Context(request, ctx, null, null, null, null);
+ private final ResponseHandlerContext rhc = new ResponseHandlerContext(context);
+
+ @Parameterized.Parameters(name = "{0}")
+ public static Iterable<Object[]> data() {
+ return Arrays.asList(new Object[][] {
+ {
+ new BiFunction<ResponseHandlerContext, ResponseStatusCode, Void>() {
+ @Override
+ public Void apply(ResponseHandlerContext context, ResponseStatusCode code) {
+ context.writeAndFlush(code, "testMessage");
+ return null;
+ }
+
+ @Override
+ public String toString() {
+ return "writeAndFlush(ResponseStatusCode, Object)";
+ }
+ }
+ }, {
+ new BiFunction<ResponseHandlerContext, ResponseStatusCode, Void>() {
+ @Override
+ public Void apply(ResponseHandlerContext context, ResponseStatusCode code) {
+ context.writeAndFlush(ResponseMessage.build(UUID.randomUUID()).code(code).create());
+ return null;
+ }
+
+ @Override
+ public String toString() {
+ return "writeAndFlush(ResponseMessage)";
+ }
+ }
+ },
+ });
+ }
+
+ @Test
+ public void shouldAllowMultipleNonFinalResponses() {
+ writeInvoker.apply(rhc, ResponseStatusCode.AUTHENTICATE);
+ Mockito.verify(ctx, Mockito.times(1)).writeAndFlush(Mockito.any());
+
+ writeInvoker.apply(rhc, ResponseStatusCode.PARTIAL_CONTENT);
+ Mockito.verify(ctx, Mockito.times(2)).writeAndFlush(Mockito.any());
+
+ writeInvoker.apply(rhc, ResponseStatusCode.PARTIAL_CONTENT);
+ Mockito.verify(ctx, Mockito.times(3)).writeAndFlush(Mockito.any());
+ }
+
+ @Test
+ public void shouldAllowAtMostOneFinalResponse() {
+ writeInvoker.apply(rhc, ResponseStatusCode.AUTHENTICATE);
+ Mockito.verify(ctx, Mockito.times(1)).writeAndFlush(Mockito.any());
+
+ writeInvoker.apply(rhc, ResponseStatusCode.SUCCESS);
+ Mockito.verify(ctx, Mockito.times(2)).writeAndFlush(Mockito.any());
+
+ try {
+ writeInvoker.apply(rhc, ResponseStatusCode.SERVER_ERROR_TIMEOUT);
+ fail("Expected an IllegalStateException");
+ } catch (IllegalStateException ex) {
+ assertThat(ex.toString(), CoreMatchers.containsString(request.getRequestId().toString()));
+ }
+ Mockito.verify(ctx, Mockito.times(2)).writeAndFlush(Mockito.any());
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f592e344/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java
new file mode 100644
index 0000000..cf42737
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server.op;
+
+import io.netty.channel.ChannelHandlerContext;
+import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+public class AbstractOpProcessorTest {
+
+ @Test
+ public void deprecatedMakeFrameMethodShouldRedirectCorrectly() throws Exception {
+ ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
+ RequestMessage request = RequestMessage.build("test").create();
+ ArgumentCaptor<ResponseMessage> responseCaptor = ArgumentCaptor.forClass(ResponseMessage.class);
+
+ try {
+ // Induce a NullPointerException to validate error response message writing
+ //noinspection deprecation
+ AbstractOpProcessor.makeFrame(ctx, request, null, true, null, ResponseStatusCode.PARTIAL_CONTENT);
+ fail("Expected a NullPointerException");
+ } catch (NullPointerException expected) {
+ // nop
+ }
+
+ Mockito.verify(ctx, Mockito.times(1)).writeAndFlush(responseCaptor.capture());
+ assertEquals(ResponseStatusCode.SERVER_ERROR_SERIALIZATION, responseCaptor.getValue().getStatus().getCode());
+ assertEquals(request.getRequestId(), responseCaptor.getValue().getRequestId());
+ }
+
+ @Test
+ public void alternativeMakeFrameMethodShouldRedirectCorrectly() throws Exception {
+ ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
+ RequestMessage request = RequestMessage.build("test").create();
+ ArgumentCaptor<ResponseMessage> responseCaptor = ArgumentCaptor.forClass(ResponseMessage.class);
+
+ try {
+ // Induce a NullPointerException to validate error response message writing
+ AbstractOpProcessor.makeFrame(ctx, request, null, true, null, ResponseStatusCode.PARTIAL_CONTENT, null);
+ fail("Expected a NullPointerException");
+ } catch (NullPointerException expected) {
+ // nop
+ }
+
+ Mockito.verify(ctx, Mockito.times(1)).writeAndFlush(responseCaptor.capture());
+ assertEquals(ResponseStatusCode.SERVER_ERROR_SERIALIZATION, responseCaptor.getValue().getStatus().getCode());
+ assertEquals(request.getRequestId(), responseCaptor.getValue().getRequestId());
+ }
+
+}
\ No newline at end of file
[20/20] tinkerpop git commit: TINKERPOP-1976 Added GLV test for
peerPressure()
Posted by sp...@apache.org.
TINKERPOP-1976 Added GLV test for peerPressure()
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0a5d8ceb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0a5d8ceb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0a5d8ceb
Branch: refs/heads/TINKERPOP-1976
Commit: 0a5d8ceb6931e3ab2165cba8cd8414e8f4575ce9
Parents: 85fbd7c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 7 13:45:39 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Aug 9 07:28:09 2018 -0400
----------------------------------------------------------------------
.../ModernGraphTypeInformation.cs | 1 +
.../test/cucumber/feature-steps.js | 3 +
gremlin-test/features/map/PeerPressure.feature | 60 ++++++++++++++++++++
.../gremlin/process/FeatureCoverageTest.java | 3 +-
4 files changed, 66 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0a5d8ceb/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
index 75dd37c..77ed4eb 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
@@ -39,6 +39,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
{"lang", typeof(string)},
{"weight", typeof(float)},
{"gremlin.pageRankVertexProgram.pageRank", typeof(double)},
+ {"gremlin.peerPressureVertexProgram.cluster", typeof(int)},
{"friendRank", typeof(double)},
{"pageRank", typeof(double)},
{"foo", typeof(object)}, // used when for invalid property key lookups
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0a5d8ceb/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
index 3f76052..e585fcc 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
@@ -70,6 +70,9 @@ const ignoredScenarios = {
'g_V_pageRank_byXpageRankX_asXaX_outXknowsX_pageRank_asXbX_selectXa_bX': new IgnoreError(ignoreReason.computerNotSupported),
'g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX': new IgnoreError(ignoreReason.computerNotSupported),
'g_V_outXcreatedX_groupXmX_byXlabelX_pageRankX1X_byXpageRankX_byXinEX_timesX1X_inXcreatedX_groupXmX_byXpageRankX_capXmX': new IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_peerPressure': new IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_peerPressure_byXclusterX_byXoutEXknowsXX_pageRankX1X_byXrankX_byXoutEXknowsXX_timesX2X_group_byXclusterX_byXrank_sumX_limitX100X': new IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX': new IgnoreError(ignoreReason.computerNotSupported),
};
defineSupportCode(function(methods) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0a5d8ceb/gremlin-test/features/map/PeerPressure.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/PeerPressure.feature b/gremlin-test/features/map/PeerPressure.feature
new file mode 100644
index 0000000..d23fa31
--- /dev/null
+++ b/gremlin-test/features/map/PeerPressure.feature
@@ -0,0 +1,60 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+Feature: Step - peerPressure()
+
+ Scenario: g_V_peerPressure
+ Given the modern graph
+ And the traversal of
+ """
+ g.withComputer().V().peerPressure()
+ """
+ When iterated to list
+ Then the result should be unordered
+ | result |
+ | v[marko] |
+ | v[vadas] |
+ | v[lop] |
+ | v[josh] |
+ | v[ripple] |
+ | v[peter] |
+ And the graph should return 6 for count of "g.withComputer().V().peerPressure().has(\"gremlin.peerPressureVertexProgram.cluster\")"
+
+ Scenario: g_V_peerPressure_byXclusterX_byXoutEXknowsXX_pageRankX1X_byXrankX_byXoutEXknowsXX_timesX2X_group_byXclusterX_byXrank_sumX_limitX100X
+ Given an unsupported test
+ Then nothing should happen because
+ """
+ The result returned is not supported under GraphSON 2.x and therefore cannot be properly asserted. More
+ specifically it has long keys which basically get toString()'d under GraphSON 2.x. This test can be supported
+ with GraphSON 3.x.
+ """
+
+ Scenario: g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX
+ Given the modern graph
+ And the traversal of
+ """
+ g.withComputer().V().has("name", "ripple").in("created").peerPressure().by(__.outE()).by("cluster").repeat(__.union(__.identity(), __.both())).times(2).dedup().valueMap("name", "cluster")
+ """
+ When iterated to list
+ Then the result should be unordered
+ | result |
+ | m[{"name": ["marko"], "cluster": [1]}] |
+ | m[{"name": ["vadas"], "cluster": [2]}] |
+ | m[{"name": ["lop"], "cluster": [4]}] |
+ | m[{"name": ["josh"], "cluster": [4]}] |
+ | m[{"name": ["ripple"], "cluster": [4]}] |
+ | m[{"name": ["peter"], "cluster": [6]}] |
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0a5d8ceb/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java
index 6a45d38..2cca50b 100644
--- a/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java
+++ b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java
@@ -55,6 +55,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.map.MinTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.PageRankTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.PathTest;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.PeerPressureTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProjectTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectTest;
@@ -143,7 +144,7 @@ public class FeatureCoverageTest {
OrderTest.class,
PageRankTest.class,
PathTest.class,
- // PeerPressureTest.class,
+ PeerPressureTest.class,
// ProfileTest.class,
// ProgramTest.class,
ProjectTest.class,
[13/20] tinkerpop git commit: TINKERPOP-1976 Minor refactoring and
test message improvement
Posted by sp...@apache.org.
TINKERPOP-1976 Minor refactoring and test message improvement
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c03b575f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c03b575f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c03b575f
Branch: refs/heads/TINKERPOP-1976
Commit: c03b575fe27f8e917f705e593e66250962dcfdf4
Parents: f7ccb67
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Aug 4 06:01:53 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Aug 9 07:28:09 2018 -0400
----------------------------------------------------------------------
.../io/graphson/TraversalSerializersV2d0.java | 4 ----
.../gremlin/process/AbstractGremlinProcessTest.java | 14 +++++++-------
2 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c03b575f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java
index 040fd1d..2a07723 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV2d0.java
@@ -37,18 +37,14 @@ import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
-import org.apache.tinkerpop.shaded.jackson.databind.JavaType;
-import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.type.TypeFactory;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c03b575f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
index 9dbf261..96dee1d 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
@@ -30,6 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -40,7 +41,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
/**
@@ -81,7 +81,7 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
final String methodName = testName.contains("[") ? testName.substring(0, testName.indexOf('[')) : testName;
final IgnoreEngine ignoreEngine = this.getClass().getMethod(methodName).getAnnotation(IgnoreEngine.class);
if (ignoreEngine != null)
- assumeTrue(String.format("This test is ignored for %s", ignoreEngine.value()), !ignoreEngine.value().equals(GraphManager.getTraversalEngineType()));
+ assumeTrue(String.format("%s.%s is ignored for %s", this.getClass().getName(), testName, ignoreEngine.value()), !ignoreEngine.value().equals(GraphManager.getTraversalEngineType()));
} catch (NoSuchMethodException nsme) {
// some tests are parameterized
throw new RuntimeException(String.format("Could not find test method %s in test case %s", name.getMethodName(), this.getClass().getName()));
@@ -128,7 +128,7 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
for (T t : results) {
if (t instanceof Map) {
- assertThat("Checking map result existence: " + t, expectedResults.stream().filter(e -> e instanceof Map).filter(e -> internalCheckMap((Map) e, (Map) t)).findAny().isPresent(), is(true));
+ assertThat("Checking map result existence: " + t, expectedResults.stream().filter(e -> e instanceof Map).anyMatch(e -> internalCheckMap((Map) e, (Map) t)), is(true));
} else {
assertThat("Checking result existence: " + t, expectedResults.contains(t), is(true));
}
@@ -153,8 +153,8 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
}
public static <A, B> void checkMap(final Map<A, B> expectedMap, final Map<A, B> actualMap) {
- final List<Map.Entry<A, B>> actualList = actualMap.entrySet().stream().sorted((a, b) -> a.getKey().toString().compareTo(b.getKey().toString())).collect(Collectors.toList());
- final List<Map.Entry<A, B>> expectedList = expectedMap.entrySet().stream().sorted((a, b) -> a.getKey().toString().compareTo(b.getKey().toString())).collect(Collectors.toList());
+ final List<Map.Entry<A, B>> actualList = actualMap.entrySet().stream().sorted(Comparator.comparing(a -> a.getKey().toString())).collect(Collectors.toList());
+ final List<Map.Entry<A, B>> expectedList = expectedMap.entrySet().stream().sorted(Comparator.comparing(a -> a.getKey().toString())).collect(Collectors.toList());
assertEquals(expectedList.size(), actualList.size());
for (int i = 0; i < actualList.size(); i++) {
assertEquals(expectedList.get(i).getKey(), actualList.get(i).getKey());
@@ -163,8 +163,8 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
}
private static <A, B> boolean internalCheckMap(final Map<A, B> expectedMap, final Map<A, B> actualMap) {
- final List<Map.Entry<A, B>> actualList = actualMap.entrySet().stream().sorted((a, b) -> a.getKey().toString().compareTo(b.getKey().toString())).collect(Collectors.toList());
- final List<Map.Entry<A, B>> expectedList = expectedMap.entrySet().stream().sorted((a, b) -> a.getKey().toString().compareTo(b.getKey().toString())).collect(Collectors.toList());
+ final List<Map.Entry<A, B>> actualList = actualMap.entrySet().stream().sorted(Comparator.comparing(a -> a.getKey().toString())).collect(Collectors.toList());
+ final List<Map.Entry<A, B>> expectedList = expectedMap.entrySet().stream().sorted(Comparator.comparing(a -> a.getKey().toString())).collect(Collectors.toList());
if (expectedList.size() != actualList.size()) {
return false;
[18/20] tinkerpop git commit: TINKERPOP-1976 Fixed up pageRank()
groovy test
Posted by sp...@apache.org.
TINKERPOP-1976 Fixed up pageRank() groovy test
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8c2313ed
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8c2313ed
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8c2313ed
Branch: refs/heads/TINKERPOP-1976
Commit: 8c2313ed46d9a8683ff824d954038b9020097ae8
Parents: 5d9c3f1
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Aug 9 07:27:17 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Aug 9 07:28:09 2018 -0400
----------------------------------------------------------------------
.../gremlin/process/traversal/step/map/GroovyPageRankTest.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c2313ed/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy
index 78671da..7554092 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy
@@ -42,7 +42,7 @@ public abstract class GroovyPageRankTest {
@Override
public Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_byXnameX_name() {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.V.pageRank.order.by(PageRankVertexProgram.PAGE_RANK, decr).name")
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.pageRank.order.by(PageRankVertexProgram.PAGE_RANK, decr).by('name').name")
}
@Override
[04/20] tinkerpop git commit: TINKERPOP-2005 Expand .* imports in
ResponseStatusCodeTest
Posted by sp...@apache.org.
TINKERPOP-2005 Expand .* imports in ResponseStatusCodeTest
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/63ae13c2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/63ae13c2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/63ae13c2
Branch: refs/heads/TINKERPOP-1976
Commit: 63ae13c24a86f59f84a9b30189bb9a73e22fe50a
Parents: 4ff4b88
Author: Dmitri Bourlatchkov <dm...@datastax.com>
Authored: Tue Jul 31 10:25:01 2018 -0400
Committer: Dmitri Bourlatchkov <dm...@datastax.com>
Committed: Tue Jul 31 10:25:01 2018 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/driver/message/ResponseStatusCodeTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/63ae13c2/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCodeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCodeTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCodeTest.java
index a231489..3fc8a78 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCodeTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCodeTest.java
@@ -21,7 +21,8 @@ package org.apache.tinkerpop.gremlin.driver.message;
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
public class ResponseStatusCodeTest {
[02/20] tinkerpop git commit: TINKERPOP-2005 Handle evaluation
excetions in AbstractEvalOpProcessor
Posted by sp...@apache.org.
TINKERPOP-2005 Handle evaluation excetions in AbstractEvalOpProcessor
Some script evaluation exceptions in AbstractEvalOpProcessor may occur
after the script has started executing. In this situation it it critical
to prevent potentially writing multiple final (e.g. error vs. success)
responses back to the client.
Exceptions that used to escape from evalOpInternal(...) would be
converted to error response messages by OpExecutorHandler, which could
coincide with a successful response from a quick script.
This change makes AbstractEvalOpProcessor do the error message
writing for the same type of exceptions that are handled by
OpExecutorHandler. However, AbstractEvalOpProcessor makes sure that
at most one final reponse message is sent by using
ResponseHandlerContext.
Also ResponseHandlerContext.writeAndFlush(...) methods will no longer
throw exceptions for attempts to send multiple final messages. This is
again to avoid multiple error response messages sent from
OpExecutorHandler.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b7a44953
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b7a44953
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b7a44953
Branch: refs/heads/TINKERPOP-1976
Commit: b7a44953c8ac62f308b78709ab2565a78eddb1af
Parents: f592e34
Author: Dmitri Bourlatchkov <dm...@datastax.com>
Authored: Mon Jul 30 12:38:21 2018 -0400
Committer: Dmitri Bourlatchkov <dm...@datastax.com>
Committed: Mon Jul 30 12:38:21 2018 -0400
----------------------------------------------------------------------
.../gremlin/server/ResponseHandlerContext.java | 19 +++---
.../server/op/AbstractEvalOpProcessor.java | 26 +++++++-
.../gremlin/server/op/AbstractOpProcessor.java | 2 +-
.../server/ResponseHandlerContextTest.java | 45 +++++++++++---
.../server/op/AbstractEvalOpProcessorTest.java | 62 ++++++++++++++++++++
5 files changed, 135 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b7a44953/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContext.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContext.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContext.java
index fff4480..3c8c13c 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContext.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContext.java
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.server;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -27,7 +29,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
* A context for asynchronously writing response messages related to a particular request.
* <p>The "write" methods of this class ensure that at most one {@link ResponseStatusCode#isFinalResponse() final}
* response message is written to the underlying channel. Attempts to write more than one final response message will
- * result in an {@link IllegalStateException}.</p>
+ * be ignored with a warning log message.</p>
* <p>Note: an object of this class should be used instead of writing to the channel directly when multiple threads
* are expected to produce final response messages concurrently. Callers must ensure that the same
* {@link ResponseHandlerContext} is used by all threads writing response messages for the same request.</p>
@@ -35,6 +37,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
* @author Dmitri Bourlatchkov
*/
public class ResponseHandlerContext {
+ private static final Logger logger = LoggerFactory.getLogger(ResponseHandlerContext.class);
private final Context context;
private final AtomicBoolean finalResponseWritten = new AtomicBoolean();
@@ -52,7 +55,7 @@ public class ResponseHandlerContext {
* {@link ResponseStatusCode#isFinalResponse() final} response is written.
* <p>Note: this method should be used instead of writing to the channel directly when multiple threads
* are expected to produce response messages concurrently.</p>
- * <p>Attempts to write more than one final response message will result in an {@link IllegalStateException}.</p>
+ * <p>Attempts to write more than one final response message will be ignored.</p>
* @see #writeAndFlush(ResponseStatusCode, Object)
*/
public void writeAndFlush(ResponseMessage message) {
@@ -65,16 +68,18 @@ public class ResponseHandlerContext {
* <p>The caller must make sure that the provided response status code matches the content of the message.</p>
* <p>Note: this method should be used instead of writing to the channel directly when multiple threads
* are expected to produce response messages concurrently.</p>
- * <p>Attempts to write more than one final response message will result in an {@link IllegalStateException}.</p>
+ * <p>Attempts to write more than one final response message will be ignored.</p>
* @see #writeAndFlush(ResponseMessage)
*/
public void writeAndFlush(ResponseStatusCode code, Object responseMessage) {
final boolean messageIsFinal = code.isFinalResponse();
- if(!finalResponseWritten.compareAndSet(false, messageIsFinal)) {
- final String errorMessage = String.format("Another final response message was already written for request %s", context.getRequestMessage().getRequestId());
- throw new IllegalStateException(errorMessage);
+ if(finalResponseWritten.compareAndSet(false, messageIsFinal)) {
+ context.getChannelHandlerContext().writeAndFlush(responseMessage);
+ } else {
+ final String logMessage = String.format("Another final response message was already written for request %s, ignoring response code: %s",
+ context.getRequestMessage().getRequestId(), code);
+ logger.warn(logMessage);
}
- context.getChannelHandlerContext().writeAndFlush(responseMessage);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b7a44953/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
index 6ff0452..39168c2 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
@@ -223,9 +223,33 @@ public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor {
* script evaluation.
* @param bindingsSupplier A function that returns the {@link Bindings} to provide to the
* {@link GremlinExecutor#eval} method.
+ * @see #evalOpInternal(ResponseHandlerContext, Supplier, BindingSupplier)
*/
protected void evalOpInternal(final Context context, final Supplier<GremlinExecutor> gremlinExecutorSupplier,
final BindingSupplier bindingsSupplier) throws OpProcessorException {
+ ResponseHandlerContext rhc = new ResponseHandlerContext(context);
+ try {
+ evalOpInternal(rhc, gremlinExecutorSupplier, bindingsSupplier);
+ } catch (Exception ex) {
+ // Exceptions may occur on after the script started executing, therefore corresponding errors must be
+ // reported via the ResponseHandlerContext.
+ logger.warn("Unable to process script evaluation request: " + ex, ex);
+ rhc.writeAndFlush(ResponseMessage.build(context.getRequestMessage())
+ .code(ResponseStatusCode.SERVER_ERROR)
+ .statusAttributeException(ex)
+ .statusMessage(ex.getMessage()).create());
+ }
+ }
+
+ /**
+ * A variant of {@link #evalOpInternal(Context, Supplier, BindingSupplier)} that is suitable for use in situations
+ * when multiple threads may produce {@link ResponseStatusCode#isFinalResponse() final} response messages
+ * concurrently.
+ * @see #evalOpInternal(Context, Supplier, BindingSupplier)
+ */
+ protected void evalOpInternal(final ResponseHandlerContext rhc, final Supplier<GremlinExecutor> gremlinExecutorSupplier,
+ final BindingSupplier bindingsSupplier) throws OpProcessorException {
+ final Context context = rhc.getContext();
final Timer.Context timerContext = evalOpTimer.time();
final ChannelHandlerContext ctx = context.getChannelHandlerContext();
final RequestMessage msg = context.getRequestMessage();
@@ -246,8 +270,6 @@ public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor {
final long seto = args.containsKey(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT) ?
Long.parseLong(args.get(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT).toString()) : settings.scriptEvaluationTimeout;
- ResponseHandlerContext rhc = new ResponseHandlerContext(context);
-
final GremlinExecutor.LifeCycle lifeCycle = GremlinExecutor.LifeCycle.build()
.scriptEvaluationTimeoutOverride(seto)
.afterFailure((b,t) -> {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b7a44953/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
index 1263c81..c2b6f1f 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
@@ -80,7 +80,7 @@ public abstract class AbstractOpProcessor implements OpProcessor {
}
/**
- * A variant of {@link #handleIterator(Context, Iterator)} that is suitable for use in situations when mutiple
+ * A variant of {@link #handleIterator(Context, Iterator)} that is suitable for use in situations when multiple
* threads may produce {@link ResponseStatusCode#isFinalResponse() final} response messages concurrently.
* @see #handleIterator(Context, Iterator)
*/
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b7a44953/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java
index bea318b..6f15a33 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java
@@ -19,10 +19,13 @@
package org.apache.tinkerpop.gremlin.server;
import io.netty.channel.ChannelHandlerContext;
+import org.apache.log4j.Logger;
import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.hamcrest.CoreMatchers;
+import org.apache.tinkerpop.gremlin.util.Log4jRecordingAppender;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -32,8 +35,7 @@ import java.util.Arrays;
import java.util.UUID;
import java.util.function.BiFunction;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertTrue;
@RunWith(Parameterized.class)
public class ResponseHandlerContextTest {
@@ -45,6 +47,7 @@ public class ResponseHandlerContextTest {
private final RequestMessage request = RequestMessage.build("test").create();
private final Context context = new Context(request, ctx, null, null, null, null);
private final ResponseHandlerContext rhc = new ResponseHandlerContext(context);
+ private final Log4jRecordingAppender recordingAppender = new Log4jRecordingAppender();
@Parameterized.Parameters(name = "{0}")
public static Iterable<Object[]> data() {
@@ -79,6 +82,18 @@ public class ResponseHandlerContextTest {
});
}
+ @Before
+ public void addRecordingAppender() {
+ final Logger rootLogger = Logger.getRootLogger();
+ rootLogger.addAppender(recordingAppender);
+ }
+
+ @After
+ public void removeRecordingAppender() {
+ final Logger rootLogger = Logger.getRootLogger();
+ rootLogger.removeAppender(recordingAppender);
+ }
+
@Test
public void shouldAllowMultipleNonFinalResponses() {
writeInvoker.apply(rhc, ResponseStatusCode.AUTHENTICATE);
@@ -99,12 +114,24 @@ public class ResponseHandlerContextTest {
writeInvoker.apply(rhc, ResponseStatusCode.SUCCESS);
Mockito.verify(ctx, Mockito.times(2)).writeAndFlush(Mockito.any());
- try {
- writeInvoker.apply(rhc, ResponseStatusCode.SERVER_ERROR_TIMEOUT);
- fail("Expected an IllegalStateException");
- } catch (IllegalStateException ex) {
- assertThat(ex.toString(), CoreMatchers.containsString(request.getRequestId().toString()));
- }
+ writeInvoker.apply(rhc, ResponseStatusCode.SERVER_ERROR_TIMEOUT);
+ assertTrue(recordingAppender.logContainsAny(".*" + request.getRequestId() + ".*"));
+ assertTrue(recordingAppender.logContainsAny(".*" + ResponseStatusCode.SERVER_ERROR_TIMEOUT + "$"));
+
+ // ensure there were no other writes to the channel
Mockito.verify(ctx, Mockito.times(2)).writeAndFlush(Mockito.any());
}
+
+ @Test
+ public void shouldNotAllowNonFinalMessagesAfterFinalResponse() {
+ writeInvoker.apply(rhc, ResponseStatusCode.SERVER_ERROR_TIMEOUT);
+ Mockito.verify(ctx, Mockito.times(1)).writeAndFlush(Mockito.any());
+
+ writeInvoker.apply(rhc, ResponseStatusCode.PARTIAL_CONTENT);
+ assertTrue(recordingAppender.logContainsAny(".*" + request.getRequestId() + ".*"));
+ assertTrue(recordingAppender.logContainsAny(".*" + ResponseStatusCode.PARTIAL_CONTENT + "$"));
+
+ // ensure there were no other writes to the channel
+ Mockito.verify(ctx, Mockito.times(1)).writeAndFlush(Mockito.any());
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b7a44953/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
new file mode 100644
index 0000000..6f25e2e
--- /dev/null
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server.op;
+
+import io.netty.channel.ChannelHandlerContext;
+import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
+import org.apache.tinkerpop.gremlin.server.Context;
+import org.apache.tinkerpop.gremlin.server.Settings;
+import org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor;
+import org.hamcrest.CoreMatchers;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+
+import javax.script.SimpleBindings;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Matchers.anyString;
+
+public class AbstractEvalOpProcessorTest {
+
+ @Test
+ public void evalOpInternalShouldHandleAllEvaluationExceptions() throws OpProcessorException {
+ AbstractEvalOpProcessor processor = new StandardOpProcessor();
+ RequestMessage request = RequestMessage.build("test").create();
+ Settings settings = new Settings();
+ ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
+ ArgumentCaptor<ResponseMessage> responseCaptor = ArgumentCaptor.forClass(ResponseMessage.class);
+
+ GremlinExecutor gremlinExecutor = Mockito.mock(GremlinExecutor.class);
+ Mockito.when(gremlinExecutor.eval(anyString(), anyString(), Mockito.any(), Mockito.<GremlinExecutor.LifeCycle>any()))
+ .thenThrow(new IllegalStateException("test-exception"));
+
+ Context context = new Context(request, ctx, settings, null, gremlinExecutor, null);
+ processor.evalOpInternal(context, context::getGremlinExecutor, SimpleBindings::new);
+
+ Mockito.verify(ctx, Mockito.times(1)).writeAndFlush(responseCaptor.capture());
+ assertEquals(ResponseStatusCode.SERVER_ERROR, responseCaptor.getValue().getStatus().getCode());
+ assertEquals(request.getRequestId(), responseCaptor.getValue().getRequestId());
+ assertThat(responseCaptor.getValue().getStatus().getMessage(), CoreMatchers.containsString("test-exception"));
+ }
+}
\ No newline at end of file
[06/20] tinkerpop git commit: TINKERPOP-2005 Set/restore log level in
ResponseHandlerContextTest
Posted by sp...@apache.org.
TINKERPOP-2005 Set/restore log level in ResponseHandlerContextTest
This is to allow these tests to capture intended log messages in the
CI environment.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fe9c26f6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fe9c26f6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fe9c26f6
Branch: refs/heads/TINKERPOP-1976
Commit: fe9c26f656cf79f513af5b1230f498934a796063
Parents: 0e0d26c
Author: Dmitri Bourlatchkov <dm...@datastax.com>
Authored: Tue Jul 31 12:11:34 2018 -0400
Committer: Dmitri Bourlatchkov <dm...@datastax.com>
Committed: Tue Jul 31 12:11:34 2018 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/server/ResponseHandlerContextTest.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fe9c26f6/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java
index 13c9992..2babee9 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.server;
import io.netty.channel.ChannelHandlerContext;
+import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
@@ -49,6 +50,8 @@ public class ResponseHandlerContextTest {
private final ResponseHandlerContext rhc = new ResponseHandlerContext(context);
private final Log4jRecordingAppender recordingAppender = new Log4jRecordingAppender();
+ private Level originalLogLevel;
+
@Parameterized.Parameters(name = "{0}")
public static Iterable<Object[]> data() {
return Arrays.asList(new Object[][] {
@@ -86,11 +89,14 @@ public class ResponseHandlerContextTest {
public void addRecordingAppender() {
final Logger rootLogger = Logger.getRootLogger();
rootLogger.addAppender(recordingAppender);
+ originalLogLevel = rootLogger.getLevel();
+ rootLogger.setLevel(Level.ALL);
}
@After
public void removeRecordingAppender() {
final Logger rootLogger = Logger.getRootLogger();
+ rootLogger.setLevel(originalLogLevel);
rootLogger.removeAppender(recordingAppender);
}
[05/20] tinkerpop git commit: TINKERPOP-2005 Minor code cleanup
Posted by sp...@apache.org.
TINKERPOP-2005 Minor code cleanup
* Declare variables 'final'
* Remove unused variables
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0e0d26cd
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0e0d26cd
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0e0d26cd
Branch: refs/heads/TINKERPOP-1976
Commit: 0e0d26cdafca3c2a3244fe224f3f08391669d470
Parents: 63ae13c
Author: Dmitri Bourlatchkov <dm...@datastax.com>
Authored: Tue Jul 31 10:48:12 2018 -0400
Committer: Dmitri Bourlatchkov <dm...@datastax.com>
Committed: Tue Jul 31 10:48:12 2018 -0400
----------------------------------------------------------------------
.../gremlin/server/ResponseHandlerContext.java | 6 +++---
.../gremlin/server/op/AbstractEvalOpProcessor.java | 3 +--
.../gremlin/server/op/AbstractOpProcessor.java | 4 ++--
.../gremlin/server/GremlinServerIntegrateTest.java | 4 ++--
.../gremlin/server/ResponseHandlerContextTest.java | 4 ++--
.../server/op/AbstractEvalOpProcessorTest.java | 14 +++++++-------
.../gremlin/server/op/AbstractOpProcessorTest.java | 12 ++++++------
7 files changed, 23 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0e0d26cd/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContext.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContext.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContext.java
index 3c8c13c..5cc79b5 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContext.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContext.java
@@ -42,7 +42,7 @@ public class ResponseHandlerContext {
private final Context context;
private final AtomicBoolean finalResponseWritten = new AtomicBoolean();
- public ResponseHandlerContext(Context context) {
+ public ResponseHandlerContext(final Context context) {
this.context = context;
}
@@ -58,7 +58,7 @@ public class ResponseHandlerContext {
* <p>Attempts to write more than one final response message will be ignored.</p>
* @see #writeAndFlush(ResponseStatusCode, Object)
*/
- public void writeAndFlush(ResponseMessage message) {
+ public void writeAndFlush(final ResponseMessage message) {
writeAndFlush(message.getStatus().getCode(), message);
}
@@ -71,7 +71,7 @@ public class ResponseHandlerContext {
* <p>Attempts to write more than one final response message will be ignored.</p>
* @see #writeAndFlush(ResponseMessage)
*/
- public void writeAndFlush(ResponseStatusCode code, Object responseMessage) {
+ public void writeAndFlush(final ResponseStatusCode code, final Object responseMessage) {
final boolean messageIsFinal = code.isFinalResponse();
if(finalResponseWritten.compareAndSet(false, messageIsFinal)) {
context.getChannelHandlerContext().writeAndFlush(responseMessage);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0e0d26cd/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
index 39168c2..ca1ee53 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
@@ -227,7 +227,7 @@ public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor {
*/
protected void evalOpInternal(final Context context, final Supplier<GremlinExecutor> gremlinExecutorSupplier,
final BindingSupplier bindingsSupplier) throws OpProcessorException {
- ResponseHandlerContext rhc = new ResponseHandlerContext(context);
+ final ResponseHandlerContext rhc = new ResponseHandlerContext(context);
try {
evalOpInternal(rhc, gremlinExecutorSupplier, bindingsSupplier);
} catch (Exception ex) {
@@ -251,7 +251,6 @@ public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor {
final BindingSupplier bindingsSupplier) throws OpProcessorException {
final Context context = rhc.getContext();
final Timer.Context timerContext = evalOpTimer.time();
- final ChannelHandlerContext ctx = context.getChannelHandlerContext();
final RequestMessage msg = context.getRequestMessage();
final GremlinExecutor gremlinExecutor = gremlinExecutorSupplier.get();
final Settings settings = context.getSettings();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0e0d26cd/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
index c2b6f1f..38ca3e1 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java
@@ -278,8 +278,8 @@ public abstract class AbstractOpProcessor implements OpProcessor {
protected static Frame makeFrame(final ChannelHandlerContext ctx, final RequestMessage msg,
final MessageSerializer serializer, final boolean useBinary, final List<Object> aggregate,
final ResponseStatusCode code, final Map<String,Object> responseMetaData) throws Exception {
- Context context = new Context(msg, ctx, null, null, null, null); // dummy context, good only for writing response messages to the channel
- ResponseHandlerContext rhc = new ResponseHandlerContext(context);
+ final Context context = new Context(msg, ctx, null, null, null, null); // dummy context, good only for writing response messages to the channel
+ final ResponseHandlerContext rhc = new ResponseHandlerContext(context);
return makeFrame(rhc, msg, serializer, useBinary, aggregate, code, responseMetaData);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0e0d26cd/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 0867fd3..eb5def9 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
@@ -1028,8 +1028,8 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
final List<ResponseMessage> responses = client.submit(request);
assertThat(responses.size(), Matchers.greaterThan(1));
for (Iterator<ResponseMessage> it = responses.iterator(); it.hasNext(); ) {
- ResponseMessage msg = it.next();
- ResponseStatusCode expected = it.hasNext() ? ResponseStatusCode.PARTIAL_CONTENT : ResponseStatusCode.SUCCESS;
+ final ResponseMessage msg = it.next();
+ final ResponseStatusCode expected = it.hasNext() ? ResponseStatusCode.PARTIAL_CONTENT : ResponseStatusCode.SUCCESS;
assertEquals(expected, msg.getStatus().getCode());
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0e0d26cd/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java
index 6f15a33..13c9992 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ResponseHandlerContextTest.java
@@ -55,7 +55,7 @@ public class ResponseHandlerContextTest {
{
new BiFunction<ResponseHandlerContext, ResponseStatusCode, Void>() {
@Override
- public Void apply(ResponseHandlerContext context, ResponseStatusCode code) {
+ public Void apply(final ResponseHandlerContext context, final ResponseStatusCode code) {
context.writeAndFlush(code, "testMessage");
return null;
}
@@ -68,7 +68,7 @@ public class ResponseHandlerContextTest {
}, {
new BiFunction<ResponseHandlerContext, ResponseStatusCode, Void>() {
@Override
- public Void apply(ResponseHandlerContext context, ResponseStatusCode code) {
+ public Void apply(final ResponseHandlerContext context, final ResponseStatusCode code) {
context.writeAndFlush(ResponseMessage.build(UUID.randomUUID()).code(code).create());
return null;
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0e0d26cd/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
index 6f25e2e..72b9c5c 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
@@ -41,17 +41,17 @@ public class AbstractEvalOpProcessorTest {
@Test
public void evalOpInternalShouldHandleAllEvaluationExceptions() throws OpProcessorException {
- AbstractEvalOpProcessor processor = new StandardOpProcessor();
- RequestMessage request = RequestMessage.build("test").create();
- Settings settings = new Settings();
- ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
- ArgumentCaptor<ResponseMessage> responseCaptor = ArgumentCaptor.forClass(ResponseMessage.class);
+ final AbstractEvalOpProcessor processor = new StandardOpProcessor();
+ final RequestMessage request = RequestMessage.build("test").create();
+ final Settings settings = new Settings();
+ final ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
+ final ArgumentCaptor<ResponseMessage> responseCaptor = ArgumentCaptor.forClass(ResponseMessage.class);
- GremlinExecutor gremlinExecutor = Mockito.mock(GremlinExecutor.class);
+ final GremlinExecutor gremlinExecutor = Mockito.mock(GremlinExecutor.class);
Mockito.when(gremlinExecutor.eval(anyString(), anyString(), Mockito.any(), Mockito.<GremlinExecutor.LifeCycle>any()))
.thenThrow(new IllegalStateException("test-exception"));
- Context context = new Context(request, ctx, settings, null, gremlinExecutor, null);
+ final Context context = new Context(request, ctx, settings, null, gremlinExecutor, null);
processor.evalOpInternal(context, context::getGremlinExecutor, SimpleBindings::new);
Mockito.verify(ctx, Mockito.times(1)).writeAndFlush(responseCaptor.capture());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0e0d26cd/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java
index cf42737..a7cee1a 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessorTest.java
@@ -33,9 +33,9 @@ public class AbstractOpProcessorTest {
@Test
public void deprecatedMakeFrameMethodShouldRedirectCorrectly() throws Exception {
- ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
- RequestMessage request = RequestMessage.build("test").create();
- ArgumentCaptor<ResponseMessage> responseCaptor = ArgumentCaptor.forClass(ResponseMessage.class);
+ final ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
+ final RequestMessage request = RequestMessage.build("test").create();
+ final ArgumentCaptor<ResponseMessage> responseCaptor = ArgumentCaptor.forClass(ResponseMessage.class);
try {
// Induce a NullPointerException to validate error response message writing
@@ -53,9 +53,9 @@ public class AbstractOpProcessorTest {
@Test
public void alternativeMakeFrameMethodShouldRedirectCorrectly() throws Exception {
- ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
- RequestMessage request = RequestMessage.build("test").create();
- ArgumentCaptor<ResponseMessage> responseCaptor = ArgumentCaptor.forClass(ResponseMessage.class);
+ final ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
+ final RequestMessage request = RequestMessage.build("test").create();
+ final ArgumentCaptor<ResponseMessage> responseCaptor = ArgumentCaptor.forClass(ResponseMessage.class);
try {
// Induce a NullPointerException to validate error response message writing
[14/20] tinkerpop git commit: TINKERPOP-1976 Can't assert order() for
pageRank()
Posted by sp...@apache.org.
TINKERPOP-1976 Can't assert order() for pageRank()
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/13440d6b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/13440d6b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/13440d6b
Branch: refs/heads/TINKERPOP-1976
Commit: 13440d6b6720b5d4f091f51674e7b341cc40e8a0
Parents: 0a5d8ce
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Aug 8 06:38:21 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Aug 9 07:28:09 2018 -0400
----------------------------------------------------------------------
gremlin-test/features/map/PageRank.feature | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/13440d6b/gremlin-test/features/map/PageRank.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/PageRank.feature b/gremlin-test/features/map/PageRank.feature
index 76af1ed..049b8c2 100644
--- a/gremlin-test/features/map/PageRank.feature
+++ b/gremlin-test/features/map/PageRank.feature
@@ -48,6 +48,8 @@ Feature: Step - pageRank()
| m[{"name": ["lop"], "projectRank": [3.0]}] |
| m[{"name": ["ripple"], "projectRank": [1.0]}] |
+ # can't fully assert order here because some ranks are equivalent. the java test does an "or" type assert to deal
+ # with this, which we can't express here in these tests. should probably change the test or
Scenario: g_V_pageRank_order_byXpageRank_decrX_name
Given the modern graph
And the traversal of
@@ -55,7 +57,7 @@ Feature: Step - pageRank()
g.withComputer().V().pageRank().order().by("gremlin.pageRankVertexProgram.pageRank", Order.decr).values("name")
"""
When iterated to list
- Then the result should be ordered
+ Then the result should be unordered
| result |
| lop |
| ripple |
[15/20] tinkerpop git commit: TINKERPOP-1976 Modified the nature of
the pageRank() order() test
Posted by sp...@apache.org.
TINKERPOP-1976 Modified the nature of the pageRank() order() test
The GLV test language doesn't support the kind of asserts that the java test was doing. Change the nature of the java test a bit to ensure it could be tested properly. Made the java test more succinct in the process.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5d9c3f13
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5d9c3f13
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5d9c3f13
Branch: refs/heads/TINKERPOP-1976
Commit: 5d9c3f1335375caa1b4c0bd0cd97094f787e9dac
Parents: 13440d6
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Aug 8 12:06:43 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Aug 9 07:28:09 2018 -0400
----------------------------------------------------------------------
.../traversal/step/map/GroovyPageRankTest.groovy | 2 +-
.../test/cucumber/feature-steps.js | 2 +-
gremlin-test/features/map/PageRank.feature | 10 ++++------
.../process/traversal/step/map/PageRankTest.java | 18 +++++++++---------
4 files changed, 15 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d9c3f13/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy
index 13787cc..78671da 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy
@@ -41,7 +41,7 @@ public abstract class GroovyPageRankTest {
}
@Override
- public Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_name() {
+ public Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_byXnameX_name() {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V.pageRank.order.by(PageRankVertexProgram.PAGE_RANK, decr).name")
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d9c3f13/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
index e585fcc..fa609be 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
@@ -63,7 +63,7 @@ const ignoredScenarios = {
// An associative array containing the scenario name as key, for example:
'g_V_pageRank': new IgnoreError(ignoreReason.computerNotSupported),
'g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_pageRank_order_byXpageRank_decrX_name': new IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_pageRank_order_byXpageRank_decrX_byXnameX_name': new IgnoreError(ignoreReason.computerNotSupported),
'g_V_pageRank_order_byXpageRank_decrX_name_limitX2X': new IgnoreError(ignoreReason.computerNotSupported),
'g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX': new IgnoreError(ignoreReason.computerNotSupported),
'g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX': new IgnoreError(ignoreReason.computerNotSupported),
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d9c3f13/gremlin-test/features/map/PageRank.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/PageRank.feature b/gremlin-test/features/map/PageRank.feature
index 049b8c2..ebf6489 100644
--- a/gremlin-test/features/map/PageRank.feature
+++ b/gremlin-test/features/map/PageRank.feature
@@ -48,21 +48,19 @@ Feature: Step - pageRank()
| m[{"name": ["lop"], "projectRank": [3.0]}] |
| m[{"name": ["ripple"], "projectRank": [1.0]}] |
- # can't fully assert order here because some ranks are equivalent. the java test does an "or" type assert to deal
- # with this, which we can't express here in these tests. should probably change the test or
- Scenario: g_V_pageRank_order_byXpageRank_decrX_name
+ Scenario: g_V_pageRank_order_byXpageRank_decrX_byXnameX_name
Given the modern graph
And the traversal of
"""
- g.withComputer().V().pageRank().order().by("gremlin.pageRankVertexProgram.pageRank", Order.decr).values("name")
+ g.withComputer().V().pageRank().order().by("gremlin.pageRankVertexProgram.pageRank", Order.decr).by("name").values("name")
"""
When iterated to list
- Then the result should be unordered
+ Then the result should be ordered
| result |
| lop |
| ripple |
- | vadas |
| josh |
+ | vadas |
| marko |
| peter |
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d9c3f13/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
index 57a3b3f..8846099 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
@@ -51,7 +51,7 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX();
- public abstract Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_name();
+ public abstract Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_byXnameX_name();
public abstract Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_name_limitX2X();
@@ -99,17 +99,17 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_pageRank_order_byXpageRank_decrX_name() {
- final Traversal<Vertex, String> traversal = get_g_V_pageRank_order_byXpageRank_decrX_name();
+ public void g_V_pageRank_order_byXpageRank_decrX_byXnameX_name() {
+ final Traversal<Vertex, String> traversal = get_g_V_pageRank_order_byXpageRank_decrX_byXnameX_name();
printTraversalForm(traversal);
final List<String> names = traversal.toList();
assertEquals(6, names.size());
assertEquals("lop", names.get(0));
assertEquals("ripple", names.get(1));
- assertTrue(names.get(2).equals("josh") || names.get(2).equals("vadas"));
- assertTrue(names.get(3).equals("josh") || names.get(3).equals("vadas"));
- assertTrue(names.get(4).equals("marko") || names.get(4).equals("peter"));
- assertTrue(names.get(5).equals("marko") || names.get(5).equals("peter"));
+ assertEquals("josh", names.get(2));
+ assertEquals("vadas", names.get(3));
+ assertEquals("marko", names.get(4));
+ assertEquals("peter", names.get(5));
}
@Test
@@ -256,8 +256,8 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_name() {
- return g.V().pageRank().order().by(PageRankVertexProgram.PAGE_RANK, Order.decr).values("name");
+ public Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_byXnameX_name() {
+ return g.V().pageRank().order().by(PageRankVertexProgram.PAGE_RANK, Order.decr).by("name").values("name");
}
@Override
[12/20] tinkerpop git commit: Updated changelog CTR
Posted by sp...@apache.org.
Updated changelog CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/37476a2b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/37476a2b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/37476a2b
Branch: refs/heads/TINKERPOP-1976
Commit: 37476a2b46467c2d704cbef977225d8da3cddd64
Parents: 387cf69
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 7 10:52:29 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Aug 7 10:52:29 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/37476a2b/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 495abd7..f6413e2 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
[[release-3-2-10]]
=== TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET)
+* Fixed problem with Gremlin Server sometimes returning an additional message after a failure.
* Added an system error code for failed plugin installs for Gremlin Server `-i` option.
* Match numbers in `choose()` options using `NumberHelper` (match values, ignore data type).
* Added support for GraphSON serialization of `Date` in Javascript.
[09/20] tinkerpop git commit: Merge branch 'TINKERPOP-2016' into tp32
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-2016' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b98ff5e1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b98ff5e1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b98ff5e1
Branch: refs/heads/TINKERPOP-1976
Commit: b98ff5e150c2da037780737c571c34215fe6c151
Parents: ce94738 1829318
Author: Robert Dale <ro...@gmail.com>
Authored: Sat Aug 4 16:44:00 2018 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Sat Aug 4 16:44:00 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
gremlin-shaded/pom.xml | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[03/20] tinkerpop git commit: TINKERPOP-2005 Encapsulate test eval
timeout overrides in a method
Posted by sp...@apache.org.
TINKERPOP-2005 Encapsulate test eval timeout overrides in a method
This is to avoid directly exposing other settings whose changes may
not be effective until the server is restarted.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4ff4b88a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4ff4b88a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4ff4b88a
Branch: refs/heads/TINKERPOP-1976
Commit: 4ff4b88a5b663f86917299691edc6f84a6bd1c67
Parents: b7a4495
Author: Dmitri Bourlatchkov <dm...@datastax.com>
Authored: Mon Jul 30 15:57:14 2018 -0400
Committer: Dmitri Bourlatchkov <dm...@datastax.com>
Committed: Mon Jul 30 15:57:14 2018 -0400
----------------------------------------------------------------------
.../server/AbstractGremlinServerIntegrationTest.java | 13 ++++++++++++-
.../gremlin/server/GremlinServerIntegrateTest.java | 2 +-
2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4ff4b88a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
index a8a8853..f11a045 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assume.assumeThat;
*/
public abstract class AbstractGremlinServerIntegrationTest {
protected GremlinServer server;
- protected Settings overriddenSettings;
+ private Settings overriddenSettings;
private final static String epollOption = "gremlin.server.epoll";
private static final boolean GREMLIN_SERVER_EPOLL = "true".equalsIgnoreCase(System.getProperty(epollOption));
private static final Logger logger = LoggerFactory.getLogger(AbstractGremlinServerIntegrationTest.class);
@@ -51,6 +51,17 @@ public abstract class AbstractGremlinServerIntegrationTest {
return settings;
}
+ /**
+ * This method may be called after {@link #startServer()} to (re-)set the script evaluation timeout in
+ * the running server.
+ * @param timeoutInMillis new script evaluation timeout
+ */
+ protected void overrideScriptEvaluationTimeout(final long timeoutInMillis) {
+ // Note: overriding settings in a running server is not guaranteed to work for all settings.
+ // It works for the evaluation timeout, though, because GremlinExecutor is re-created for each evaluation.
+ overriddenSettings.scriptEvaluationTimeout = timeoutInMillis;
+ }
+
public InputStream getSettingsInputStream() {
return AbstractGremlinServerIntegrationTest.class.getResourceAsStream("gremlin-server-integration.yaml");
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4ff4b88a/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 9256458..0867fd3 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
@@ -394,7 +394,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
// Note: this test may have a false negative result, but a failure would indicate a real problem.
for(int i = 0; i < 30; i++) {
int timeout = 1 + i;
- overriddenSettings.scriptEvaluationTimeout = timeout;
+ overrideScriptEvaluationTimeout(timeout);
try {
client.submit("x = 1 + 1").all().get().get(0).getInt();
[10/20] tinkerpop git commit: Added a system error code for failed
plugin installs to Gremlin Server CTR
Posted by sp...@apache.org.
Added a system error code for failed plugin installs to Gremlin Server CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2d315e82
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2d315e82
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2d315e82
Branch: refs/heads/TINKERPOP-1976
Commit: 2d315e828149a132ecabf406af91acc3caec064c
Parents: b98ff5e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 7 06:28:56 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Aug 7 06:30:08 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../tinkerpop/gremlin/server/util/GremlinServerInstall.java | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d315e82/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8137b45..495abd7 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
[[release-3-2-10]]
=== TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET)
+* Added an system error code for failed plugin installs for Gremlin Server `-i` option.
* Match numbers in `choose()` options using `NumberHelper` (match values, ignore data type).
* Added support for GraphSON serialization of `Date` in Javascript.
* Fixed bug in Java driver where an disorderly shutdown of the server would cause the client to hang.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d315e82/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/GremlinServerInstall.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/GremlinServerInstall.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/GremlinServerInstall.java
index 03317d3..58532a0 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/GremlinServerInstall.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/GremlinServerInstall.java
@@ -23,6 +23,8 @@ import org.apache.tinkerpop.gremlin.groovy.util.DependencyGrabber;
import groovy.lang.GroovyClassLoader;
/**
+ * Command line installer for plugins to Gremlin Server.
+ *
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class GremlinServerInstall {
@@ -39,6 +41,7 @@ public class GremlinServerInstall {
} catch (Exception iae) {
System.out.println(String.format("Could not install the dependency: %s", iae.getMessage()));
iae.printStackTrace();
+ System.exit(1);
}
}
[16/20] tinkerpop git commit: TINKERPOP-1976 Removed an OptOut from
RemoteGraph
Posted by sp...@apache.org.
TINKERPOP-1976 Removed an OptOut from RemoteGraph
Carved out a special case for a behavior that is specific to remote operations around side-effects
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/682bdde6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/682bdde6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/682bdde6
Branch: refs/heads/TINKERPOP-1976
Commit: 682bdde6c58f992b20ad919279c7da691c1dc210
Parents: c03b575
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 6 15:10:52 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Aug 9 07:28:09 2018 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/process/remote/RemoteGraph.java | 4 ----
.../driver/remote/DriverRemoteTraversalSideEffects.java | 3 ++-
.../gremlin/process/AbstractGremlinProcessTest.java | 10 +++++++++-
3 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/682bdde6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
index 1ea7d42..3699fea 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
@@ -48,10 +48,6 @@ import java.util.Iterator;
@Graph.OptIn(Graph.OptIn.SUITE_PROCESS_STANDARD)
@Graph.OptIn(Graph.OptIn.SUITE_PROCESS_COMPUTER)
@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupCountTest",
- method = "g_V_hasXnoX_groupCountXaX_capXaX",
- reason = "This test asserts an empty side-effect which reflects as a null rather than an \"empty\" and thus doesn't assert")
-@Graph.OptOut(
test = "org.apache.tinkerpop.gremlin.process.traversal.CoreTraversalTest",
method = "*",
reason = "The test suite does not support profiling or lambdas and for groovy tests: 'Could not locate method: GraphTraversalSource.withStrategies([{traversalCategory=interface org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy$DecorationStrategy}])'")
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/682bdde6/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffects.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffects.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffects.java
index 4305567..791c70e 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffects.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffects.java
@@ -30,6 +30,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
@@ -88,7 +89,7 @@ public class DriverRemoteTraversalSideEffects extends AbstractRemoteTraversalSid
final Result result = client.submitAsync(msg).get().all().get().get(0);
sideEffects.put(key, null == result ? null : result.getObject());
} catch (Exception ex) {
- // we use to try to catch "no found" situations returned from the server here and then null the
+ // we use to try to catch "no found" situations returned from the server here and then null the
// side-effect for the requested key. doesn't seem like there is a need for that now because calls
// to get() now initially trigger a call the keys() so you would know all of the keys available on
// the server and would validate them up front throwing sideEffectKeyDoesNotExist(key) which thus
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/682bdde6/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
index 96dee1d..c3f4dc2 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process;
import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
import org.apache.tinkerpop.gremlin.GraphManager;
+import org.apache.tinkerpop.gremlin.process.remote.traversal.RemoteTraversalSideEffects;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects;
@@ -96,8 +97,15 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
final Class clazz = (Class) keysClasses[i + 1];
assertThat(sideEffects.keys().contains(key), is(true));
assertThat(sideEffects.exists(key), is(true));
- assertEquals(clazz, sideEffects.get((String) keysClasses[i]).getClass());
assertThat(sideEffects.exists(UUID.randomUUID().toString()), is(false));
+
+ // there is slightly different behavior for remote side-effects so carving out a few asserts with that
+ // in mind. the client really doesnt' really have a way of knowing what type of object to create when it
+ // gets an empty iterator so it makes the result null and therefore we end up with a NPE if we try to
+ // access it. the rest of the behavior is solid so better to do this than OptOut I think
+ if (!(sideEffects instanceof RemoteTraversalSideEffects)) {
+ assertEquals(clazz, sideEffects.get((String) keysClasses[i]).getClass());
+ }
}
assertEquals(sideEffects.keys().size(), counter);
assertThat(sideEffects.keys().contains(UUID.randomUUID().toString()), is(false));
[07/20] tinkerpop git commit: TINKERPOP-2016 Bumped to Jackson 2.9.6
Posted by sp...@apache.org.
TINKERPOP-2016 Bumped to Jackson 2.9.6
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1829318f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1829318f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1829318f
Branch: refs/heads/TINKERPOP-1976
Commit: 1829318f6bfce1bc360818c6a0c34492fa69ec9a
Parents: 7fce137
Author: Robert Dale <ro...@gmail.com>
Authored: Wed Aug 1 20:02:14 2018 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Wed Aug 1 20:02:14 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
gremlin-shaded/pom.xml | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1829318f/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index b6e85ce..8137b45 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -44,6 +44,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Added concrete configuration methods to `SparkGraphComputer` to make a more clear API for configuring it.
* Fixed a bug in `TinkerGraphCountStrategy`, which didn't consider that certain map steps may not emit an element.
* Fixed a bug in JavaScript GLV where DriverRemoteConnection close() method didn't returned a Promise instance.
+* Bumped to Jackson 2.9.6.
[[release-3-2-9]]
=== TinkerPop 3.2.9 (Release Date: May 8, 2018)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1829318f/gremlin-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-shaded/pom.xml b/gremlin-shaded/pom.xml
index 192262d..3f41b30 100644
--- a/gremlin-shaded/pom.xml
+++ b/gremlin-shaded/pom.xml
@@ -49,8 +49,8 @@ limitations under the License.
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <!-- Update the shade plugin config whenever you change this version -->
- <version>2.9.4</version>
+ <!-- Update the shade plugin config whenever you change this version; update what exactly? -->
+ <version>2.9.6</version>
<optional>true</optional>
</dependency>
</dependencies>
[08/20] tinkerpop git commit: Added some javadoc CTR
Posted by sp...@apache.org.
Added some javadoc CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ce947388
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ce947388
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ce947388
Branch: refs/heads/TINKERPOP-1976
Commit: ce947388e505436d97bcfb55de45d0a52bf8b075
Parents: 7fce137
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Aug 4 06:27:46 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Aug 4 06:27:46 2018 -0400
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/driver/Client.java | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ce947388/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
index 3da8663..efbc844 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
@@ -23,6 +23,7 @@ import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.slf4j.Logger;
@@ -131,7 +132,10 @@ public abstract class Client {
}
/**
- * Submit a {@link Traversal} to the server for remote execution.
+ * Submit a {@link Traversal} to the server for remote execution.Results are returned as {@link Traverser}
+ * instances and are therefore bulked, meaning that to properly iterate the contents of the result each
+ * {@link Traverser#bulk()} must be examined to determine the number of times that object should be presented in
+ * iteration.
*/
public ResultSet submit(final Traversal traversal) {
try {
@@ -144,14 +148,19 @@ public abstract class Client {
}
/**
- * An asynchronous version of {@link #submit(Traversal)}.
+ * An asynchronous version of {@link #submit(Traversal)}. Results are returned as {@link Traverser} instances and
+ * are therefore bulked, meaning that to properly iterate the contents of the result each {@link Traverser#bulk()}
+ * must be examined to determine the number of times that object should be presented in iteration.
*/
public CompletableFuture<ResultSet> submitAsync(final Traversal traversal) {
throw new UnsupportedOperationException("This implementation does not support Traversal submission - use a sessionless Client created with from the alias() method");
}
/**
- * Submit a {@link Bytecode} to the server for remote execution.
+ * Submit a {@link Bytecode} to the server for remote execution. Results are returned as {@link Traverser}
+ * instances and are therefore bulked, meaning that to properly iterate the contents of the result each
+ * {@link Traverser#bulk()} must be examined to determine the number of times that object should be presented in
+ * iteration.
*/
public ResultSet submit(final Bytecode bytecode) {
try {
@@ -164,7 +173,9 @@ public abstract class Client {
}
/**
- * An asynchronous version of {@link #submit(Traversal)}.
+ * An asynchronous version of {@link #submit(Traversal)}. Results are returned as {@link Traverser} instances and
+ * are therefore bulked, meaning that to properly iterate the contents of the result each {@link Traverser#bulk()}
+ * must be examined to determine the number of times that object should be presented in iteration.
*/
public CompletableFuture<ResultSet> submitAsync(final Bytecode bytecode) {
throw new UnsupportedOperationException("This implementation does not support Traversal submission - use a sessionless Client created with from the alias() method");
[11/20] tinkerpop git commit: Merge branch 'pr-899' into tp32
Posted by sp...@apache.org.
Merge branch 'pr-899' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/387cf693
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/387cf693
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/387cf693
Branch: refs/heads/TINKERPOP-1976
Commit: 387cf69323b1ea0a7194033fe951db8f9e43b799
Parents: 2d315e8 fe9c26f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 7 10:51:23 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Aug 7 10:51:23 2018 -0400
----------------------------------------------------------------------
.../driver/message/ResponseStatusCode.java | 7 +
.../driver/message/ResponseStatusCodeTest.java | 36 +++++
.../gremlin/server/ResponseHandlerContext.java | 85 +++++++++++
.../server/op/AbstractEvalOpProcessor.java | 40 ++++--
.../gremlin/server/op/AbstractOpProcessor.java | 34 ++++-
.../AbstractGremlinServerIntegrationTest.java | 20 ++-
.../server/GremlinServerIntegrateTest.java | 51 +++++++
.../server/ResponseHandlerContextTest.java | 143 +++++++++++++++++++
.../server/op/AbstractEvalOpProcessorTest.java | 62 ++++++++
.../server/op/AbstractOpProcessorTest.java | 73 ++++++++++
10 files changed, 535 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
[19/20] tinkerpop git commit: TINKERPOP-1976 Added pageRank() test
for GLVs
Posted by sp...@apache.org.
TINKERPOP-1976 Added pageRank() test for GLVs
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/85fbd7cd
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/85fbd7cd
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/85fbd7cd
Branch: refs/heads/TINKERPOP-1976
Commit: 85fbd7cd471a5f4276ba19fddb28f3f4d376e643
Parents: 682bdde
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 7 08:53:32 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Aug 9 07:28:09 2018 -0400
----------------------------------------------------------------------
.../ModernGraphTypeInformation.cs | 3 +
.../test/cucumber/feature-steps.js | 11 +-
.../glv/GraphTraversalSource.template | 2 +-
.../gremlin_python/process/graph_traversal.py | 2 +-
gremlin-test/features/map/PageRank.feature | 142 +++++++++++++++++++
.../gremlin/process/FeatureCoverageTest.java | 3 +-
6 files changed, 159 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/85fbd7cd/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
index 7489b44..75dd37c 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
@@ -38,6 +38,9 @@ namespace Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
{"name", typeof(string)},
{"lang", typeof(string)},
{"weight", typeof(float)},
+ {"gremlin.pageRankVertexProgram.pageRank", typeof(double)},
+ {"friendRank", typeof(double)},
+ {"pageRank", typeof(double)},
{"foo", typeof(object)}, // used when for invalid property key lookups
{"friendWeight", typeof(float)}, // used in an AddVertex.feature test
{"performances", typeof(int)} // grateful dead graph
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/85fbd7cd/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
index 3976348..3f76052 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
@@ -55,12 +55,21 @@ const parsers = [
const ignoreReason = {
lambdaNotSupported: 'Lambdas are not supported on gremlin-javascript',
+ computerNotSupported: "withComputer() is not supported on gremlin-javascript",
needsFurtherInvestigation: '',
};
const ignoredScenarios = {
// An associative array containing the scenario name as key, for example:
- // 'g_V_asXa_bX_out_asXcX_path_selectXkeysX': new IgnoreError(ignoreReason.embeddedListAssertion),
+ 'g_V_pageRank': new IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX': new IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_pageRank_order_byXpageRank_decrX_name': new IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_pageRank_order_byXpageRank_decrX_name_limitX2X': new IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX': new IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX': new IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_pageRank_byXpageRankX_asXaX_outXknowsX_pageRank_asXbX_selectXa_bX': new IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX': new IgnoreError(ignoreReason.computerNotSupported),
+ 'g_V_outXcreatedX_groupXmX_byXlabelX_pageRankX1X_byXpageRankX_byXinEX_timesX1X_inXcreatedX_groupXmX_byXpageRankX_capXmX': new IgnoreError(ignoreReason.computerNotSupported),
};
defineSupportCode(function(methods) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/85fbd7cd/gremlin-python/glv/GraphTraversalSource.template
----------------------------------------------------------------------
diff --git a/gremlin-python/glv/GraphTraversalSource.template b/gremlin-python/glv/GraphTraversalSource.template
index 54b339e..d7ef973 100644
--- a/gremlin-python/glv/GraphTraversalSource.template
+++ b/gremlin-python/glv/GraphTraversalSource.template
@@ -52,9 +52,9 @@ class GraphTraversalSource(object):
source = self.get_graph_traversal_source()
source.traversal_strategies.add_strategies([RemoteStrategy(remote_connection)])
return source
+
def withComputer(self,graph_computer=None, workers=None, result=None, persist=None, vertices=None, edges=None, configuration=None):
return self.withStrategies(VertexProgramStrategy(graph_computer,workers,result,persist,vertices,edges,configuration))
-
<% sourceSpawnMethods.each { method -> %>
def <%= method %>(self, *args):
traversal = self.get_graph_traversal()
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/85fbd7cd/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
index b1056f0..b515e95 100644
--- a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
@@ -77,10 +77,10 @@ class GraphTraversalSource(object):
source = self.get_graph_traversal_source()
source.traversal_strategies.add_strategies([RemoteStrategy(remote_connection)])
return source
+
def withComputer(self,graph_computer=None, workers=None, result=None, persist=None, vertices=None, edges=None, configuration=None):
return self.withStrategies(VertexProgramStrategy(graph_computer,workers,result,persist,vertices,edges,configuration))
-
def E(self, *args):
traversal = self.get_graph_traversal()
traversal.bytecode.add_step("E", *args)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/85fbd7cd/gremlin-test/features/map/PageRank.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/PageRank.feature b/gremlin-test/features/map/PageRank.feature
new file mode 100644
index 0000000..76af1ed
--- /dev/null
+++ b/gremlin-test/features/map/PageRank.feature
@@ -0,0 +1,142 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+Feature: Step - pageRank()
+
+ Scenario: g_V_pageRank
+ Given the modern graph
+ And the traversal of
+ """
+ g.withComputer().V().pageRank()
+ """
+ When iterated to list
+ Then the result should be unordered
+ | result |
+ | v[marko] |
+ | v[vadas] |
+ | v[lop] |
+ | v[josh] |
+ | v[ripple] |
+ | v[peter] |
+ And the graph should return 6 for count of "g.withComputer().V().pageRank().has(\"gremlin.pageRankVertexProgram.pageRank\")"
+
+ Scenario: g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX
+ Given the modern graph
+ And the traversal of
+ """
+ g.withComputer().V().out("created").pageRank().by(__.bothE()).by("projectRank").times(0).valueMap("name", "projectRank")
+ """
+ When iterated to list
+ Then the result should be unordered
+ | result |
+ | m[{"name": ["lop"], "projectRank": [3.0]}] |
+ | m[{"name": ["lop"], "projectRank": [3.0]}] |
+ | m[{"name": ["lop"], "projectRank": [3.0]}] |
+ | m[{"name": ["ripple"], "projectRank": [1.0]}] |
+
+ Scenario: g_V_pageRank_order_byXpageRank_decrX_name
+ Given the modern graph
+ And the traversal of
+ """
+ g.withComputer().V().pageRank().order().by("gremlin.pageRankVertexProgram.pageRank", Order.decr).values("name")
+ """
+ When iterated to list
+ Then the result should be ordered
+ | result |
+ | lop |
+ | ripple |
+ | vadas |
+ | josh |
+ | marko |
+ | peter |
+
+ Scenario: g_V_pageRank_order_byXpageRank_decrX_name_limitX2X
+ Given the modern graph
+ And the traversal of
+ """
+ g.withComputer().V().pageRank().order().by("gremlin.pageRankVertexProgram.pageRank", Order.decr).values("name").limit(2)
+ """
+ When iterated to list
+ Then the result should be ordered
+ | result |
+ | lop |
+ | ripple |
+
+ Scenario: g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX
+ Given the modern graph
+ And the traversal of
+ """
+ g.withComputer().V().pageRank().by(__.outE("knows")).by("friendRank").valueMap("name", "friendRank")
+ """
+ When iterated to list
+ Then the result should be unordered
+ | result |
+ | m[{"name": ["marko"], "friendRank": [0.15000000000000002]}] |
+ | m[{"name": ["vadas"], "friendRank": [0.21375000000000002]}] |
+ | m[{"name": ["lop"], "friendRank": [0.15000000000000002]}] |
+ | m[{"name": ["josh"], "friendRank": [0.21375000000000002]}] |
+ | m[{"name": ["ripple"], "friendRank": [0.15000000000000002]}] |
+ | m[{"name": ["peter"], "friendRank": [0.15000000000000002]}] |
+
+ Scenario: g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX
+ Given the modern graph
+ And the traversal of
+ """
+ g.withComputer().V().hasLabel("person").pageRank().by("pageRank").order().by("pageRank").valueMap("name", "pageRank")
+ """
+ When iterated to list
+ Then the result should be unordered
+ | result |
+ | m[{"name": ["marko"], "pageRank": [0.15000000000000002]}] |
+ | m[{"name": ["vadas"], "pageRank": [0.19250000000000003]}] |
+ | m[{"name": ["josh"], "pageRank": [0.19250000000000003]}] |
+ | m[{"name": ["peter"], "pageRank": [0.15000000000000002]}] |
+
+ Scenario: g_V_pageRank_byXpageRankX_asXaX_outXknowsX_pageRank_asXbX_selectXa_bX
+ Given the modern graph
+ And the traversal of
+ """
+ g.withComputer().V().pageRank().by("pageRank").as("a").out("knows").values("pageRank").as("b").select("a", "b")
+ """
+ When iterated to list
+ Then the result should be unordered
+ | result |
+ | m[{"a": "v[marko]", "b": 0.19250000000000003}] |
+ | m[{"a": "v[marko]", "b": 0.19250000000000003}] |
+
+ Scenario: g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX
+ Given the modern graph
+ And the traversal of
+ """
+ g.withComputer().V().hasLabel("software").has("name", "ripple").pageRank(1.0).by(__.inE("created")).times(1).by("priors").in("created").union(__.both(), __.identity()).valueMap("name", "priors")
+ """
+ When iterated to list
+ Then the result should be unordered
+ | result |
+ | m[{"name": ["josh"], "priors": [1.0]}] |
+ | m[{"name": ["marko"], "priors": [0.0]}] |
+ | m[{"name": ["lop"], "priors": [0.0]}] |
+ | m[{"name": ["ripple"], "priors": [0.0]}] |
+
+ Scenario: g_V_outXcreatedX_groupXmX_byXlabelX_pageRankX1X_byXpageRankX_byXinEX_timesX1X_inXcreatedX_groupXmX_byXpageRankX_capXmX()
+ Given an unsupported test
+ Then nothing should happen because
+ """
+ The result returned is not supported under GraphSON 2.x and therefore cannot be properly asserted. More
+ specifically it has long keys which basically get toString()'d under GraphSON 2.x. This test can be supported
+ with GraphSON 3.x.
+ """
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/85fbd7cd/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java
index 503df77..6a45d38 100644
--- a/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java
+++ b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java
@@ -53,6 +53,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.map.MaxTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.MeanTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.MinTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderTest;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.PageRankTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.PathTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProjectTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesTest;
@@ -140,7 +141,7 @@ public class FeatureCoverageTest {
MeanTest.class,
MinTest.class,
OrderTest.class,
- //PageRankTest.class,
+ PageRankTest.class,
PathTest.class,
// PeerPressureTest.class,
// ProfileTest.class,
[17/20] tinkerpop git commit: TINKERPOP-1976 Removed some OptOuts on
RemoteGraph
Posted by sp...@apache.org.
TINKERPOP-1976 Removed some OptOuts on RemoteGraph
Some tests needed to use the "process" runner apparently
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f7ccb67b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f7ccb67b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f7ccb67b
Branch: refs/heads/TINKERPOP-1976
Commit: f7ccb67b13547edba2986f53993d862576db59c4
Parents: 37476a2
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Aug 2 19:44:50 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Aug 9 07:28:09 2018 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/process/remote/RemoteGraph.java | 13 -------------
.../process/traversal/step/map/PeerPressureTest.java | 6 ++++--
.../decoration/TranslationStrategyProcessTest.java | 3 +++
3 files changed, 7 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f7ccb67b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
index 4b23475..1ea7d42 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
@@ -24,7 +24,6 @@ import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
import org.apache.tinkerpop.gremlin.process.remote.traversal.strategy.decoration.RemoteStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
@@ -53,18 +52,6 @@ import java.util.Iterator;
method = "g_V_hasXnoX_groupCountXaX_capXaX",
reason = "This test asserts an empty side-effect which reflects as a null rather than an \"empty\" and thus doesn't assert")
@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.PeerPressureTest",
- method = "*",
- reason = "https://issues.apache.org/jira/browse/TINKERPOP-1976")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.PageRankTest",
- method = "*",
- reason = "https://issues.apache.org/jira/browse/TINKERPOP-1976")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategyProcessTest",
- method = "*",
- reason = "hmmmm")
-@Graph.OptOut(
test = "org.apache.tinkerpop.gremlin.process.traversal.CoreTraversalTest",
method = "*",
reason = "The test suite does not support profiling or lambdas and for groovy tests: 'Could not locate method: GraphTraversalSource.withStrategies([{traversalCategory=interface org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy$DecorationStrategy}])'")
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f7ccb67b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java
index 996be6d..67ed267 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java
@@ -22,11 +22,13 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.TestHelper;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
+import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
import org.apache.tinkerpop.gremlin.process.computer.clustering.peerpressure.PeerPressureVertexProgram;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
+import org.junit.runner.RunWith;
import java.util.HashMap;
import java.util.HashSet;
@@ -42,6 +44,7 @@ import static org.junit.Assert.assertTrue;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
+@RunWith(GremlinProcessRunner.class)
public abstract class PeerPressureTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Vertex> get_g_V_peerPressure();
@@ -99,8 +102,7 @@ public abstract class PeerPressureTest extends AbstractGremlinProcessTest {
assertTrue(ids.contains(convertToVertexId("josh")));
assertTrue(ids.contains(convertToVertexId("peter")));
}
-
-
+
public static class Traversals extends PeerPressureTest {
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f7ccb67b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/TranslationStrategyProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/TranslationStrategyProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/TranslationStrategyProcessTest.java
index a280a9c..0b81cce 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/TranslationStrategyProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/TranslationStrategyProcessTest.java
@@ -21,9 +21,11 @@ package org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
+import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,6 +35,7 @@ import static org.junit.Assert.assertEquals;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
+@RunWith(GremlinProcessRunner.class)
public class TranslationStrategyProcessTest extends AbstractGremlinProcessTest {
private static final Logger logger = LoggerFactory.getLogger(TranslationStrategyProcessTest.class);