Skip to content

Commit b3d0ad7

Browse files
authored
Skip update-cache logic when loading TsFile in IoTV2Consensus (#15729)
1 parent 83ebf5b commit b3d0ad7

5 files changed

Lines changed: 10 additions & 14 deletions

File tree

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/pipeconsensus/PipeConsensusReceiver.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -714,11 +714,7 @@ private TSStatus loadFileToDataRegion(String filePath, ProgressIndex progressInd
714714
DataRegion region =
715715
StorageEngine.getInstance().getDataRegion(((DataRegionId) consensusGroupId));
716716
if (region != null) {
717-
TsFileResource resource =
718-
generateTsFileResource(
719-
filePath,
720-
progressIndex,
721-
IoTDBDescriptor.getInstance().getConfig().isCacheLastValuesForLoad());
717+
TsFileResource resource = generateTsFileResource(filePath, progressIndex);
722718
region.loadNewTsFile(resource, true, false, true);
723719
} else {
724720
// Data region is null indicates that dr has been removed or migrated. In those cases, there
@@ -773,13 +769,13 @@ private void updateWritePointCountMetrics(long writePointCount) {
773769
dataRegion, databaseName, writePointCount, true)));
774770
}
775771

776-
private TsFileResource generateTsFileResource(
777-
String filePath, ProgressIndex progressIndex, boolean cacheLastValues) throws IOException {
772+
private TsFileResource generateTsFileResource(String filePath, ProgressIndex progressIndex)
773+
throws IOException {
778774
final File tsFile = new File(filePath);
779775

780776
final TsFileResource tsFileResource = new TsFileResource(tsFile);
781777
try (final TsFileSequenceReader reader = new TsFileSequenceReader(tsFile.getAbsolutePath())) {
782-
TsFileResourceUtils.updateTsFileResource(reader, tsFileResource, cacheLastValues);
778+
TsFileResourceUtils.updateTsFileResource(reader, tsFileResource);
783779
}
784780

785781
tsFileResource.setStatus(TsFileResourceStatus.NORMAL);

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3051,7 +3051,8 @@ public void loadNewTsFile(
30513051

30523052
TsFileLastReader lastReader = null;
30533053
LastCacheLoadStrategy lastCacheLoadStrategy = config.getLastCacheLoadStrategy();
3054-
if ((lastCacheLoadStrategy == LastCacheLoadStrategy.UPDATE
3054+
if (!isFromConsensus
3055+
&& (lastCacheLoadStrategy == LastCacheLoadStrategy.UPDATE
30553056
|| lastCacheLoadStrategy == LastCacheLoadStrategy.UPDATE_NO_BLOB)
30563057
&& newTsFileResource.getLastValues() == null) {
30573058
try {

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/utils/TsFileResourceUtils.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -413,9 +413,8 @@ public static boolean validateTsFileResourcesHasNoOverlap(List<TsFileResource> r
413413
}
414414

415415
public static void updateTsFileResource(
416-
TsFileSequenceReader reader, TsFileResource tsFileResource, boolean cacheLastValues)
417-
throws IOException {
418-
updateTsFileResource(reader.getAllTimeseriesMetadata(false), tsFileResource, cacheLastValues);
416+
TsFileSequenceReader reader, TsFileResource tsFileResource) throws IOException {
417+
updateTsFileResource(reader.getAllTimeseriesMetadata(false), tsFileResource, false);
419418
tsFileResource.updatePlanIndexes(reader.getMinPlanIndex());
420419
tsFileResource.updatePlanIndexes(reader.getMaxPlanIndex());
421420
}

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/AbstractTsFileRecoverPerformer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ private void loadResourceFile() throws IOException {
115115
protected void reconstructResourceFile() throws IOException {
116116
try (TsFileSequenceReader reader =
117117
new TsFileSequenceReader(tsFileResource.getTsFile().getAbsolutePath())) {
118-
TsFileResourceUtils.updateTsFileResource(reader, tsFileResource, false);
118+
TsFileResourceUtils.updateTsFileResource(reader, tsFileResource);
119119
}
120120

121121
// set progress index for pipe to avoid data loss

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
<thrift.version>0.14.1</thrift.version>
176176
<xz.version>1.9</xz.version>
177177
<zstd-jni.version>1.5.6-3</zstd-jni.version>
178-
<tsfile.version>2.1.0-250612-SNAPSHOT</tsfile.version>
178+
<tsfile.version>2.1.0-250616-SNAPSHOT</tsfile.version>
179179
</properties>
180180
<!--
181181
if we claim dependencies in dependencyManagement, then we do not claim

0 commit comments

Comments
 (0)