This is an automated email from the ASF dual-hosted git repository. shuwenwei pushed a commit to branch compation-log in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 29496df2097104835ef9019371aad344f35b4f7f Author: shuwenwei <[email protected]> AuthorDate: Fri Jun 20 11:49:45 2025 +0800 modify wal log --- .../org/apache/iotdb/db/storageengine/dataregion/wal/WALManager.java | 2 +- .../dataregion/wal/allocation/AbstractNodeAllocationStrategy.java | 3 ++- .../db/storageengine/dataregion/wal/buffer/AbstractWALBuffer.java | 3 ++- .../iotdb/db/storageengine/dataregion/wal/buffer/WALBuffer.java | 3 ++- .../apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java | 4 +++- .../db/storageengine/dataregion/wal/checkpoint/CheckpointManager.java | 3 ++- .../apache/iotdb/db/storageengine/dataregion/wal/io/LogWriter.java | 3 ++- .../apache/iotdb/db/storageengine/dataregion/wal/io/WALMetaData.java | 3 ++- .../apache/iotdb/db/storageengine/dataregion/wal/io/WALReader.java | 3 ++- .../apache/iotdb/db/storageengine/dataregion/wal/node/WALNode.java | 3 ++- .../iotdb/db/storageengine/dataregion/wal/utils/WALEntryHandler.java | 3 ++- 11 files changed, 22 insertions(+), 11 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALManager.java index 96d4931fa43..794fb7a8b0d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALManager.java @@ -56,7 +56,7 @@ import java.util.concurrent.atomic.AtomicLong; /** This class is used to manage and allocate wal nodes. */ public class WALManager implements IService { - private static final Logger logger = LoggerFactory.getLogger(WALManager.class); + private static final Logger logger = LoggerFactory.getLogger(IoTDBConstant.WRITE_LOGGER_NAME); private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig(); // manage all wal nodes and decide how to allocate them diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/AbstractNodeAllocationStrategy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/AbstractNodeAllocationStrategy.java index e98086e5146..97c4c7aa68c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/AbstractNodeAllocationStrategy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/AbstractNodeAllocationStrategy.java @@ -21,6 +21,7 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.allocation; import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.db.exception.DiskSpaceInsufficientException; import org.apache.iotdb.db.storageengine.dataregion.wal.node.IWALNode; import org.apache.iotdb.db.storageengine.dataregion.wal.node.WALFakeNode; @@ -37,7 +38,7 @@ import java.util.Arrays; public abstract class AbstractNodeAllocationStrategy implements NodeAllocationStrategy { private static final Logger logger = - LoggerFactory.getLogger(AbstractNodeAllocationStrategy.class); + LoggerFactory.getLogger(IoTDBConstant.WRITE_LOGGER_NAME); private static final CommonConfig commonConfig = CommonDescriptor.getInstance().getConfig(); // manage wal folders diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/AbstractWALBuffer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/AbstractWALBuffer.java index c8f68523032..d8ca0a5f4f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/AbstractWALBuffer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/AbstractWALBuffer.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.buffer; +import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.file.SystemFileFactory; import org.apache.iotdb.db.storageengine.dataregion.wal.WALManager; import org.apache.iotdb.db.storageengine.dataregion.wal.io.WALWriter; @@ -35,7 +36,7 @@ import java.nio.file.StandardCopyOption; import java.util.Arrays; public abstract class AbstractWALBuffer implements IWALBuffer { - private static final Logger logger = LoggerFactory.getLogger(AbstractWALBuffer.class); + private static final Logger logger = LoggerFactory.getLogger(IoTDBConstant.WRITE_LOGGER_NAME); // WALNode identifier of this buffer protected final String identifier; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBuffer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBuffer.java index 872a116d5c9..fe187123465 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBuffer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBuffer.java @@ -22,6 +22,7 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.buffer; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.concurrent.ThreadName; import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -72,7 +73,7 @@ import static org.apache.iotdb.db.storageengine.dataregion.wal.node.WALNode.DEFA * writes and avoid waiting for buffer syncing to disk. */ public class WALBuffer extends AbstractWALBuffer { - private static final Logger logger = LoggerFactory.getLogger(WALBuffer.class); + private static final Logger logger = LoggerFactory.getLogger(IoTDBConstant.WRITE_LOGGER_NAME); private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig(); public static final int ONE_THIRD_WAL_BUFFER_SIZE = config.getWalBufferSize() / 3; private static final double FSYNC_BUFFER_RATIO = 0.95; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java index a8e94e2780a..f0dde4d2b49 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.buffer; +import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.ContinuousSameSearchIndexSeparatorNode; @@ -45,7 +47,7 @@ import java.util.Objects; * value(physical plan or memTable snapshot). */ public abstract class WALEntry implements SerializedSize { - private static final Logger logger = LoggerFactory.getLogger(WALEntry.class); + private static final Logger logger = LoggerFactory.getLogger(IoTDBConstant.WRITE_LOGGER_NAME); // type of value protected final WALEntryType type; 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 1c859f1eae4..8fd22bd9de4 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 @@ -20,6 +20,7 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.checkpoint; import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.file.SystemFileFactory; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -49,7 +50,7 @@ import java.util.concurrent.locks.ReentrantLock; /** This class is used to manage checkpoints of one wal node. */ public class CheckpointManager implements AutoCloseable { - private static final Logger logger = LoggerFactory.getLogger(CheckpointManager.class); + private static final Logger logger = LoggerFactory.getLogger(IoTDBConstant.WRITE_LOGGER_NAME); private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig(); private static final WritingMetrics WRITING_METRICS = WritingMetrics.getInstance(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/LogWriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/LogWriter.java index 95721f846cc..4bbb4231d15 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/LogWriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/LogWriter.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.io; +import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.service.metrics.WritingMetrics; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALEntry; @@ -41,7 +42,7 @@ import java.nio.channels.FileChannel; * and writing {@link Checkpoint} into .checkpoint file. */ public abstract class LogWriter implements ILogWriter { - private static final Logger logger = LoggerFactory.getLogger(LogWriter.class); + private static final Logger logger = LoggerFactory.getLogger(IoTDBConstant.WRITE_LOGGER_NAME); protected final File logFile; protected final FileOutputStream logStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALMetaData.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALMetaData.java index ba9211656ef..c7bd86b6bb1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALMetaData.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALMetaData.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.io; +import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.consensus.iot.log.ConsensusReqReader; import org.apache.iotdb.db.storageengine.dataregion.wal.exception.BrokenWALFileException; import org.apache.iotdb.db.utils.SerializedSize; @@ -42,7 +43,7 @@ import java.util.Set; */ public class WALMetaData implements SerializedSize { - private static final Logger logger = LoggerFactory.getLogger(WALMetaData.class); + private static final Logger logger = LoggerFactory.getLogger(IoTDBConstant.WRITE_LOGGER_NAME); // search index 8 byte, wal entries' number 4 bytes private static final int FIXED_SERIALIZED_SIZE = Long.BYTES + Integer.BYTES; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALReader.java index 261e95eb52f..072244c0343 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALReader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALReader.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.io; +import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALEntry; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALEntryType; @@ -38,7 +39,7 @@ import java.util.NoSuchElementException; * This reader returns {@link WALEntry} directly, the usage of WALReader is like {@link Iterator}. */ public class WALReader implements Closeable { - private static final Logger logger = LoggerFactory.getLogger(WALReader.class); + private static final Logger logger = LoggerFactory.getLogger(IoTDBConstant.WRITE_LOGGER_NAME); // use 1/10 of .wal file size as buffer size private static final int STREAM_BUFFER_SIZE = (int) IoTDBDescriptor.getInstance().getConfig().getWalFileSizeThresholdInByte() / 10; 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 35432a8fd6f..7b101e28542 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.node; +import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.file.SystemFileFactory; import org.apache.iotdb.commons.utils.TestOnly; @@ -89,7 +90,7 @@ import java.util.stream.Collectors; * 1. */ public class WALNode implements IWALNode { - private static final Logger logger = LoggerFactory.getLogger(WALNode.class); + private static final Logger logger = LoggerFactory.getLogger(IoTDBConstant.WRITE_LOGGER_NAME); private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig(); // no iot consensus, all insert nodes can be safely deleted public static final long DEFAULT_SAFELY_DELETED_SEARCH_INDEX = Long.MAX_VALUE; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/utils/WALEntryHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/utils/WALEntryHandler.java index f5d7406f5a6..d04331b695e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/utils/WALEntryHandler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/utils/WALEntryHandler.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.utils; +import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALEntry; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALEntryValue; @@ -40,7 +41,7 @@ import java.util.concurrent.atomic.AtomicReference; */ public class WALEntryHandler { - private static final Logger logger = LoggerFactory.getLogger(WALEntryHandler.class); + private static final Logger logger = LoggerFactory.getLogger(IoTDBConstant.WRITE_LOGGER_NAME); private long memTableId = -1;
