Repository: cassandra Updated Branches: refs/heads/trunk 414685381 -> 989c3aa82
Fixup unsued Verb.MATERIALIZEDVIEW_MUTATION patch by Aleksey Yeschenko for CASSANDRA-9993 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39ee0408 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39ee0408 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39ee0408 Branch: refs/heads/trunk Commit: 39ee04088cfd2926ed27490267b9f562472f5647 Parents: 16498de Author: Aleksey Yeschenko <[email protected]> Authored: Thu Aug 6 18:11:23 2015 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu Aug 6 18:11:23 2015 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 1 - src/java/org/apache/cassandra/net/MessagingService.java | 8 ++------ src/java/org/apache/cassandra/service/StorageService.java | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/39ee0408/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 02f3c17..6d6745a 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -992,7 +992,6 @@ public class DatabaseDescriptor case PAXOS_PREPARE: case PAXOS_PROPOSE: case BATCHLOG_MUTATION: - case MATERIALIZED_VIEW_MUTATION: return getWriteRpcTimeout(); case COUNTER_MUTATION: return getCounterWriteRpcTimeout(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/39ee0408/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 e10b4cb..da475f7 100644 --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@ -135,11 +135,12 @@ public final class MessagingService implements MessagingServiceMBean PAXOS_COMMIT, @Deprecated PAGED_RANGE, BATCHLOG_MUTATION, - MATERIALIZED_VIEW_MUTATION, // remember to add new verbs at the end, since we serialize by ordinal UNUSED_1, UNUSED_2, UNUSED_3, + UNUSED_4, + UNUSED_5, ; } @@ -147,7 +148,6 @@ public final class MessagingService implements MessagingServiceMBean {{ put(Verb.MUTATION, Stage.MUTATION); put(Verb.COUNTER_MUTATION, Stage.COUNTER_MUTATION); - put(Verb.MATERIALIZED_VIEW_MUTATION, Stage.MATERIALIZED_VIEW_MUTATION); put(Verb.BATCHLOG_MUTATION, Stage.BATCHLOG_MUTATION); put(Verb.READ_REPAIR, Stage.MUTATION); put(Verb.TRUNCATE, Stage.MUTATION); @@ -208,7 +208,6 @@ public final class MessagingService implements MessagingServiceMBean put(Verb.MUTATION, Mutation.serializer); put(Verb.BATCHLOG_MUTATION, Mutation.serializer); - put(Verb.MATERIALIZED_VIEW_MUTATION, Mutation.serializer); put(Verb.READ_REPAIR, Mutation.serializer); put(Verb.READ, ReadCommand.serializer); //put(Verb.RANGE_SLICE, ReadCommand.legacyRangeSliceCommandSerializer); @@ -236,7 +235,6 @@ public final class MessagingService implements MessagingServiceMBean {{ put(Verb.MUTATION, WriteResponse.serializer); put(Verb.BATCHLOG_MUTATION, WriteResponse.serializer); - put(Verb.MATERIALIZED_VIEW_MUTATION, WriteResponse.serializer); put(Verb.READ_REPAIR, WriteResponse.serializer); put(Verb.COUNTER_MUTATION, WriteResponse.serializer); put(Verb.RANGE_SLICE, ReadResponse.legacyRangeSliceReplySerializer); @@ -300,7 +298,6 @@ public final class MessagingService implements MessagingServiceMBean public static final EnumSet<Verb> DROPPABLE_VERBS = EnumSet.of(Verb._TRACE, Verb.MUTATION, Verb.BATCHLOG_MUTATION, //FIXME: should this be droppable?? - Verb.MATERIALIZED_VIEW_MUTATION, Verb.COUNTER_MUTATION, Verb.READ_REPAIR, Verb.READ, @@ -630,7 +627,6 @@ public final class MessagingService implements MessagingServiceMBean { assert message.verb == Verb.MUTATION || message.verb == Verb.BATCHLOG_MUTATION - || message.verb == Verb.MATERIALIZED_VIEW_MUTATION || message.verb == Verb.COUNTER_MUTATION; int messageId = nextId(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/39ee0408/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 f263a82..a8ac8bf 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -294,7 +294,6 @@ public class StorageService extends NotificationBroadcasterSupport implements IE /* register the verb handlers */ MessagingService.instance().registerVerbHandlers(MessagingService.Verb.MUTATION, new MutationVerbHandler()); MessagingService.instance().registerVerbHandlers(MessagingService.Verb.BATCHLOG_MUTATION, new MutationVerbHandler()); - MessagingService.instance().registerVerbHandlers(MessagingService.Verb.MATERIALIZED_VIEW_MUTATION, new MutationVerbHandler()); MessagingService.instance().registerVerbHandlers(MessagingService.Verb.READ_REPAIR, new ReadRepairVerbHandler()); MessagingService.instance().registerVerbHandlers(MessagingService.Verb.READ, new ReadCommandVerbHandler()); MessagingService.instance().registerVerbHandlers(MessagingService.Verb.RANGE_SLICE, new ReadCommandVerbHandler());
