Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix compaction cached time chunk flip twice #13903

Merged
merged 3 commits into from
Oct 25, 2024
Merged

Fix compaction cached time chunk flip twice #13903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58302c9
fix cached time chunk flip twice
shuwenwei Oct 24, 2024
192787f
add ut
shuwenwei Oct 24, 2024
c299250
rewind
shuwenwei Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions ...eengine/dataregion/compaction/execute/utils/executor/batch/utils/BatchCompactionPlan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package org.apache.iotdb.db.storageengine.dataregion.compaction.execute.utils.executor.batch.utils;

import org.apache.iotdb.commons.utils.TestOnly;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.utils.executor.ModifiedStatus;

import org.apache.tsfile.file.metadata.ChunkMetadata;
Expand All @@ -35,7 +36,7 @@
import java.util.Map;

public class BatchCompactionPlan {
public static final long MAX_CACHED_TIME_CHUNKS_SIZE = 2 * 1024 * 1024;
public static long maxCachedTimeChunksSize = 2 * 1024 * 1024;
private final List<CompactChunkPlan> compactChunkPlans = new ArrayList<>();
private final Map<String, Map<TimeRange, ModifiedStatus>> alignedPageModifiedStatusCache =
new HashMap<>();
Expand All @@ -51,12 +52,12 @@ public Chunk getTimeChunkFromCache(TsFileSequenceReader reader, ChunkMetadata ch
if (chunk == null) {
chunk = reader.readMemChunk(chunkMetadata);
}
chunk.getData().flip();
chunk.getData().rewind();
return chunk;
}

public void addTimeChunkToCache(String file, long offset, Chunk chunk) {
if (cachedTimeChunkSize >= MAX_CACHED_TIME_CHUNKS_SIZE) {
if (cachedTimeChunkSize >= maxCachedTimeChunksSize) {
return;
}
cachedTimeChunks.put(
Expand Down Expand Up @@ -97,6 +98,16 @@ public boolean isEmpty() {
return compactChunkPlans.isEmpty();
}

@TestOnly
public static void setMaxCachedTimeChunksSize(long size) {
maxCachedTimeChunksSize = size;
}

@TestOnly
public static long getMaxCachedTimeChunksSize() {
return maxCachedTimeChunksSize;
}

@Override
public String toString() {
return compactChunkPlans.toString();
Expand Down
2 changes: 1 addition & 1 deletion ...b/storageengine/dataregion/compaction/selector/estimator/AbstractCompactionEstimator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public abstract class AbstractCompactionEstimator {
((double) SystemInfo.getInstance().getMemorySizeForCompaction()
/ IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount()
* IoTDBDescriptor.getInstance().getConfig().getChunkMetadataSizeProportion())
+ BatchCompactionPlan.MAX_CACHED_TIME_CHUNKS_SIZE;
+ BatchCompactionPlan.maxCachedTimeChunksSize;

protected abstract long calculatingMetadataMemoryCost(CompactionTaskInfo taskInfo);

Expand Down
37 changes: 37 additions & 0 deletions ...torageengine/dataregion/compaction/inner/BatchedAlignedSeriesFastInnerCompactionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.performer.impl.FastCompactionPerformer;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.task.subtask.FastCompactionTaskSummary;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.utils.CompactionUtils;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.utils.executor.batch.utils.BatchCompactionPlan;
import org.apache.iotdb.db.storageengine.dataregion.compaction.utils.CompactionCheckerUtils;
import org.apache.iotdb.db.storageengine.dataregion.modification.Deletion;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource;
Expand Down Expand Up @@ -319,6 +320,42 @@ public void testCompactionByDeserialize() throws Exception {
validate(targetResource);
}

@Test
public void testCompactionByDeserializeWithLargeTimeChunk() throws Exception {
long defaultMaxCachedTimeChunkSize = BatchCompactionPlan.getMaxCachedTimeChunksSize();
try {
BatchCompactionPlan.setMaxCachedTimeChunksSize(1);
TsFileResource unseqResource1 =
generateSingleAlignedSeriesFile(
"d0",
Arrays.asList("s0", "s1", "s2"),
new TimeRange[][] {
new TimeRange[] {new TimeRange(100, 200), new TimeRange(500, 600)}
},
TSEncoding.PLAIN,
CompressionType.LZ4,
Arrays.asList(false, false, false),
false);
unseqResources.add(unseqResource1);

TsFileResource unseqResource2 =
generateSingleAlignedSeriesFile(
"d0",
Arrays.asList("s0", "s1", "s2"),
new TimeRange[] {new TimeRange(150, 550)},
TSEncoding.PLAIN,
CompressionType.LZ4,
Arrays.asList(false, false, false),
false);
unseqResources.add(unseqResource2);

TsFileResource targetResource = performCompaction();
validate(targetResource);
} finally {
BatchCompactionPlan.setMaxCachedTimeChunksSize(defaultMaxCachedTimeChunkSize);
}
}

@Test
public void testCompactionByDeserializeWithEmptyColumn() throws Exception {
TsFileResource unseqResource1 =
Expand Down
Loading