refactor rpc

shihuili1218 · Oct 23, 2024 · 4eb0029 · 4eb0029
1 parent c65efa1
commit 4eb0029
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/...klein-consensus-paxos/src/main/java/com/ofcoder/klein/consensus/paxos/PaxosConsensus.java b/...klein-consensus-paxos/src/main/java/com/ofcoder/klein/consensus/paxos/PaxosConsensus.java
@@ -24,8 +24,21 @@
 import com.ofcoder.klein.consensus.facade.sm.SM;
 import com.ofcoder.klein.consensus.facade.sm.SMRegistry;
 import com.ofcoder.klein.consensus.paxos.core.RuntimeAccessor;
-import com.ofcoder.klein.consensus.paxos.core.sm.*;
-import com.ofcoder.klein.consensus.paxos.rpc.*;
+import com.ofcoder.klein.consensus.paxos.core.sm.ChangeMemberOp;
+import com.ofcoder.klein.consensus.paxos.core.sm.MasterSM;
+import com.ofcoder.klein.consensus.paxos.core.sm.MemberManagerSM;
+import com.ofcoder.klein.consensus.paxos.core.sm.MemberRegistry;
+import com.ofcoder.klein.consensus.paxos.core.sm.PaxosMemberConfiguration;
+import com.ofcoder.klein.consensus.paxos.rpc.AcceptProcessor;
+import com.ofcoder.klein.consensus.paxos.rpc.ConfirmProcessor;
+import com.ofcoder.klein.consensus.paxos.rpc.ElasticProcessor;
+import com.ofcoder.klein.consensus.paxos.rpc.HeartbeatProcessor;
+import com.ofcoder.klein.consensus.paxos.rpc.LearnProcessor;
+import com.ofcoder.klein.consensus.paxos.rpc.NewMasterProcessor;
+import com.ofcoder.klein.consensus.paxos.rpc.PreElectProcessor;
+import com.ofcoder.klein.consensus.paxos.rpc.PrepareProcessor;
+import com.ofcoder.klein.consensus.paxos.rpc.RedirectProcessor;
+import com.ofcoder.klein.consensus.paxos.rpc.SnapSyncProcessor;
 import com.ofcoder.klein.consensus.paxos.rpc.vo.ElasticReq;
 import com.ofcoder.klein.consensus.paxos.rpc.vo.ElasticRes;
 import com.ofcoder.klein.rpc.facade.Endpoint;

diff --git a/...ein-consensus-paxos/src/main/java/com/ofcoder/klein/consensus/paxos/core/DataAligner.java b/...ein-consensus-paxos/src/main/java/com/ofcoder/klein/consensus/paxos/core/DataAligner.java
@@ -23,7 +23,11 @@
 import com.ofcoder.klein.consensus.paxos.Proposal;
 import com.ofcoder.klein.consensus.paxos.core.sm.MemberRegistry;
 import com.ofcoder.klein.consensus.paxos.core.sm.PaxosMemberConfiguration;
-import com.ofcoder.klein.consensus.paxos.rpc.vo.*;
+import com.ofcoder.klein.consensus.paxos.rpc.vo.LearnReq;
+import com.ofcoder.klein.consensus.paxos.rpc.vo.LearnRes;
+import com.ofcoder.klein.consensus.paxos.rpc.vo.SnapSyncReq;
+import com.ofcoder.klein.consensus.paxos.rpc.vo.SnapSyncRes;
+import com.ofcoder.klein.consensus.paxos.rpc.vo.Sync;
 import com.ofcoder.klein.rpc.facade.Endpoint;
 import com.ofcoder.klein.rpc.facade.RpcClient;
 import com.ofcoder.klein.spi.ExtensionLoader;

diff --git a/klein-rpc/klein-rpc-grpc/src/main/java/com/ofcoder/klein/rpc/grpc/GrpcClient.java b/klein-rpc/klein-rpc-grpc/src/main/java/com/ofcoder/klein/rpc/grpc/GrpcClient.java
@@ -28,14 +28,24 @@
 import com.ofcoder.klein.rpc.facade.exception.InvokeTimeoutException;
 import com.ofcoder.klein.rpc.facade.exception.RpcException;
 import com.ofcoder.klein.spi.Join;
-import io.grpc.*;
+import io.grpc.CallOptions;
+import io.grpc.Channel;
+import io.grpc.ConnectivityState;
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import io.grpc.MethodDescriptor;
 import io.grpc.stub.ClientCalls;
 import io.grpc.stub.StreamObserver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.nio.ByteBuffer;
-import java.util.concurrent.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 /**
  * Grpc Client.