This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch mck/13704/4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit e68e549262cf8e2f8a48dc427795b29b023db3d1 Author: mck <[email protected]> AuthorDate: Fri Sep 13 17:31:56 2024 +0200 SQUASH – address existing review comments --- src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java | 1 + src/java/org/apache/cassandra/db/MutationVerbHandler.java | 1 + src/java/org/apache/cassandra/db/ReadCommand.java | 2 +- src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java | 1 + .../org/apache/cassandra/repair/RepairMessageVerbHandler.java | 1 + src/java/org/apache/cassandra/service/StorageServiceMBean.java | 8 ++++---- .../apache/cassandra/service/paxos/AbstractPaxosVerbHandler.java | 2 +- .../org/apache/cassandra/service/paxos/CommitVerbHandler.java | 1 + .../org/apache/cassandra/service/paxos/PrepareVerbHandler.java | 1 + 9 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java b/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java index adb2242bde..f9625e9c6d 100644 --- a/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java +++ b/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java @@ -32,6 +32,7 @@ public class CounterMutationVerbHandler extends AbstractMutationVerbHandler<Coun private static final Logger logger = LoggerFactory.getLogger(CounterMutationVerbHandler.class); + @Override protected void applyMutation(final Message<CounterMutation> message, InetAddressAndPort respondToAddress) { long queryStartNanoTime = System.nanoTime(); diff --git a/src/java/org/apache/cassandra/db/MutationVerbHandler.java b/src/java/org/apache/cassandra/db/MutationVerbHandler.java index 105e33c640..840286a02e 100644 --- a/src/java/org/apache/cassandra/db/MutationVerbHandler.java +++ b/src/java/org/apache/cassandra/db/MutationVerbHandler.java @@ -64,6 +64,7 @@ public class MutationVerbHandler extends AbstractMutationVerbHandler<Mutation> } } + @Override protected void applyMutation(Message<Mutation> message, InetAddressAndPort respondToAddress) { message.payload.applyFuture().thenAccept(o -> respond(message, respondToAddress)).exceptionally(wto -> { diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java index d16ca47dd0..1df23cc7fd 100644 --- a/src/java/org/apache/cassandra/db/ReadCommand.java +++ b/src/java/org/apache/cassandra/db/ReadCommand.java @@ -150,7 +150,7 @@ public abstract class ReadCommand extends AbstractReadQuery public abstract boolean isLimitedToOnePartition(); /** - * Whether this is command is a single partition read + * Whether this command is a single partition read * * @return true if the command is a single partition read, false otherwise */ diff --git a/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java b/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java index 2b2ee1db58..bb7d5710af 100644 --- a/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java +++ b/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java @@ -34,6 +34,7 @@ public class ReadRepairVerbHandler extends AbstractMutationVerbHandler<Mutation> super.doVerb(message); } + @Override void applyMutation(Message<Mutation> message, InetAddressAndPort respondToAddress) { message.payload.apply(); diff --git a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java index 59c9fc2350..1d5f1a4d9d 100644 --- a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java +++ b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java @@ -62,6 +62,7 @@ public class RepairMessageVerbHandler implements IVerbHandler<RepairMessage> return prs != null ? prs.previewKind : PreviewKind.NONE; } + @Override public void doVerb(final Message<RepairMessage> message) { // TODO add cancel/interrupt message diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java index a44154c6ad..144db8ad5a 100644 --- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java +++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java @@ -873,11 +873,11 @@ public interface StorageServiceMBean extends NotificationEmitter * Toggles to turn on the logging or rejection of operations for token ranges that the node does not own, * or is not about to acquire. */ - public boolean isOutOfTokenRangeRequestLoggingEnabled(); - public void setOutOfTokenRangeRequestLoggingEnabled(boolean enabled); + boolean isOutOfTokenRangeRequestLoggingEnabled(); + void setOutOfTokenRangeRequestLoggingEnabled(boolean enabled); - public boolean isOutOfTokenRangeRequestRejectionEnabled(); - public void setOutOfTokenRangeRequestRejectionEnabled(boolean enabled); + boolean isOutOfTokenRangeRequestRejectionEnabled(); + void setOutOfTokenRangeRequestRejectionEnabled(boolean enabled); /** * Get the per-keyspace counts of operations that the node has received for tokens outside of diff --git a/src/java/org/apache/cassandra/service/paxos/AbstractPaxosVerbHandler.java b/src/java/org/apache/cassandra/service/paxos/AbstractPaxosVerbHandler.java index ee5980f6f9..7f668f6459 100644 --- a/src/java/org/apache/cassandra/service/paxos/AbstractPaxosVerbHandler.java +++ b/src/java/org/apache/cassandra/service/paxos/AbstractPaxosVerbHandler.java @@ -68,7 +68,7 @@ public abstract class AbstractPaxosVerbHandler implements IVerbHandler<Commit> private static void sendFailureResponse(Message<?> respondTo) { - Message reply = respondTo.failureResponse(RequestFailureReason.UNKNOWN); + Message<?> reply = respondTo.failureResponse(RequestFailureReason.UNKNOWN); MessagingService.instance().send(reply, respondTo.from()); } diff --git a/src/java/org/apache/cassandra/service/paxos/CommitVerbHandler.java b/src/java/org/apache/cassandra/service/paxos/CommitVerbHandler.java index 67822750db..94ebd9ce16 100644 --- a/src/java/org/apache/cassandra/service/paxos/CommitVerbHandler.java +++ b/src/java/org/apache/cassandra/service/paxos/CommitVerbHandler.java @@ -28,6 +28,7 @@ public class CommitVerbHandler extends AbstractPaxosVerbHandler { public static final CommitVerbHandler instance = new CommitVerbHandler(); + @Override void processMessage(Message<Commit> message) { PaxosState.commit(message.payload); diff --git a/src/java/org/apache/cassandra/service/paxos/PrepareVerbHandler.java b/src/java/org/apache/cassandra/service/paxos/PrepareVerbHandler.java index e14dd6fb79..86558dc5bc 100644 --- a/src/java/org/apache/cassandra/service/paxos/PrepareVerbHandler.java +++ b/src/java/org/apache/cassandra/service/paxos/PrepareVerbHandler.java @@ -31,6 +31,7 @@ public class PrepareVerbHandler extends AbstractPaxosVerbHandler return PaxosState.prepare(toPrepare); } + @Override public void processMessage(Message<Commit> message) { Message<PrepareResponse> reply = message.responseWith(doPrepare(message.payload)); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
