diff --git a/broker/src/main/java/org/apache/rocketmq/broker/dleger/DLegerRoleChangeHandler.java b/broker/src/main/java/org/apache/rocketmq/broker/dleger/DLegerRoleChangeHandler.java index e1d8e7e968dc61648342c01a45a91b2f797356ab..6c5fddcdfb77480a3c134b040f6762a07f660d90 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/dleger/DLegerRoleChangeHandler.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/dleger/DLegerRoleChangeHandler.java @@ -21,10 +21,10 @@ import java.util.concurrent.Executors; import org.apache.rocketmq.broker.BrokerController; import org.apache.rocketmq.common.ThreadFactoryImpl; import org.apache.rocketmq.common.constant.LoggerName; -import org.apache.rocketmq.dleger.DLegerLeaderElector; -import org.apache.rocketmq.dleger.DLegerServer; -import org.apache.rocketmq.dleger.MemberState; -import org.apache.rocketmq.dleger.utils.UtilAll; +import io.openmessaging.storage.dleger.DLegerLeaderElector; +import io.openmessaging.storage.dleger.DLegerServer; +import io.openmessaging.storage.dleger.MemberState; +import io.openmessaging.storage.dleger.utils.UtilAll; import org.apache.rocketmq.logging.InternalLogger; import org.apache.rocketmq.logging.InternalLoggerFactory; import org.apache.rocketmq.store.DefaultMessageStore; diff --git a/store/pom.xml b/store/pom.xml index 7de04fcae5f377bffa61bff52593c6c565282f2f..1c54d4dc79bbfcfbe67c081e52b2a94c9703ac3a 100644 --- a/store/pom.xml +++ b/store/pom.xml @@ -29,8 +29,8 @@ - org.apache.rocketmq - rocketmq-dleger + io.openmessaging.storage + dleger 0.1-SNAPSHOT diff --git a/store/src/main/java/org/apache/rocketmq/store/dleger/DLegerCommitLog.java b/store/src/main/java/org/apache/rocketmq/store/dleger/DLegerCommitLog.java index 2122211d53b8cfd82b88c453e19a0200e468eee3..9255ba1109071e035270ec64125083e126095114 100644 --- a/store/src/main/java/org/apache/rocketmq/store/dleger/DLegerCommitLog.java +++ b/store/src/main/java/org/apache/rocketmq/store/dleger/DLegerCommitLog.java @@ -16,6 +16,16 @@ */ package org.apache.rocketmq.store.dleger; +import io.openmessaging.storage.dleger.DLegerConfig; +import io.openmessaging.storage.dleger.DLegerServer; +import io.openmessaging.storage.dleger.entry.DLegerEntry; +import io.openmessaging.storage.dleger.protocol.AppendEntryRequest; +import io.openmessaging.storage.dleger.protocol.AppendEntryResponse; +import io.openmessaging.storage.dleger.protocol.DLegerResponseCode; +import io.openmessaging.storage.dleger.store.file.DLegerMmapFileStore; +import io.openmessaging.storage.dleger.store.file.MmapFile; +import io.openmessaging.storage.dleger.store.file.MmapFileList; +import io.openmessaging.storage.dleger.store.file.SelectMmapBufferResult; import java.nio.ByteBuffer; import java.util.HashMap; import java.util.concurrent.CompletableFuture; @@ -27,16 +37,6 @@ import org.apache.rocketmq.common.message.MessageDecoder; import org.apache.rocketmq.common.message.MessageExt; import org.apache.rocketmq.common.message.MessageExtBatch; import org.apache.rocketmq.common.sysflag.MessageSysFlag; -import org.apache.rocketmq.dleger.DLegerConfig; -import org.apache.rocketmq.dleger.DLegerServer; -import org.apache.rocketmq.dleger.entry.DLegerEntry; -import org.apache.rocketmq.dleger.protocol.AppendEntryRequest; -import org.apache.rocketmq.dleger.protocol.AppendEntryResponse; -import org.apache.rocketmq.dleger.protocol.DLegerResponseCode; -import org.apache.rocketmq.dleger.store.file.DLegerMmapFileStore; -import org.apache.rocketmq.dleger.store.file.MmapFile; -import org.apache.rocketmq.dleger.store.file.MmapFileList; -import org.apache.rocketmq.dleger.store.file.SelectMmapBufferResult; import org.apache.rocketmq.store.AppendMessageResult; import org.apache.rocketmq.store.AppendMessageStatus; import org.apache.rocketmq.store.CommitLog; diff --git a/store/src/main/java/org/apache/rocketmq/store/dleger/DLegerSelectMappedBufferResult.java b/store/src/main/java/org/apache/rocketmq/store/dleger/DLegerSelectMappedBufferResult.java index 2d21af4a57d22d57b9d473dc2eadf74802c885e6..3f6b235ce859a0f34176782845b0d63e1dc57259 100644 --- a/store/src/main/java/org/apache/rocketmq/store/dleger/DLegerSelectMappedBufferResult.java +++ b/store/src/main/java/org/apache/rocketmq/store/dleger/DLegerSelectMappedBufferResult.java @@ -17,7 +17,7 @@ package org.apache.rocketmq.store.dleger; -import org.apache.rocketmq.dleger.store.file.SelectMmapBufferResult; +import io.openmessaging.storage.dleger.store.file.SelectMmapBufferResult; import org.apache.rocketmq.store.SelectMappedBufferResult; public class DLegerSelectMappedBufferResult extends SelectMappedBufferResult { diff --git a/store/src/test/java/org/apache/rocketmq/store/dleger/DLegerCommitlogTest.java b/store/src/test/java/org/apache/rocketmq/store/dleger/DLegerCommitlogTest.java index be606654d7101a65b91590cc3698fa9c87e11b4a..ed3397a4e3272baee1a95e7ecce0a9df7e88847d 100644 --- a/store/src/test/java/org/apache/rocketmq/store/dleger/DLegerCommitlogTest.java +++ b/store/src/test/java/org/apache/rocketmq/store/dleger/DLegerCommitlogTest.java @@ -8,7 +8,7 @@ import java.util.UUID; import org.apache.rocketmq.common.BrokerConfig; import org.apache.rocketmq.common.message.MessageDecoder; import org.apache.rocketmq.common.message.MessageExt; -import org.apache.rocketmq.dleger.DLegerServer; +import io.openmessaging.storage.dleger.DLegerServer; import org.apache.rocketmq.store.DefaultMessageStore; import org.apache.rocketmq.store.GetMessageResult; import org.apache.rocketmq.store.GetMessageStatus;