This is an automated email from the ASF dual-hosted git repository. tanxinyu pushed a commit to branch fix_wal_version_incrementent in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 168a05b9a7cd1a7e22715262ab164810c8703dc8 Author: OneSizeFitQuorum <[email protected]> AuthorDate: Thu Jul 18 11:59:29 2024 +0800 fix Signed-off-by: OneSizeFitQuorum <[email protected]> --- .../db/storageengine/dataregion/wal/buffer/AbstractWALBuffer.java | 4 ++-- .../iotdb/db/storageengine/dataregion/wal/buffer/IWALBuffer.java | 2 +- .../apache/iotdb/db/storageengine/dataregion/wal/io/LogWriter.java | 3 --- .../apache/iotdb/db/storageengine/dataregion/wal/node/WALNode.java | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) 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 c4c5bc13a3d..c8f68523032 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 @@ -84,8 +84,8 @@ public abstract class AbstractWALBuffer implements IWALBuffer { } @Override - public long getCurrentWALFileSize() { - return currentWALFileWriter.size(); + public long getCurrentWALOriginalFileSize() { + return currentWALFileWriter.originalSize(); } /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/IWALBuffer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/IWALBuffer.java index b5b283ed021..455ca72cb7d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/IWALBuffer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/IWALBuffer.java @@ -37,7 +37,7 @@ public interface IWALBuffer extends AutoCloseable { long getCurrentWALFileVersion(); /** Get current wal file's size. */ - long getCurrentWALFileSize(); + long getCurrentWALOriginalFileSize(); /** Get current search index. */ long getCurrentSearchIndex(); 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 6e55ee0bcad..48a3ae1806c 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 @@ -108,9 +108,6 @@ public abstract class LogWriter implements ILogWriter { bufferSize = buffer.position(); buffer.flip(); compressed = true; - size += COMPRESSED_HEADER_SIZE; - } else { - size += UN_COMPRESSED_HEADER_SIZE; } size += bufferSize; /* 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 79d5d26673b..ca5be7c221b 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 @@ -296,7 +296,7 @@ public class WALNode implements IWALNode { long firstVersionId = checkpointManager.getFirstValidWALVersionId(); if (firstVersionId == Long.MIN_VALUE) { // roll wal log writer to delete current wal file - if (buffer.getCurrentWALFileSize() > 0) { + if (buffer.getCurrentWALOriginalFileSize() > 0) { rollWALFile(); } }
