This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch refactor_overflow
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/refactor_overflow by this push:
new 9b4f9f3 fix non-test
9b4f9f3 is described below
commit 9b4f9f34e4e4a70a2fea5ac874955b997c182977
Author: 江天 <[email protected]>
AuthorDate: Wed Jun 5 15:11:56 2019 +0800
fix non-test
---
.../org/apache/iotdb/db/engine/DatabaseEngine.java | 3 +-
...{EngingeConstants.java => EngineConstants.java} | 4 +-
.../java/org/apache/iotdb/db/engine/Processor.java | 3 --
.../db/engine/sgmanager/StorageGroupManager.java | 7 ++-
.../db/engine/sgmanager/StorageGroupProcessor.java | 19 ++++----
.../db/engine/tsfiledata/TsFileProcessor.java | 10 ++--
.../iotdb/db/monitor/collector/FileSize.java | 6 +--
.../iotdb/db/query/control/JobFileManager.java | 14 ++++--
.../db/query/control/QueryResourceManager.java | 1 -
.../db/query/executor/AggregateEngineExecutor.java | 3 +-
.../GroupByWithOnlyTimeFilterDataSetDataSet.java | 2 +-
.../java/org/apache/iotdb/db/query/fill/IFill.java | 2 +-
.../query/timegenerator/EngineNodeConstructor.java | 2 +-
.../apache/iotdb/db/service/CloseMergeService.java | 1 +
.../java/org/apache/iotdb/db/service/IoTDB.java | 25 ++--------
.../org/apache/iotdb/db/utils/LoadDataUtils.java | 12 ++---
.../org/apache/iotdb/db/utils/RecordUtils.java | 50 +++++---------------
.../recover/ExclusiveLogRecoverPerformer.java | 11 +----
.../writelog/recover/FileNodeRecoverPerformer.java | 53 ----------------------
.../engine/bufferwrite/BufferWriteBenchmark.java | 14 +++---
.../bufferwrite/BufferWriteProcessorNewTest.java | 8 ++--
.../bufferwrite/BufferWriteProcessorTest.java | 8 ++--
.../memcontrol/BufferwriteFileSizeControlTest.java | 8 ++--
.../memcontrol/BufferwriteMetaSizeControlTest.java | 8 ++--
.../memcontrol/OverflowFileSizeControlTest.java | 6 +--
.../memcontrol/OverflowMetaSizeControlTest.java | 6 +--
.../overflow/io/OverflowProcessorBenchmark.java | 10 ++--
.../engine/overflow/io/OverflowProcessorTest.java | 6 +--
28 files changed, 103 insertions(+), 199 deletions(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/DatabaseEngine.java
b/iotdb/src/main/java/org/apache/iotdb/db/engine/DatabaseEngine.java
index abe90ec..71f278d 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/DatabaseEngine.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/DatabaseEngine.java
@@ -27,6 +27,7 @@ import org.apache.iotdb.db.engine.datasource.QueryDataSource;
import org.apache.iotdb.db.exception.StorageGroupManagerException;
import org.apache.iotdb.db.qp.physical.crud.InsertPlan;
import org.apache.iotdb.db.query.context.QueryContext;
+import org.apache.iotdb.db.service.IService;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
@@ -36,7 +37,7 @@ import
org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression;
/**
* DatabaseEngine is an abstraction of IoTDB storage-level interfaces.
*/
-public interface DatabaseEngine {
+public interface DatabaseEngine extends IService {
/**
* This function is just for unit test.
diff --git
a/iotdb/src/main/java/org/apache/iotdb/db/engine/EngingeConstants.java
b/iotdb/src/main/java/org/apache/iotdb/db/engine/EngineConstants.java
similarity index 95%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/EngingeConstants.java
rename to iotdb/src/main/java/org/apache/iotdb/db/engine/EngineConstants.java
index 56cd481..c8241b9 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/EngingeConstants.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/EngineConstants.java
@@ -22,9 +22,9 @@ package org.apache.iotdb.db.engine;
* Constants for using in bufferwrite, overflow and filenode.
*
*/
-public class EngingeConstants {
+public class EngineConstants {
- private EngingeConstants(){
+ private EngineConstants(){
}
public static final String OVERFLOW_FLUSH_ACTION = "OVERFLOW_FLUSH_ACTION";
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/Processor.java
b/iotdb/src/main/java/org/apache/iotdb/db/engine/Processor.java
index 363c685..059b2bc 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/Processor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/Processor.java
@@ -22,15 +22,12 @@ import java.io.IOException;
import java.util.concurrent.Future;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.apache.iotdb.db.engine.bufferwrite.BufferWriteProcessor;
import org.apache.iotdb.db.exception.ProcessorException;
import org.apache.iotdb.db.exception.TsFileProcessorException;
/**
* Processor is used for implementing different processor with different
operation.<br>
*
- * @see BufferWriteProcessor
- * @see FileNodeProcessor
*/
public abstract class Processor {
diff --git
a/iotdb/src/main/java/org/apache/iotdb/db/engine/sgmanager/StorageGroupManager.java
b/iotdb/src/main/java/org/apache/iotdb/db/engine/sgmanager/StorageGroupManager.java
index 91440bd..b7260ea 100644
---
a/iotdb/src/main/java/org/apache/iotdb/db/engine/sgmanager/StorageGroupManager.java
+++
b/iotdb/src/main/java/org/apache/iotdb/db/engine/sgmanager/StorageGroupManager.java
@@ -59,7 +59,6 @@ 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;
import org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression;
-import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -143,11 +142,11 @@ public class StorageGroupManager implements IStatistic,
IService, DatabaseEngine
@Override
public Map<String, InsertPlan> getAllStatisticsValue() {
long curTime = System.currentTimeMillis();
- TSRecord tsRecord = StatMonitor
+ InsertPlan plan = StatMonitor
.convertToInsertPlan(getStatParamsHashMap(),
MonitorConstants.STAT_STORAGE_DELTA_NAME,
curTime);
- HashMap<String, TSRecord> ret = new HashMap<>();
- ret.put(MonitorConstants.STAT_STORAGE_DELTA_NAME, tsRecord);
+ HashMap<String, InsertPlan> ret = new HashMap<>();
+ ret.put(MonitorConstants.STAT_STORAGE_DELTA_NAME, plan);
return ret;
}
diff --git
a/iotdb/src/main/java/org/apache/iotdb/db/engine/sgmanager/StorageGroupProcessor.java
b/iotdb/src/main/java/org/apache/iotdb/db/engine/sgmanager/StorageGroupProcessor.java
index eeac144..586955b 100644
---
a/iotdb/src/main/java/org/apache/iotdb/db/engine/sgmanager/StorageGroupProcessor.java
+++
b/iotdb/src/main/java/org/apache/iotdb/db/engine/sgmanager/StorageGroupProcessor.java
@@ -48,7 +48,7 @@ import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.conf.directories.Directories;
import org.apache.iotdb.db.engine.Processor;
-import org.apache.iotdb.db.engine.EngingeConstants;
+import org.apache.iotdb.db.engine.EngineConstants;
import org.apache.iotdb.db.engine.merge.MergeTask;
import org.apache.iotdb.db.engine.modification.Deletion;
import org.apache.iotdb.db.engine.modification.ModificationFile;
@@ -269,16 +269,19 @@ public class StorageGroupProcessor extends Processor
implements IStatistic {
@Override
public Map<String, InsertPlan> getAllStatisticsValue() {
Long curTime = System.currentTimeMillis();
- HashMap<String, TSRecord> tsRecordHashMap = new HashMap<>();
- TSRecord tsRecord = new TSRecord(curTime, statStorageGroupName);
-
+ HashMap<String, InsertPlan> tsRecordHashMap = new HashMap<>();
Map<String, AtomicLong> hashMap = getStatParamsHashMap();
- tsRecord.dataPointList = new ArrayList<>();
+ String[] measurements = new String[hashMap.size()];
+ String[] values = new String[hashMap.size()];
+
+ int i = 0;
for (Map.Entry<String, AtomicLong> entry : hashMap.entrySet()) {
- tsRecord.dataPointList.add(new LongDataPoint(entry.getKey(),
entry.getValue().get()));
+ measurements[i] = entry.getKey();
+ values[i++] = entry.getValue().toString();
}
+ InsertPlan plan = new InsertPlan(statStorageGroupName, curTime,
measurements, values);
- tsRecordHashMap.put(statStorageGroupName, tsRecord);
+ tsRecordHashMap.put(statStorageGroupName, plan);
return tsRecordHashMap;
}
@@ -780,7 +783,7 @@ public class StorageGroupProcessor extends Processor
implements IStatistic {
mergeBaseDir = Directories.getInstance().getNextFolderForTsfile();
mergeFileName = minimumTime
- + EngingeConstants.TSFILE_NAME_SEPARATOR + System.currentTimeMillis()
+ + EngineConstants.TSFILE_NAME_SEPARATOR + System.currentTimeMillis()
+ MERGE_TEMP_SUFFIX;
mergeOutputPath = constructOutputFilePath(mergeBaseDir, getProcessorName(),
mergeFileName);
diff --git
a/iotdb/src/main/java/org/apache/iotdb/db/engine/tsfiledata/TsFileProcessor.java
b/iotdb/src/main/java/org/apache/iotdb/db/engine/tsfiledata/TsFileProcessor.java
index 6abff9a..b08f869 100644
---
a/iotdb/src/main/java/org/apache/iotdb/db/engine/tsfiledata/TsFileProcessor.java
+++
b/iotdb/src/main/java/org/apache/iotdb/db/engine/tsfiledata/TsFileProcessor.java
@@ -42,7 +42,7 @@ import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.conf.directories.Directories;
import org.apache.iotdb.db.engine.Processor;
-import org.apache.iotdb.db.engine.EngingeConstants;
+import org.apache.iotdb.db.engine.EngineConstants;
import org.apache.iotdb.db.engine.sgmanager.TsFileResource;
import org.apache.iotdb.db.engine.memcontrol.BasicMemController;
import org.apache.iotdb.db.engine.memcontrol.BasicMemController.UsageLevel;
@@ -234,12 +234,12 @@ public class TsFileProcessor extends Processor {
throws TsFileProcessorException {
File[] tsFiles = dataFolder
.listFiles(x ->
!x.getName().contains(RestorableTsFileIOWriter.RESTORE_SUFFIX)
- &&
x.getName().split(EngingeConstants.TSFILE_NAME_SEPARATOR).length == 2);
+ && x.getName().split(EngineConstants.TSFILE_NAME_SEPARATOR).length
== 2);
if (tsFiles == null || tsFiles.length == 0) {
return;
}
Arrays.sort(tsFiles, Comparator.comparingLong(x -> Long
-
.parseLong(x.getName().split(EngingeConstants.TSFILE_NAME_SEPARATOR)[0])));
+
.parseLong(x.getName().split(EngineConstants.TSFILE_NAME_SEPARATOR)[0])));
for (File tsfile : tsFiles) {
if (tsfile.getName().endsWith(StorageGroupProcessor.MERGE_TEMP_SUFFIX)) {
@@ -257,7 +257,7 @@ public class TsFileProcessor extends Processor {
// add one TsFiles to tsFileResources and update device inserted time map
private void addResource(File tsfile) throws TsFileProcessorException {
//TODO we'd better define a file suffix for TsFile, e.g., .ts
- String[] names =
tsfile.getName().split(EngingeConstants.TSFILE_NAME_SEPARATOR);
+ String[] names =
tsfile.getName().split(EngineConstants.TSFILE_NAME_SEPARATOR);
long time = Long.parseLong(names[0]);
if (fileNamePrefix < time) {
fileNamePrefix = time;
@@ -297,7 +297,7 @@ public class TsFileProcessor extends Processor {
LOGGER.debug("The bufferwrite processor data dir doesn't exists, create
new directory {}.",
dataFolder.getAbsolutePath());
}
- String fileName = (fileNamePrefix + 1) +
EngingeConstants.TSFILE_NAME_SEPARATOR
+ String fileName = (fileNamePrefix + 1) +
EngineConstants.TSFILE_NAME_SEPARATOR
+ System.currentTimeMillis();
return new File(dataFolder, fileName);
}
diff --git
a/iotdb/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java
b/iotdb/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java
index 6f780cf..a4adf64 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java
@@ -61,11 +61,11 @@ public class FileSize implements IStatistic {
@Override
public Map<String, InsertPlan> getAllStatisticsValue() {
long curTime = System.currentTimeMillis();
- TSRecord tsRecord = StatMonitor
+ InsertPlan plan = StatMonitor
.convertToInsertPlan(getStatParamsHashMap(),
MonitorConstants.FILE_SIZE_STORAGE_GROUP_NAME,
curTime);
- HashMap<String, TSRecord> ret = new HashMap<>();
- ret.put(MonitorConstants.FILE_SIZE_STORAGE_GROUP_NAME, tsRecord);
+ HashMap<String, InsertPlan> ret = new HashMap<>();
+ ret.put(MonitorConstants.FILE_SIZE_STORAGE_GROUP_NAME, plan);
return ret;
}
diff --git
a/iotdb/src/main/java/org/apache/iotdb/db/query/control/JobFileManager.java
b/iotdb/src/main/java/org/apache/iotdb/db/query/control/JobFileManager.java
index 46cce5b..53e1f8e 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/control/JobFileManager.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/control/JobFileManager.java
@@ -22,7 +22,6 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.iotdb.db.engine.sgmanager.TsFileResource;
-import org.apache.iotdb.db.engine.datasource.OverflowInsertFile;
import org.apache.iotdb.db.engine.datasource.QueryDataSource;
/**
@@ -66,11 +65,16 @@ public class JobFileManager {
addFilePathToMap(jobId, unSealedFilePath, false);
}
- for (OverflowInsertFile overflowInsertFile :
dataSource.getOverflowSeriesDataSource()
- .getOverflowInsertFileList()) {
- String overflowFilePath = overflowInsertFile.getFilePath();
+ for (TsFileResource tsFileResource :
dataSource.getOverflowSeriesDataSource().getSealedFiles()) {
+ String overflowFilePath = tsFileResource.getFilePath();
// overflow is unclosed by default
- addFilePathToMap(jobId, overflowFilePath, false);
+ addFilePathToMap(jobId, overflowFilePath, true);
+ }
+
+ if (dataSource.getOverflowSeriesDataSource().hasUnsealedFile()) {
+ String unSealedFilePath = dataSource.getOverflowSeriesDataSource()
+ .getUnsealedFile().getFilePath();
+ addFilePathToMap(jobId, unSealedFilePath, false);
}
}
diff --git
a/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java
b/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java
index 406eb11..ac4cd62 100644
---
a/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java
+++
b/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java
@@ -26,7 +26,6 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.iotdb.db.engine.DatabaseEngineFactory;
-import org.apache.iotdb.db.engine.datasource.OverflowSeriesDataSource;
import org.apache.iotdb.db.engine.datasource.QueryDataSource;
import org.apache.iotdb.db.exception.StorageGroupManagerException;
import org.apache.iotdb.db.query.context.QueryContext;
diff --git
a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java
b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java
index 49cd60c..41a04e3 100644
---
a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java
+++
b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java
@@ -114,7 +114,8 @@ public class AggregateEngineExecutor {
// unseq reader for all chunk groups in unSeqFile, memory
PriorityMergeReader unSeqMergeReader = SeriesReaderFactory.getInstance()
-
.createUnSeqMergeReader(queryDataSource.getOverflowSeriesDataSource(),
timeFilter);
+
.createUnSeqMergeReader(queryDataSource.getOverflowSeriesDataSource(), context,
+ timeFilter);
readersOfSequenceData.add(sequenceReader);
readersOfUnSequenceData.add(unSeqMergeReader);
}
diff --git
a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/groupby/GroupByWithOnlyTimeFilterDataSetDataSet.java
b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/groupby/GroupByWithOnlyTimeFilterDataSetDataSet.java
index ff7a502..82ec604 100644
---
a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/groupby/GroupByWithOnlyTimeFilterDataSetDataSet.java
+++
b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/groupby/GroupByWithOnlyTimeFilterDataSetDataSet.java
@@ -91,7 +91,7 @@ public class GroupByWithOnlyTimeFilterDataSetDataSet extends
GroupByEngineDataSe
// unseq reader for all chunk groups in unSeqFile, memory
PriorityMergeReader unSeqMergeReader = SeriesReaderFactory.getInstance()
-
.createUnSeqMergeReader(queryDataSource.getOverflowSeriesDataSource(),
timeFilter);
+
.createUnSeqMergeReader(queryDataSource.getOverflowSeriesDataSource(), context,
timeFilter);
sequenceReaderList.add(sequenceReader);
unSequenceReaderList.add(unSeqMergeReader);
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/fill/IFill.java
b/iotdb/src/main/java/org/apache/iotdb/db/query/fill/IFill.java
index 6292a65..e9ad223 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/fill/IFill.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/fill/IFill.java
@@ -62,7 +62,7 @@ public abstract class IFill {
// unseq reader for all chunk groups in unSeqFile, memory
PriorityMergeReader unSeqMergeReader = SeriesReaderFactory.getInstance()
- .createUnSeqMergeReader(queryDataSource.getOverflowSeriesDataSource(),
timeFilter);
+ .createUnSeqMergeReader(queryDataSource.getOverflowSeriesDataSource(),
context, timeFilter);
allDataReader = new AllDataReader(sequenceReader, unSeqMergeReader);
}
diff --git
a/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java
b/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java
index 4e31bff..4369c82 100644
---
a/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java
+++
b/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java
@@ -98,7 +98,7 @@ public class EngineNodeConstructor {
// reader for all unSequence data
PriorityMergeReader unSeqMergeReader = SeriesReaderFactory.getInstance()
- .createUnSeqMergeReader(queryDataSource.getOverflowSeriesDataSource(),
filter);
+ .createUnSeqMergeReader(queryDataSource.getOverflowSeriesDataSource(),
context, filter);
if (!tsFilesReader.hasNext()) {
//only have unsequence data.
diff --git
a/iotdb/src/main/java/org/apache/iotdb/db/service/CloseMergeService.java
b/iotdb/src/main/java/org/apache/iotdb/db/service/CloseMergeService.java
index 3743ad0..fa72ae6 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/service/CloseMergeService.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/service/CloseMergeService.java
@@ -26,6 +26,7 @@ import org.apache.iotdb.db.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.db.concurrent.ThreadName;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
+import org.apache.iotdb.db.engine.DatabaseEngineFactory;
import org.apache.iotdb.db.exception.StartupException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java
b/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java
index e6f768e..8902a55 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java
@@ -24,6 +24,7 @@ import
org.apache.iotdb.db.concurrent.IoTDBDefaultThreadExceptionHandler;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
+import org.apache.iotdb.db.engine.DatabaseEngineFactory;
import org.apache.iotdb.db.engine.memcontrol.BasicMemController;
import org.apache.iotdb.db.exception.StorageGroupManagerException;
import org.apache.iotdb.db.exception.PathErrorException;
@@ -81,14 +82,12 @@ public class IoTDB implements IoTDBMBean {
Runtime.getRuntime().addShutdownHook(new IoTDBShutdownHook());
setUncaughtExceptionHandler();
- DatabaseEngineFactory.getCurrent().recovery();
+ //noinspection ResultOfMethodCallIgnored
+ DatabaseEngineFactory.getCurrent(); // implicit recover
try {
systemDataRecovery();
} catch (RecoverException e) {
- String errorMessage = String.format("Failed to recover system data
because of %s",
- e.getMessage());
- LOGGER.error(errorMessage);
- throw new StartupException(errorMessage);
+ throw new StartupException(e);
}
// When registering statMonitor, we should start recovering some statistics
// with latest values stored
@@ -144,21 +143,7 @@ public class IoTDB implements IoTDBMBean {
LOGGER.info("{}: start checking write log...",
IoTDBConstant.GLOBAL_DB_NAME);
WriteLogNodeManager writeLogManager =
MultiFileLogNodeManager.getInstance();
- List<String> filenodeNames = null;
- try {
- filenodeNames = MManager.getInstance().getAllStorageGroups();
- } catch (PathErrorException e) {
- throw new RecoverException(e);
- }
- for (String filenodeName : filenodeNames) {
- if (writeLogManager.hasWAL(filenodeName)) {
- try {
- DatabaseEngineFactory.getCurrent().recoverFileNode(filenodeName);
- } catch (StorageGroupManagerException e) {
- throw new RecoverException(e);
- }
- }
- }
+
IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
boolean enableWal = config.isEnableWal();
config.setEnableWal(false);
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/LoadDataUtils.java
b/iotdb/src/main/java/org/apache/iotdb/db/utils/LoadDataUtils.java
index 580987f..d498e3e 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/utils/LoadDataUtils.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/LoadDataUtils.java
@@ -37,8 +37,8 @@ import
org.apache.iotdb.db.exception.StorageGroupManagerException;
import org.apache.iotdb.db.exception.PathErrorException;
import org.apache.iotdb.db.exception.ProcessorException;
import org.apache.iotdb.db.metadata.MManager;
+import org.apache.iotdb.db.qp.physical.crud.InsertPlan;
import org.apache.iotdb.tsfile.exception.write.WriteProcessException;
-import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.schema.FileSchema;
import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.slf4j.Logger;
@@ -128,13 +128,13 @@ public class LoadDataUtils {
}
private void loadOneRecordLine(String line) {
- TSRecord record = RecordUtils.parseSimpleTupleRecord(line,
this.fileSchema);
- totalPointCount += record.dataPointList.size();
+ InsertPlan plan = RecordUtils.parseSimpleTuplePlan(line, this.fileSchema);
+ totalPointCount += plan.getValues().length;
String nsPath = null;
try {
- nsPath = mmanager.getStorageGroupByPath(record.deviceId);
+ nsPath = mmanager.getStorageGroupByPath(plan.getDeviceId());
} catch (PathErrorException e) {
- logger.error("given seriesPath not found, given deviceId:{}",
record.deviceId, e);
+ logger.error("given seriesPath not found, given deviceId:{}",
plan.getDeviceId(), e);
}
if (!writeInstanceMap.contains(nsPath)) {
if (writeInstanceMap.size() < writeInstanceThreshold) {
@@ -152,7 +152,7 @@ public class LoadDataUtils {
}
// appeared before, insert directly
try {
- databaseEngine.insert(record, false);
+ databaseEngine.insert(plan, false);
} catch (StorageGroupManagerException e) {
logger.error("failed when insert into databaseEngine, record:{}", line,
e);
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/RecordUtils.java
b/iotdb/src/main/java/org/apache/iotdb/db/utils/RecordUtils.java
index a77a294..4a443ec 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/utils/RecordUtils.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/RecordUtils.java
@@ -18,6 +18,7 @@
*/
package org.apache.iotdb.db.utils;
+import org.apache.iotdb.db.qp.physical.crud.InsertPlan;
import org.apache.iotdb.tsfile.common.constant.JsonFormatConstant;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.utils.Binary;
@@ -49,9 +50,9 @@ public class RecordUtils {
*
* @param str - input string
* @param schema - constructed file schema
- * @return TSRecord constructed from str
+ * @return InsertPlan constructed from str
*/
- public static TSRecord parseSimpleTupleRecord(String str, FileSchema schema)
{
+ public static InsertPlan parseSimpleTuplePlan(String str, FileSchema schema)
{
// split items
String[] items = str.split(JsonFormatConstant.TSRECORD_SEPARATOR);
// get deviceId and timestamp, then create a new TSRecord
@@ -62,54 +63,27 @@ public class RecordUtils {
} catch (NumberFormatException e) {
LOG.warn("given timestamp is illegal:{}", str);
// return a TSRecord without any data points
- return new TSRecord(-1, deviceId);
+ return new InsertPlan(deviceId, -1, null, null);
}
- TSRecord ret = new TSRecord(timestamp, deviceId);
-
+ int valuesNum = (items.length - 2) / 2;
+ String[] measurements = new String[valuesNum];
+ String[] values = new String[valuesNum];
+ int idx = 0;
// loop all rest items except the last one
String measurementId;
TSDataType type;
for (int i = 2; i < items.length - 1; i += 2) {
// get measurementId and value
measurementId = items[i].trim();
+ String value = items[i + 1].trim();
type = schema.getMeasurementDataType(measurementId);
if (type == null) {
LOG.warn("measurementId:{},type not found, pass", measurementId);
continue;
}
- String value = items[i + 1].trim();
- // if value is not null, wrap it with corresponding DataPoint and add to
TSRecord
- if (!"".equals(value)) {
- try {
- switch (type) {
- case INT32:
- ret.addTuple(new IntDataPoint(measurementId,
Integer.valueOf(value)));
- break;
- case INT64:
- ret.addTuple(new LongDataPoint(measurementId,
Long.valueOf(value)));
- break;
- case FLOAT:
- ret.addTuple(new FloatDataPoint(measurementId,
Float.valueOf(value)));
- break;
- case DOUBLE:
- ret.addTuple(new DoubleDataPoint(measurementId,
Double.valueOf(value)));
- break;
- case BOOLEAN:
- ret.addTuple(new BooleanDataPoint(measurementId,
Boolean.valueOf(value)));
- break;
- case TEXT:
- ret.addTuple(new StringDataPoint(measurementId,
Binary.valueOf(items[i + 1])));
- break;
- default:
-
- LOG.warn("unsupported data type:{}", type);
- break;
- }
- } catch (NumberFormatException e) {
- LOG.warn("parsing measurement meets error, omit it: {}",
e.getMessage());
- }
- }
+ measurements[idx] = measurementId;
+ values[idx++] = value;
}
- return ret;
+ return new InsertPlan(deviceId, timestamp, measurements, values);
}
}
diff --git
a/iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/ExclusiveLogRecoverPerformer.java
b/iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/ExclusiveLogRecoverPerformer.java
index 3e55df1..5972425 100644
---
a/iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/ExclusiveLogRecoverPerformer.java
+++
b/iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/ExclusiveLogRecoverPerformer.java
@@ -31,6 +31,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.FileUtils;
import org.apache.iotdb.db.conf.IoTDBConstant;
+import org.apache.iotdb.db.engine.DatabaseEngineFactory;
import org.apache.iotdb.db.exception.StorageGroupManagerException;
import org.apache.iotdb.db.exception.ProcessorException;
import org.apache.iotdb.db.exception.RecoverException;
@@ -56,7 +57,6 @@ public class ExclusiveLogRecoverPerformer implements
RecoverPerformer {
private String restoreFilePath;
private RecoverStage currStage;
private LogReplayer replayer = new ConcreteLogReplayer();
- private RecoverPerformer fileNodeRecoverPerformer;
// recovery of Overflow maybe different from BufferWrite
private boolean isOverflow;
@@ -66,14 +66,9 @@ public class ExclusiveLogRecoverPerformer implements
RecoverPerformer {
public ExclusiveLogRecoverPerformer(String restoreFilePath,
ExclusiveWriteLogNode logNode) {
this.restoreFilePath = restoreFilePath;
this.writeLogNode = logNode;
- this.fileNodeRecoverPerformer = new
FileNodeRecoverPerformer(writeLogNode.getIdentifier());
this.isOverflow =
logNode.getFileNodeName().contains(IoTDBConstant.OVERFLOW_LOG_NODE_SUFFIX);
}
- public void setFileNodeRecoverPerformer(RecoverPerformer
fileNodeRecoverPerformer) {
- this.fileNodeRecoverPerformer = fileNodeRecoverPerformer;
- }
-
public void setReplayer(LogReplayer replayer) {
this.replayer = replayer;
}
@@ -222,8 +217,6 @@ public class ExclusiveLogRecoverPerformer implements
RecoverPerformer {
throw new RecoverException("Cannot recover restore file, recovery
aborted.");
}
- fileNodeRecoverPerformer.recover();
-
currStage = REPLAY_LOG;
logger.info("Log node {} recover files ended",
writeLogNode.getLogDirectory());
replayLog();
@@ -284,7 +277,7 @@ public class ExclusiveLogRecoverPerformer implements
RecoverPerformer {
+ " logs failed to recover, see logs above for details");
}
try {
-
DatabaseEngineFactory.getCurrent().closeOneFileNode(writeLogNode.getFileNodeName());
+
DatabaseEngineFactory.getCurrent().closeStorageGroup(writeLogNode.getFileNodeName());
} catch (StorageGroupManagerException e) {
logger.error("Log node {} cannot perform flush after replaying logs!
Because {}",
writeLogNode.getIdentifier(), e.getMessage());
diff --git
a/iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/FileNodeRecoverPerformer.java
b/iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/FileNodeRecoverPerformer.java
deleted file mode 100644
index 033b63c..0000000
---
a/iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/FileNodeRecoverPerformer.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.iotdb.db.writelog.recover;
-import org.apache.iotdb.db.exception.StorageGroupManagerException;
-import org.apache.iotdb.db.exception.RecoverException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class FileNodeRecoverPerformer implements RecoverPerformer {
-
- private static final Logger logger =
LoggerFactory.getLogger(FileNodeRecoverPerformer.class);
-
- /**
- * If the storage group is "root.a.b", then the identifier of a bufferwrite
processor will be
- * "root.a.b-bufferwrite", and the identifier of an overflow processor will
be
- * "root.a.b-overflow".
- */
- private String identifier;
-
- public FileNodeRecoverPerformer(String identifier) {
- this.identifier = identifier;
- }
-
- @Override
- public void recover() throws RecoverException {
- try {
- DatabaseEngineFactory.getCurrent().recoverFileNode(getFileNodeName());
- } catch (StorageGroupManagerException e) {
- logger.error("Cannot recover filenode {}", identifier);
- throw new RecoverException(e);
- }
- }
-
- public String getFileNodeName() {
- return identifier.split("-")[0];
- }
-}
diff --git
a/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteBenchmark.java
b/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteBenchmark.java
index d90eff0..906bef9 100644
---
a/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteBenchmark.java
+++
b/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteBenchmark.java
@@ -23,7 +23,7 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.io.FileUtils;
-import org.apache.iotdb.db.engine.EngingeConstants;
+import org.apache.iotdb.db.engine.EngineConstants;
import org.apache.iotdb.db.engine.version.SysTimeVersionController;
import org.apache.iotdb.db.exception.BufferWriteProcessorException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -76,22 +76,22 @@ public class BufferWriteBenchmark {
public static void main(String[] args) throws BufferWriteProcessorException,
IOException {
before();
Map<String, Action> parameters = new HashMap<>();
- parameters.put(EngingeConstants.BUFFERWRITE_FLUSH_ACTION, new Action() {
+ parameters.put(EngineConstants.BUFFERWRITE_FLUSH_ACTION, new Action() {
@Override
public void act() throws ActionException {
- System.out.println(EngingeConstants.BUFFERWRITE_FLUSH_ACTION);
+ System.out.println(EngineConstants.BUFFERWRITE_FLUSH_ACTION);
}
});
- parameters.put(EngingeConstants.BUFFERWRITE_CLOSE_ACTION, new Action() {
+ parameters.put(EngineConstants.BUFFERWRITE_CLOSE_ACTION, new Action() {
@Override
public void act() throws ActionException {
- System.out.println(EngingeConstants.BUFFERWRITE_CLOSE_ACTION);
+ System.out.println(EngineConstants.BUFFERWRITE_CLOSE_ACTION);
}
});
- parameters.put(EngingeConstants.FILENODE_PROCESSOR_FLUSH_ACTION, new
Action() {
+ parameters.put(EngineConstants.FILENODE_PROCESSOR_FLUSH_ACTION, new
Action() {
@Override
public void act() throws ActionException {
- System.out.println(EngingeConstants.FILENODE_PROCESSOR_FLUSH_ACTION);
+ System.out.println(EngineConstants.FILENODE_PROCESSOR_FLUSH_ACTION);
}
});
diff --git
a/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessorNewTest.java
b/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessorNewTest.java
index ce7ae70..bec0052 100644
---
a/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessorNewTest.java
+++
b/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessorNewTest.java
@@ -32,7 +32,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.apache.iotdb.db.conf.directories.Directories;
-import org.apache.iotdb.db.engine.EngingeConstants;
+import org.apache.iotdb.db.engine.EngineConstants;
import org.apache.iotdb.db.engine.MetadataManagerHelper;
import org.apache.iotdb.db.engine.datasource.ReadOnlyMemChunk;
import org.apache.iotdb.db.engine.version.SysTimeVersionController;
@@ -86,9 +86,9 @@ public class BufferWriteProcessorNewTest {
@Before
public void setUp() throws Exception {
- parameters.put(EngingeConstants.BUFFERWRITE_FLUSH_ACTION, bfflushaction);
- parameters.put(EngingeConstants.BUFFERWRITE_CLOSE_ACTION, bfcloseaction);
- parameters.put(EngingeConstants.FILENODE_PROCESSOR_FLUSH_ACTION,
fnflushaction);
+ parameters.put(EngineConstants.BUFFERWRITE_FLUSH_ACTION, bfflushaction);
+ parameters.put(EngineConstants.BUFFERWRITE_CLOSE_ACTION, bfcloseaction);
+ parameters.put(EngineConstants.FILENODE_PROCESSOR_FLUSH_ACTION,
fnflushaction);
MetadataManagerHelper.initMetadata();
EnvironmentUtils.envSetUp();
}
diff --git
a/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessorTest.java
b/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessorTest.java
index b934c3f..b44555d 100644
---
a/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessorTest.java
+++
b/iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessorTest.java
@@ -34,7 +34,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.apache.iotdb.db.conf.directories.Directories;
-import org.apache.iotdb.db.engine.EngingeConstants;
+import org.apache.iotdb.db.engine.EngineConstants;
import org.apache.iotdb.db.engine.MetadataManagerHelper;
import org.apache.iotdb.db.engine.PathUtils;
import org.apache.iotdb.db.engine.datasource.ReadOnlyMemChunk;
@@ -97,9 +97,9 @@ public class BufferWriteProcessorTest {
@Before
public void setUp() throws Exception {
- parameters.put(EngingeConstants.BUFFERWRITE_FLUSH_ACTION, bfflushaction);
- parameters.put(EngingeConstants.BUFFERWRITE_CLOSE_ACTION, bfcloseaction);
- parameters.put(EngingeConstants.FILENODE_PROCESSOR_FLUSH_ACTION,
fnflushaction);
+ parameters.put(EngineConstants.BUFFERWRITE_FLUSH_ACTION, bfflushaction);
+ parameters.put(EngineConstants.BUFFERWRITE_CLOSE_ACTION, bfcloseaction);
+ parameters.put(EngineConstants.FILENODE_PROCESSOR_FLUSH_ACTION,
fnflushaction);
// origin value
groupSizeInByte = TsFileConf.groupSizeInByte;
// new value
diff --git
a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteFileSizeControlTest.java
b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteFileSizeControlTest.java
index 56a130a..36035d2 100644
---
a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteFileSizeControlTest.java
+++
b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteFileSizeControlTest.java
@@ -33,7 +33,7 @@ import org.apache.iotdb.db.engine.PathUtils;
import org.apache.iotdb.db.engine.bufferwrite.Action;
import org.apache.iotdb.db.engine.bufferwrite.ActionException;
import org.apache.iotdb.db.engine.bufferwrite.BufferWriteProcessor;
-import org.apache.iotdb.db.engine.EngingeConstants;
+import org.apache.iotdb.db.engine.EngineConstants;
import org.apache.iotdb.db.engine.version.SysTimeVersionController;
import org.apache.iotdb.db.exception.BufferWriteProcessorException;
import org.apache.iotdb.db.utils.EnvironmentUtils;
@@ -130,9 +130,9 @@ public class BufferwriteFileSizeControlTest {
new File(filename).delete();
Map<String, Action> parameters = new HashMap<>();
- parameters.put(EngingeConstants.BUFFERWRITE_FLUSH_ACTION, bfflushaction);
- parameters.put(EngingeConstants.BUFFERWRITE_CLOSE_ACTION, bfcloseaction);
- parameters.put(EngingeConstants.FILENODE_PROCESSOR_FLUSH_ACTION,
fnflushaction);
+ parameters.put(EngineConstants.BUFFERWRITE_FLUSH_ACTION, bfflushaction);
+ parameters.put(EngineConstants.BUFFERWRITE_CLOSE_ACTION, bfcloseaction);
+ parameters.put(EngineConstants.FILENODE_PROCESSOR_FLUSH_ACTION,
fnflushaction);
try {
processor = new
BufferWriteProcessor(Directories.getInstance().getTsFolderForTest(), nsp,
diff --git
a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteMetaSizeControlTest.java
b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteMetaSizeControlTest.java
index 86a16b0..3385837 100644
---
a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteMetaSizeControlTest.java
+++
b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteMetaSizeControlTest.java
@@ -33,7 +33,7 @@ import org.apache.iotdb.db.engine.PathUtils;
import org.apache.iotdb.db.engine.bufferwrite.Action;
import org.apache.iotdb.db.engine.bufferwrite.ActionException;
import org.apache.iotdb.db.engine.bufferwrite.BufferWriteProcessor;
-import org.apache.iotdb.db.engine.EngingeConstants;
+import org.apache.iotdb.db.engine.EngineConstants;
import org.apache.iotdb.db.engine.version.SysTimeVersionController;
import org.apache.iotdb.db.exception.BufferWriteProcessorException;
import org.apache.iotdb.db.utils.EnvironmentUtils;
@@ -130,9 +130,9 @@ public class BufferwriteMetaSizeControlTest {
new File(filename).delete();
Map<String, Action> parameters = new HashMap<>();
- parameters.put(EngingeConstants.BUFFERWRITE_FLUSH_ACTION, bfflushaction);
- parameters.put(EngingeConstants.BUFFERWRITE_CLOSE_ACTION, bfcloseaction);
- parameters.put(EngingeConstants.FILENODE_PROCESSOR_FLUSH_ACTION,
fnflushaction);
+ parameters.put(EngineConstants.BUFFERWRITE_FLUSH_ACTION, bfflushaction);
+ parameters.put(EngineConstants.BUFFERWRITE_CLOSE_ACTION, bfcloseaction);
+ parameters.put(EngineConstants.FILENODE_PROCESSOR_FLUSH_ACTION,
fnflushaction);
try {
processor = new
BufferWriteProcessor(Directories.getInstance().getTsFolderForTest(), nsp,
diff --git
a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/OverflowFileSizeControlTest.java
b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/OverflowFileSizeControlTest.java
index 72b4658..51dd69b 100644
---
a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/OverflowFileSizeControlTest.java
+++
b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/OverflowFileSizeControlTest.java
@@ -29,7 +29,7 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.MetadataManagerHelper;
import org.apache.iotdb.db.engine.bufferwrite.Action;
import org.apache.iotdb.db.engine.bufferwrite.ActionException;
-import org.apache.iotdb.db.engine.EngingeConstants;
+import org.apache.iotdb.db.engine.EngineConstants;
import org.apache.iotdb.db.engine.version.SysTimeVersionController;
import org.apache.iotdb.db.engine.overflow.io.OverflowProcessor;
import org.apache.iotdb.db.exception.OverflowProcessorException;
@@ -95,8 +95,8 @@ public class OverflowFileSizeControlTest {
@Before
public void setUp() throws Exception {
parameters = new HashMap<>();
- parameters.put(EngingeConstants.OVERFLOW_FLUSH_ACTION,
overflowflushaction);
- parameters.put(EngingeConstants.FILENODE_PROCESSOR_FLUSH_ACTION,
filenodeflushaction);
+ parameters.put(EngineConstants.OVERFLOW_FLUSH_ACTION, overflowflushaction);
+ parameters.put(EngineConstants.FILENODE_PROCESSOR_FLUSH_ACTION,
filenodeflushaction);
overflowFileSize = dbConfig.getOverflowFileSizeThreshold();
groupSize = tsconfig.groupSizeInByte;
diff --git
a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/OverflowMetaSizeControlTest.java
b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/OverflowMetaSizeControlTest.java
index 8235954..c4b00ba 100644
---
a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/OverflowMetaSizeControlTest.java
+++
b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/OverflowMetaSizeControlTest.java
@@ -29,7 +29,7 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.MetadataManagerHelper;
import org.apache.iotdb.db.engine.bufferwrite.Action;
import org.apache.iotdb.db.engine.bufferwrite.ActionException;
-import org.apache.iotdb.db.engine.EngingeConstants;
+import org.apache.iotdb.db.engine.EngineConstants;
import org.apache.iotdb.db.engine.version.SysTimeVersionController;
import org.apache.iotdb.db.engine.overflow.io.OverflowProcessor;
import org.apache.iotdb.db.exception.OverflowProcessorException;
@@ -95,8 +95,8 @@ public class OverflowMetaSizeControlTest {
@Before
public void setUp() throws Exception {
parameters = new HashMap<String, Action>();
- parameters.put(EngingeConstants.OVERFLOW_FLUSH_ACTION,
overflowflushaction);
- parameters.put(EngingeConstants.FILENODE_PROCESSOR_FLUSH_ACTION,
filenodeflushaction);
+ parameters.put(EngineConstants.OVERFLOW_FLUSH_ACTION, overflowflushaction);
+ parameters.put(EngineConstants.FILENODE_PROCESSOR_FLUSH_ACTION,
filenodeflushaction);
overflowFileSize = dbConfig.getOverflowMetaSizeThreshold();
groupSize = tsconfig.groupSizeInByte;
diff --git
a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/io/OverflowProcessorBenchmark.java
b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/io/OverflowProcessorBenchmark.java
index 8942e7c..c968f54 100644
---
a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/io/OverflowProcessorBenchmark.java
+++
b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/io/OverflowProcessorBenchmark.java
@@ -27,7 +27,7 @@ import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.bufferwrite.Action;
import org.apache.iotdb.db.engine.bufferwrite.ActionException;
-import org.apache.iotdb.db.engine.EngingeConstants;
+import org.apache.iotdb.db.engine.EngineConstants;
import org.apache.iotdb.db.engine.version.SysTimeVersionController;
import org.apache.iotdb.db.exception.OverflowProcessorException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -82,16 +82,16 @@ public class OverflowProcessorBenchmark {
public static void main(String[] args) throws IOException,
OverflowProcessorException {
Map<String, Action> parameters = new HashMap<>();
- parameters.put(EngingeConstants.OVERFLOW_FLUSH_ACTION, new Action() {
+ parameters.put(EngineConstants.OVERFLOW_FLUSH_ACTION, new Action() {
@Override
public void act() throws ActionException {
- System.out.println(EngingeConstants.OVERFLOW_FLUSH_ACTION);
+ System.out.println(EngineConstants.OVERFLOW_FLUSH_ACTION);
}
});
- parameters.put(EngingeConstants.FILENODE_PROCESSOR_FLUSH_ACTION, new
Action() {
+ parameters.put(EngineConstants.FILENODE_PROCESSOR_FLUSH_ACTION, new
Action() {
@Override
public void act() throws ActionException {
- System.out.println(EngingeConstants.FILENODE_PROCESSOR_FLUSH_ACTION);
+ System.out.println(EngineConstants.FILENODE_PROCESSOR_FLUSH_ACTION);
}
});
OverflowProcessor overflowProcessor = new
OverflowProcessor("Overflow_bench", parameters,
diff --git
a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/io/OverflowProcessorTest.java
b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/io/OverflowProcessorTest.java
index 7b0a58d..340b48e 100644
---
a/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/io/OverflowProcessorTest.java
+++
b/iotdb/src/test/java/org/apache/iotdb/db/engine/overflow/io/OverflowProcessorTest.java
@@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.iotdb.db.engine.PathUtils;
import org.apache.iotdb.db.engine.bufferwrite.Action;
import org.apache.iotdb.db.engine.bufferwrite.ActionException;
-import org.apache.iotdb.db.engine.EngingeConstants;
+import org.apache.iotdb.db.engine.EngineConstants;
import org.apache.iotdb.db.engine.datasource.MergeSeriesDataSource;
import org.apache.iotdb.db.engine.datasource.OverflowSeriesDataSource;
import org.apache.iotdb.db.engine.version.SysTimeVersionController;
@@ -67,8 +67,8 @@ public class OverflowProcessorTest {
public void setUp() throws Exception {
EnvironmentUtils.envSetUp();
parameters = new HashMap<String, Action>();
- parameters.put(EngingeConstants.OVERFLOW_FLUSH_ACTION,
overflowflushaction);
- parameters.put(EngingeConstants.FILENODE_PROCESSOR_FLUSH_ACTION,
filenodeflushaction);
+ parameters.put(EngineConstants.OVERFLOW_FLUSH_ACTION, overflowflushaction);
+ parameters.put(EngineConstants.FILENODE_PROCESSOR_FLUSH_ACTION,
filenodeflushaction);
}
@After
