From 39e1e79b2bcd22a5e12a432a25a0168aad97b8dc Mon Sep 17 00:00:00 2001 From: Liu Xuxin Date: Thu, 16 Mar 2023 13:30:52 +0800 Subject: [PATCH 1/2] fix leak of fd --- .../executor/readchunk/AlignedSeriesCompactionExecutor.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/executor/readchunk/AlignedSeriesCompactionExecutor.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/executor/readchunk/AlignedSeriesCompactionExecutor.java index 9e292a45afa49..42d7b197f2cac 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/executor/readchunk/AlignedSeriesCompactionExecutor.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/executor/readchunk/AlignedSeriesCompactionExecutor.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.engine.compaction.execute.utils.executor.readchunk; +import com.google.common.util.concurrent.RateLimiter; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.engine.TsFileMetricManager; -import org.apache.iotdb.db.engine.cache.ChunkCache; import org.apache.iotdb.db.engine.compaction.execute.task.CompactionTaskSummary; import org.apache.iotdb.db.engine.compaction.schedule.CompactionTaskManager; import org.apache.iotdb.db.engine.compaction.schedule.constant.CompactionType; @@ -43,8 +43,6 @@ import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter; -import com.google.common.util.concurrent.RateLimiter; - import java.io.IOException; import java.util.ArrayList; import java.util.Comparator; @@ -115,7 +113,7 @@ private List collectSchemaFromAlignedChunkMetadataList( continue; } measurementSet.add(chunkMetadata.getMeasurementUid()); - Chunk chunk = ChunkCache.getInstance().get((ChunkMetadata) chunkMetadata); + Chunk chunk = reader.readMemChunk((ChunkMetadata) chunkMetadata); ChunkHeader header = chunk.getHeader(); schemaSet.add( new MeasurementSchema( From d8f3afa37c429564ee0009568c2b29e9b2cd1c51 Mon Sep 17 00:00:00 2001 From: Liu Xuxin Date: Thu, 16 Mar 2023 13:38:16 +0800 Subject: [PATCH 2/2] format the code --- .../executor/readchunk/AlignedSeriesCompactionExecutor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/executor/readchunk/AlignedSeriesCompactionExecutor.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/executor/readchunk/AlignedSeriesCompactionExecutor.java index 42d7b197f2cac..2ec407ad29e86 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/executor/readchunk/AlignedSeriesCompactionExecutor.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/executor/readchunk/AlignedSeriesCompactionExecutor.java @@ -18,7 +18,6 @@ */ package org.apache.iotdb.db.engine.compaction.execute.utils.executor.readchunk; -import com.google.common.util.concurrent.RateLimiter; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.engine.TsFileMetricManager; import org.apache.iotdb.db.engine.compaction.execute.task.CompactionTaskSummary; @@ -43,6 +42,8 @@ import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter; +import com.google.common.util.concurrent.RateLimiter; + import java.io.IOException; import java.util.ArrayList; import java.util.Comparator;