You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/04/02 20:30:18 UTC
incubator-tinkerpop git commit: SparkExecutor is lenient on
ViewPayload reductions.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 4ef878686 -> b441c7ed9
SparkExecutor is lenient on ViewPayload reductions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/b441c7ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b441c7ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b441c7ed
Branch: refs/heads/master
Commit: b441c7ed91fa910c7a3b3158e8ef3709933bce01
Parents: 4ef8786
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Apr 2 12:30:16 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Apr 2 12:30:16 2015 -0600
----------------------------------------------------------------------
.../gremlin/hadoop/process/computer/spark/SparkExecutor.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b441c7ed/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/SparkExecutor.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/SparkExecutor.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/SparkExecutor.java
index 512c0e0..f86c311 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/SparkExecutor.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/SparkExecutor.java
@@ -113,16 +113,16 @@ public final class SparkExecutor {
((ViewIncomingPayload<M>) a).addIncomingMessage(((MessagePayload<M>) b).getMessage(), messageCombiner);
else if (b instanceof ViewPayload)
((ViewIncomingPayload<M>) a).setView(((ViewPayload) b).getView());
- else if (b instanceof ViewIncomingPayload)
- throw new IllegalStateException("It should never be the case that two views reduce to the same key");
+ //else if (b instanceof ViewIncomingPayload)
+ // throw new IllegalStateException("It should never be the case that two views reduce to the same key");
return a;
} else if (b instanceof ViewIncomingPayload) {
if (a instanceof MessagePayload)
((ViewIncomingPayload<M>) b).addIncomingMessage(((MessagePayload<M>) a).getMessage(), messageCombiner);
else if (a instanceof ViewPayload)
((ViewIncomingPayload<M>) b).setView(((ViewPayload) a).getView());
- else if (a instanceof ViewIncomingPayload)
- throw new IllegalStateException("It should never be the case that two views reduce to the same key");
+ //else if (a instanceof ViewIncomingPayload)
+ // throw new IllegalStateException("It should never be the case that two views reduce to the same key");
return b;
} else {
final ViewIncomingPayload<M> c = new ViewIncomingPayload<>(messageCombiner);