You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/06/20 03:05:17 UTC
[incubator-iotdb] branch feature_async_close_tsfile updated: remove
parameter modFile in constructor of SeqTsFileRecoverPerformer
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch feature_async_close_tsfile
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/feature_async_close_tsfile by this push:
new 963a550 remove parameter modFile in constructor of SeqTsFileRecoverPerformer
963a550 is described below
commit 963a550f4817350561e5617b4d15991af26a6fd5
Author: 江天 <jt...@163.com>
AuthorDate: Thu Jun 20 11:03:13 2019 +0800
remove parameter modFile in constructor of SeqTsFileRecoverPerformer
---
.../iotdb/db/engine/bufferwrite/BufferWriteProcessor.java | 2 --
.../apache/iotdb/db/engine/filenode/FileNodeProcessor.java | 11 ++++-------
.../apache/iotdb/db/engine/overflow/io/OverflowResource.java | 2 --
...leRecoverPerformer.java => SeqTsFileRecoverPerformer.java} | 10 ++++++----
.../test/java/org/apache/iotdb/db/writelog/RecoverTest.java | 7 +++----
5 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java
index d16dc32..c7d7709 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java
@@ -49,7 +49,6 @@ import org.apache.iotdb.db.engine.pool.FlushPoolManager;
import org.apache.iotdb.db.engine.querycontext.ReadOnlyMemChunk;
import org.apache.iotdb.db.engine.version.VersionController;
import org.apache.iotdb.db.exception.BufferWriteProcessorException;
-import org.apache.iotdb.db.exception.ProcessorException;
import org.apache.iotdb.db.monitor.collector.MemTableWriteTimeCost;
import org.apache.iotdb.db.monitor.collector.MemTableWriteTimeCost.MemTableWriteTimeCostType;
import org.apache.iotdb.db.qp.constant.DatetimeUtils;
@@ -57,7 +56,6 @@ import org.apache.iotdb.db.utils.ImmediateFuture;
import org.apache.iotdb.db.utils.MemUtils;
import org.apache.iotdb.db.writelog.manager.MultiFileLogNodeManager;
import org.apache.iotdb.db.writelog.node.WriteLogNode;
-import org.apache.iotdb.db.writelog.recover.TsFileRecoverPerformer;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.file.metadata.ChunkMetaData;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
index 3177431..a602678 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
@@ -88,7 +88,7 @@ import org.apache.iotdb.db.utils.ImmediateFuture;
import org.apache.iotdb.db.utils.MemUtils;
import org.apache.iotdb.db.utils.QueryUtils;
import org.apache.iotdb.db.utils.TimeValuePair;
-import org.apache.iotdb.db.writelog.recover.TsFileRecoverPerformer;
+import org.apache.iotdb.db.writelog.recover.SeqTsFileRecoverPerformer;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.exception.write.WriteProcessException;
import org.apache.iotdb.tsfile.file.footer.ChunkGroupFooter;
@@ -467,17 +467,14 @@ public class FileNodeProcessor extends Processor implements IStatistic {
parameters.put(FileNodeConstants.OVERFLOW_FLUSH_ACTION, overflowFlushAction);
parameters.put(FileNodeConstants.FILENODE_PROCESSOR_FLUSH_ACTION, fileNodeFlushAction);
- recoverUpdateTimeMap();
-
for (int i = 0; i < newFileNodes.size(); i++) {
TsFileResource tsFile = newFileNodes.get(i);
try {
String filePath = tsFile.getFilePath();
String logNodePrefix = BufferWriteProcessor.logNodePrefix(processorName);
- TsFileRecoverPerformer recoverPerformer =
- new TsFileRecoverPerformer(filePath, logNodePrefix,
- fileSchema, versionController, tsFile,
- tsFile.getModFile());
+ SeqTsFileRecoverPerformer recoverPerformer =
+ new SeqTsFileRecoverPerformer(filePath, logNodePrefix,
+ fileSchema, versionController, tsFile);
recoverPerformer.recover();
} catch (ProcessorException e) {
LOGGER.error(
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowResource.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowResource.java
index d5c20c0..859fff0 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowResource.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/io/OverflowResource.java
@@ -39,13 +39,11 @@ import org.apache.iotdb.db.engine.modification.Deletion;
import org.apache.iotdb.db.engine.modification.Modification;
import org.apache.iotdb.db.engine.modification.ModificationFile;
import org.apache.iotdb.db.engine.version.VersionController;
-import org.apache.iotdb.db.exception.ProcessorException;
import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.db.utils.MemUtils;
import org.apache.iotdb.db.utils.QueryUtils;
import org.apache.iotdb.db.writelog.manager.MultiFileLogNodeManager;
import org.apache.iotdb.db.writelog.node.WriteLogNode;
-import org.apache.iotdb.db.writelog.recover.TsFileRecoverPerformer;
import org.apache.iotdb.tsfile.file.metadata.ChunkGroupMetaData;
import org.apache.iotdb.tsfile.file.metadata.ChunkMetaData;
import org.apache.iotdb.tsfile.file.metadata.TsDeviceMetadata;
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java b/iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverPerformer.java
similarity index 95%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java
rename to iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverPerformer.java
index 8041aa4..f1904c1 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverPerformer.java
@@ -37,7 +37,7 @@ import org.apache.iotdb.tsfile.file.metadata.ChunkMetaData;
import org.apache.iotdb.tsfile.write.schema.FileSchema;
import org.apache.iotdb.tsfile.write.writer.NativeRestorableIOWriter;
-public class TsFileRecoverPerformer {
+public class SeqTsFileRecoverPerformer {
private String insertFilePath;
private String processorName;
@@ -47,16 +47,18 @@ public class TsFileRecoverPerformer {
private IMemTable recoverMemTable;
private TsFileResource tsFileResource;
- public TsFileRecoverPerformer(String insertFilePath, String processorName,
+ public SeqTsFileRecoverPerformer(String insertFilePath, String processorName,
FileSchema fileSchema, VersionController versionController,
- TsFileResource currentTsFileResource, ModificationFile modFile) {
+ TsFileResource currentTsFileResource) {
this.insertFilePath = insertFilePath;
this.processorName = processorName;
this.fileSchema = fileSchema;
this.versionController = versionController;
this.recoverMemTable = new PrimitiveMemTable();
- this.logReplayer = new LogReplayer(processorName, insertFilePath, modFile, versionController,
+ this.logReplayer = new LogReplayer(processorName, insertFilePath, currentTsFileResource.getModFile(),
+ versionController,
currentTsFileResource, fileSchema, recoverMemTable);
+ this.tsFileResource = currentTsFileResource;
}
public void recover() throws ProcessorException {
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/RecoverTest.java b/iotdb/src/test/java/org/apache/iotdb/db/writelog/RecoverTest.java
index 87e6779..92fdc60 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/writelog/RecoverTest.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/writelog/RecoverTest.java
@@ -38,7 +38,7 @@ import org.apache.iotdb.db.qp.physical.crud.InsertPlan;
import org.apache.iotdb.db.qp.physical.crud.UpdatePlan;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.db.writelog.node.ExclusiveWriteLogNode;
-import org.apache.iotdb.db.writelog.recover.TsFileRecoverPerformer;
+import org.apache.iotdb.db.writelog.recover.SeqTsFileRecoverPerformer;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.read.common.Path;
@@ -106,9 +106,8 @@ public class RecoverTest {
logNode.write(deletePlan);
logNode.forceSync();
- TsFileRecoverPerformer performer = new TsFileRecoverPerformer(
- insertFile.getPath(), deviceId, schema, SysTimeVersionController.INSTANCE, tsFileResource,
- tsFileResource.getModFile());
+ SeqTsFileRecoverPerformer performer = new SeqTsFileRecoverPerformer(
+ insertFile.getPath(), deviceId, schema, SysTimeVersionController.INSTANCE, tsFileResource);
// used to check if logs are replayed in order
performer.recover();