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 2016/08/25 13:09:14 UTC
[1/2] tinkerpop git commit: Fixed error code when keys are not found
for traversalopprocessor
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 192da0a11 -> ba8bb6097
Fixed error code when keys are not found for traversalopprocessor
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e71ebed6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e71ebed6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e71ebed6
Branch: refs/heads/TINKERPOP-1278
Commit: e71ebed62b5ecd2a0023a79017012d5ea639a101
Parents: 192da0a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Aug 25 09:08:05 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Aug 25 09:08:05 2016 -0400
----------------------------------------------------------------------
.../gremlin/server/op/traversal/TraversalOpProcessor.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e71ebed6/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
index 632008c..b44c51b 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
@@ -279,7 +279,7 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
if (null == sideEffects) {
final String errorMessage = String.format("Could not find side-effects for %s.", sideEffect.get());
logger.warn(errorMessage);
- ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT).statusMessage(errorMessage).create());
+ ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR).statusMessage(errorMessage).create());
onError(graph, context);
return;
}
@@ -319,8 +319,7 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
final RequestMessage msg = context.getRequestMessage();
logger.debug("Traversal request {} for in thread {}", msg.getRequestId(), Thread.currentThread().getName());
- // TODO: Look to polish this up in GraphSON 2.0 when we don't have type lossiness anymore
- // right now the TraversalOpPorcessor can take a direct GraphSON representation of Bytecode or directly take
+ // right now the TraversalOpProcessor can take a direct GraphSON representation of Bytecode or directly take
// deserialized Bytecode object.
final Object bytecodeObj = msg.getArgs().get(Tokens.ARGS_GREMLIN);
final Bytecode bytecode = bytecodeObj instanceof Bytecode ? (Bytecode) bytecodeObj :
[2/2] tinkerpop git commit: Better handle scenario when a side-effect
is not found for keys.
Posted by sp...@apache.org.
Better handle scenario when a side-effect is not found for keys.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ba8bb609
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ba8bb609
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ba8bb609
Branch: refs/heads/TINKERPOP-1278
Commit: ba8bb609711da1a4f81de878b013b37340bbed58
Parents: e71ebed
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Aug 25 09:08:35 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Aug 25 09:08:35 2016 -0400
----------------------------------------------------------------------
.../driver/remote/DriverRemoteTraversalSideEffects.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ba8bb609/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 01c5c16..d8adcc6 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
@@ -18,6 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.driver.remote;
+import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Host;
import org.apache.tinkerpop.gremlin.driver.Result;
@@ -25,6 +26,7 @@ import org.apache.tinkerpop.gremlin.driver.Tokens;
import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.process.remote.traversal.AbstractRemoteTraversalSideEffects;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -82,7 +84,11 @@ public class DriverRemoteTraversalSideEffects extends AbstractRemoteTraversalSid
try {
keys = client.submitAsync(msg).get().all().get().stream().map(r -> r.getString()).collect(Collectors.toSet());
} catch (Exception ex) {
- throw new RuntimeException("Could not get keys", ex);
+ final Throwable root = ExceptionUtils.getRootCause(ex);
+ if (root.getMessage().equals("Could not find side-effects for " + serverSideEffect + "."))
+ keys = Collections.emptySet();
+ else
+ throw new RuntimeException("Could not get keys", root);
}
}