Skip to content

Commit 805eccd

Browse files
authored
[To Rel/0.13][IOTDB-4635] Fix data cannot be queried when flushing memtable (#7599)
1 parent bb82440 commit 805eccd

File tree

4 files changed

+2
-24
lines changed

4 files changed

+2
-24
lines changed

server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/utils/MultiTsFileDeviceIterator.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,6 @@ public Map<String, MeasurementSchema> getAllSchemasOfCurrentDevice() throws IOEx
173173
* return MeasurementIterator, who iterates the measurements of not aligned device
174174
*
175175
* @param device the full path of the device to be iterated
176-
* @return
177-
* @throws IOException
178176
*/
179177
public MeasurementIterator iterateNotAlignedSeries(
180178
String device, boolean derserializeTimeseriesMetadata) throws IOException {
@@ -191,7 +189,6 @@ public MeasurementIterator iterateNotAlignedSeries(
191189
*
192190
* @return a list of pair(TsFileSequenceReader, the list of AlignedChunkMetadata for current
193191
* device)
194-
* @throws IOException
195192
*/
196193
public LinkedList<Pair<TsFileSequenceReader, List<AlignedChunkMetadata>>>
197194
getReaderAndChunkMetadataForCurrentAlignedSeries() throws IOException {
@@ -387,9 +384,6 @@ public String nextSeries() {
387384
*
388385
* <p>If there are any modifications for these chunk, we will apply them to the metadata. Use
389386
* `ChunkMetadata.getDeleteIntervalList() == null` to judge if the chunk is modified.
390-
*
391-
* @return
392-
* @throws IllegalPathException
393387
*/
394388
public LinkedList<Pair<TsFileSequenceReader, List<ChunkMetadata>>>
395389
getMetadataListForCurrentSeries() throws IllegalPathException {

server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ public void run() {
280280
this.writer.setMinPlanIndex(memTable.getMinPlanIndex());
281281
this.writer.setMaxPlanIndex(memTable.getMaxPlanIndex());
282282
this.writer.endChunkGroup();
283-
writer.checkMetadataSizeAndMayFlush();
284283
} else {
285284
((IChunkWriter) ioMessage).writeToFileWriter(this.writer);
286285
}

server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,7 @@ public class TsFileProcessor {
172172
this.storageGroupName = storageGroupName;
173173
this.tsFileResource = new TsFileResource(tsfile, this);
174174
this.storageGroupInfo = storageGroupInfo;
175-
this.writer =
176-
new RestorableTsFileIOWriter(
177-
tsfile,
178-
(long)
179-
(IoTDBDescriptor.getInstance().getConfig().getMemtableSizeThreshold()
180-
* IoTDBDescriptor.getInstance()
181-
.getConfig()
182-
.getChunkMetadataMemorySizeProportion()));
175+
this.writer = new RestorableTsFileIOWriter(tsfile);
183176
this.updateLatestFlushTimeCallback = updateLatestFlushTimeCallback;
184177
this.sequence = sequence;
185178
logger.info("create a new tsfile processor {}", tsfile.getAbsolutePath());

server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
package org.apache.iotdb.db.writelog.recover;
2121

22-
import org.apache.iotdb.db.conf.IoTDBDescriptor;
2322
import org.apache.iotdb.db.engine.fileSystem.SystemFileFactory;
2423
import org.apache.iotdb.db.engine.flush.MemTableFlushTask;
2524
import org.apache.iotdb.db.engine.memtable.IMemTable;
@@ -114,14 +113,7 @@ public RestorableTsFileIOWriter recover(
114113
// remove corrupted part of the TsFile
115114
RestorableTsFileIOWriter restorableTsFileIOWriter = null;
116115
try {
117-
restorableTsFileIOWriter =
118-
new RestorableTsFileIOWriter(
119-
file,
120-
(long)
121-
(IoTDBDescriptor.getInstance().getConfig().getMemtableSizeThreshold()
122-
* IoTDBDescriptor.getInstance()
123-
.getConfig()
124-
.getChunkMetadataMemorySizeProportion()));
116+
restorableTsFileIOWriter = new RestorableTsFileIOWriter(file);
125117
} catch (NotCompatibleTsFileException e) {
126118
boolean result = file.delete();
127119
logger.warn("TsFile {} is incompatible. Delete it successfully {}", filePath, result);

0 commit comments

Comments
 (0)