cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject git commit: Fix paged ranges with multiple replicas
Date Mon, 16 Sep 2013 14:22:45 GMT
Updated Branches:
  refs/heads/cassandra-2.0 a05f6309d -> a2824e63a


Fix paged ranges with multiple replicas

patch by slebresne; reviewed by jbellis for CASSANDRA-6004


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a2824e63
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2824e63
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2824e63

Branch: refs/heads/cassandra-2.0
Commit: a2824e63a60bec88bc0d385f1e1fcb32cc75b766
Parents: a05f630
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Mon Sep 16 16:22:01 2013 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon Sep 16 16:22:01 2013 +0200

----------------------------------------------------------------------
 CHANGES.txt                                               | 1 +
 src/java/org/apache/cassandra/net/MessagingService.java   | 2 +-
 src/java/org/apache/cassandra/service/StorageService.java | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2824e63/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2f01b7d..9f2b786 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,6 +16,7 @@
  * Make standalone scrubber handle old and new style leveled manifest
    (CASSANDRA-6005)
  * Fix paxos bugs (CASSANDRA-6012, 6013, 6023)
+ * Fix paged ranges with multiple replicas (CASSANDRA-6004)
 Merged from 1.2:
 1.2.10
  * Fix possible divide-by-zero in HHOM (CASSANDRA-5990)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2824e63/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java
index 40b9f0e..d8c93b5 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -191,7 +191,7 @@ public final class MessagingService implements MessagingServiceMBean
         put(Verb.READ_REPAIR, RowMutation.serializer);
         put(Verb.READ, ReadCommand.serializer);
         put(Verb.RANGE_SLICE, RangeSliceCommand.serializer);
-        put(Verb.PAGED_RANGE, RangeSliceCommand.serializer);
+        put(Verb.PAGED_RANGE, PagedRangeCommand.serializer);
         put(Verb.BOOTSTRAP_TOKEN, BootStrapper.StringSerializer.instance);
         put(Verb.REPAIR_MESSAGE, RepairMessage.serializer);
         put(Verb.GOSSIP_DIGEST_ACK, GossipDigestAck.serializer);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2824e63/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 931ef8c..8e29312 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -230,6 +230,7 @@ public class StorageService extends NotificationBroadcasterSupport implements
IE
         MessagingService.instance().registerVerbHandlers(MessagingService.Verb.READ_REPAIR,
new ReadRepairVerbHandler());
         MessagingService.instance().registerVerbHandlers(MessagingService.Verb.READ, new
ReadVerbHandler());
         MessagingService.instance().registerVerbHandlers(MessagingService.Verb.RANGE_SLICE,
new RangeSliceVerbHandler());
+        MessagingService.instance().registerVerbHandlers(MessagingService.Verb.PAGED_RANGE,
new RangeSliceVerbHandler());
         MessagingService.instance().registerVerbHandlers(MessagingService.Verb.COUNTER_MUTATION,
new CounterMutationVerbHandler());
         MessagingService.instance().registerVerbHandlers(MessagingService.Verb.TRUNCATE,
new TruncateVerbHandler());
         MessagingService.instance().registerVerbHandlers(MessagingService.Verb.PAXOS_PREPARE,
new PrepareVerbHandler());


Mime
View raw message