Polish the code after separating DLedgerProxy module

hhqre2008 · Sep 8, 2022 · 6c93827 · 6c93827
1 parent 1028498
commit 6c93827
Show file tree

Hide file tree

Showing 20 changed files with 40 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -16,13 +16,13 @@ Dledger has added many new features that are not described in the [original pape
 * Parallel log replication between leader and followers
 * Asynchronous replication
 * State machine
+* Multi-Raft
 * High tolerance of symmetric network partition
 * High tolerance of asymmetric network partition
 * [Jepsen verification with fault injection](https://github.com/openmessaging/openmessaging-dledger-jepsen)
 
 ### New features waiting to be added ###
 * Snapshot
-* Multi-Raft 
 * Dynamic membership & configuration change
 * SSL/TLS support
 

diff --git a/...torage/dledger/cmdline/AppendCommand.java → ...torage/dledger/command/AppendCommand.java b/...torage/dledger/cmdline/AppendCommand.java → ...torage/dledger/command/AppendCommand.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.cmdline;
+package io.openmessaging.storage.dledger.command;
 
 import com.alibaba.fastjson.JSON;
 import com.beust.jcommander.Parameter;

diff --git a/.../storage/dledger/cmdline/BaseCommand.java → .../storage/dledger/command/BaseCommand.java b/.../storage/dledger/cmdline/BaseCommand.java → .../storage/dledger/command/BaseCommand.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.cmdline;
+package io.openmessaging.storage.dledger.command;
 
 public abstract class BaseCommand {
 

diff --git a/.../storage/dledger/cmdline/BossCommand.java → .../storage/dledger/command/BossCommand.java b/.../storage/dledger/cmdline/BossCommand.java → .../storage/dledger/command/BossCommand.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.cmdline;
+package io.openmessaging.storage.dledger.command;
 
 import com.beust.jcommander.JCommander;
 

diff --git a/...torage/dledger/cmdline/ConfigCommand.java → ...torage/dledger/command/ConfigCommand.java b/...torage/dledger/cmdline/ConfigCommand.java → ...torage/dledger/command/ConfigCommand.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.cmdline;
+package io.openmessaging.storage.dledger.command;
 
 import com.beust.jcommander.Parameter;
 import org.slf4j.Logger;

diff --git a/...penmessaging/storage/dledger/DLedger.java → ...ging/storage/dledger/command/DLedger.java b/...penmessaging/storage/dledger/DLedger.java → ...ging/storage/dledger/command/DLedger.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger;
+package io.openmessaging.storage.dledger.command;
 
 import com.alibaba.fastjson.JSON;
 import com.beust.jcommander.JCommander;
-import io.openmessaging.storage.dledger.cmdline.ConfigCommand;
+import io.openmessaging.storage.dledger.DLedgerConfig;
 import io.openmessaging.storage.dledger.proxy.DLedgerProxy;
 import io.openmessaging.storage.dledger.proxy.DLedgerProxyConfig;
 import io.openmessaging.storage.dledger.proxy.util.ConfigUtils;

diff --git a/...g/storage/dledger/cmdline/GetCommand.java → ...g/storage/dledger/command/GetCommand.java b/...g/storage/dledger/cmdline/GetCommand.java → ...g/storage/dledger/command/GetCommand.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.cmdline;
+package io.openmessaging.storage.dledger.command;
 
 import com.alibaba.fastjson.JSON;
 import com.beust.jcommander.Parameter;

diff --git a/...er/cmdline/LeadershipTransferCommand.java → ...er/command/LeadershipTransferCommand.java b/...er/cmdline/LeadershipTransferCommand.java → ...er/command/LeadershipTransferCommand.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.cmdline;
+package io.openmessaging.storage.dledger.command;
 
 import com.alibaba.fastjson.JSON;
 import com.beust.jcommander.Parameter;

diff --git a/...rage/dledger/cmdline/ReadFileCommand.java → ...rage/dledger/command/ReadFileCommand.java b/...rage/dledger/cmdline/ReadFileCommand.java → ...rage/dledger/command/ReadFileCommand.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.cmdline;
+package io.openmessaging.storage.dledger.command;
 
 import com.alibaba.fastjson.JSON;
 import com.beust.jcommander.Parameter;

diff --git a/...torage/dledger/cmdline/ServerCommand.java → ...torage/dledger/command/ServerCommand.java b/...torage/dledger/cmdline/ServerCommand.java → ...torage/dledger/command/ServerCommand.java
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.cmdline;
+package io.openmessaging.storage.dledger.command;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
-import io.openmessaging.storage.dledger.DLedger;
 import io.openmessaging.storage.dledger.DLedgerConfig;
 import io.openmessaging.storage.dledger.proxy.DLedgerProxyConfig;
 import io.openmessaging.storage.dledger.proxy.util.ConfigUtils;

diff --git a/...edger/dledger/DLedgerProxyConfigTest.java → ...edger/command/DLedgerProxyConfigTest.java b/...edger/dledger/DLedgerProxyConfigTest.java → ...edger/command/DLedgerProxyConfigTest.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.dledger;
+package io.openmessaging.storage.dledger.command;
 
 import com.beust.jcommander.JCommander;
-import io.openmessaging.storage.dledger.cmdline.ConfigCommand;
 import io.openmessaging.storage.dledger.proxy.DLedgerProxyConfig;
 import io.openmessaging.storage.dledger.proxy.util.ConfigUtils;
 import org.junit.jupiter.api.Assertions;

diff --git a/...ing/storage/dledger/AppendAndGetTest.java → ...orage/dledger/proxy/AppendAndGetTest.java b/...ing/storage/dledger/AppendAndGetTest.java → ...orage/dledger/proxy/AppendAndGetTest.java
@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger;
+package io.openmessaging.storage.dledger.proxy;
 
+import io.openmessaging.storage.dledger.DLedgerConfig;
+import io.openmessaging.storage.dledger.DLedgerServer;
 import io.openmessaging.storage.dledger.client.DLedgerClient;
 import io.openmessaging.storage.dledger.entry.DLedgerEntry;
 import io.openmessaging.storage.dledger.protocol.AppendEntryRequest;
 import io.openmessaging.storage.dledger.protocol.AppendEntryResponse;
 import io.openmessaging.storage.dledger.protocol.DLedgerResponseCode;
 import io.openmessaging.storage.dledger.protocol.GetEntriesResponse;
-import io.openmessaging.storage.dledger.proxy.DLedgerProxy;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;

diff --git a/...ng/storage/dledger/AppendAndPushTest.java → ...rage/dledger/proxy/AppendAndPushTest.java b/...ng/storage/dledger/AppendAndPushTest.java → ...rage/dledger/proxy/AppendAndPushTest.java
@@ -14,14 +14,18 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger;
+package io.openmessaging.storage.dledger.proxy;
 
+import io.openmessaging.storage.dledger.AppendFuture;
+import io.openmessaging.storage.dledger.BatchAppendFuture;
+import io.openmessaging.storage.dledger.DLedgerConfig;
+import io.openmessaging.storage.dledger.DLedgerRpcNettyService;
+import io.openmessaging.storage.dledger.DLedgerServer;
 import io.openmessaging.storage.dledger.entry.DLedgerEntry;
 import io.openmessaging.storage.dledger.protocol.AppendEntryRequest;
 import io.openmessaging.storage.dledger.protocol.AppendEntryResponse;
 import io.openmessaging.storage.dledger.protocol.BatchAppendEntryRequest;
 import io.openmessaging.storage.dledger.protocol.DLedgerResponseCode;
-import io.openmessaging.storage.dledger.proxy.DLedgerProxy;
 import io.openmessaging.storage.dledger.utils.DLedgerUtils;
 import java.util.ArrayList;
 import java.util.LinkedList;

diff --git a/...saging/storage/dledger/BatchPushTest.java → .../storage/dledger/proxy/BatchPushTest.java b/...saging/storage/dledger/BatchPushTest.java → .../storage/dledger/proxy/BatchPushTest.java
@@ -14,15 +14,18 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger;
+package io.openmessaging.storage.dledger.proxy;
 
+import io.openmessaging.storage.dledger.AppendFuture;
+import io.openmessaging.storage.dledger.DLedgerConfig;
+import io.openmessaging.storage.dledger.DLedgerRpcNettyService;
+import io.openmessaging.storage.dledger.DLedgerServer;
 import io.openmessaging.storage.dledger.client.DLedgerClient;
 import io.openmessaging.storage.dledger.entry.DLedgerEntry;
 import io.openmessaging.storage.dledger.protocol.AppendEntryRequest;
 import io.openmessaging.storage.dledger.protocol.AppendEntryResponse;
 import io.openmessaging.storage.dledger.protocol.DLedgerResponseCode;
 import io.openmessaging.storage.dledger.protocol.GetEntriesResponse;
-import io.openmessaging.storage.dledger.proxy.DLedgerProxy;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;

diff --git a/...ng/storage/dledger/LeaderElectorTest.java → ...rage/dledger/proxy/LeaderElectorTest.java b/...ng/storage/dledger/LeaderElectorTest.java → ...rage/dledger/proxy/LeaderElectorTest.java
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger;
+package io.openmessaging.storage.dledger.proxy;
 
+import io.openmessaging.storage.dledger.DLedgerConfig;
+import io.openmessaging.storage.dledger.DLedgerServer;
+import io.openmessaging.storage.dledger.MemberState;
 import io.openmessaging.storage.dledger.protocol.AppendEntryRequest;
 import io.openmessaging.storage.dledger.protocol.AppendEntryResponse;
 import io.openmessaging.storage.dledger.protocol.DLedgerResponseCode;
-import io.openmessaging.storage.dledger.proxy.DLedgerProxy;
-import io.openmessaging.storage.dledger.proxy.DLedgerProxyConfig;
 import io.openmessaging.storage.dledger.utils.DLedgerUtils;
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/...torage/dledger/ProxyAppendAndGetTest.java → .../dledger/proxy/ProxyAppendAndGetTest.java b/...torage/dledger/ProxyAppendAndGetTest.java → .../dledger/proxy/ProxyAppendAndGetTest.java
@@ -14,19 +14,16 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger;
+package io.openmessaging.storage.dledger.proxy;
 
 import io.openmessaging.storage.dledger.DLedgerConfig;
 import io.openmessaging.storage.dledger.DLedgerServer;
-import io.openmessaging.storage.dledger.ServerTestHarness;
 import io.openmessaging.storage.dledger.client.DLedgerClient;
 import io.openmessaging.storage.dledger.entry.DLedgerEntry;
 import io.openmessaging.storage.dledger.protocol.AppendEntryRequest;
 import io.openmessaging.storage.dledger.protocol.AppendEntryResponse;
 import io.openmessaging.storage.dledger.protocol.DLedgerResponseCode;
 import io.openmessaging.storage.dledger.protocol.GetEntriesResponse;
-import io.openmessaging.storage.dledger.proxy.DLedgerProxy;
-import io.openmessaging.storage.dledger.proxy.DLedgerProxyConfig;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 

diff --git a/...aging/storage/dledger/ServerTestBase.java → ...storage/dledger/proxy/ServerTestBase.java b/...aging/storage/dledger/ServerTestBase.java → ...storage/dledger/proxy/ServerTestBase.java
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger;
-import io.openmessaging.storage.dledger.util.FileTestUtil;
+package io.openmessaging.storage.dledger.proxy;
+import io.openmessaging.storage.dledger.proxy.util.FileTestUtil;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...ng/storage/dledger/ServerTestHarness.java → ...rage/dledger/proxy/ServerTestHarness.java b/...ng/storage/dledger/ServerTestHarness.java → ...rage/dledger/proxy/ServerTestHarness.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger;
+package io.openmessaging.storage.dledger.proxy;
 
+import io.openmessaging.storage.dledger.DLedgerConfig;
+import io.openmessaging.storage.dledger.DLedgerServer;
+import io.openmessaging.storage.dledger.MemberState;
 import io.openmessaging.storage.dledger.client.DLedgerClient;
-import io.openmessaging.storage.dledger.proxy.DLedgerProxy;
-import io.openmessaging.storage.dledger.proxy.DLedgerProxyConfig;
-import io.openmessaging.storage.dledger.util.FileTestUtil;
+import io.openmessaging.storage.dledger.proxy.util.FileTestUtil;
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;

diff --git a/...storage/dledger/util/ConfigUtilsTest.java → ...e/dledger/proxy/util/ConfigUtilsTest.java b/...storage/dledger/util/ConfigUtilsTest.java → ...e/dledger/proxy/util/ConfigUtilsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.util;
+package io.openmessaging.storage.dledger.proxy.util;
 
 import io.openmessaging.storage.dledger.proxy.DLedgerProxyConfig;
 import io.openmessaging.storage.dledger.proxy.util.ConfigUtils;

diff --git a/...ng/storage/dledger/util/FileTestUtil.java → ...rage/dledger/proxy/util/FileTestUtil.java b/...ng/storage/dledger/util/FileTestUtil.java → ...rage/dledger/proxy/util/FileTestUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.openmessaging.storage.dledger.util;
+package io.openmessaging.storage.dledger.proxy.util;
 
 import io.openmessaging.storage.dledger.utils.IOUtils;
 import java.io.File;