From f8725c0f64c45dc60cf4ccd948817e7212ce9a81 Mon Sep 17 00:00:00 2001 From: Caideyipi <87789683+Caideyipi@users.noreply.github.com> Date: Fri, 20 Nov 2026 18:18:29 +0800 Subject: [PATCH] Refactor obsolete WAL memtable pin tracking --- .../wal/checkpoint/CheckpointManager.java | 10 +++--- .../wal/exception/MemTablePinException.java | 34 ------------------- .../dataregion/wal/node/WALNode.java | 18 +++++----- 3 files changed, 13 insertions(+), 49 deletions(-) delete mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/exception/MemTablePinException.java diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/checkpoint/CheckpointManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/checkpoint/CheckpointManager.java index ec96f43c7d401..911e12725c165 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/checkpoint/CheckpointManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/checkpoint/CheckpointManager.java @@ -92,7 +92,7 @@ public CheckpointManager(String identifier, String logDirectory) throws IOExcept logHeader(); } - public List activeOrPinnedMemTables() { + public List activeMemTables() { infoLock.lock(); try { return new ArrayList<>(memTableId2Info.values()); @@ -126,7 +126,7 @@ private void logHeader() { */ private void makeGlobalInfoCP() { long start = System.nanoTime(); - List memTableInfos = activeOrPinnedMemTables(); + List memTableInfos = activeMemTables(); memTableInfos.removeIf(MemTableInfo::isFlushed); Checkpoint checkpoint = new Checkpoint(CheckpointType.GLOBAL_MEMORY_TABLE_INFO, memTableInfos); logByCachedByteBuffer(checkpoint); @@ -267,7 +267,7 @@ private boolean tryRollingLogWriter() throws IOException { public MemTableInfo getOldestMemTableInfo() { // find oldest memTable - return activeOrPinnedMemTables().stream() + return activeMemTables().stream() .min(Comparator.comparingLong(MemTableInfo::getMemTableId)) .orElse(null); } @@ -278,7 +278,7 @@ public MemTableInfo getOldestMemTableInfo() { * @return Return {@link Long#MIN_VALUE} if no file is valid */ public long getFirstValidWALVersionId() { - List memTableInfos = activeOrPinnedMemTables(); + List memTableInfos = activeMemTables(); long firstValidVersionId = memTableInfos.isEmpty() ? Long.MIN_VALUE : Long.MAX_VALUE; for (MemTableInfo memTableInfo : memTableInfos) { firstValidVersionId = Math.min(firstValidVersionId, memTableInfo.getFirstFileVersionId()); @@ -301,7 +301,7 @@ public void updateCostOfActiveMemTables( /** Get total cost of active memTables. */ public long getTotalCostOfActiveMemTables() { - List memTableInfos = activeOrPinnedMemTables(); + List memTableInfos = activeMemTables(); long totalCost = 0; for (MemTableInfo memTableInfo : memTableInfos) { // flushed memTables are not active diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/exception/MemTablePinException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/exception/MemTablePinException.java deleted file mode 100644 index 61d989dbdc2ff..0000000000000 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/exception/MemTablePinException.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.iotdb.db.storageengine.dataregion.wal.exception; - -public class MemTablePinException extends WALException { - public MemTablePinException(Throwable cause) { - super(cause); - } - - public MemTablePinException(String message) { - super(message); - } - - public MemTablePinException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNode.java index c28ed1dda2d2f..ffb0783416468 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNode.java @@ -364,7 +364,7 @@ public void deleteOutdatedFiles() { private class DeleteOutdatedFileTask implements Runnable { private File[] sortedWalFilesExcludingLast; - private List activeOrPinnedMemTables; + private List activeMemTables; private long cachedSafelyDeletedSearchIndex; private int fileIndexAfterFilterSafelyDeleteIndex; @@ -396,7 +396,7 @@ private boolean initAndCheckIfNeedContinue() { } this.sortedWalFilesExcludingLast = Arrays.copyOfRange(allWalFilesOfOneNode, 0, allWalFilesOfOneNode.length - 1); - this.activeOrPinnedMemTables = checkpointManager.activeOrPinnedMemTables(); + this.activeMemTables = checkpointManager.activeMemTables(); updateFileIndexAfterFilterSafelyDeleteIndex(); this.successfullyDeleted = new ArrayList<>(); this.deleteFileSize = 0; @@ -450,15 +450,15 @@ public void run() { private void updateEffectiveInfoRationAndUpdateMetric() { // calculate effective information ratio long costOfActiveMemTables = checkpointManager.getTotalCostOfActiveMemTables(); - MemTableInfo oldestUnpinnedMemTableInfo = checkpointManager.getOldestMemTableInfo(); + MemTableInfo oldestMemTableInfo = checkpointManager.getOldestMemTableInfo(); long avgFileSize = getFileNum() != 0 ? getDiskUsage() / getFileNum() : config.getWalFileSizeThresholdInByte(); long totalCost = - oldestUnpinnedMemTableInfo == null + oldestMemTableInfo == null ? costOfActiveMemTables - : (getCurrentWALFileVersion() - oldestUnpinnedMemTableInfo.getFirstFileVersionId()) + : (getCurrentWALFileVersion() - oldestMemTableInfo.getFirstFileVersionId()) * avgFileSize; if (costOfActiveMemTables == 0 || totalCost == 0) { effectiveInfoRatio = 1.0d; @@ -676,7 +676,7 @@ private void snapshotMemTable(DataRegion dataRegion, File tsFile, MemTableInfo m } } - public boolean isContainsActiveOrPinnedMemTable(Long versionId) { + public boolean isContainsActiveMemTable(Long versionId) { Set memTableIdsOfCurrentWal = buffer.getMemTableIds(versionId); // A null result means that the WAL is still being written or its metadata could not be read. // Keep the file in either case because its memTable ids are unknown. @@ -684,9 +684,7 @@ public boolean isContainsActiveOrPinnedMemTable(Long versionId) { return true; } return !Collections.disjoint( - activeOrPinnedMemTables.stream() - .map(MemTableInfo::getMemTableId) - .collect(Collectors.toSet()), + activeMemTables.stream().map(MemTableInfo::getMemTableId).collect(Collectors.toSet()), memTableIdsOfCurrentWal); } @@ -698,7 +696,7 @@ private boolean canDeleteFile(long fileArrIdx, WALFileStatus walFileStatus, long return (fileArrIdx < fileIndexAfterFilterSafelyDeleteIndex || walFileStatus == WALFileStatus.CONTAINS_NONE_SEARCH_INDEX) && versionId < subscriptionRetainedMinVersionId - && !isContainsActiveOrPinnedMemTable(versionId); + && !isContainsActiveMemTable(versionId); } }