(ratis) branch master updated: RATIS-2165. Do not include RaftClientRequest Message in ReadIndexRequest (#1160)

[szetszwo]

This is an automated email from the ASF dual-hosted git repository.

szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ratis.git


The following commit(s) were added to refs/heads/master by this push:
     new de4e24d4c RATIS-2165. Do not include RaftClientRequest Message in 
ReadIndexRequest (#1160)
de4e24d4c is described below

commit de4e24d4c026719d59d055933147b7c80ee1f702
Author: 133tosakarin <97331129+133tosaka...@users.noreply.github.com>
AuthorDate: Wed Oct 9 08:06:22 2024 +0800

    RATIS-2165. Do not include RaftClientRequest Message in ReadIndexRequest 
(#1160)
---
 .../main/java/org/apache/ratis/client/impl/ClientProtoUtils.java    | 6 +++++-
 .../main/java/org/apache/ratis/server/impl/ServerProtoUtils.java    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git 
a/ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java 
b/ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java
index 5e217e7da..44e3a5cd6 100644
--- 
a/ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java
+++ 
b/ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java
@@ -204,9 +204,13 @@ public interface ClientProtoUtils {
   }
 
   static RaftClientRequestProto toRaftClientRequestProto(RaftClientRequest 
request) {
+    return toRaftClientRequestProto(request, true);
+  }
+
+  static RaftClientRequestProto toRaftClientRequestProto(RaftClientRequest 
request, boolean withMsg) {
     final RaftClientRequestProto.Builder b = 
RaftClientRequestProto.newBuilder()
         .setRpcRequest(toRaftRpcRequestProtoBuilder(request));
-    if (request.getMessage() != null) {
+    if (withMsg && request.getMessage() != null) {
       b.setMessage(toClientMessageEntryProtoBuilder(request.getMessage()));
     }
 
diff --git 
a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerProtoUtils.java 
b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerProtoUtils.java
index e35cb2386..29a42f65a 100644
--- 
a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerProtoUtils.java
+++ 
b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerProtoUtils.java
@@ -114,7 +114,7 @@ final class ServerProtoUtils {
       RaftClientRequest clientRequest, RaftGroupMemberId requestorId, 
RaftPeerId replyId) {
     return ReadIndexRequestProto.newBuilder()
         
.setServerRequest(ClientProtoUtils.toRaftRpcRequestProtoBuilder(requestorId, 
replyId))
-        
.setClientRequest(ClientProtoUtils.toRaftClientRequestProto(clientRequest))
+        
.setClientRequest(ClientProtoUtils.toRaftClientRequestProto(clientRequest, 
false))
         .build();
   }