You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/08/06 16:44:15 UTC
[1/2] cassandra git commit: Fix Verb.BATCHLOG_MUTATION usages in
StorageProxy
Repository: cassandra
Updated Branches:
refs/heads/trunk c35bfc09c -> 414685381
Fix Verb.BATCHLOG_MUTATION usages in StorageProxy
patch by Carl Yeksigian; reviewed by Aleksey Yeschenko for
CASSANDRA-9992
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/16498de4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16498de4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16498de4
Branch: refs/heads/trunk
Commit: 16498de42d1e173f39d7edeba5ab7d567e609cc6
Parents: 762db47
Author: Carl Yeksigian <ca...@apache.org>
Authored: Wed Aug 5 11:42:01 2015 -0400
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Aug 6 17:42:45 2015 +0300
----------------------------------------------------------------------
.../apache/cassandra/service/StorageProxy.java | 24 +++++++++++++++-----
1 file changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16498de4/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index b637b17..2c3c018 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -837,18 +837,18 @@ public class StorageProxy implements StorageProxyMBean
{
insertLocal(Stage.BATCHLOG_MUTATION, message.payload, handler);
}
- else if (targetVersion == MessagingService.current_version)
- {
- MessagingService.instance().sendRR(message, target, handler, false);
- }
- else
+ else if (targetVersion < MessagingService.VERSION_30)
{
MessagingService.instance().sendRR(BatchlogManager.getBatchlogMutationFor(mutations, uuid, targetVersion)
- .createMessage(MessagingService.Verb.BATCHLOG_MUTATION),
+ .createMessage(MessagingService.Verb.MUTATION),
target,
handler,
false);
}
+ else
+ {
+ MessagingService.instance().sendRR(message, target, handler, false);
+ }
}
handler.get();
@@ -870,10 +870,22 @@ public class StorageProxy implements StorageProxyMBean
MessageOut<Mutation> message = mutation.createMessage(MessagingService.Verb.BATCHLOG_MUTATION);
for (InetAddress target : endpoints)
{
+ int targetVersion = MessagingService.instance().getVersion(target);
if (canDoLocalRequest(target))
+ {
insertLocal(Stage.BATCHLOG_MUTATION, message.payload, handler);
+ }
+ else if (targetVersion < MessagingService.VERSION_30)
+ {
+ MessagingService.instance().sendRR(mutation.createMessage(MessagingService.Verb.MUTATION),
+ target,
+ handler,
+ false);
+ }
else
+ {
MessagingService.instance().sendRR(message, target, handler, false);
+ }
}
}
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/41468538
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41468538
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41468538
Branch: refs/heads/trunk
Commit: 41468538172c652ab40cc9f9f9e5612c3baa4cbd
Parents: c35bfc0 16498de
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Aug 6 17:44:53 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Aug 6 17:44:53 2015 +0300
----------------------------------------------------------------------
.../apache/cassandra/service/StorageProxy.java | 24 +++++++++++++++-----
1 file changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------