You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ch...@apache.org on 2020/11/25 01:02:48 UTC
[iotdb] 04/05: rename IndexerManager to FileIndexerManager
This is an automated email from the ASF dual-hosted git repository.
chaow pushed a commit to branch fileIndex
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ba2ecdac2c3a6c772bcb4eaa77a26558b662c4b2
Author: chaow <xu...@gmail.com>
AuthorDate: Wed Sep 16 14:29:53 2020 +0800
rename IndexerManager to FileIndexerManager
---
.../resources/conf/iotdb-engine.properties | 11 ++--
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 20 +++----
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 9 +--
.../org/apache/iotdb/db/engine/StorageEngine.java | 14 ++---
.../iotdb/db/engine/merge/task/MergeFileTask.java | 10 ++--
.../engine/storagegroup/StorageGroupProcessor.java | 70 +++++++++++-----------
.../db/engine/storagegroup/TsFileProcessor.java | 17 +++---
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 2 -
...IndexerManager.java => FileIndexerManager.java} | 30 +++++-----
.../{TimeIndexer.java => FileTimeIndexer.java} | 2 +-
.../org/apache/iotdb/db/timeIndex/TimeIndex.java | 2 +-
...eIndexer.java => LoadAllDeviceTimeIndexer.java} | 6 +-
.../timeIndex/device/RocksDBDeviceTimeIndexer.java | 4 +-
13 files changed, 95 insertions(+), 102 deletions(-)
diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index 4b33bfc..f8b2ca4 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -229,7 +229,6 @@ write_read_schema_free_memory_proportion=4:3:1:2
# primitive array size (length of each array) in array pool
primitive_array_size=128
-<<<<<<< HEAD
# Ratio of write memory for invoking flush disk, 0.4 by default
flush_proportion=0.4
@@ -254,12 +253,10 @@ max_waiting_time_when_insert_blocked=0
# estimated metadata size (in byte) of one timeseries in Mtree
estimated_series_size=300
-=======
-# device time indexer
-enable_device_indexer=false
-# 0, indexer base on file; 1, indexer base on rocksdb
-device_indexer_type=0
->>>>>>> fix conflict
+
+enable_file_time_indexer=false
+# 0, device indexer base on file; 1, device indexer base on rocksdb
+file_time_indexer_type=0
####################
### Upgrade Configurations
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index c571022..52a1c63 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -783,8 +783,8 @@ public class IoTDBConfig {
private boolean debugState = false;
// enable new indexer
- private boolean enableDeviceIndexer = false;
- private int deviceIndexerType = 0;
+ private boolean enableFileTimeIndexer = false;
+ private int fileTimeIndexerType = 0;
public IoTDBConfig() {
// empty constructor
@@ -2098,19 +2098,19 @@ public class IoTDBConfig {
this.defaultIndexWindowRange = defaultIndexWindowRange;
}
- public boolean isEnableDeviceIndexer() {
- return enableDeviceIndexer;
+ public boolean isEnableFileTimeIndexer() {
+ return enableFileTimeIndexer;
}
- public void setEnableDeviceIndexer(boolean enableDeviceIndexer) {
- this.enableDeviceIndexer = enableDeviceIndexer;
+ public void setEnableFileTimeIndexer(boolean enableFileTimeIndexer) {
+ this.enableFileTimeIndexer = enableFileTimeIndexer;
}
- public int getDeviceIndexerType() {
- return deviceIndexerType;
+ public int getFileTimeIndexerType() {
+ return fileTimeIndexerType;
}
- public void setDeviceIndexerType(int deviceIndexerType) {
- this.deviceIndexerType = deviceIndexerType;
+ public void setFileTimeIndexerType(int fileTimeIndexerType) {
+ this.fileTimeIndexerType = fileTimeIndexerType;
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 8b559db..33d8e8a 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -517,13 +517,14 @@ public class IoTDBDescriptor {
conf.setDebugState(Boolean.parseBoolean(properties
.getProperty("debug_state", String.valueOf(conf.isDebugOn()))));
- conf.setEnableDeviceIndexer((Boolean.parseBoolean(
+
+ conf.setEnableFileTimeIndexer((Boolean.parseBoolean(
properties.getProperty(
- "enable_device_indexer", String.valueOf(conf.isEnableDeviceIndexer())))));
+ "enable_file_time_indexer", String.valueOf(conf.isEnableFileTimeIndexer())))));
- conf.setDeviceIndexerType((Integer.parseInt(
+ conf.setFileTimeIndexerType((Integer.parseInt(
properties.getProperty(
- "device_indexer_type", String.valueOf(conf.getDeviceIndexerType())))));
+ "file_time_indexer_type", String.valueOf(conf.getFileTimeIndexerType())))));
// mqtt
if (properties.getProperty(IoTDBConstant.MQTT_HOST_NAME) != null) {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
index d785627..b17f413 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
@@ -78,7 +78,7 @@ import org.apache.iotdb.db.query.control.QueryFileManager;
import org.apache.iotdb.db.service.IService;
import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.service.ServiceType;
-import org.apache.iotdb.db.timeIndex.IndexerManager;
+import org.apache.iotdb.db.timeIndex.FileIndexerManager;
import org.apache.iotdb.db.utils.FilePathUtils;
import org.apache.iotdb.db.utils.TestOnly;
import org.apache.iotdb.db.utils.UpgradeUtils;
@@ -628,9 +628,9 @@ public class StorageEngine implements IService {
logger.info("Start deleting all storage groups' timeseries");
syncCloseAllProcessor();
for (PartialPath storageGroup : IoTDB.metaManager.getAllStorageGroupPaths()) {
- if (IoTDBDescriptor.getInstance().getConfig().isEnableDeviceIndexer()) {
- IndexerManager.getInstance().deleteSeqIndexer(storageGroup);
- IndexerManager.getInstance().deleteUnseqIndexer(storageGroup);
+ if (IoTDBDescriptor.getInstance().getConfig().isEnableFileTimeIndexer()) {
+ FileIndexerManager.getInstance().deleteSeqIndexer(storageGroup);
+ FileIndexerManager.getInstance().deleteUnseqIndexer(storageGroup);
}
this.deleteAllDataFilesInOneStorageGroup(storageGroup);
}
@@ -645,9 +645,9 @@ public class StorageEngine implements IService {
public void deleteStorageGroup(PartialPath storageGroupPath) {
deleteAllDataFilesInOneStorageGroup(storageGroupPath);
StorageGroupProcessor processor = processorMap.remove(storageGroupPath);
- if (IoTDBDescriptor.getInstance().getConfig().isEnableDeviceIndexer()) {
- IndexerManager.getInstance().deleteSeqIndexer(storageGroupPath);
- IndexerManager.getInstance().deleteUnseqIndexer(storageGroupPath);
+ if (IoTDBDescriptor.getInstance().getConfig().isEnableFileTimeIndexer()) {
+ FileIndexerManager.getInstance().deleteSeqIndexer(storageGroupPath);
+ FileIndexerManager.getInstance().deleteUnseqIndexer(storageGroupPath);
}
if (processor != null) {
processor.deleteFolder(systemDir);
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeFileTask.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeFileTask.java
index ac645d6..a806271 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeFileTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeFileTask.java
@@ -41,8 +41,8 @@ import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.exception.metadata.IllegalPathException;
import org.apache.iotdb.db.metadata.PartialPath;
import org.apache.iotdb.db.query.control.FileReaderManager;
-import org.apache.iotdb.db.timeIndex.IndexerManager;
-import org.apache.iotdb.db.timeIndex.TimeIndexer;
+import org.apache.iotdb.db.timeIndex.FileIndexerManager;
+import org.apache.iotdb.db.timeIndex.FileTimeIndexer;
import org.apache.iotdb.tsfile.exception.write.TsFileNotCompleteException;
import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata;
import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer;
@@ -202,11 +202,11 @@ class MergeFileTask {
fsFactory.moveFile(fileWriter.getFile(), newMergeFile);
seqFile.setFile(newMergeFile);
- if (IoTDBDescriptor.getInstance().getConfig().isEnableDeviceIndexer()) {
+ if (IoTDBDescriptor.getInstance().getConfig().isEnableFileTimeIndexer()) {
// add new device index
// may Indexer need delete old index background
- TimeIndexer timeIndexer = IndexerManager.getInstance().getSeqIndexer(seqFile.getStorageGroupName());
- timeIndexer.addIndexForPaths(seqFile.getDeviceToIndexMap(), seqFile.getStartTimes(), seqFile.getEndTimes(), seqFile.getTsFilePath());
+ FileTimeIndexer fileTimeIndexer = FileIndexerManager.getInstance().getSeqIndexer(seqFile.getStorageGroupName());
+ fileTimeIndexer.addIndexForPaths(seqFile.getDeviceToIndexMap(), seqFile.getStartTimes(), seqFile.getEndTimes(), seqFile.getTsFilePath());
}
} catch (Exception e) {
logger.error(e.getMessage(), e);
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index 11dcf16..2e03646 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -82,8 +82,8 @@ import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.db.query.control.QueryFileManager;
import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.service.UpgradeSevice;
-import org.apache.iotdb.db.timeIndex.IndexerManager;
-import org.apache.iotdb.db.timeIndex.TimeIndexer;
+import org.apache.iotdb.db.timeIndex.FileIndexerManager;
+import org.apache.iotdb.db.timeIndex.FileTimeIndexer;
import org.apache.iotdb.db.utils.CopyOnReadLinkedList;
import org.apache.iotdb.db.writelog.recover.TsFileRecoverPerformer;
import org.apache.iotdb.rpc.RpcUtils;
@@ -270,8 +270,8 @@ public class StorageGroupProcessor {
* unseqDeviceTimeIndexer manage the device Index of unseq tsfiles
*
*/
- private TimeIndexer seqTimeIndexer;
- private TimeIndexer unseqTimeIndexer;
+ private FileTimeIndexer seqFileTimeIndexer;
+ private FileTimeIndexer unseqFileTimeIndexer;
public StorageGroupProcessor(String systemDir, String storageGroupName,
TsFileFlushPolicy fileFlushPolicy) throws StorageGroupProcessorException {
@@ -385,14 +385,14 @@ public class StorageGroupProcessor {
globalLatestFlushedTimeForEachDevice.putAll(endTimeMap);
}
- if (IoTDBDescriptor.getInstance().getConfig().isEnableDeviceIndexer()) {
+ if (IoTDBDescriptor.getInstance().getConfig().isEnableFileTimeIndexer()) {
// init TimeIndexer
try {
- seqTimeIndexer = IndexerManager.getInstance().getSeqIndexer(storageGroupName);
- unseqTimeIndexer = IndexerManager.getInstance().getUnseqIndexer(storageGroupName);
- if (seqTimeIndexer != null) {
- seqTimeIndexer.init();
- unseqTimeIndexer.init();
+ seqFileTimeIndexer = FileIndexerManager.getInstance().getSeqIndexer(storageGroupName);
+ unseqFileTimeIndexer = FileIndexerManager.getInstance().getUnseqIndexer(storageGroupName);
+ if (seqFileTimeIndexer != null) {
+ seqFileTimeIndexer.init();
+ unseqFileTimeIndexer.init();
}
} catch (IllegalPathException e) {
throw new StorageGroupProcessorException(e);
@@ -1303,15 +1303,15 @@ public class StorageGroupProcessor {
}
tsFileManagement.remove(resource, isSeq);
if (isSeq) {
- if (IoTDBDescriptor.getInstance().getConfig().isEnableDeviceIndexer()) {
- TimeIndexer timeIndexer = IndexerManager.getInstance().getSeqIndexer(resource.getStorageGroupName());
- timeIndexer.deleteIndexForPaths(resource.getDeviceToIndexMap(), resource.getStartTimes(),
+ if (IoTDBDescriptor.getInstance().getConfig().isEnableFileTimeIndexer()) {
+ FileTimeIndexer fileTimeIndexer = FileIndexerManager.getInstance().getSeqIndexer(resource.getStorageGroupName());
+ fileTimeIndexer.deleteIndexForPaths(resource.getDeviceToIndexMap(), resource.getStartTimes(),
resource.getEndTimes(), resource.getTsFilePath());
}
} else {
- if (IoTDBDescriptor.getInstance().getConfig().isEnableDeviceIndexer()) {
- TimeIndexer timeIndexer = IndexerManager.getInstance().getUnseqIndexer(resource.getStorageGroupName());
- timeIndexer.deleteIndexForPaths(resource.getDeviceToIndexMap(), resource.getStartTimes(),
+ if (IoTDBDescriptor.getInstance().getConfig().isEnableFileTimeIndexer()) {
+ FileTimeIndexer fileTimeIndexer = FileIndexerManager.getInstance().getUnseqIndexer(resource.getStorageGroupName());
+ fileTimeIndexer.deleteIndexForPaths(resource.getDeviceToIndexMap(), resource.getStartTimes(),
resource.getEndTimes(), resource.getTsFilePath());
}
}
@@ -1403,9 +1403,9 @@ public class StorageGroupProcessor {
List<TsFileResource> seqResources;
List<TsFileResource> unseqResources;
try {
- if (IoTDBDescriptor.getInstance().getConfig().isEnableDeviceIndexer()) {
- seqResources = seqTimeIndexer.filterByPath(deviceId, timeFilter);
- unseqResources = unseqTimeIndexer.filterByPath(deviceId, timeFilter);
+ if (IoTDBDescriptor.getInstance().getConfig().isEnableFileTimeIndexer()) {
+ seqResources = seqFileTimeIndexer.filterByPath(deviceId, timeFilter);
+ unseqResources = unseqFileTimeIndexer.filterByPath(deviceId, timeFilter);
List<TsFileResource> unsealedSeqFiles = getUnSealedListResourceForQuery(
tsFileManagement.getTsFileList(true),
deviceId, measurementId, context, timeFilter, true);
@@ -1895,14 +1895,14 @@ public class StorageGroupProcessor {
newFilePartitionId)) {
updateLatestTimeMap(newTsFileResource);
}
- if (IoTDBDescriptor.getInstance().getConfig().isEnableDeviceIndexer()) {
- TimeIndexer timeIndexer = null;
+ if (IoTDBDescriptor.getInstance().getConfig().isEnableFileTimeIndexer()) {
+ FileTimeIndexer fileTimeIndexer = null;
if (newTsFileResource.isSeq()) {
- timeIndexer = IndexerManager.getInstance().getSeqIndexer(newTsFileResource.getStorageGroupName());
+ fileTimeIndexer = FileIndexerManager.getInstance().getSeqIndexer(newTsFileResource.getStorageGroupName());
} else {
- timeIndexer = IndexerManager.getInstance().getUnseqIndexer(newTsFileResource.getStorageGroupName());
+ fileTimeIndexer = FileIndexerManager.getInstance().getUnseqIndexer(newTsFileResource.getStorageGroupName());
}
- timeIndexer.addIndexForPaths(newTsFileResource.getDeviceToIndexMap(), newTsFileResource.getStartTimes(),
+ fileTimeIndexer.addIndexForPaths(newTsFileResource.getDeviceToIndexMap(), newTsFileResource.getStartTimes(),
newTsFileResource.getEndTimes(), newTsFileResource.getTsFilePath());
}
} catch (DiskSpaceInsufficientException | IllegalPathException e) {
@@ -1965,15 +1965,15 @@ public class StorageGroupProcessor {
newFilePartitionId);
}
- if (IoTDBDescriptor.getInstance().getConfig().isEnableDeviceIndexer()) {
+ if (IoTDBDescriptor.getInstance().getConfig().isEnableFileTimeIndexer()) {
try {
- TimeIndexer timeIndexer = null;
+ FileTimeIndexer fileTimeIndexer = null;
if (newTsFileResource.isSeq()) {
- timeIndexer = IndexerManager.getInstance().getSeqIndexer(newTsFileResource.getStorageGroupName());
+ fileTimeIndexer = FileIndexerManager.getInstance().getSeqIndexer(newTsFileResource.getStorageGroupName());
} else {
- timeIndexer = IndexerManager.getInstance().getUnseqIndexer(newTsFileResource.getStorageGroupName());
+ fileTimeIndexer = FileIndexerManager.getInstance().getUnseqIndexer(newTsFileResource.getStorageGroupName());
}
- timeIndexer.addIndexForPaths(newTsFileResource.getDeviceToIndexMap(), newTsFileResource.getStartTimes(),
+ fileTimeIndexer.addIndexForPaths(newTsFileResource.getDeviceToIndexMap(), newTsFileResource.getStartTimes(),
newTsFileResource.getEndTimes(), newTsFileResource.getTsFilePath());
} catch (IllegalPathException e) {
logger.error("Fail to get DeviceTimeIndexer for storage group {}, err:{}", newTsFileResource.getStorageGroupName(), e.getMessage());
@@ -2382,16 +2382,16 @@ public class StorageGroupProcessor {
tsFileResourceToBeDeleted.writeLock();
try {
tsFileResourceToBeDeleted.remove();
- if (IoTDBDescriptor.getInstance().getConfig().isEnableDeviceIndexer()) {
+ if (IoTDBDescriptor.getInstance().getConfig().isEnableFileTimeIndexer()) {
try {
- TimeIndexer timeIndexer = null;
+ FileTimeIndexer fileTimeIndexer = null;
if (tsFileResourceToBeDeleted.isSeq()) {
- timeIndexer = IndexerManager.getInstance().getSeqIndexer(tsFileResourceToBeDeleted.getStorageGroupName());
+ fileTimeIndexer = FileIndexerManager.getInstance().getSeqIndexer(tsFileResourceToBeDeleted.getStorageGroupName());
} else {
- timeIndexer = IndexerManager.getInstance().getUnseqIndexer(tsFileResourceToBeDeleted.getStorageGroupName());
+ fileTimeIndexer = FileIndexerManager.getInstance().getUnseqIndexer(tsFileResourceToBeDeleted.getStorageGroupName());
}
- if (timeIndexer != null) {
- timeIndexer.deleteIndexForPaths(tsFileResourceToBeDeleted.getDeviceToIndexMap(),
+ if (fileTimeIndexer != null) {
+ fileTimeIndexer.deleteIndexForPaths(tsFileResourceToBeDeleted.getDeviceToIndexMap(),
tsFileResourceToBeDeleted.getStartTimes(), tsFileResourceToBeDeleted.getEndTimes(),
tsFileResourceToBeDeleted.getTsFilePath());
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
index d44c281..cf18c83 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
@@ -50,11 +50,8 @@ import org.apache.iotdb.db.engine.storagegroup.StorageGroupProcessor.UpdateEndTi
import org.apache.iotdb.db.engine.version.VersionController;
import org.apache.iotdb.db.exception.TsFileProcessorException;
import org.apache.iotdb.db.exception.WriteProcessException;
-<<<<<<< HEAD
import org.apache.iotdb.db.exception.metadata.MetadataException;
-=======
import org.apache.iotdb.db.exception.metadata.IllegalPathException;
->>>>>>> fix conflict
import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.metadata.PartialPath;
import org.apache.iotdb.db.qp.physical.crud.InsertRowPlan;
@@ -63,8 +60,8 @@ import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.db.rescon.PrimitiveArrayManager;
import org.apache.iotdb.db.rescon.SystemInfo;
import org.apache.iotdb.db.utils.MemUtils;
-import org.apache.iotdb.db.timeIndex.IndexerManager;
-import org.apache.iotdb.db.timeIndex.TimeIndexer;
+import org.apache.iotdb.db.timeIndex.FileIndexerManager;
+import org.apache.iotdb.db.timeIndex.FileTimeIndexer;
import org.apache.iotdb.db.utils.QueryUtils;
import org.apache.iotdb.db.utils.datastructure.TVList;
import org.apache.iotdb.db.writelog.WALFlushListener;
@@ -818,16 +815,16 @@ public class TsFileProcessor {
private void endFile() throws IOException, TsFileProcessorException {
long closeStartTime = System.currentTimeMillis();
- if (IoTDBDescriptor.getInstance().getConfig().isEnableDeviceIndexer()) {
+ if (IoTDBDescriptor.getInstance().getConfig().isEnableFileTimeIndexer()) {
// update device index
try {
- TimeIndexer timeIndexer = null;
+ FileTimeIndexer fileTimeIndexer = null;
if (sequence) {
- timeIndexer = IndexerManager.getInstance().getSeqIndexer(storageGroupName);
+ fileTimeIndexer = FileIndexerManager.getInstance().getSeqIndexer(storageGroupName);
} else {
- timeIndexer = IndexerManager.getInstance().getUnseqIndexer(storageGroupName);
+ fileTimeIndexer = FileIndexerManager.getInstance().getUnseqIndexer(storageGroupName);
}
- timeIndexer.addIndexForPaths(tsFileResource.deviceToIndex, tsFileResource.startTimes,
+ fileTimeIndexer.addIndexForPaths(tsFileResource.deviceToIndex, tsFileResource.startTimes,
tsFileResource.endTimes, tsFileResource.getTsFilePath());
} catch (IllegalPathException e) {
logger.error("Failed to endFile {} for storage group {}, err:{}", tsFileResource.getTsFile(),
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
index ccf31b0..ea828c2 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
@@ -127,7 +127,6 @@ import org.apache.iotdb.db.query.dataset.SingleDataSet;
import org.apache.iotdb.db.query.executor.IQueryRouter;
import org.apache.iotdb.db.query.executor.QueryRouter;
import org.apache.iotdb.db.service.IoTDB;
-import org.apache.iotdb.db.timeIndex.IndexerManager;
import org.apache.iotdb.db.utils.AuthUtils;
import org.apache.iotdb.db.utils.FileLoaderUtils;
import org.apache.iotdb.db.utils.UpgradeUtils;
@@ -140,7 +139,6 @@ import org.apache.iotdb.tsfile.read.TsFileSequenceReader;
import org.apache.iotdb.tsfile.read.common.Field;
import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.read.common.RowRecord;
-import org.apache.iotdb.tsfile.read.filter.operator.In;
import org.apache.iotdb.tsfile.read.query.dataset.EmptyDataSet;
import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet;
import org.apache.iotdb.tsfile.utils.Binary;
diff --git a/server/src/main/java/org/apache/iotdb/db/timeIndex/IndexerManager.java b/server/src/main/java/org/apache/iotdb/db/timeIndex/FileIndexerManager.java
similarity index 78%
rename from server/src/main/java/org/apache/iotdb/db/timeIndex/IndexerManager.java
rename to server/src/main/java/org/apache/iotdb/db/timeIndex/FileIndexerManager.java
index eb09ab8..2c9f602 100644
--- a/server/src/main/java/org/apache/iotdb/db/timeIndex/IndexerManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/timeIndex/FileIndexerManager.java
@@ -29,12 +29,12 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-public class IndexerManager {
+public class FileIndexerManager {
private String indexerFilePath;
- private Map<PartialPath, TimeIndexer> seqIndexers;
- private Map<PartialPath, TimeIndexer> unseqIndexers;
+ private Map<PartialPath, FileTimeIndexer> seqIndexers;
+ private Map<PartialPath, FileTimeIndexer> unseqIndexers;
private ReentrantReadWriteLock lock;
- private static final Logger logger = LoggerFactory.getLogger(IndexerManager.class);
+ private static final Logger logger = LoggerFactory.getLogger(FileIndexerManager.class);
private static class IndexerManagerHolder {
@@ -42,14 +42,14 @@ public class IndexerManager {
// allowed to do nothing
}
- private static final IndexerManager INSTANCE = new IndexerManager();
+ private static final FileIndexerManager INSTANCE = new FileIndexerManager();
}
- public static IndexerManager getInstance() {
+ public static FileIndexerManager getInstance() {
return IndexerManagerHolder.INSTANCE;
}
- private IndexerManager() {
+ private FileIndexerManager() {
indexerFilePath = IoTDBDescriptor.getInstance().getConfig().getSchemaDir()
+ File.pathSeparator + IndexConstants.INDEXER_FILE;
seqIndexers = new ConcurrentHashMap<>();
@@ -68,19 +68,19 @@ public class IndexerManager {
return true;
}
- public void addSeqIndexer(PartialPath storageGroup, TimeIndexer TimeIndexer) {
+ public void addSeqIndexer(PartialPath storageGroup, FileTimeIndexer fileTimeIndexer) {
lock.writeLock().lock();
try {
- seqIndexers.put(storageGroup, TimeIndexer);
+ seqIndexers.put(storageGroup, fileTimeIndexer);
} finally {
lock.writeLock().unlock();
}
}
- public void addUnseqIndexer(PartialPath storageGroup, TimeIndexer TimeIndexer) {
+ public void addUnseqIndexer(PartialPath storageGroup, FileTimeIndexer fileTimeIndexer) {
lock.writeLock().lock();
try {
- unseqIndexers.put(storageGroup, TimeIndexer);
+ unseqIndexers.put(storageGroup, fileTimeIndexer);
} finally {
lock.writeLock().unlock();
}
@@ -104,7 +104,7 @@ public class IndexerManager {
}
}
- public TimeIndexer getSeqIndexer(PartialPath storageGroup) {
+ public FileTimeIndexer getSeqIndexer(PartialPath storageGroup) {
lock.readLock().lock();
try {
return seqIndexers.get(storageGroup);
@@ -113,7 +113,7 @@ public class IndexerManager {
}
}
- public TimeIndexer getSeqIndexer(String storageGroup) throws IllegalPathException {
+ public FileTimeIndexer getSeqIndexer(String storageGroup) throws IllegalPathException {
PartialPath sgName;
try {
sgName = new PartialPath(storageGroup);
@@ -129,7 +129,7 @@ public class IndexerManager {
}
}
- public TimeIndexer getUnseqIndexer(PartialPath storageGroup) {
+ public FileTimeIndexer getUnseqIndexer(PartialPath storageGroup) {
lock.readLock().lock();
try {
return unseqIndexers.get(storageGroup);
@@ -138,7 +138,7 @@ public class IndexerManager {
}
}
- public TimeIndexer getUnseqIndexer(String storageGroup) throws IllegalPathException {
+ public FileTimeIndexer getUnseqIndexer(String storageGroup) throws IllegalPathException {
PartialPath sgName;
try {
sgName = new PartialPath(storageGroup);
diff --git a/server/src/main/java/org/apache/iotdb/db/timeIndex/TimeIndexer.java b/server/src/main/java/org/apache/iotdb/db/timeIndex/FileTimeIndexer.java
similarity index 98%
rename from server/src/main/java/org/apache/iotdb/db/timeIndex/TimeIndexer.java
rename to server/src/main/java/org/apache/iotdb/db/timeIndex/FileTimeIndexer.java
index 36e9297..64c6dab 100644
--- a/server/src/main/java/org/apache/iotdb/db/timeIndex/TimeIndexer.java
+++ b/server/src/main/java/org/apache/iotdb/db/timeIndex/FileTimeIndexer.java
@@ -25,7 +25,7 @@ import org.apache.iotdb.tsfile.read.filter.basic.Filter;
import java.util.List;
import java.util.Map;
-public interface TimeIndexer {
+public interface FileTimeIndexer {
/**
* init the Indexer when IoTDB start
* @return whether success
diff --git a/server/src/main/java/org/apache/iotdb/db/timeIndex/TimeIndex.java b/server/src/main/java/org/apache/iotdb/db/timeIndex/TimeIndex.java
index 261033d..5cf3705 100644
--- a/server/src/main/java/org/apache/iotdb/db/timeIndex/TimeIndex.java
+++ b/server/src/main/java/org/apache/iotdb/db/timeIndex/TimeIndex.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.timeIndex;
import org.apache.iotdb.db.metadata.PartialPath;
/**
- * Time Index, like deviceIndexer: [(deviceId, startTime, endTime, TsFilePath)] to accelerate query
+ * Time Index, like deviceIndex: [(deviceId, startTime, endTime, TsFilePath)] to accelerate query
*/
public class TimeIndex {
private PartialPath[] paths;
diff --git a/server/src/main/java/org/apache/iotdb/db/timeIndex/device/LoadAllTimeIndexer.java b/server/src/main/java/org/apache/iotdb/db/timeIndex/device/LoadAllDeviceTimeIndexer.java
similarity index 93%
rename from server/src/main/java/org/apache/iotdb/db/timeIndex/device/LoadAllTimeIndexer.java
rename to server/src/main/java/org/apache/iotdb/db/timeIndex/device/LoadAllDeviceTimeIndexer.java
index 7cd51f7..3d02b9c 100644
--- a/server/src/main/java/org/apache/iotdb/db/timeIndex/device/LoadAllTimeIndexer.java
+++ b/server/src/main/java/org/apache/iotdb/db/timeIndex/device/LoadAllDeviceTimeIndexer.java
@@ -20,16 +20,16 @@ package org.apache.iotdb.db.timeIndex.device;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.metadata.PartialPath;
-import org.apache.iotdb.db.timeIndex.TimeIndexer;
+import org.apache.iotdb.db.timeIndex.FileTimeIndexer;
import org.apache.iotdb.db.timeIndex.UpdateIndexsParam;
import org.apache.iotdb.tsfile.read.filter.basic.Filter;
import java.util.List;
import java.util.Map;
-public class LoadAllTimeIndexer implements TimeIndexer {
+public class LoadAllDeviceTimeIndexer implements FileTimeIndexer {
- public LoadAllTimeIndexer() {
+ public LoadAllDeviceTimeIndexer() {
}
diff --git a/server/src/main/java/org/apache/iotdb/db/timeIndex/device/RocksDBDeviceTimeIndexer.java b/server/src/main/java/org/apache/iotdb/db/timeIndex/device/RocksDBDeviceTimeIndexer.java
index 9635232..686531f 100644
--- a/server/src/main/java/org/apache/iotdb/db/timeIndex/device/RocksDBDeviceTimeIndexer.java
+++ b/server/src/main/java/org/apache/iotdb/db/timeIndex/device/RocksDBDeviceTimeIndexer.java
@@ -20,14 +20,14 @@ package org.apache.iotdb.db.timeIndex.device;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.metadata.PartialPath;
-import org.apache.iotdb.db.timeIndex.TimeIndexer;
+import org.apache.iotdb.db.timeIndex.FileTimeIndexer;
import org.apache.iotdb.db.timeIndex.UpdateIndexsParam;
import org.apache.iotdb.tsfile.read.filter.basic.Filter;
import java.util.List;
import java.util.Map;
-public class RocksDBDeviceTimeIndexer implements TimeIndexer {
+public class RocksDBDeviceTimeIndexer implements FileTimeIndexer {
@Override
public boolean init() {
return false;