dingshuangxi888 commented on code in PR #6781:
URL: https://github.com/apache/rocketmq/pull/6781#discussion_r1206202831
##########
tieredstore/src/main/java/org/apache/rocketmq/tieredstore/TieredDispatcher.java:
##########
@@ -40,42 +40,43 @@
import org.apache.rocketmq.store.MessageStore;
import org.apache.rocketmq.store.SelectMappedBufferResult;
import org.apache.rocketmq.tieredstore.common.AppendResult;
+import org.apache.rocketmq.tieredstore.common.FileSegmentType;
import org.apache.rocketmq.tieredstore.common.TieredMessageStoreConfig;
import org.apache.rocketmq.tieredstore.common.TieredStoreExecutor;
-import org.apache.rocketmq.tieredstore.container.TieredContainerManager;
-import org.apache.rocketmq.tieredstore.container.TieredMessageQueueContainer;
+import org.apache.rocketmq.tieredstore.file.CompositeQueueFlatFile;
+import org.apache.rocketmq.tieredstore.file.TieredFlatFileManager;
import org.apache.rocketmq.tieredstore.metrics.TieredStoreMetricsConstant;
import org.apache.rocketmq.tieredstore.metrics.TieredStoreMetricsManager;
-import org.apache.rocketmq.tieredstore.provider.TieredFileSegment;
import org.apache.rocketmq.tieredstore.util.CQItemBufferUtil;
import org.apache.rocketmq.tieredstore.util.MessageBufferUtil;
import org.apache.rocketmq.tieredstore.util.TieredStoreUtil;
public class TieredDispatcher extends ServiceThread implements
CommitLogDispatcher {
+
private static final Logger logger =
LoggerFactory.getLogger(TieredStoreUtil.TIERED_STORE_LOGGER_NAME);
private final MessageStore defaultStore;
- private final TieredContainerManager tieredContainerManager;
+ private final TieredFlatFileManager tieredFlatFileManager;
private final TieredMessageStoreConfig storeConfig;
private final String brokerName;
- private ConcurrentMap<TieredMessageQueueContainer, List<DispatchRequest>>
dispatchRequestReadMap;
- private ConcurrentMap<TieredMessageQueueContainer, List<DispatchRequest>>
dispatchRequestWriteMap;
+ private ConcurrentMap<CompositeQueueFlatFile, List<DispatchRequest>>
dispatchRequestReadMap;
+ private ConcurrentMap<CompositeQueueFlatFile, List<DispatchRequest>>
dispatchRequestWriteMap;
private final ReentrantLock dispatchRequestListLock;
public TieredDispatcher(MessageStore defaultStore,
TieredMessageStoreConfig storeConfig) {
this.defaultStore = defaultStore;
this.storeConfig = storeConfig;
this.brokerName = storeConfig.getBrokerName();
- this.tieredContainerManager =
TieredContainerManager.getInstance(storeConfig);
+ this.tieredFlatFileManager =
TieredFlatFileManager.getInstance(storeConfig);
this.dispatchRequestReadMap = new ConcurrentHashMap<>();
this.dispatchRequestWriteMap = new ConcurrentHashMap<>();
this.dispatchRequestListLock = new ReentrantLock();
TieredStoreExecutor.commonScheduledExecutor.scheduleWithFixedDelay(()
-> {
try {
- for (TieredMessageQueueContainer container :
tieredContainerManager.getAllMQContainer()) {
- if (!container.getQueueLock().isLocked()) {
+ for (CompositeQueueFlatFile container :
tieredFlatFileManager.deepCopyFlatFileToList()) {
+ if (!container.getCompositeFlatFileLock().isLocked()) {
TieredStoreExecutor.dispatchExecutor.execute(() -> {
try {
dispatchByMQContainer(container);
Review Comment:
这个方法名也改下吧
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
