This is an automated email from the ASF dual-hosted git repository. xuekaifeng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push: new 2cbee31 change the way to get MManager (#1431) 2cbee31 is described below commit 2cbee31e19f563d5c688d119056da9e9ff582d40 Author: chaow <xunmengzhu...@gmail.com> AuthorDate: Wed Jul 1 09:22:21 2020 +0800 change the way to get MManager (#1431) Co-authored-by: mychaow <941210...@qq.com> --- docs/SystemDesign/DataQuery/LastQuery.md | 2 +- docs/zh/SystemDesign/DataQuery/LastQuery.md | 2 +- .../db/conf/adapter/IoTDBConfigDynamicAdapter.java | 10 ++--- .../db/conf/adapter/ManageDynamicParameters.java | 4 +- .../org/apache/iotdb/db/engine/StorageEngine.java | 34 ++++++--------- .../iotdb/db/engine/merge/recover/LogAnalyzer.java | 22 +++++----- .../iotdb/db/engine/merge/task/MergeTask.java | 22 ++++------ .../engine/storagegroup/StorageGroupProcessor.java | 49 +++++++-------------- .../db/engine/storagegroup/TsFileResource.java | 35 ++++++--------- .../org/apache/iotdb/db/metadata/MManager.java | 4 ++ .../org/apache/iotdb/db/monitor/StatMonitor.java | 22 +++++----- .../apache/iotdb/db/qp/executor/PlanExecutor.java | 29 +++++++------ .../iotdb/db/qp/strategy/PhysicalGenerator.java | 6 ++- .../qp/strategy/optimizer/ConcatPathOptimizer.java | 21 ++++----- .../db/query/dataset/AlignByDeviceDataSet.java | 10 ++--- .../iotdb/db/query/executor/LastQueryExecutor.java | 12 +++--- .../query/timegenerator/ServerTimeGenerator.java | 7 +-- .../java/org/apache/iotdb/db/service/IoTDB.java | 8 ++-- .../org/apache/iotdb/db/service/TSServiceImpl.java | 5 +-- .../db/sync/receiver/transfer/SyncServiceImpl.java | 23 +++++----- .../db/sync/sender/manage/SyncFileManager.java | 27 +++++------- .../db/tools/memestimation/MemEstToolCmd.java | 6 +-- .../org/apache/iotdb/db/utils/SchemaUtils.java | 21 ++++----- .../iotdb/db/writelog/recover/LogReplayer.java | 13 +++--- .../writelog/recover/TsFileRecoverPerformer.java | 19 ++++---- .../adapter/IoTDBConfigDynamicAdapterTest.java | 20 ++++----- .../iotdb/db/engine/MetadataManagerHelper.java | 3 +- .../iotdb/db/engine/merge/MergePerfTest.java | 11 ++--- .../apache/iotdb/db/engine/merge/MergeTest.java | 27 ++++++------ .../engine/modification/DeletionFileNodeTest.java | 22 +++++----- .../db/engine/modification/DeletionQueryTest.java | 21 ++++----- .../storagegroup/FileNodeManagerBenchmark.java | 14 +++--- .../iotdb/db/engine/storagegroup/TTLTest.java | 35 +++++++-------- .../apache/iotdb/db/integration/IoTDBLastIT.java | 14 +++--- .../iotdb/db/metadata/MManagerAdvancedTest.java | 18 ++++---- .../iotdb/db/metadata/MManagerBasicTest.java | 29 ++++++------- .../iotdb/db/metadata/MManagerImproveTest.java | 22 +++++----- .../java/org/apache/iotdb/db/qp/PlannerTest.java | 5 ++- .../iotdb/db/qp/plan/ConcatOptimizerTest.java | 27 ++++++------ .../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 11 +++-- .../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 50 +++++++--------------- .../dataset/EngineDataSetWithValueFilterTest.java | 11 ++--- .../db/query/dataset/GroupByLevelDataSetTest.java | 5 +-- .../db/query/dataset/GroupByTimeDataSetTest.java | 4 +- .../iotdb/db/query/reader/ReaderTestHelper.java | 7 +-- .../query/reader/series/SeriesReaderTestUtil.java | 28 ++++++------ .../db/sync/receiver/load/FileLoaderTest.java | 3 +- .../recover/SyncReceiverLogAnalyzerTest.java | 3 +- .../db/sync/sender/manage/SyncFileManagerTest.java | 27 ++++++------ .../sender/recover/SyncSenderLogAnalyzerTest.java | 25 +++++------ .../apache/iotdb/db/utils/EnvironmentUtils.java | 22 +++++----- .../apache/iotdb/db/writelog/PerformanceTest.java | 19 ++++---- .../db/writelog/recover/DeviceStringTest.java | 15 ++++--- .../iotdb/db/writelog/recover/LogReplayerTest.java | 19 ++++---- .../recover/RecoverResourceFromReaderTest.java | 10 ++--- .../db/writelog/recover/SeqTsFileRecoverTest.java | 23 ++++------ .../writelog/recover/UnseqTsFileRecoverTest.java | 21 ++++----- .../apache/iotdb/spark/db/EnvironmentUtils.java | 23 +++++----- 58 files changed, 471 insertions(+), 536 deletions(-) diff --git a/docs/SystemDesign/DataQuery/LastQuery.md b/docs/SystemDesign/DataQuery/LastQuery.md index 39cf379..1a254bd 100644 --- a/docs/SystemDesign/DataQuery/LastQuery.md +++ b/docs/SystemDesign/DataQuery/LastQuery.md @@ -35,7 +35,7 @@ We add a Last data cache to the MNode structure corresponding to the time series ``` try { - node = MManager.getInstance().getDeviceNodeWithAutoCreateStorageGroup(seriesPath.toString()); + node = IoTDB.metaManager.getDeviceNodeWithAutoCreateStorageGroup(seriesPath.toString()); } catch (MetadataException e) { throw new QueryProcessException(e); } diff --git a/docs/zh/SystemDesign/DataQuery/LastQuery.md b/docs/zh/SystemDesign/DataQuery/LastQuery.md index dfc252e..7ac1027 100644 --- a/docs/zh/SystemDesign/DataQuery/LastQuery.md +++ b/docs/zh/SystemDesign/DataQuery/LastQuery.md @@ -32,7 +32,7 @@ Last查询对每个指定的时间序列执行`calculateLastPairForOneSeries`方 我们在需要查询的时间序列所对应的MNode结构中添加Last数据缓存。`calculateLastPairForOneSeries`方法对于某个时间序列的Last查询,首先尝试读取MNode中的缓存数据。 ``` try { - node = MManager.getInstance().getDeviceNodeWithAutoCreateStorageGroup(seriesPath.toString()); + node = IoTDB.metaManager.getDeviceNodeWithAutoCreateStorageGroup(seriesPath.toString()); } catch (MetadataException e) { throw new QueryProcessException(e); } diff --git a/server/src/main/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java b/server/src/main/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java index 2e91b04..d66f054 100644 --- a/server/src/main/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java @@ -21,8 +21,8 @@ package org.apache.iotdb.db.conf.adapter; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.ConfigAdjusterException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.rescon.PrimitiveArrayPool; +import org.apache.iotdb.db.service.IoTDB; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -171,7 +171,7 @@ public class IoTDBConfigDynamicAdapter implements IDynamicAdapter { "After adjusting, max memTable num is {}, tsFile threshold is {}, memtableSize is {}, memTableSizeFloorThreshold is {}, storage group = {}, total timeseries = {}, the max number of timeseries among storage groups = {}", maxMemTableNum, tsFileSizeThreshold, memtableSizeInByte, memTableSizeFloorThreshold, totalStorageGroup, totalTimeseries, - MManager.getInstance().getMaximalSeriesNumberAmongStorageGroups()); + IoTDB.metaManager.getMaximalSeriesNumberAmongStorageGroups()); } currentMemTableSize = memtableSizeInByte; } @@ -196,7 +196,7 @@ public class IoTDBConfigDynamicAdapter implements IDynamicAdapter { b /= magnification; double c = (double) CONFIG.getTsFileSizeThreshold() * maxMemTableNum * CHUNK_METADATA_SIZE_IN_BYTE - * MManager.getInstance().getMaximalSeriesNumberAmongStorageGroups() * ratio + * IoTDB.metaManager.getMaximalSeriesNumberAmongStorageGroups() * ratio / magnification / magnification; double tempValue = b * b - 4 * a * c; double memTableSize = ((b + Math.sqrt(tempValue)) / (2 * a)); @@ -213,7 +213,7 @@ public class IoTDBConfigDynamicAdapter implements IDynamicAdapter { private long calcTsFileSizeThreshold(long memTableSize, double ratio) { return (long) ((allocateMemoryForWrite * (1 - WAL_MEMORY_RATIO) - maxMemTableNum * memTableSize - staticMemory) * memTableSize / (ratio * maxMemTableNum * CHUNK_METADATA_SIZE_IN_BYTE - * MManager.getInstance().getMaximalSeriesNumberAmongStorageGroups())); + * IoTDB.metaManager.getMaximalSeriesNumberAmongStorageGroups())); } /** @@ -222,7 +222,7 @@ public class IoTDBConfigDynamicAdapter implements IDynamicAdapter { * takes 8 bytes. */ private long getMemTableSizeFloorThreshold() { - return MManager.getInstance().getMaximalSeriesNumberAmongStorageGroups() + return IoTDB.metaManager.getMaximalSeriesNumberAmongStorageGroups() * PrimitiveArrayPool.ARRAY_SIZE * Long.BYTES * 2; } diff --git a/server/src/main/java/org/apache/iotdb/db/conf/adapter/ManageDynamicParameters.java b/server/src/main/java/org/apache/iotdb/db/conf/adapter/ManageDynamicParameters.java index a21399b..395214f 100644 --- a/server/src/main/java/org/apache/iotdb/db/conf/adapter/ManageDynamicParameters.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/adapter/ManageDynamicParameters.java @@ -22,8 +22,8 @@ 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.exception.StartupException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.service.IService; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.service.JMXService; import org.apache.iotdb.db.service.ServiceType; import org.slf4j.Logger; @@ -59,7 +59,7 @@ public class ManageDynamicParameters implements ManageDynamicParametersMBean, IS CONFIG.getTsFileSizeThreshold(), CompressionRatio.getInstance().getRatio(), IoTDBConfigDynamicAdapter.getInstance().getTotalStorageGroup(), IoTDBConfigDynamicAdapter.getInstance().getTotalTimeseries(), - MManager.getInstance().getMaximalSeriesNumberAmongStorageGroups()); + IoTDB.metaManager.getMaximalSeriesNumberAmongStorageGroups()); } @Override 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 3f13ca9..aac4265 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 @@ -18,22 +18,6 @@ */ package org.apache.iotdb.db.engine; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.ConcurrentModificationException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.Callable; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; import org.apache.commons.io.FileUtils; import org.apache.iotdb.db.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.conf.IoTDBConfig; @@ -58,13 +42,13 @@ import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.exception.metadata.StorageGroupNotSetException; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.runtime.StorageEngineFailureException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.metadata.mnode.StorageGroupMNode; import org.apache.iotdb.db.qp.physical.crud.InsertRowPlan; import org.apache.iotdb.db.qp.physical.crud.InsertTabletPlan; import org.apache.iotdb.db.query.context.QueryContext; 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.utils.FilePathUtils; import org.apache.iotdb.db.utils.TestOnly; @@ -74,6 +58,12 @@ import org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; +import java.io.IOException; +import java.util.*; +import java.util.Map.Entry; +import java.util.concurrent.*; + public class StorageEngine implements IService { private final Logger logger; @@ -148,7 +138,7 @@ public class StorageEngine implements IService { /* * recover all storage group processors. */ - List<StorageGroupMNode> sgNodes = MManager.getInstance().getAllStorageGroupNodes(); + List<StorageGroupMNode> sgNodes = IoTDB.metaManager.getAllStorageGroupNodes(); List<Future> futures = new ArrayList<>(); for (StorageGroupMNode storageGroup : sgNodes) { futures.add(recoveryThreadPool.submit((Callable<Void>) () -> { @@ -258,7 +248,7 @@ public class StorageEngine implements IService { public StorageGroupProcessor getProcessor(String path) throws StorageEngineException { String storageGroupName; try { - storageGroupName = MManager.getInstance().getStorageGroupName(path); + storageGroupName = IoTDB.metaManager.getStorageGroupName(path); StorageGroupProcessor processor; processor = processorMap.get(storageGroupName); if (processor == null) { @@ -269,7 +259,7 @@ public class StorageEngine implements IService { logger.info("construct a processor instance, the storage group is {}, Thread is {}", storageGroupName, Thread.currentThread().getId()); processor = new StorageGroupProcessor(systemDir, storageGroupName, fileFlushPolicy); - StorageGroupMNode storageGroup = MManager.getInstance() + StorageGroupMNode storageGroup = IoTDB.metaManager .getStorageGroupNode(storageGroupName); processor.setDataTTL(storageGroup.getDataTTL()); processorMap.put(storageGroupName, processor); @@ -501,7 +491,7 @@ public class StorageEngine implements IService { public synchronized boolean deleteAll() { logger.info("Start deleting all storage groups' timeseries"); syncCloseAllProcessor(); - for (String storageGroup : MManager.getInstance().getAllStorageGroupNames()) { + for (String storageGroup : IoTDB.metaManager.getAllStorageGroupNames()) { this.deleteAllDataFilesInOneStorageGroup(storageGroup); } return true; @@ -533,7 +523,7 @@ public class StorageEngine implements IService { throw new StorageEngineException("Can not get the corresponding storage group."); } String device = deviceMap.keySet().iterator().next(); - String storageGroupName = MManager.getInstance().getStorageGroupName(device); + String storageGroupName = IoTDB.metaManager.getStorageGroupName(device); getProcessor(storageGroupName).loadNewTsFile(newTsFileResource); } diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/recover/LogAnalyzer.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/recover/LogAnalyzer.java index 2e4958d..a62b761 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/merge/recover/LogAnalyzer.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/recover/LogAnalyzer.java @@ -19,25 +19,25 @@ package org.apache.iotdb.db.engine.merge.recover; -import static org.apache.iotdb.db.engine.merge.recover.MergeLogger.*; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.util.*; -import java.util.Map.Entry; - import org.apache.iotdb.db.engine.fileSystem.SystemFileFactory; import org.apache.iotdb.db.engine.merge.manage.MergeResource; import org.apache.iotdb.db.engine.merge.task.MergeTask; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; import org.apache.iotdb.db.exception.metadata.MetadataException; -import org.apache.iotdb.db.metadata.MManager; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.tsfile.read.common.Path; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.util.*; +import java.util.Map.Entry; + +import static org.apache.iotdb.db.engine.merge.recover.MergeLogger.*; + /** * LogAnalyzer scans the "merge.log" file and recovers information such as files of last merge, * the last available positions of each file and how many timeseries and files have been merged. @@ -99,7 +99,7 @@ public class LogAnalyzer { analyzeUnseqFiles(bufferedReader); - List<String> storageGroupPaths = MManager.getInstance().getAllTimeseriesName(storageGroupName + ".*"); + List<String> storageGroupPaths = IoTDB.metaManager.getAllTimeseriesName(storageGroupName + ".*"); unmergedPaths = new ArrayList<>(); for (String path : storageGroupPaths) { unmergedPaths.add(new Path(path)); diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeTask.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeTask.java index a5652f3..8a82250 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeTask.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeTask.java @@ -19,30 +19,26 @@ package org.apache.iotdb.db.engine.merge.task; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.concurrent.Callable; import org.apache.iotdb.db.engine.merge.manage.MergeContext; import org.apache.iotdb.db.engine.merge.manage.MergeResource; import org.apache.iotdb.db.engine.merge.recover.MergeLogger; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; import org.apache.iotdb.db.exception.metadata.MetadataException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.metadata.mnode.MNode; import org.apache.iotdb.db.metadata.mnode.MeasurementMNode; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.MergeUtils; import org.apache.iotdb.tsfile.read.common.Path; import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; +import java.io.IOException; +import java.util.*; +import java.util.Map.Entry; +import java.util.concurrent.Callable; + /** * MergeTask merges given seqFiles and unseqFiles into new ones, which basically consists of three * steps: 1. rewrite overflowed, modified or small-sized chunks into temp merge files @@ -126,11 +122,11 @@ public class MergeTask implements Callable<Void> { mergeLogger.logFiles(resource); - Set<String> devices = MManager.getInstance().getDevices(storageGroupName); + Set<String> devices = IoTDB.metaManager.getDevices(storageGroupName); Map<Path, MeasurementSchema> measurementSchemaMap = new HashMap<>(); List<Path> unmergedSeries = new ArrayList<>(); for (String device : devices) { - MNode deviceNode = MManager.getInstance().getNodeByPath(device); + MNode deviceNode = IoTDB.metaManager.getNodeByPath(device); for (Entry<String, MNode> entry : deviceNode.getChildren().entrySet()) { Path path = new Path(device, entry.getKey()); measurementSchemaMap.put(path, ((MeasurementMNode) entry.getValue()).getSchema()); 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 a1e9e97..f034b94 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 @@ -18,29 +18,6 @@ */ package org.apache.iotdb.db.engine.storagegroup; -import static org.apache.iotdb.db.engine.merge.task.MergeTask.MERGE_SUFFIX; -import static org.apache.iotdb.db.engine.storagegroup.TsFileResource.TEMP_SUFFIX; -import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.TSFILE_SUFFIX; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.TreeMap; -import java.util.TreeSet; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; import org.apache.commons.io.FileUtils; import org.apache.iotdb.db.conf.IoTDBConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -63,13 +40,7 @@ import org.apache.iotdb.db.engine.querycontext.QueryDataSource; import org.apache.iotdb.db.engine.querycontext.ReadOnlyMemChunk; import org.apache.iotdb.db.engine.version.SimpleFileVersionController; import org.apache.iotdb.db.engine.version.VersionController; -import org.apache.iotdb.db.exception.BatchInsertionException; -import org.apache.iotdb.db.exception.DiskSpaceInsufficientException; -import org.apache.iotdb.db.exception.LoadFileException; -import org.apache.iotdb.db.exception.MergeException; -import org.apache.iotdb.db.exception.StorageGroupProcessorException; -import org.apache.iotdb.db.exception.TsFileProcessorException; -import org.apache.iotdb.db.exception.WriteProcessException; +import org.apache.iotdb.db.exception.*; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.exception.query.OutOfTTLException; import org.apache.iotdb.db.exception.query.QueryProcessException; @@ -81,6 +52,7 @@ import org.apache.iotdb.db.qp.physical.crud.InsertRowPlan; import org.apache.iotdb.db.qp.physical.crud.InsertTabletPlan; 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.utils.CopyOnReadLinkedList; import org.apache.iotdb.db.writelog.recover.TsFileRecoverPerformer; @@ -98,6 +70,17 @@ import org.apache.iotdb.tsfile.write.writer.RestorableTsFileIOWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; +import java.io.IOException; +import java.util.*; +import java.util.Map.Entry; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; + +import static org.apache.iotdb.db.engine.merge.task.MergeTask.MERGE_SUFFIX; +import static org.apache.iotdb.db.engine.storagegroup.TsFileResource.TEMP_SUFFIX; +import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.TSFILE_SUFFIX; + /** * For sequence data, a StorageGroupProcessor has some TsFileProcessors, in which there is only one * TsFileProcessor in the working status. <br/> @@ -777,7 +760,7 @@ public class StorageGroupProcessor { throws WriteProcessException { MNode node = null; try { - MManager manager = MManager.getInstance(); + MManager manager = IoTDB.metaManager; node = manager.getDeviceNodeWithAutoCreateAndReadLock(plan.getDeviceId()); String[] measurementList = plan.getMeasurements(); for (int i = 0; i < measurementList.length; i++) { @@ -832,7 +815,7 @@ public class StorageGroupProcessor { throws WriteProcessException { MNode node = null; try { - MManager manager = MManager.getInstance(); + MManager manager = IoTDB.metaManager; node = manager.getDeviceNodeWithAutoCreateAndReadLock(plan.getDeviceId()); String[] measurementList = plan.getMeasurements(); for (int i = 0; i < measurementList.length; i++) { @@ -1261,7 +1244,7 @@ public class StorageGroupProcessor { String deviceId, String measurementId, QueryContext context, Filter timeFilter, boolean isSeq) throws MetadataException { - MeasurementSchema schema = MManager.getInstance().getSeriesSchema(deviceId, measurementId); + MeasurementSchema schema = IoTDB.metaManager.getSeriesSchema(deviceId, measurementId); List<TsFileResource> tsfileResourcesForQuery = new ArrayList<>(); long timeLowerBound = dataTTL != Long.MAX_VALUE ? System.currentTimeMillis() - dataTTL : Long diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java index 8a55537..fbb5164 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java @@ -18,26 +18,6 @@ */ package org.apache.iotdb.db.engine.storagegroup; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.file.FileAlreadyExistsException; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Random; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; - import org.apache.iotdb.db.conf.IoTDBConstant; import org.apache.iotdb.db.engine.StorageEngine; import org.apache.iotdb.db.engine.modification.ModificationFile; @@ -45,7 +25,7 @@ import org.apache.iotdb.db.engine.querycontext.ReadOnlyMemChunk; import org.apache.iotdb.db.engine.storagegroup.StorageGroupProcessor.UpgradeTsFileResourceCallBack; import org.apache.iotdb.db.engine.upgrade.UpgradeTask; import org.apache.iotdb.db.exception.PartitionViolationException; -import org.apache.iotdb.db.metadata.MManager; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.service.UpgradeSevice; import org.apache.iotdb.db.utils.FilePathUtils; import org.apache.iotdb.db.utils.UpgradeUtils; @@ -59,6 +39,17 @@ import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.file.FileAlreadyExistsException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.*; +import java.util.Map.Entry; +import java.util.concurrent.ConcurrentHashMap; + public class TsFileResource { private static final Logger logger = LoggerFactory.getLogger(TsFileResource.class); @@ -291,7 +282,7 @@ public class TsFileResource { long time = ReadWriteIOUtils.readLong(inputStream); // To reduce the String number in memory, // use the deviceId from MManager instead of the deviceId read from disk - path = MManager.getInstance().getDeviceId(path); + path = IoTDB.metaManager.getDeviceId(path); deviceMap.put(path, i); startTimesArray[i] = time; } diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java index 1dcd3a2..b62773e 100644 --- a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java +++ b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java @@ -179,6 +179,10 @@ public class MManager { MTREE_SNAPSHOT_THREAD_CHECK_TIME, TimeUnit.SECONDS); } + /** + * we should not use this function in other place, but only in IoTDB class + * @return + */ public static MManager getInstance() { return MManagerHolder.INSTANCE; } diff --git a/server/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java b/server/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java index fabc0e8..8138200 100644 --- a/server/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java +++ b/server/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java @@ -19,13 +19,6 @@ package org.apache.iotdb.db.monitor; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicLong; import org.apache.iotdb.db.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.concurrent.ThreadName; import org.apache.iotdb.db.concurrent.WrappedRunnable; @@ -41,6 +34,7 @@ import org.apache.iotdb.db.monitor.MonitorConstants.FileNodeProcessorStatConstan import org.apache.iotdb.db.monitor.collector.FileSize; import org.apache.iotdb.db.qp.physical.crud.InsertRowPlan; 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.tsfile.common.conf.TSFileDescriptor; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; @@ -50,6 +44,14 @@ import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; + public class StatMonitor implements IService { private static final Logger logger = LoggerFactory.getLogger(StatMonitor.class); @@ -75,7 +77,7 @@ public class StatMonitor implements IService { private StatMonitor() { initTemporaryStatList(); - MManager mmanager = MManager.getInstance(); + MManager mmanager = IoTDB.metaManager; statisticMap = new HashMap<>(); IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig(); statMonitorDetectFreqSec = config.getStatMonitorDetectFreqSec(); @@ -138,7 +140,7 @@ public class StatMonitor implements IService { } void registerStatStorageGroup() { - MManager mManager = MManager.getInstance(); + MManager mManager = IoTDB.metaManager; String prefix = MonitorConstants.STAT_STORAGE_GROUP_PREFIX; try { if (!mManager.isPathExist(prefix)) { @@ -155,7 +157,7 @@ public class StatMonitor implements IService { * @param hashMap series path and data type pair, for example: [root.stat.file.size.DATA, INT64] */ public synchronized void registerStatStorageGroup(Map<String, String> hashMap) { - MManager mManager = MManager.getInstance(); + MManager mManager = IoTDB.metaManager; try { for (Map.Entry<String, String> entry : hashMap.entrySet()) { if (entry.getValue() == null) { 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 e15d229..ce32a50 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 @@ -59,6 +59,7 @@ import org.apache.iotdb.db.query.dataset.ShowTimeSeriesResult; 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.utils.AuthUtils; import org.apache.iotdb.db.utils.FileLoaderUtils; import org.apache.iotdb.db.utils.UpgradeUtils; @@ -102,7 +103,7 @@ public class PlanExecutor implements IPlanExecutor { public PlanExecutor() throws QueryProcessException { queryRouter = new QueryRouter(); - mManager = MManager.getInstance(); + mManager = IoTDB.metaManager; try { authorizer = BasicAuthorizer.getInstance(); } catch (AuthException e) { @@ -367,19 +368,19 @@ public class PlanExecutor implements IPlanExecutor { } protected int getPathsNum(String path) throws MetadataException { - return MManager.getInstance().getAllTimeseriesCount(path); + return IoTDB.metaManager.getAllTimeseriesCount(path); } protected int getNodesNumInGivenLevel(String path, int level) throws MetadataException { - return MManager.getInstance().getNodesCountInGivenLevel(path, level); + return IoTDB.metaManager.getNodesCountInGivenLevel(path, level); } protected List<String> getPathsName(String path) throws MetadataException { - return MManager.getInstance().getAllTimeseriesName(path); + return IoTDB.metaManager.getAllTimeseriesName(path); } protected List<String> getNodesList(String schemaPattern, int level) throws MetadataException { - return MManager.getInstance().getNodesList(schemaPattern, level); + return IoTDB.metaManager.getNodesList(schemaPattern, level); } private QueryDataSet processCountTimeSeries(CountPlan countPlan) throws MetadataException { @@ -414,7 +415,7 @@ public class PlanExecutor implements IPlanExecutor { } protected Set<String> getDevices(String path) throws MetadataException { - return MManager.getInstance().getDevices(path); + return IoTDB.metaManager.getDevices(path); } private QueryDataSet processShowChildPaths(ShowChildPathsPlan showChildPathsPlan) @@ -435,11 +436,11 @@ public class PlanExecutor implements IPlanExecutor { } protected Set<String> getPathNextChildren(String path) throws MetadataException { - return MManager.getInstance().getChildNodePathInNextLevel(path); + return IoTDB.metaManager.getChildNodePathInNextLevel(path); } protected List<String> getAllStorageGroupNames() { - return MManager.getInstance().getAllStorageGroupNames(); + return IoTDB.metaManager.getAllStorageGroupNames(); } private QueryDataSet processShowStorageGroup() { @@ -512,12 +513,12 @@ public class PlanExecutor implements IPlanExecutor { protected List<ShowTimeSeriesResult> showTimeseries(ShowTimeSeriesPlan plan) throws MetadataException { - return MManager.getInstance().showTimeseries(plan); + return IoTDB.metaManager.showTimeseries(plan); } protected List<ShowTimeSeriesResult> showTimeseriesWithIndex(ShowTimeSeriesPlan plan) throws MetadataException { - return MManager.getInstance().getAllTimeseriesSchema(plan); + return IoTDB.metaManager.getAllTimeseriesSchema(plan); } private void updateRecord( @@ -538,7 +539,7 @@ public class PlanExecutor implements IPlanExecutor { } protected List<StorageGroupMNode> getAllStorageGroupNodes() { - return MManager.getInstance().getAllStorageGroupNodes(); + return IoTDB.metaManager.getAllStorageGroupNodes(); } private QueryDataSet processShowTTLQuery(ShowTTLPlan showTTLPlan) { @@ -617,7 +618,7 @@ public class PlanExecutor implements IPlanExecutor { listDataSet, timestamp++, "storage group number", - Integer.toString(MManager.getInstance().getAllStorageGroupNames().size())); + Integer.toString(IoTDB.metaManager.getAllStorageGroupNames().size())); addRowRecordForShowQuery( listDataSet, timestamp++, @@ -627,7 +628,7 @@ public class PlanExecutor implements IPlanExecutor { listDataSet, timestamp, "maximal timeseries number among storage groups", - Long.toString(MManager.getInstance().getMaximalSeriesNumberAmongStorageGroups())); + Long.toString(IoTDB.metaManager.getMaximalSeriesNumberAmongStorageGroups())); return listDataSet; } @@ -834,7 +835,7 @@ public class PlanExecutor implements IPlanExecutor { private void operateTTL(SetTTLPlan plan) throws QueryProcessException { try { - MManager.getInstance().setTTL(plan.getStorageGroup(), plan.getDataTTL()); + IoTDB.metaManager.setTTL(plan.getStorageGroup(), plan.getDataTTL()); StorageEngine.getInstance().setTTL(plan.getStorageGroup(), plan.getDataTTL()); } catch (MetadataException | StorageEngineException e) { throw new QueryProcessException(e); diff --git a/server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java b/server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java index a1e52aa..efce1a3 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java @@ -105,6 +105,8 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.read.common.Path; import org.apache.iotdb.tsfile.read.expression.IExpression; import org.apache.iotdb.tsfile.utils.Pair; +import org.apache.iotdb.db.service.IoTDB; + /** * Used to convert logical operator to physical plan @@ -728,10 +730,10 @@ public class PhysicalGenerator { } protected List<String> getMatchedTimeseries(String path) throws MetadataException { - return MManager.getInstance().getAllTimeseriesName(path); + return IoTDB.metaManager.getAllTimeseriesName(path); } protected Set<String> getMatchedDevices(String path) throws MetadataException { - return MManager.getInstance().getDevices(path); + return IoTDB.metaManager.getDevices(path); } } diff --git a/server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java b/server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java index af6fdbb..62d0dec 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java @@ -18,27 +18,22 @@ */ package org.apache.iotdb.db.qp.strategy.optimizer; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.exception.query.LogicalOptimizeException; import org.apache.iotdb.db.exception.runtime.SQLParserException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.qp.constant.SQLConstant; import org.apache.iotdb.db.qp.logical.Operator; -import org.apache.iotdb.db.qp.logical.crud.BasicFunctionOperator; -import org.apache.iotdb.db.qp.logical.crud.FilterOperator; -import org.apache.iotdb.db.qp.logical.crud.FromOperator; -import org.apache.iotdb.db.qp.logical.crud.FunctionOperator; -import org.apache.iotdb.db.qp.logical.crud.QueryOperator; -import org.apache.iotdb.db.qp.logical.crud.SFWOperator; -import org.apache.iotdb.db.qp.logical.crud.SelectOperator; +import org.apache.iotdb.db.qp.logical.crud.*; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.tsfile.read.common.Path; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + /** * concat paths in select and from clause. */ @@ -317,6 +312,6 @@ public class ConcatPathOptimizer implements ILogicalOptimizer { } protected List<Path> removeWildcard(String path) throws MetadataException { - return MManager.getInstance().getAllTimeseriesPath(path); + return IoTDB.metaManager.getAllTimeseriesPath(path); } } diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/AlignByDeviceDataSet.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/AlignByDeviceDataSet.java index e351b91..e224a07 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/AlignByDeviceDataSet.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/AlignByDeviceDataSet.java @@ -29,16 +29,12 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.metadata.mnode.MNode; -import org.apache.iotdb.db.qp.physical.crud.AggregationPlan; -import org.apache.iotdb.db.qp.physical.crud.AlignByDevicePlan; +import org.apache.iotdb.db.qp.physical.crud.*; import org.apache.iotdb.db.qp.physical.crud.AlignByDevicePlan.MeasurementType; -import org.apache.iotdb.db.qp.physical.crud.FillQueryPlan; -import org.apache.iotdb.db.qp.physical.crud.GroupByTimePlan; -import org.apache.iotdb.db.qp.physical.crud.RawDataQueryPlan; import org.apache.iotdb.db.query.context.QueryContext; import org.apache.iotdb.db.query.executor.IQueryRouter; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.tsfile.exception.filter.QueryFilterOptimizationException; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.read.common.Field; @@ -201,7 +197,7 @@ public class AlignByDeviceDataSet extends QueryDataSet { protected Set<String> getDeviceMeasurements(String device) throws IOException { try { - MNode deviceNode = MManager.getInstance().getNodeByPath(device); + MNode deviceNode = IoTDB.metaManager.getNodeByPath(device); return deviceNode.getChildren().keySet(); } catch (MetadataException e) { throw new IOException("Cannot get node from " + device, e); diff --git a/server/src/main/java/org/apache/iotdb/db/query/executor/LastQueryExecutor.java b/server/src/main/java/org/apache/iotdb/db/query/executor/LastQueryExecutor.java index 8b4f292..395109b 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/executor/LastQueryExecutor.java +++ b/server/src/main/java/org/apache/iotdb/db/query/executor/LastQueryExecutor.java @@ -20,20 +20,17 @@ package org.apache.iotdb.db.query.executor; -import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_VALUE; -import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TIMESERIES; -import java.util.Set; import org.apache.iotdb.db.engine.querycontext.QueryDataSource; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.metadata.mnode.MeasurementMNode; import org.apache.iotdb.db.qp.physical.crud.LastQueryPlan; import org.apache.iotdb.db.query.context.QueryContext; import org.apache.iotdb.db.query.control.QueryResourceManager; import org.apache.iotdb.db.query.dataset.ListDataSet; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.FileLoaderUtils; import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata; @@ -46,9 +43,14 @@ import org.apache.iotdb.tsfile.read.common.RowRecord; import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; import org.apache.iotdb.tsfile.utils.Binary; import org.apache.iotdb.tsfile.utils.TsPrimitiveType; + import java.io.IOException; import java.util.Arrays; import java.util.List; +import java.util.Set; + +import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TIMESERIES; +import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_VALUE; public class LastQueryExecutor { private List<Path> selectedSeries; @@ -114,7 +116,7 @@ public class LastQueryExecutor { // Retrieve last value from MNode MeasurementMNode node; try { - node = (MeasurementMNode) MManager.getInstance().getNodeByPath(seriesPath.toString()); + node = (MeasurementMNode) IoTDB.metaManager.getNodeByPath(seriesPath.toString()); } catch (MetadataException e) { throw new QueryProcessException(e); } diff --git a/server/src/main/java/org/apache/iotdb/db/query/timegenerator/ServerTimeGenerator.java b/server/src/main/java/org/apache/iotdb/db/query/timegenerator/ServerTimeGenerator.java index 7b857cd..ee1cf91 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/timegenerator/ServerTimeGenerator.java +++ b/server/src/main/java/org/apache/iotdb/db/query/timegenerator/ServerTimeGenerator.java @@ -18,14 +18,13 @@ */ package org.apache.iotdb.db.query.timegenerator; -import java.io.IOException; import org.apache.iotdb.db.engine.querycontext.QueryDataSource; import org.apache.iotdb.db.exception.StorageEngineException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.qp.physical.crud.RawDataQueryPlan; import org.apache.iotdb.db.query.context.QueryContext; import org.apache.iotdb.db.query.control.QueryResourceManager; import org.apache.iotdb.db.query.reader.series.SeriesRawDataBatchReader; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.read.common.Path; import org.apache.iotdb.tsfile.read.expression.IExpression; @@ -34,6 +33,8 @@ import org.apache.iotdb.tsfile.read.filter.basic.Filter; import org.apache.iotdb.tsfile.read.query.timegenerator.TimeGenerator; import org.apache.iotdb.tsfile.read.reader.IBatchReader; +import java.io.IOException; + /** * A timestamp generator for query with filter. e.g. For query clause "select s1, s2 from root where * s3 < 0 and time > 100", this class can iterate back to every timestamp of the query. @@ -69,7 +70,7 @@ public class ServerTimeGenerator extends TimeGenerator { TSDataType dataType; QueryDataSource queryDataSource; try { - dataType = MManager.getInstance().getSeriesType(path.getFullPath()); + dataType = IoTDB.metaManager.getSeriesType(path.getFullPath()); queryDataSource = QueryResourceManager.getInstance().getQueryDataSource(path, context, filter); // update filter by TTL filter = queryDataSource.updateFilterUsingTTL(filter); diff --git a/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java b/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java index 9b717ef..9b1d15c 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java +++ b/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java @@ -18,7 +18,6 @@ */ package org.apache.iotdb.db.service; -import java.io.IOException; import org.apache.iotdb.db.concurrent.IoTDBDefaultThreadExceptionHandler; import org.apache.iotdb.db.conf.IoTDBConfigCheck; import org.apache.iotdb.db.conf.IoTDBConstant; @@ -40,12 +39,15 @@ import org.apache.iotdb.db.writelog.manager.MultiFileLogNodeManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + public class IoTDB implements IoTDBMBean { private static final Logger logger = LoggerFactory.getLogger(IoTDB.class); private final String mbeanName = String.format("%s:%s=%s", IoTDBConstant.IOTDB_PACKAGE, IoTDBConstant.JMX_TYPE, "IoTDB"); private RegisterManager registerManager = new RegisterManager(); + public static MManager metaManager = MManager.getInstance(); public static IoTDB getInstance() { return IoTDBHolder.INSTANCE; @@ -133,7 +135,7 @@ public class IoTDB implements IoTDBMBean { private void initMManager() { long time = System.currentTimeMillis(); - MManager.getInstance().init(); + IoTDB.metaManager.init(); long end = System.currentTimeMillis() - time; logger.info("spend {}ms to recover schema.", end); IoTDBConfigDynamicAdapter.getInstance().setInitialized(true); @@ -152,7 +154,7 @@ public class IoTDB implements IoTDBMBean { public void shutdown() throws Exception { logger.info("Deactivating IoTDB..."); - MManager.getInstance().clear(); + IoTDB.metaManager.clear(); TracingManager.getInstance().close(); registerManager.shutdownAll(); JMXService.deregisterMBean(mbeanName); diff --git a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java index cd60197..74edd18 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java @@ -53,7 +53,6 @@ import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.exception.metadata.StorageGroupNotSetException; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.runtime.SQLParserException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.metrics.server.SqlArgument; import org.apache.iotdb.db.qp.Planner; import org.apache.iotdb.db.qp.constant.SQLConstant; @@ -346,11 +345,11 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext { } private String getMetadataInString() { - return MManager.getInstance().getMetadataInString(); + return IoTDB.metaManager.getMetadataInString(); } protected List<String> getPaths(String path) throws MetadataException { - return MManager.getInstance().getAllTimeseriesName(path); + return IoTDB.metaManager.getAllTimeseriesName(path); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/sync/receiver/transfer/SyncServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/sync/receiver/transfer/SyncServiceImpl.java index 9110bd1..f5f325f 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/receiver/transfer/SyncServiceImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/receiver/transfer/SyncServiceImpl.java @@ -18,15 +18,6 @@ */ package org.apache.iotdb.db.sync.receiver.transfer; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.math.BigInteger; -import java.nio.ByteBuffer; -import java.nio.channels.FileChannel; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; import org.apache.iotdb.db.concurrent.ThreadName; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBConstant; @@ -36,8 +27,8 @@ import org.apache.iotdb.db.engine.storagegroup.TsFileResource; import org.apache.iotdb.db.exception.DiskSpaceInsufficientException; import org.apache.iotdb.db.exception.SyncDeviceOwnerConflictException; import org.apache.iotdb.db.exception.metadata.MetadataException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.metadata.MetadataConstant; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.sync.conf.SyncConstant; import org.apache.iotdb.db.sync.receiver.load.FileLoader; import org.apache.iotdb.db.sync.receiver.load.FileLoaderManager; @@ -53,6 +44,16 @@ import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.math.BigInteger; +import java.nio.ByteBuffer; +import java.nio.channels.FileChannel; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + public class SyncServiceImpl implements SyncService.Iface { private static final Logger logger = LoggerFactory.getLogger(SyncServiceImpl.class); @@ -271,7 +272,7 @@ public class SyncServiceImpl implements SyncService.Iface { String metadataOperation; while ((metadataOperation = br.readLine()) != null) { try { - MManager.getInstance().operation(metadataOperation); + IoTDB.metaManager.operation(metadataOperation); } catch (IOException | MetadataException e) { logger.error("Can not operate metadata operation {} ", metadataOperation, e); } diff --git a/server/src/main/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManager.java b/server/src/main/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManager.java index d6e360e..de5e41d 100644 --- a/server/src/main/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManager.java +++ b/server/src/main/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManager.java @@ -18,30 +18,25 @@ */ package org.apache.iotdb.db.sync.sender.manage; -import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.TSFILE_SUFFIX; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; import org.apache.iotdb.db.conf.IoTDBConstant; import org.apache.iotdb.db.engine.merge.task.MergeTask; import org.apache.iotdb.db.engine.modification.ModificationFile; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; -import org.apache.iotdb.db.exception.metadata.MetadataException; -import org.apache.iotdb.db.metadata.MManager; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.sync.conf.SyncSenderDescriptor; import org.apache.iotdb.tsfile.common.constant.TsFileConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.util.*; +import java.util.Map.Entry; + +import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.TSFILE_SUFFIX; + public class SyncFileManager implements ISyncFileManager { private static final Logger LOGGER = LoggerFactory.getLogger(SyncFileManager.class); @@ -77,7 +72,7 @@ public class SyncFileManager implements ISyncFileManager { private Map<String, Map<Long, Set<File>>> toBeSyncedFilesMap; private SyncFileManager() { - MManager.getInstance().init(); + IoTDB.metaManager.init(); } public static SyncFileManager getInstance() { diff --git a/server/src/main/java/org/apache/iotdb/db/tools/memestimation/MemEstToolCmd.java b/server/src/main/java/org/apache/iotdb/db/tools/memestimation/MemEstToolCmd.java index bdc1ce0..a12f33b 100644 --- a/server/src/main/java/org/apache/iotdb/db/tools/memestimation/MemEstToolCmd.java +++ b/server/src/main/java/org/apache/iotdb/db/tools/memestimation/MemEstToolCmd.java @@ -26,7 +26,7 @@ import org.apache.iotdb.db.conf.IoTDBConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.conf.adapter.IoTDBConfigDynamicAdapter; import org.apache.iotdb.db.exception.ConfigAdjusterException; -import org.apache.iotdb.db.metadata.MManager; +import org.apache.iotdb.db.service.IoTDB; @Command(name = "calmem", description = "calculate minimum memory required for writing based on the number of storage groups and timeseries") public class MemEstToolCmd extends WrappedRunnable { @@ -71,7 +71,7 @@ public class MemEstToolCmd extends WrappedRunnable { config.setTsFileSizeThreshold(tsFileSize); IoTDBConfigDynamicAdapter.getInstance().reset(); IoTDBConfigDynamicAdapter.getInstance().setInitialized(true); - MManager.getInstance().clear(); + IoTDB.metaManager.clear(); long sgCnt = 1; long tsCnt = 0; @@ -87,7 +87,7 @@ public class MemEstToolCmd extends WrappedRunnable { maxTsNumValid = Math.min(tsCnt, maxTsNum); maxTsNumValid = Math.max(maxTsNumValid, tsCnt / sgNum + 1); } - MManager.getInstance().setMaxSeriesNumberAmongStorageGroup(maxTsNumValid); + IoTDB.metaManager.setMaxSeriesNumberAmongStorageGroup(maxTsNumValid); } } catch (ConfigAdjusterException e) { diff --git a/server/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java index fd359e1..84c767c 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java @@ -18,14 +18,10 @@ */ package org.apache.iotdb.db.utils; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.exception.metadata.PathAlreadyExistException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.qp.constant.SQLConstant; +import org.apache.iotdb.db.service.IoTDB; 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; @@ -34,6 +30,11 @@ import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + public class SchemaUtils { private SchemaUtils() { @@ -49,7 +50,7 @@ public class SchemaUtils { TSDataType dataType = schema.getType(); TSEncoding encoding = schema.getEncodingType(); CompressionType compressionType = schema.getCompressor(); - MManager.getInstance().createTimeseries(path, dataType, encoding, + IoTDB.metaManager.createTimeseries(path, dataType, encoding, compressionType, Collections.emptyMap()); } catch (PathAlreadyExistException ignored) { // ignore added timeseries @@ -64,7 +65,7 @@ public class SchemaUtils { throws MetadataException { List<TSDataType> dataTypes = new ArrayList<>(); for (Path path : paths) { - dataTypes.add(MManager.getInstance().getSeriesType(path.getFullPath())); + dataTypes.add(IoTDB.metaManager.getSeriesType(path.getFullPath())); } return dataTypes; } @@ -82,7 +83,7 @@ public class SchemaUtils { } List<TSDataType> dataTypes = new ArrayList<>(); for (String path : paths) { - dataTypes.add(MManager.getInstance().getSeriesType(path)); + dataTypes.add(IoTDB.metaManager.getSeriesType(path)); } return dataTypes; } @@ -95,7 +96,7 @@ public class SchemaUtils { } List<TSDataType> dataTypes = new ArrayList<>(); for (Path path : paths) { - dataTypes.add(MManager.getInstance().getSeriesType(path.getFullPath())); + dataTypes.add(IoTDB.metaManager.getSeriesType(path.getFullPath())); } return dataTypes; } @@ -108,7 +109,7 @@ public class SchemaUtils { if (dataType != null) { tsDataTypes.add(dataType); } else { - tsDataTypes.add(MManager.getInstance().getSeriesType(paths.get(i).getFullPath())); + tsDataTypes.add(IoTDB.metaManager.getSeriesType(paths.get(i).getFullPath())); } } return tsDataTypes; diff --git a/server/src/main/java/org/apache/iotdb/db/writelog/recover/LogReplayer.java b/server/src/main/java/org/apache/iotdb/db/writelog/recover/LogReplayer.java index 99514a6..ce9dd03 100644 --- a/server/src/main/java/org/apache/iotdb/db/writelog/recover/LogReplayer.java +++ b/server/src/main/java/org/apache/iotdb/db/writelog/recover/LogReplayer.java @@ -19,10 +19,6 @@ package org.apache.iotdb.db.writelog.recover; -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import org.apache.iotdb.db.engine.memtable.IMemTable; import org.apache.iotdb.db.engine.modification.Deletion; import org.apache.iotdb.db.engine.modification.ModificationFile; @@ -31,13 +27,13 @@ import org.apache.iotdb.db.engine.version.VersionController; import org.apache.iotdb.db.exception.WriteProcessException; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.qp.physical.PhysicalPlan; import org.apache.iotdb.db.qp.physical.crud.DeletePlan; import org.apache.iotdb.db.qp.physical.crud.InsertPlan; import org.apache.iotdb.db.qp.physical.crud.InsertRowPlan; import org.apache.iotdb.db.qp.physical.crud.InsertTabletPlan; import org.apache.iotdb.db.qp.physical.crud.UpdatePlan; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.writelog.io.ILogReader; import org.apache.iotdb.db.writelog.manager.MultiFileLogNodeManager; import org.apache.iotdb.db.writelog.node.WriteLogNode; @@ -47,6 +43,11 @@ import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * LogReplayer finds the logNode of the TsFile given by insertFilePath and logNodePrefix, reads the * WALs from the logNode and redoes them into a given MemTable and ModificationFile. @@ -153,7 +154,7 @@ public class LogReplayer { } MeasurementSchema[] schemas; try { - schemas = MManager.getInstance().getSchemas(plan.getDeviceId(), plan + schemas = IoTDB.metaManager.getSchemas(plan.getDeviceId(), plan .getMeasurements()); } catch (MetadataException e) { throw new QueryProcessException(e); diff --git a/server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java b/server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java index 39c9f63..1b5acd0 100644 --- a/server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java +++ b/server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java @@ -19,15 +19,6 @@ package org.apache.iotdb.db.writelog.recover; -import static org.apache.iotdb.db.engine.storagegroup.TsFileResource.RESOURCE_SUFFIX; - -import java.io.File; -import java.io.IOException; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.ExecutionException; import org.apache.iotdb.db.conf.IoTDBConstant; import org.apache.iotdb.db.engine.fileSystem.SystemFileFactory; import org.apache.iotdb.db.engine.flush.MemTableFlushTask; @@ -47,6 +38,16 @@ import org.apache.iotdb.tsfile.write.writer.RestorableTsFileIOWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; +import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.concurrent.ExecutionException; + +import static org.apache.iotdb.db.engine.storagegroup.TsFileResource.RESOURCE_SUFFIX; + /** * TsFileRecoverPerformer recovers a SeqTsFile to correct status, redoes the WALs since last crash * and removes the redone logs. diff --git a/server/src/test/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapterTest.java b/server/src/test/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapterTest.java index 5f34b51..0b1ba26 100644 --- a/server/src/test/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapterTest.java +++ b/server/src/test/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapterTest.java @@ -18,18 +18,18 @@ */ package org.apache.iotdb.db.conf.adapter; -import static org.apache.iotdb.db.conf.adapter.IoTDBConfigDynamicAdapter.MEMTABLE_NUM_FOR_EACH_PARTITION; -import static org.junit.Assert.assertEquals; - import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.ConfigAdjusterException; -import org.apache.iotdb.db.metadata.MManager; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; +import static org.apache.iotdb.db.conf.adapter.IoTDBConfigDynamicAdapter.MEMTABLE_NUM_FOR_EACH_PARTITION; +import static org.junit.Assert.assertEquals; + public class IoTDBConfigDynamicAdapterTest { private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConfig(); @@ -53,7 +53,7 @@ public class IoTDBConfigDynamicAdapterTest { CONFIG.setMaxMemtableNumber(oldMaxMemTableNumber); CONFIG.setTsFileSizeThreshold(oldTsFileThreshold); CONFIG.setMemtableSizeThreshold(oldGroupSizeInByte); - MManager.getInstance().setMaxSeriesNumberAmongStorageGroup(0); + IoTDB.metaManager.setMaxSeriesNumberAmongStorageGroup(0); IoTDBConfigDynamicAdapter.getInstance().reset(); } @@ -63,7 +63,7 @@ public class IoTDBConfigDynamicAdapterTest { for (int i = 1; i < 100; i++) { IoTDBConfigDynamicAdapter.getInstance().addOrDeleteTimeSeries(1); } - MManager.getInstance().setMaxSeriesNumberAmongStorageGroup(100); + IoTDB.metaManager.setMaxSeriesNumberAmongStorageGroup(100); for (int i = 1; i < 1000000; i++) { try { IoTDBConfigDynamicAdapter.getInstance().addOrDeleteStorageGroup(1); @@ -86,13 +86,13 @@ public class IoTDBConfigDynamicAdapterTest { for (int i = 1; i < 100; i++) { IoTDBConfigDynamicAdapter.getInstance().addOrDeleteStorageGroup(1); } - MManager.getInstance().setMaxSeriesNumberAmongStorageGroup(100); + IoTDB.metaManager.setMaxSeriesNumberAmongStorageGroup(100); for (int i = 1; i < 1000000; i++) { try { IoTDBConfigDynamicAdapter.getInstance().addOrDeleteTimeSeries(1); if (i % 10 == 0) { - MManager.getInstance().setMaxSeriesNumberAmongStorageGroup(i); + IoTDB.metaManager.setMaxSeriesNumberAmongStorageGroup(i); } totalTimeseries += 1; assertEquals(IoTDBConfigDynamicAdapter.getInstance().getCurrentMemTableSize(), @@ -119,7 +119,7 @@ public class IoTDBConfigDynamicAdapterTest { try { for (; i <= 280 * 3200; i++) { IoTDBConfigDynamicAdapter.getInstance().addOrDeleteTimeSeries(1); - MManager.getInstance().setMaxSeriesNumberAmongStorageGroup(i / 30 + 1); + IoTDB.metaManager.setMaxSeriesNumberAmongStorageGroup(i / 30 + 1); } } catch (ConfigAdjusterException e) { assertEquals(String.format(ConfigAdjusterException.ERROR_MSG_FORMAT, @@ -128,7 +128,7 @@ public class IoTDBConfigDynamicAdapterTest { try { while (true) { IoTDBConfigDynamicAdapter.getInstance().addOrDeleteTimeSeries(1); - MManager.getInstance().setMaxSeriesNumberAmongStorageGroup(MManager.getInstance().getMaximalSeriesNumberAmongStorageGroups() + 1); + IoTDB.metaManager.setMaxSeriesNumberAmongStorageGroup(IoTDB.metaManager.getMaximalSeriesNumberAmongStorageGroups() + 1); } } catch (ConfigAdjusterException e ) { assertEquals(String.format(ConfigAdjusterException.ERROR_MSG_FORMAT, diff --git a/server/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java b/server/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java index 78806da..ac5c489 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.engine; import org.apache.iotdb.db.metadata.MManager; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; @@ -29,7 +30,7 @@ import java.util.Collections; public class MetadataManagerHelper { public static void initMetadata() { - MManager mmanager = MManager.getInstance(); + MManager mmanager = IoTDB.metaManager; mmanager.init(); try { mmanager.setStorageGroup("root.vehicle.d0"); diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergePerfTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergePerfTest.java index 4dcdcc3..3fd59ef 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergePerfTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergePerfTest.java @@ -19,17 +19,18 @@ package org.apache.iotdb.db.engine.merge; -import java.io.File; -import java.util.ArrayList; -import java.util.List; import org.apache.commons.io.FileUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.constant.TestConstant; import org.apache.iotdb.db.engine.merge.manage.MergeResource; import org.apache.iotdb.db.engine.merge.task.MergeTask; -import org.apache.iotdb.db.metadata.MManager; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; +import java.io.File; +import java.util.ArrayList; +import java.util.List; + public class MergePerfTest extends MergeTest{ private long timeConsumption; @@ -37,7 +38,7 @@ public class MergePerfTest extends MergeTest{ private File tempSGDir; public void test() throws Exception { - MManager.getInstance().init(); + IoTDB.metaManager.init(); tempSGDir = new File(TestConstant.BASE_OUTPUT_PATH.concat("tempSG")); tempSGDir.mkdirs(); setUp(); diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java index 3759ae3..31c50d4 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java @@ -19,23 +19,16 @@ package org.apache.iotdb.db.engine.merge; -import static org.apache.iotdb.db.conf.IoTDBConstant.PATH_SEPARATOR; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; import org.apache.iotdb.db.conf.IoTDBConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.constant.TestConstant; import org.apache.iotdb.db.engine.cache.ChunkMetadataCache; import org.apache.iotdb.db.engine.merge.manage.MergeManager; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; -import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.exception.StorageEngineException; -import org.apache.iotdb.db.metadata.MManager; +import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.query.control.FileReaderManager; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; @@ -49,6 +42,14 @@ import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; import org.junit.After; import org.junit.Before; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static org.apache.iotdb.db.conf.IoTDBConstant.PATH_SEPARATOR; + abstract class MergeTest { static final String MERGE_TEST_SG = "root.mergeTest"; @@ -71,7 +72,7 @@ abstract class MergeTest { @Before public void setUp() throws IOException, WriteProcessException, MetadataException, MetadataException { - MManager.getInstance().init(); + IoTDB.metaManager.init(); prevMergeChunkThreshold = IoTDBDescriptor.getInstance().getConfig().getChunkMergePointThreshold(); IoTDBDescriptor.getInstance().getConfig().setChunkMergePointThreshold(-1); @@ -87,7 +88,7 @@ abstract class MergeTest { unseqResources.clear(); IoTDBDescriptor.getInstance().getConfig().setChunkMergePointThreshold(prevMergeChunkThreshold); ChunkMetadataCache.getInstance().clear(); - MManager.getInstance().clear(); + IoTDB.metaManager.clear(); EnvironmentUtils.cleanAllDir(); MergeManager.getINSTANCE().stop(); } @@ -102,10 +103,10 @@ abstract class MergeTest { for (int i = 0; i < deviceNum; i++) { deviceIds[i] = MERGE_TEST_SG + PATH_SEPARATOR + "device" + i; } - MManager.getInstance().setStorageGroup(MERGE_TEST_SG); + IoTDB.metaManager.setStorageGroup(MERGE_TEST_SG); for (String device : deviceIds) { for (MeasurementSchema measurementSchema : measurementSchemas) { - MManager.getInstance().createTimeseries( + IoTDB.metaManager.createTimeseries( device + PATH_SEPARATOR + measurementSchema.getMeasurementId(), measurementSchema .getType(), measurementSchema.getEncodingType(), measurementSchema.getCompressor(), Collections.emptyMap()); diff --git a/server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java b/server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java index 1e0bcfe..275ce61 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java @@ -19,10 +19,6 @@ package org.apache.iotdb.db.engine.modification; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.apache.iotdb.db.utils.EnvironmentUtils.TEST_QUERY_CONTEXT; -import static org.apache.iotdb.db.utils.EnvironmentUtils.TEST_QUERY_JOB_ID; import org.apache.iotdb.db.conf.directories.DirectoryManager; import org.apache.iotdb.db.engine.StorageEngine; import org.apache.iotdb.db.engine.modification.io.LocalTextModificationAccessor; @@ -31,9 +27,9 @@ import org.apache.iotdb.db.engine.querycontext.ReadOnlyMemChunk; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.qp.physical.crud.InsertRowPlan; import org.apache.iotdb.db.query.control.QueryResourceManager; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; @@ -43,15 +39,21 @@ import org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression; import org.apache.iotdb.tsfile.read.reader.IPointReader; import org.apache.iotdb.tsfile.write.record.TSRecord; import org.apache.iotdb.tsfile.write.record.datapoint.DoubleDataPoint; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; + +import static org.apache.iotdb.db.utils.EnvironmentUtils.TEST_QUERY_CONTEXT; +import static org.apache.iotdb.db.utils.EnvironmentUtils.TEST_QUERY_JOB_ID; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class DeletionFileNodeTest { @@ -72,9 +74,9 @@ public class DeletionFileNodeTest { public void setup() throws MetadataException { EnvironmentUtils.envSetUp(); - MManager.getInstance().setStorageGroup(processorName); + IoTDB.metaManager.setStorageGroup(processorName); for (int i = 0; i < 10; i++) { - MManager.getInstance().createTimeseries(processorName + "." + measurements[i], dataType, + IoTDB.metaManager.createTimeseries(processorName + "." + measurements[i], dataType, encoding, TSFileDescriptor.getInstance().getConfig().getCompressor(), Collections.emptyMap()); } } diff --git a/server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java b/server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java index 92cd429..e066360 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java @@ -19,21 +19,14 @@ package org.apache.iotdb.db.engine.modification; -import static org.apache.iotdb.db.utils.EnvironmentUtils.TEST_QUERY_CONTEXT; -import static org.junit.Assert.assertEquals; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; import org.apache.iotdb.db.engine.StorageEngine; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.qp.physical.crud.InsertRowPlan; import org.apache.iotdb.db.qp.physical.crud.RawDataQueryPlan; import org.apache.iotdb.db.query.executor.QueryRouter; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; @@ -46,6 +39,14 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static org.apache.iotdb.db.utils.EnvironmentUtils.TEST_QUERY_CONTEXT; +import static org.junit.Assert.assertEquals; + public class DeletionQueryTest { private String processorName = "root.test"; @@ -65,9 +66,9 @@ public class DeletionQueryTest { public void setup() throws MetadataException { EnvironmentUtils.envSetUp(); - MManager.getInstance().setStorageGroup(processorName); + IoTDB.metaManager.setStorageGroup(processorName); for (int i = 0; i < 10; i++) { - MManager.getInstance().createTimeseries(processorName + "." + measurements[i], dataType, + IoTDB.metaManager.createTimeseries(processorName + "." + measurements[i], dataType, encoding, TSFileDescriptor.getInstance().getConfig().getCompressor(), Collections.emptyMap()); } } diff --git a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/FileNodeManagerBenchmark.java b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/FileNodeManagerBenchmark.java index ac630d4..edb05fe 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/FileNodeManagerBenchmark.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/FileNodeManagerBenchmark.java @@ -18,15 +18,12 @@ */ package org.apache.iotdb.db.engine.storagegroup; -import java.io.IOException; -import java.util.Collections; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.atomic.AtomicLong; import org.apache.iotdb.db.engine.StorageEngine; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.MetadataException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.qp.physical.crud.InsertRowPlan; +import org.apache.iotdb.db.metadata.MManager; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.db.utils.RandomNum; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; @@ -35,6 +32,11 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; import org.apache.iotdb.tsfile.write.record.TSRecord; import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint; +import java.io.IOException; +import java.util.Collections; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.atomic.AtomicLong; + /** * Bench The storage group manager with mul-thread and get its performance. */ @@ -65,7 +67,7 @@ public class FileNodeManagerBenchmark { private static void prepare() throws MetadataException { - MManager manager = MManager.getInstance(); + MManager manager = IoTDB.metaManager; manager.setStorageGroup(prefix); for (String device : devices) { for (String measurement : measurements) { diff --git a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java index 5a436fe..66d708b 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java @@ -20,17 +20,6 @@ package org.apache.iotdb.db.engine.storagegroup; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; import org.apache.iotdb.db.conf.IoTDBConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.conf.directories.DirectoryManager; @@ -43,7 +32,6 @@ import org.apache.iotdb.db.exception.WriteProcessException; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.exception.query.OutOfTTLException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.metadata.mnode.StorageGroupMNode; import org.apache.iotdb.db.qp.Planner; import org.apache.iotdb.db.qp.executor.PlanExecutor; @@ -52,6 +40,7 @@ import org.apache.iotdb.db.qp.physical.sys.SetTTLPlan; import org.apache.iotdb.db.qp.physical.sys.ShowTTLPlan; import org.apache.iotdb.db.query.control.QueryResourceManager; import org.apache.iotdb.db.query.reader.series.SeriesRawDataBatchReader; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.common.constant.TsFileConstant; import org.apache.iotdb.tsfile.exception.filter.QueryFilterOptimizationException; @@ -69,6 +58,12 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import java.io.File; +import java.io.IOException; +import java.util.*; + +import static org.junit.Assert.*; + public class TTLTest { private String sg1 = "root.TTL_SG1"; @@ -97,11 +92,11 @@ public class TTLTest { private void createSchemas() throws MetadataException, StorageGroupProcessorException { - MManager.getInstance().setStorageGroup(sg1); - MManager.getInstance().setStorageGroup(sg2); + IoTDB.metaManager.setStorageGroup(sg1); + IoTDB.metaManager.setStorageGroup(sg2); storageGroupProcessor = new StorageGroupProcessor(IoTDBDescriptor.getInstance().getConfig() .getSystemDir(), sg1, new DirectFlushPolicy()); - MManager.getInstance().createTimeseries(g1s1, TSDataType.INT64, TSEncoding.PLAIN, + IoTDB.metaManager.createTimeseries(g1s1, TSDataType.INT64, TSEncoding.PLAIN, CompressionType.UNCOMPRESSED, Collections.emptyMap()); } @@ -111,19 +106,19 @@ public class TTLTest { boolean caught = false; try { - MManager.getInstance().setTTL(sg1 + ".notExist", ttl); + IoTDB.metaManager.setTTL(sg1 + ".notExist", ttl); } catch (MetadataException e) { caught = true; } assertTrue(caught); // normally set ttl - MManager.getInstance().setTTL(sg1, ttl); - StorageGroupMNode mNode = MManager.getInstance().getStorageGroupNode(sg1); + IoTDB.metaManager.setTTL(sg1, ttl); + StorageGroupMNode mNode = IoTDB.metaManager.getStorageGroupNode(sg1); assertEquals(ttl, mNode.getDataTTL()); // default ttl - mNode = MManager.getInstance().getStorageGroupNode(sg2); + mNode = IoTDB.metaManager.getStorageGroupNode(sg2); assertEquals(Long.MAX_VALUE, mNode.getDataTTL()); } @@ -333,7 +328,7 @@ public class TTLTest { public void testShowTTL() throws IOException, QueryProcessException, QueryFilterOptimizationException, StorageEngineException, MetadataException, TException, InterruptedException { - MManager.getInstance().setTTL(sg1, ttl); + IoTDB.metaManager.setTTL(sg1, ttl); ShowTTLPlan plan = new ShowTTLPlan(Collections.emptyList()); PlanExecutor executor = new PlanExecutor(); diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLastIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLastIT.java index 5bedf48..ffe697b 100644 --- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLastIT.java +++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLastIT.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.integration; import org.apache.iotdb.db.exception.metadata.MetadataException; -import org.apache.iotdb.db.metadata.MManager; -import org.apache.iotdb.db.metadata.mnode.MeasurementMNode; import org.apache.iotdb.db.metadata.mnode.MNode; +import org.apache.iotdb.db.metadata.mnode.MeasurementMNode; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.jdbc.Config; import org.junit.After; @@ -31,8 +31,6 @@ import org.junit.Test; import java.sql.*; -import static org.junit.Assert.fail; - public class IoTDBLastIT { private static String[] dataSet1 = new String[]{ @@ -131,7 +129,7 @@ public class IoTDBLastIT { } MeasurementMNode node = - (MeasurementMNode) MManager.getInstance().getNodeByPath("root.ln.wf01.wt01.temperature"); + (MeasurementMNode) IoTDB.metaManager.getNodeByPath("root.ln.wf01.wt01.temperature"); node.resetCache(); statement.execute( @@ -191,7 +189,7 @@ public class IoTDBLastIT { DriverManager.getConnection("jdbc:iotdb://127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { - MNode node = MManager.getInstance().getNodeByPath("root.ln.wf01.wt02.temperature"); + MNode node = IoTDB.metaManager.getNodeByPath("root.ln.wf01.wt02.temperature"); ((MeasurementMNode) node).resetCache(); boolean hasResultSet = statement.execute( @@ -242,7 +240,7 @@ public class IoTDBLastIT { DriverManager.getConnection("jdbc:iotdb://127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { - MNode node = MManager.getInstance().getNodeByPath("root.ln.wf01.wt03.temperature"); + MNode node = IoTDB.metaManager.getNodeByPath("root.ln.wf01.wt03.temperature"); ((MeasurementMNode) node).resetCache(); statement.execute("INSERT INTO root.ln.wf01.wt03(timestamp,status, id) values(500, false, 9)"); @@ -290,7 +288,7 @@ public class IoTDBLastIT { statement.execute("INSERT INTO root.ln.wf01.wt04(timestamp,temperature) values(150,31.2)"); statement.execute("flush"); - MNode node = MManager.getInstance().getNodeByPath("root.ln.wf01.wt03.temperature"); + MNode node = IoTDB.metaManager.getNodeByPath("root.ln.wf01.wt03.temperature"); ((MeasurementMNode) node).resetCache(); boolean hasResultSet = statement.execute( diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/MManagerAdvancedTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/MManagerAdvancedTest.java index 2176a7c..295dd9d 100644 --- a/server/src/test/java/org/apache/iotdb/db/metadata/MManagerAdvancedTest.java +++ b/server/src/test/java/org/apache/iotdb/db/metadata/MManagerAdvancedTest.java @@ -18,15 +18,10 @@ */ package org.apache.iotdb.db.metadata; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; import org.apache.iotdb.db.exception.metadata.MetadataException; -import org.apache.iotdb.db.metadata.mnode.MeasurementMNode; import org.apache.iotdb.db.metadata.mnode.MNode; +import org.apache.iotdb.db.metadata.mnode.MeasurementMNode; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; @@ -39,6 +34,13 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + public class MManagerAdvancedTest { private static MManager mmanager = null; @@ -46,7 +48,7 @@ public class MManagerAdvancedTest { @Before public void setUp() throws Exception { EnvironmentUtils.envSetUp(); - mmanager = MManager.getInstance(); + mmanager = IoTDB.metaManager; mmanager.setStorageGroup("root.vehicle.d0"); mmanager.setStorageGroup("root.vehicle.d1"); diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java index cbd14d4..29c942f 100644 --- a/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java +++ b/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java @@ -18,19 +18,10 @@ */ package org.apache.iotdb.db.metadata; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.exception.query.PathException; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; @@ -41,6 +32,10 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.util.*; + +import static org.junit.Assert.*; + public class MManagerBasicTest { private CompressionType compressionType; @@ -63,7 +58,7 @@ public class MManagerBasicTest { @Test public void testAddPathAndExist() { - MManager manager = MManager.getInstance(); + MManager manager = IoTDB.metaManager; assertTrue(manager.isPathExist("root")); assertFalse(manager.isPathExist("root.laptop")); @@ -202,7 +197,7 @@ public class MManagerBasicTest { @Test public void testSetStorageGroupAndExist() { - MManager manager = MManager.getInstance(); + MManager manager = IoTDB.metaManager; try { assertFalse(manager.isStorageGroup("root")); @@ -228,7 +223,7 @@ public class MManagerBasicTest { @Test public void testGetAllFileNamesByPath() { - MManager manager = MManager.getInstance(); + MManager manager = IoTDB.metaManager; try { manager.setStorageGroup("root.laptop.d1"); manager.setStorageGroup("root.laptop.d2"); @@ -253,7 +248,7 @@ public class MManagerBasicTest { @Test public void testCheckStorageExistOfPath() { - MManager manager = MManager.getInstance(); + MManager manager = IoTDB.metaManager; try { assertTrue(manager.getAllTimeseriesName("root").isEmpty()); @@ -281,7 +276,7 @@ public class MManagerBasicTest { @Test public void testMaximalSeriesNumberAmongStorageGroup() throws MetadataException, PathException { - MManager manager = MManager.getInstance(); + MManager manager = IoTDB.metaManager; assertEquals(0, manager.getMaximalSeriesNumberAmongStorageGroups()); manager.setStorageGroup("root.laptop"); assertEquals(0, manager.getMaximalSeriesNumberAmongStorageGroups()); @@ -335,7 +330,7 @@ public class MManagerBasicTest { @Test public void testGetDevicesWithGivenPrefix() { - MManager manager = MManager.getInstance(); + MManager manager = IoTDB.metaManager; try { manager.setStorageGroup("root.laptop"); @@ -362,7 +357,7 @@ public class MManagerBasicTest { @Test public void testGetChildNodePathInNextLevel() { - MManager manager = MManager.getInstance(); + MManager manager = IoTDB.metaManager; String[] res = new String[]{ "[root.laptop, root.vehicle]", "[root.laptop.b1, root.laptop.b2]", diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java index 5949d0e..dc6172f 100644 --- a/server/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java +++ b/server/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java @@ -18,16 +18,10 @@ */ package org.apache.iotdb.db.metadata; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.metadata.mnode.MNode; import org.apache.iotdb.db.metadata.mnode.MeasurementMNode; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; @@ -38,6 +32,12 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static org.junit.Assert.*; + public class MManagerImproveTest { private static Logger logger = LoggerFactory.getLogger(MManagerImproveTest.class); @@ -49,7 +49,7 @@ public class MManagerImproveTest { @Before public void setUp() throws Exception { EnvironmentUtils.envSetUp(); - mManager = MManager.getInstance(); + mManager = IoTDB.metaManager; mManager.setStorageGroup("root.t1.v2"); for (int j = 0; j < DEVICE_NUM; j++) { @@ -65,7 +65,7 @@ public class MManagerImproveTest { @Test public void checkSetUp() { - mManager = MManager.getInstance(); + mManager = IoTDB.metaManager; assertTrue(mManager.isPathExist("root.t1.v2.d3.s5")); assertFalse(mManager.isPathExist("root.t1.v2.d9.s" + TIMESERIES_NUM)); @@ -74,7 +74,7 @@ public class MManagerImproveTest { @Test public void analyseTimeCost() throws MetadataException { - mManager = MManager.getInstance(); + mManager = IoTDB.metaManager; long startTime, endTime; long string_combine, path_exist, list_init, check_filelevel, get_seriestype; @@ -148,7 +148,7 @@ public class MManagerImproveTest { @Test public void improveTest() throws MetadataException { - mManager = MManager.getInstance(); + mManager = IoTDB.metaManager; String[] deviceIdList = new String[DEVICE_NUM]; for (int i = 0; i < DEVICE_NUM; i++) { diff --git a/server/src/test/java/org/apache/iotdb/db/qp/PlannerTest.java b/server/src/test/java/org/apache/iotdb/db/qp/PlannerTest.java index 0a093b8..763b90c 100644 --- a/server/src/test/java/org/apache/iotdb/db/qp/PlannerTest.java +++ b/server/src/test/java/org/apache/iotdb/db/qp/PlannerTest.java @@ -28,6 +28,7 @@ import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.qp.logical.Operator.OperatorType; import org.apache.iotdb.db.qp.physical.PhysicalPlan; import org.apache.iotdb.db.qp.physical.crud.InsertRowPlan; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; @@ -41,11 +42,11 @@ public class PlannerTest { private CompressionType compressionType = TSFileDescriptor.getInstance().getConfig().getCompressor(); - private MManager mManager = MManager.getInstance(); + private MManager mManager = IoTDB.metaManager; private Planner processor = new Planner(); static { - MManager.getInstance().init(); + IoTDB.metaManager.init(); } @Before diff --git a/server/src/test/java/org/apache/iotdb/db/qp/plan/ConcatOptimizerTest.java b/server/src/test/java/org/apache/iotdb/db/qp/plan/ConcatOptimizerTest.java index ffa3526..5c98df4 100644 --- a/server/src/test/java/org/apache/iotdb/db/qp/plan/ConcatOptimizerTest.java +++ b/server/src/test/java/org/apache/iotdb/db/qp/plan/ConcatOptimizerTest.java @@ -18,17 +18,14 @@ */ package org.apache.iotdb.db.qp.plan; -import static org.junit.Assert.assertEquals; - -import java.io.IOException; import org.antlr.v4.runtime.RecognitionException; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.qp.Planner; import org.apache.iotdb.db.qp.physical.PhysicalPlan; import org.apache.iotdb.db.qp.physical.crud.RawDataQueryPlan; import org.apache.iotdb.db.qp.strategy.optimizer.ConcatPathOptimizer; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; @@ -42,6 +39,10 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import java.io.IOException; + +import static org.junit.Assert.assertEquals; + /** * test the correctness of {@linkplain ConcatPathOptimizer ConcatPathOptimizer} */ @@ -52,25 +53,25 @@ public class ConcatOptimizerTest { @Before public void before() throws MetadataException { processor = new Planner(); - MManager.getInstance().init(); - MManager.getInstance().setStorageGroup("root.laptop"); - MManager.getInstance().createTimeseries("root.laptop.d1.s1", TSDataType.INT64, TSEncoding.PLAIN, + IoTDB.metaManager.init(); + IoTDB.metaManager.setStorageGroup("root.laptop"); + IoTDB.metaManager.createTimeseries("root.laptop.d1.s1", TSDataType.INT64, TSEncoding.PLAIN, CompressionType.UNCOMPRESSED, null); - MManager.getInstance().createTimeseries("root.laptop.d1.s2", TSDataType.INT64, TSEncoding.PLAIN, + IoTDB.metaManager.createTimeseries("root.laptop.d1.s2", TSDataType.INT64, TSEncoding.PLAIN, CompressionType.UNCOMPRESSED, null); - MManager.getInstance().createTimeseries("root.laptop.d2.s1", TSDataType.INT64, TSEncoding.PLAIN, + IoTDB.metaManager.createTimeseries("root.laptop.d2.s1", TSDataType.INT64, TSEncoding.PLAIN, CompressionType.UNCOMPRESSED, null); - MManager.getInstance().createTimeseries("root.laptop.d2.s2", TSDataType.INT64, TSEncoding.PLAIN, + IoTDB.metaManager.createTimeseries("root.laptop.d2.s2", TSDataType.INT64, TSEncoding.PLAIN, CompressionType.UNCOMPRESSED, null); - MManager.getInstance().createTimeseries("root.laptop.d3.s1", TSDataType.INT64, TSEncoding.PLAIN, + IoTDB.metaManager.createTimeseries("root.laptop.d3.s1", TSDataType.INT64, TSEncoding.PLAIN, CompressionType.UNCOMPRESSED, null); - MManager.getInstance().createTimeseries("root.laptop.d3.s2", TSDataType.INT64, TSEncoding.PLAIN, + IoTDB.metaManager.createTimeseries("root.laptop.d3.s2", TSDataType.INT64, TSEncoding.PLAIN, CompressionType.UNCOMPRESSED, null); } @After public void after() throws IOException { - MManager.getInstance().clear(); + IoTDB.metaManager.clear(); EnvironmentUtils.cleanAllDir(); } diff --git a/server/src/test/java/org/apache/iotdb/db/qp/plan/LogicalPlanSmallTest.java b/server/src/test/java/org/apache/iotdb/db/qp/plan/LogicalPlanSmallTest.java index 40b487d..58741c8 100644 --- a/server/src/test/java/org/apache/iotdb/db/qp/plan/LogicalPlanSmallTest.java +++ b/server/src/test/java/org/apache/iotdb/db/qp/plan/LogicalPlanSmallTest.java @@ -18,26 +18,25 @@ */ package org.apache.iotdb.db.qp.plan; -import java.util.ArrayList; import org.antlr.v4.runtime.misc.ParseCancellationException; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.LogicalOptimizeException; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.runtime.SQLParserException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.qp.logical.RootOperator; import org.apache.iotdb.db.qp.logical.crud.QueryOperator; import org.apache.iotdb.db.qp.logical.sys.DeleteStorageGroupOperator; import org.apache.iotdb.db.qp.logical.sys.SetStorageGroupOperator; -import org.apache.iotdb.db.qp.logical.sys.ShowTimeSeriesOperator; -import org.apache.iotdb.db.qp.physical.sys.ShowTimeSeriesPlan; import org.apache.iotdb.db.qp.strategy.ParseDriver; import org.apache.iotdb.db.qp.strategy.optimizer.ConcatPathOptimizer; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.tsfile.read.common.Path; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.util.ArrayList; + public class LogicalPlanSmallTest { private ParseDriver parseDriver; @@ -179,10 +178,10 @@ public class LogicalPlanSmallTest { String sqlStr = "select s1 from root.vehicle.d1 where s1 < 20 and time <= now() slimit 2 soffset 1"; RootOperator operator = (RootOperator) parseDriver .parse(sqlStr, IoTDBDescriptor.getInstance().getConfig().getZoneID()); - MManager.getInstance().init(); + IoTDB.metaManager.init(); ConcatPathOptimizer concatPathOptimizer = new ConcatPathOptimizer(); concatPathOptimizer.transform(operator); - MManager.getInstance().clear(); + IoTDB.metaManager.clear(); // expected to throw LogicalOptimizeException: SOFFSET <SOFFSETValue>: SOFFSETValue exceeds the range. } diff --git a/server/src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java b/server/src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java index f796120..b1e22e5 100644 --- a/server/src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java +++ b/server/src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java @@ -19,43 +19,19 @@ package org.apache.iotdb.db.qp.plan; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; import org.antlr.v4.runtime.misc.ParseCancellationException; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.runtime.SQLParserException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.qp.Planner; import org.apache.iotdb.db.qp.logical.Operator.OperatorType; import org.apache.iotdb.db.qp.physical.PhysicalPlan; -import org.apache.iotdb.db.qp.physical.crud.AggregationPlan; -import org.apache.iotdb.db.qp.physical.crud.FillQueryPlan; -import org.apache.iotdb.db.qp.physical.crud.GroupByTimeFillPlan; -import org.apache.iotdb.db.qp.physical.crud.GroupByTimePlan; -import org.apache.iotdb.db.qp.physical.crud.LastQueryPlan; -import org.apache.iotdb.db.qp.physical.crud.QueryPlan; -import org.apache.iotdb.db.qp.physical.crud.RawDataQueryPlan; -import org.apache.iotdb.db.qp.physical.sys.AuthorPlan; -import org.apache.iotdb.db.qp.physical.sys.CreateTimeSeriesPlan; -import org.apache.iotdb.db.qp.physical.sys.DataAuthPlan; -import org.apache.iotdb.db.qp.physical.sys.LoadConfigurationPlan; -import org.apache.iotdb.db.qp.physical.sys.OperateFilePlan; -import org.apache.iotdb.db.qp.physical.sys.ShowPlan; +import org.apache.iotdb.db.qp.physical.crud.*; +import org.apache.iotdb.db.qp.physical.sys.*; import org.apache.iotdb.db.query.executor.fill.LinearFill; import org.apache.iotdb.db.query.executor.fill.PreviousFill; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; @@ -73,31 +49,37 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.io.File; +import java.io.IOException; +import java.util.*; + +import static org.junit.Assert.*; + public class PhysicalPlanTest { private Planner processor = new Planner(); @Before public void before() throws MetadataException { - MManager.getInstance().init(); - MManager.getInstance().setStorageGroup("root.vehicle"); - MManager.getInstance() + IoTDB.metaManager.init(); + IoTDB.metaManager.setStorageGroup("root.vehicle"); + IoTDB.metaManager .createTimeseries("root.vehicle.d1.s1", TSDataType.FLOAT, TSEncoding.PLAIN, CompressionType.UNCOMPRESSED, null); - MManager.getInstance() + IoTDB.metaManager .createTimeseries("root.vehicle.d2.s1", TSDataType.FLOAT, TSEncoding.PLAIN, CompressionType.UNCOMPRESSED, null); - MManager.getInstance() + IoTDB.metaManager .createTimeseries("root.vehicle.d3.s1", TSDataType.FLOAT, TSEncoding.PLAIN, CompressionType.UNCOMPRESSED, null); - MManager.getInstance() + IoTDB.metaManager .createTimeseries("root.vehicle.d4.s1", TSDataType.FLOAT, TSEncoding.PLAIN, CompressionType.UNCOMPRESSED, null); } @After public void clean() throws IOException { - MManager.getInstance().clear(); + IoTDB.metaManager.clear(); EnvironmentUtils.cleanAllDir(); } diff --git a/server/src/test/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithValueFilterTest.java b/server/src/test/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithValueFilterTest.java index 64b7a56..213dbdc 100644 --- a/server/src/test/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithValueFilterTest.java +++ b/server/src/test/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithValueFilterTest.java @@ -18,23 +18,20 @@ */ package org.apache.iotdb.db.query.dataset; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.qp.Planner; import org.apache.iotdb.db.qp.executor.IPlanExecutor; import org.apache.iotdb.db.qp.executor.PlanExecutor; import org.apache.iotdb.db.qp.physical.crud.QueryPlan; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; import org.junit.After; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.*; + public class EngineDataSetWithValueFilterTest { private IPlanExecutor queryExecutor = new PlanExecutor(); @@ -81,7 +78,7 @@ public class EngineDataSetWithValueFilterTest { "insert into root.test.d0(timestamp,s1) values(3000,'1309')"}; static { - MManager.getInstance().init(); + IoTDB.metaManager.init(); } public EngineDataSetWithValueFilterTest() throws QueryProcessException { diff --git a/server/src/test/java/org/apache/iotdb/db/query/dataset/GroupByLevelDataSetTest.java b/server/src/test/java/org/apache/iotdb/db/query/dataset/GroupByLevelDataSetTest.java index 3e8cae0..8094d77 100644 --- a/server/src/test/java/org/apache/iotdb/db/query/dataset/GroupByLevelDataSetTest.java +++ b/server/src/test/java/org/apache/iotdb/db/query/dataset/GroupByLevelDataSetTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.query.dataset; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.qp.Planner; import org.apache.iotdb.db.qp.executor.IPlanExecutor; import org.apache.iotdb.db.qp.executor.PlanExecutor; import org.apache.iotdb.db.qp.physical.crud.QueryPlan; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; import org.junit.After; @@ -31,7 +31,6 @@ import org.junit.Before; import org.junit.Test; import static org.junit.Assert.*; -import static org.junit.Assert.assertEquals; public class GroupByLevelDataSetTest { private IPlanExecutor queryExecutor = new PlanExecutor(); @@ -82,7 +81,7 @@ public class GroupByLevelDataSetTest { "insert into root.test.d1(timestamp, \"s3.xy\") values(10, 'text')"}; static { - MManager.getInstance().init(); + IoTDB.metaManager.init(); } public GroupByLevelDataSetTest() throws QueryProcessException { diff --git a/server/src/test/java/org/apache/iotdb/db/query/dataset/GroupByTimeDataSetTest.java b/server/src/test/java/org/apache/iotdb/db/query/dataset/GroupByTimeDataSetTest.java index 09b31fd..16f05fd 100644 --- a/server/src/test/java/org/apache/iotdb/db/query/dataset/GroupByTimeDataSetTest.java +++ b/server/src/test/java/org/apache/iotdb/db/query/dataset/GroupByTimeDataSetTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.query.dataset; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.qp.Planner; import org.apache.iotdb.db.qp.executor.IPlanExecutor; import org.apache.iotdb.db.qp.executor.PlanExecutor; import org.apache.iotdb.db.qp.physical.crud.QueryPlan; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet; import org.junit.After; @@ -79,7 +79,7 @@ public class GroupByTimeDataSetTest { "insert into root.test.d1(timestamp, \"s3.xy\") values(10, 'text')"}; static { - MManager.getInstance().init(); + IoTDB.metaManager.init(); } public GroupByTimeDataSetTest() throws QueryProcessException { diff --git a/server/src/test/java/org/apache/iotdb/db/query/reader/ReaderTestHelper.java b/server/src/test/java/org/apache/iotdb/db/query/reader/ReaderTestHelper.java index 6d7357a..28135c1 100644 --- a/server/src/test/java/org/apache/iotdb/db/query/reader/ReaderTestHelper.java +++ b/server/src/test/java/org/apache/iotdb/db/query/reader/ReaderTestHelper.java @@ -19,20 +19,21 @@ package org.apache.iotdb.db.query.reader; -import java.io.IOException; import org.apache.iotdb.db.conf.adapter.ActiveTimeSeriesCounter; import org.apache.iotdb.db.constant.TestConstant; import org.apache.iotdb.db.engine.MetadataManagerHelper; import org.apache.iotdb.db.engine.flush.TsFileFlushPolicy.DirectFlushPolicy; import org.apache.iotdb.db.engine.storagegroup.StorageGroupProcessor; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.query.control.FileReaderManager; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.junit.After; import org.junit.Before; +import java.io.IOException; + public abstract class ReaderTestHelper { private String storageGroup = "root.vehicle"; @@ -43,7 +44,7 @@ public abstract class ReaderTestHelper { private String systemDir = TestConstant.OUTPUT_DATA_DIR.concat("info"); static { - MManager.getInstance().init(); + IoTDB.metaManager.init(); } @Before diff --git a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java index 72f01a1..3eb5544 100644 --- a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java +++ b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java @@ -19,15 +19,6 @@ package org.apache.iotdb.db.query.reader.series; -import static org.apache.iotdb.db.conf.IoTDBConstant.PATH_SEPARATOR; - -import java.io.File; -import java.io.IOException; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.apache.iotdb.db.conf.IoTDBConstant; import org.apache.iotdb.db.constant.TestConstant; import org.apache.iotdb.db.engine.cache.ChunkMetadataCache; @@ -35,8 +26,8 @@ import org.apache.iotdb.db.engine.merge.manage.MergeManager; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.exception.query.PathException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.query.control.FileReaderManager; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; @@ -47,6 +38,15 @@ import org.apache.iotdb.tsfile.write.record.TSRecord; import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint; import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; +import java.io.File; +import java.io.IOException; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.apache.iotdb.db.conf.IoTDBConstant.PATH_SEPARATOR; + public class SeriesReaderTestUtil { private static int seqFileNum = 5; @@ -61,7 +61,7 @@ public class SeriesReaderTestUtil { public static void setUp(List<MeasurementSchema> measurementSchemas, List<String> deviceIds, List<TsFileResource> seqResources, List<TsFileResource> unseqResources) throws MetadataException, PathException, IOException, WriteProcessException { - MManager.getInstance().init(); + IoTDB.metaManager.init(); prepareSeries(measurementSchemas, deviceIds); prepareFiles(seqResources, unseqResources, measurementSchemas, deviceIds); } @@ -72,7 +72,7 @@ public class SeriesReaderTestUtil { seqResources.clear(); unseqResources.clear(); ChunkMetadataCache.getInstance().clear(); - MManager.getInstance().clear(); + IoTDB.metaManager.clear(); EnvironmentUtils.cleanAllDir(); MergeManager.getINSTANCE().stop(); } @@ -158,10 +158,10 @@ public class SeriesReaderTestUtil { for (int i = 0; i < deviceNum; i++) { deviceIds.add(SERIES_READER_TEST_SG + PATH_SEPARATOR + "device" + i); } - MManager.getInstance().setStorageGroup(SERIES_READER_TEST_SG); + IoTDB.metaManager.setStorageGroup(SERIES_READER_TEST_SG); for (String device : deviceIds) { for (MeasurementSchema measurementSchema : measurementSchemas) { - MManager.getInstance().createTimeseries( + IoTDB.metaManager.createTimeseries( device + PATH_SEPARATOR + measurementSchema.getMeasurementId(), measurementSchema .getType(), measurementSchema.getEncodingType(), measurementSchema.getCompressor(), Collections.emptyMap()); diff --git a/server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java b/server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java index 8b12267..caf45f5 100644 --- a/server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java +++ b/server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java @@ -29,6 +29,7 @@ import org.apache.iotdb.db.exception.StartupException; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.metadata.MManager; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.sync.conf.SyncConstant; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.junit.After; @@ -62,7 +63,7 @@ public class FileLoaderTest { } private void initMetadata() throws MetadataException { - MManager mmanager = MManager.getInstance(); + MManager mmanager = IoTDB.metaManager; mmanager.init(); mmanager.setStorageGroup("root.sg0"); mmanager.setStorageGroup("root.sg1"); diff --git a/server/src/test/java/org/apache/iotdb/db/sync/receiver/recover/SyncReceiverLogAnalyzerTest.java b/server/src/test/java/org/apache/iotdb/db/sync/receiver/recover/SyncReceiverLogAnalyzerTest.java index f4da3d2..c9fea93 100644 --- a/server/src/test/java/org/apache/iotdb/db/sync/receiver/recover/SyncReceiverLogAnalyzerTest.java +++ b/server/src/test/java/org/apache/iotdb/db/sync/receiver/recover/SyncReceiverLogAnalyzerTest.java @@ -28,6 +28,7 @@ import org.apache.iotdb.db.exception.StartupException; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.metadata.MManager; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.sync.conf.SyncConstant; import org.apache.iotdb.db.sync.receiver.load.FileLoader; import org.apache.iotdb.db.sync.receiver.load.FileLoaderManager; @@ -69,7 +70,7 @@ public class SyncReceiverLogAnalyzerTest { } private void initMetadata() throws MetadataException { - MManager mmanager = MManager.getInstance(); + MManager mmanager = IoTDB.metaManager; mmanager.init(); mmanager.setStorageGroup("root.sg0"); mmanager.setStorageGroup("root.sg1"); diff --git a/server/src/test/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManagerTest.java b/server/src/test/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManagerTest.java index e4c1e94..3500c95 100644 --- a/server/src/test/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManagerTest.java +++ b/server/src/test/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManagerTest.java @@ -18,19 +18,6 @@ */ package org.apache.iotdb.db.sync.sender.manage; -import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.TSFILE_SUFFIX; -import static org.junit.Assert.assertTrue; - -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Random; -import java.util.Set; import org.apache.iotdb.db.conf.IoTDBConstant; import org.apache.iotdb.db.conf.directories.DirectoryManager; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; @@ -38,7 +25,7 @@ import org.apache.iotdb.db.exception.DiskSpaceInsufficientException; import org.apache.iotdb.db.exception.StartupException; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.MetadataException; -import org.apache.iotdb.db.metadata.MManager; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.sync.conf.SyncSenderConfig; import org.apache.iotdb.db.sync.conf.SyncSenderDescriptor; import org.apache.iotdb.db.utils.EnvironmentUtils; @@ -50,6 +37,16 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.*; +import java.util.Map.Entry; + +import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.TSFILE_SUFFIX; +import static org.junit.Assert.assertTrue; + public class SyncFileManagerTest { private static final Logger logger = LoggerFactory.getLogger(SyncFileManagerTest.class); @@ -77,7 +74,7 @@ public class SyncFileManagerTest { Random r = new Random(0); for (int i = 0; i < 3; i++) { - MManager.getInstance().setStorageGroup(getSgName(i)); + IoTDB.metaManager.setStorageGroup(getSgName(i)); } for (int i = 0; i < 3; i++) { for (int j = 0; j < 5; j++) { diff --git a/server/src/test/java/org/apache/iotdb/db/sync/sender/recover/SyncSenderLogAnalyzerTest.java b/server/src/test/java/org/apache/iotdb/db/sync/sender/recover/SyncSenderLogAnalyzerTest.java index 15a83d0..bac82cf 100644 --- a/server/src/test/java/org/apache/iotdb/db/sync/sender/recover/SyncSenderLogAnalyzerTest.java +++ b/server/src/test/java/org/apache/iotdb/db/sync/sender/recover/SyncSenderLogAnalyzerTest.java @@ -18,18 +18,6 @@ */ package org.apache.iotdb.db.sync.sender.recover; -import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.TSFILE_SUFFIX; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.IOException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Random; -import java.util.Set; import org.apache.iotdb.db.conf.IoTDBConstant; import org.apache.iotdb.db.conf.directories.DirectoryManager; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; @@ -37,7 +25,7 @@ import org.apache.iotdb.db.exception.DiskSpaceInsufficientException; import org.apache.iotdb.db.exception.StartupException; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.MetadataException; -import org.apache.iotdb.db.metadata.MManager; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.sync.conf.SyncConstant; import org.apache.iotdb.db.sync.conf.SyncSenderConfig; import org.apache.iotdb.db.sync.conf.SyncSenderDescriptor; @@ -52,6 +40,15 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; +import java.io.IOException; +import java.util.*; +import java.util.Map.Entry; + +import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.TSFILE_SUFFIX; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class SyncSenderLogAnalyzerTest { private static final Logger LOGGER = LoggerFactory.getLogger(SyncSenderLogAnalyzerTest.class); @@ -83,7 +80,7 @@ public class SyncSenderLogAnalyzerTest { Map<String, Map<Long, Set<File>>> allFileList = new HashMap<>(); for (int i = 0; i < 3; i++) { - MManager.getInstance().setStorageGroup(getSgName(i)); + IoTDB.metaManager.setStorageGroup(getSgName(i)); } Random r = new Random(0); for (int i = 0; i < 3; i++) { diff --git a/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java b/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java index ee7f045..ebe8a9e 100644 --- a/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java +++ b/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java @@ -18,15 +18,6 @@ */ package org.apache.iotdb.db.utils; -import static org.junit.Assert.fail; - -import java.io.File; -import java.io.IOException; -import java.net.InetSocketAddress; -import java.net.Socket; -import javax.management.remote.JMXConnector; -import javax.management.remote.JMXConnectorFactory; -import javax.management.remote.JMXServiceURL; import org.apache.commons.io.FileUtils; import org.apache.iotdb.db.auth.AuthException; import org.apache.iotdb.db.auth.authorizer.BasicAuthorizer; @@ -38,7 +29,6 @@ import org.apache.iotdb.db.constant.TestConstant; import org.apache.iotdb.db.engine.StorageEngine; import org.apache.iotdb.db.engine.cache.ChunkMetadataCache; import org.apache.iotdb.db.exception.StorageEngineException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.query.context.QueryContext; import org.apache.iotdb.db.query.control.FileReaderManager; import org.apache.iotdb.db.query.control.QueryResourceManager; @@ -50,6 +40,16 @@ import org.apache.thrift.transport.TTransportException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.management.remote.JMXConnector; +import javax.management.remote.JMXConnectorFactory; +import javax.management.remote.JMXServiceURL; +import java.io.File; +import java.io.IOException; +import java.net.InetSocketAddress; +import java.net.Socket; + +import static org.junit.Assert.fail; + /** * <p> * This class is used for cleaning test environment in unit test and integration test @@ -136,7 +136,7 @@ public class EnvironmentUtils { ChunkMetadataCache.getInstance().clear(); } // close metadata - MManager.getInstance().clear(); + IoTDB.metaManager.clear(); // close tracing TracingManager.getInstance().close(); diff --git a/server/src/test/java/org/apache/iotdb/db/writelog/PerformanceTest.java b/server/src/test/java/org/apache/iotdb/db/writelog/PerformanceTest.java index dd40e42..82207d9 100644 --- a/server/src/test/java/org/apache/iotdb/db/writelog/PerformanceTest.java +++ b/server/src/test/java/org/apache/iotdb/db/writelog/PerformanceTest.java @@ -18,17 +18,14 @@ */ package org.apache.iotdb.db.writelog; -import java.io.File; -import java.io.IOException; -import java.util.Collections; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.WriteProcessException; import org.apache.iotdb.db.exception.metadata.MetadataException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.qp.physical.crud.DeletePlan; import org.apache.iotdb.db.qp.physical.crud.InsertRowPlan; import org.apache.iotdb.db.qp.physical.crud.UpdatePlan; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.db.writelog.node.ExclusiveWriteLogNode; import org.apache.iotdb.db.writelog.node.WriteLogNode; @@ -41,6 +38,10 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import java.io.File; +import java.io.IOException; +import java.util.Collections; + @Ignore public class PerformanceTest { @@ -129,19 +130,19 @@ public class PerformanceTest { tempProcessorStore.createNewFile(); try { - MManager.getInstance().setStorageGroup("root.logTestDevice"); + IoTDB.metaManager.setStorageGroup("root.logTestDevice"); } catch (MetadataException ignored) { } - MManager.getInstance() + IoTDB.metaManager .createTimeseries("root.logTestDevice.s1", TSDataType.DOUBLE, TSEncoding.PLAIN, TSFileDescriptor.getInstance().getConfig().getCompressor(), Collections.emptyMap()); - MManager.getInstance() + IoTDB.metaManager .createTimeseries("root.logTestDevice.s2", TSDataType.INT32, TSEncoding.PLAIN, TSFileDescriptor.getInstance().getConfig().getCompressor(), Collections.emptyMap()); - MManager.getInstance() + IoTDB.metaManager .createTimeseries("root.logTestDevice.s3", TSDataType.TEXT, TSEncoding.PLAIN, TSFileDescriptor.getInstance().getConfig().getCompressor(), Collections.emptyMap()); - MManager.getInstance() + IoTDB.metaManager .createTimeseries("root.logTestDevice.s4", TSDataType.BOOLEAN, TSEncoding.PLAIN, TSFileDescriptor.getInstance().getConfig().getCompressor(), Collections.emptyMap()); WriteLogNode logNode = new ExclusiveWriteLogNode("root.logTestDevice"); diff --git a/server/src/test/java/org/apache/iotdb/db/writelog/recover/DeviceStringTest.java b/server/src/test/java/org/apache/iotdb/db/writelog/recover/DeviceStringTest.java index 171e444..fa85ca3 100644 --- a/server/src/test/java/org/apache/iotdb/db/writelog/recover/DeviceStringTest.java +++ b/server/src/test/java/org/apache/iotdb/db/writelog/recover/DeviceStringTest.java @@ -19,12 +19,6 @@ package org.apache.iotdb.db.writelog.recover; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.IOException; -import java.util.Collections; - import org.apache.commons.io.FileUtils; import org.apache.iotdb.db.constant.TestConstant; import org.apache.iotdb.db.engine.fileSystem.SystemFileFactory; @@ -32,6 +26,7 @@ import org.apache.iotdb.db.engine.storagegroup.TsFileResource; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.metadata.MManager; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; @@ -47,6 +42,12 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import java.io.File; +import java.io.IOException; +import java.util.Collections; + +import static org.junit.Assert.assertTrue; + public class DeviceStringTest { private File tsF; @@ -54,7 +55,7 @@ public class DeviceStringTest { private String logNodePrefix = TestConstant.OUTPUT_DATA_DIR.concat("testNode/0"); private Schema schema; private TsFileResource resource; - private MManager mManager = MManager.getInstance(); + private MManager mManager = IoTDB.metaManager; @Before public void setup() throws IOException, WriteProcessException, MetadataException { diff --git a/server/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java b/server/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java index 745e06b..7321643 100644 --- a/server/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java +++ b/server/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java @@ -19,13 +19,6 @@ package org.apache.iotdb.db.writelog.recover; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.IOException; -import java.util.Collections; import org.apache.iotdb.db.engine.fileSystem.SystemFileFactory; import org.apache.iotdb.db.engine.memtable.IMemTable; import org.apache.iotdb.db.engine.memtable.PrimitiveMemTable; @@ -39,9 +32,9 @@ import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.StorageGroupProcessorException; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.qp.physical.crud.DeletePlan; import org.apache.iotdb.db.qp.physical.crud.InsertRowPlan; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.db.writelog.manager.MultiFileLogNodeManager; import org.apache.iotdb.db.writelog.node.WriteLogNode; @@ -55,6 +48,12 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import java.io.File; +import java.io.IOException; +import java.util.Collections; + +import static org.junit.Assert.*; + public class LogReplayerTest { @Before @@ -88,11 +87,11 @@ public class LogReplayerTest { TsFileResource tsFileResource = new TsFileResource(tsFile); IMemTable memTable = new PrimitiveMemTable(); - MManager.getInstance().setStorageGroup("root.sg"); + IoTDB.metaManager.setStorageGroup("root.sg"); try { for (int i = 0; i < 5; i++) { for (int j = 0; j < 5; j++) { - MManager.getInstance() + IoTDB.metaManager .createTimeseries("root.sg.device" + i + ".sensor" + j, TSDataType.INT64, TSEncoding.PLAIN, TSFileDescriptor.getInstance().getConfig().getCompressor(), Collections.emptyMap()); diff --git a/server/src/test/java/org/apache/iotdb/db/writelog/recover/RecoverResourceFromReaderTest.java b/server/src/test/java/org/apache/iotdb/db/writelog/recover/RecoverResourceFromReaderTest.java index a7bc9f0..0256e75 100644 --- a/server/src/test/java/org/apache/iotdb/db/writelog/recover/RecoverResourceFromReaderTest.java +++ b/server/src/test/java/org/apache/iotdb/db/writelog/recover/RecoverResourceFromReaderTest.java @@ -34,8 +34,8 @@ import org.apache.iotdb.db.engine.version.VersionController; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.StorageGroupProcessorException; import org.apache.iotdb.db.exception.metadata.MetadataException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.qp.physical.crud.InsertRowPlan; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.db.writelog.manager.MultiFileLogNodeManager; import org.apache.iotdb.db.writelog.node.WriteLogNode; @@ -90,24 +90,24 @@ public class RecoverResourceFromReaderTest { MeasurementSchema measurementSchema = new MeasurementSchema("sensor" + j, TSDataType.INT64, TSEncoding.PLAIN); schema.registerTimeseries(path, measurementSchema); - MManager.getInstance().createTimeseries(path.getFullPath(), measurementSchema.getType(), + IoTDB.metaManager.createTimeseries(path.getFullPath(), measurementSchema.getType(), measurementSchema.getEncodingType(), measurementSchema.getCompressor(), measurementSchema.getProps()); } } schema.registerTimeseries(new Path(("root.sg.device99"), ("sensor4")), new MeasurementSchema("sensor4", TSDataType.INT64, TSEncoding.PLAIN)); - MManager.getInstance() + IoTDB.metaManager .createTimeseries("root.sg.device99.sensor4", TSDataType.INT64, TSEncoding.PLAIN, TSFileDescriptor.getInstance().getConfig().getCompressor(), Collections.emptyMap()); schema.registerTimeseries(new Path(("root.sg.device99"), ("sensor2")), new MeasurementSchema("sensor2", TSDataType.INT64, TSEncoding.PLAIN)); - MManager.getInstance() + IoTDB.metaManager .createTimeseries("root.sg.device99.sensor2", TSDataType.INT64, TSEncoding.PLAIN, TSFileDescriptor.getInstance().getConfig().getCompressor(), Collections.emptyMap()); schema.registerTimeseries(new Path(("root.sg.device99"), ("sensor1")), new MeasurementSchema("sensor1", TSDataType.INT64, TSEncoding.PLAIN)); - MManager.getInstance() + IoTDB.metaManager .createTimeseries("root.sg.device99.sensor1", TSDataType.INT64, TSEncoding.PLAIN, TSFileDescriptor.getInstance().getConfig().getCompressor(), Collections.emptyMap()); writer = new TsFileWriter(tsF, schema); diff --git a/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java b/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java index ecd49a8..f3806ca 100644 --- a/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java +++ b/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java @@ -19,17 +19,6 @@ package org.apache.iotdb.db.writelog.recover; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import org.apache.commons.io.FileUtils; import org.apache.iotdb.db.conf.adapter.ActiveTimeSeriesCounter; import org.apache.iotdb.db.constant.TestConstant; @@ -39,8 +28,8 @@ import org.apache.iotdb.db.engine.version.VersionController; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.StorageGroupProcessorException; import org.apache.iotdb.db.exception.metadata.MetadataException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.qp.physical.crud.InsertRowPlan; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.db.writelog.manager.MultiFileLogNodeManager; import org.apache.iotdb.db.writelog.node.WriteLogNode; @@ -66,6 +55,12 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.io.File; +import java.io.IOException; +import java.util.*; + +import static org.junit.Assert.*; + public class SeqTsFileRecoverTest { private File tsF; @@ -95,10 +90,10 @@ public class SeqTsFileRecoverTest { tsF = SystemFileFactory.INSTANCE.getFile(logNodePrefix, "1-1-1.tsfile"); tsF.getParentFile().mkdirs(); - MManager.getInstance().setStorageGroup("root.sg"); + IoTDB.metaManager.setStorageGroup("root.sg"); for (int i = 0; i < 10; i++) { for (int j = 0; j < 10; j++) { - MManager.getInstance() + IoTDB.metaManager .createTimeseries("root.sg.device" + i + ".sensor" + j, TSDataType.INT64, TSEncoding.PLAIN, TSFileDescriptor.getInstance().getConfig().getCompressor(), Collections.emptyMap()); diff --git a/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java b/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java index cd63f94..4975292 100644 --- a/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java +++ b/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java @@ -19,11 +19,6 @@ package org.apache.iotdb.db.writelog.recover; -import static org.junit.Assert.assertEquals; - -import java.io.File; -import java.io.IOException; -import java.util.Collections; import org.apache.commons.io.FileUtils; import org.apache.iotdb.db.conf.adapter.ActiveTimeSeriesCounter; import org.apache.iotdb.db.constant.TestConstant; @@ -33,10 +28,10 @@ import org.apache.iotdb.db.engine.version.VersionController; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.StorageGroupProcessorException; import org.apache.iotdb.db.exception.metadata.MetadataException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.qp.physical.crud.InsertRowPlan; import org.apache.iotdb.db.query.reader.chunk.ChunkDataIterator; import org.apache.iotdb.db.query.reader.universal.PriorityMergeReader; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.db.writelog.manager.MultiFileLogNodeManager; import org.apache.iotdb.db.writelog.node.WriteLogNode; @@ -63,6 +58,12 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import java.io.File; +import java.io.IOException; +import java.util.Collections; + +import static org.junit.Assert.assertEquals; + public class UnseqTsFileRecoverTest { private File tsF; @@ -98,24 +99,24 @@ public class UnseqTsFileRecoverTest { MeasurementSchema measurementSchema = new MeasurementSchema("sensor" + j, TSDataType.INT64, TSEncoding.PLAIN); schema.registerTimeseries(path, measurementSchema); - MManager.getInstance().createTimeseries(path.getFullPath(), measurementSchema.getType(), + IoTDB.metaManager.createTimeseries(path.getFullPath(), measurementSchema.getType(), measurementSchema.getEncodingType(), measurementSchema.getCompressor(), measurementSchema.getProps()); } } schema.registerTimeseries(new Path(("root.sg.device99"), ("sensor4")), new MeasurementSchema("sensor4", TSDataType.INT64, TSEncoding.PLAIN)); - MManager.getInstance() + IoTDB.metaManager .createTimeseries("root.sg.device99.sensor4", TSDataType.INT64, TSEncoding.PLAIN, TSFileDescriptor.getInstance().getConfig().getCompressor(), Collections.emptyMap()); schema.registerTimeseries(new Path(("root.sg.device99"), ("sensor2")), new MeasurementSchema("sensor2", TSDataType.INT64, TSEncoding.PLAIN)); - MManager.getInstance() + IoTDB.metaManager .createTimeseries("root.sg.device99.sensor2", TSDataType.INT64, TSEncoding.PLAIN, TSFileDescriptor.getInstance().getConfig().getCompressor(), Collections.emptyMap()); schema.registerTimeseries(new Path(("root.sg.device99"), ("sensor1")), new MeasurementSchema("sensor1", TSDataType.INT64, TSEncoding.PLAIN)); - MManager.getInstance() + IoTDB.metaManager .createTimeseries("root.sg.device99.sensor1", TSDataType.INT64, TSEncoding.PLAIN, TSFileDescriptor.getInstance().getConfig().getCompressor(), Collections.emptyMap()); writer = new TsFileWriter(tsF, schema); diff --git a/spark-iotdb-connector/src/test/scala/org/apache/iotdb/spark/db/EnvironmentUtils.java b/spark-iotdb-connector/src/test/scala/org/apache/iotdb/spark/db/EnvironmentUtils.java index 0070fe0..5d848a9 100644 --- a/spark-iotdb-connector/src/test/scala/org/apache/iotdb/spark/db/EnvironmentUtils.java +++ b/spark-iotdb-connector/src/test/scala/org/apache/iotdb/spark/db/EnvironmentUtils.java @@ -18,17 +18,10 @@ */ package org.apache.iotdb.spark.db; -import java.io.File; -import java.io.IOException; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Locale; import org.apache.commons.io.FileUtils; import org.apache.iotdb.db.auth.AuthException; -import org.apache.iotdb.db.auth.authorizer.IAuthorizer; import org.apache.iotdb.db.auth.authorizer.BasicAuthorizer; +import org.apache.iotdb.db.auth.authorizer.IAuthorizer; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.conf.adapter.IoTDBConfigDynamicAdapter; @@ -38,11 +31,11 @@ import org.apache.iotdb.db.engine.cache.ChunkMetadataCache; import org.apache.iotdb.db.engine.flush.FlushManager; import org.apache.iotdb.db.exception.StartupException; import org.apache.iotdb.db.exception.StorageEngineException; -import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.monitor.StatMonitor; import org.apache.iotdb.db.query.context.QueryContext; import org.apache.iotdb.db.query.control.FileReaderManager; import org.apache.iotdb.db.query.control.QueryResourceManager; +import org.apache.iotdb.db.service.IoTDB; import org.apache.iotdb.db.service.MetricsService; import org.apache.iotdb.db.writelog.manager.MultiFileLogNodeManager; import org.apache.iotdb.jdbc.Config; @@ -50,6 +43,14 @@ import org.junit.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; +import java.io.IOException; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Locale; + /** * <p> * This class is used for cleaning test environment in unit test and integration test @@ -123,7 +124,7 @@ public class EnvironmentUtils { ChunkMetadataCache.getInstance().clear(); } // close metadata - MManager.getInstance().clear(); + IoTDB.metaManager.clear(); MetricsService.getInstance().stop(); // delete all directory cleanAllDir(); @@ -172,7 +173,7 @@ public class EnvironmentUtils { */ public static void envSetUp() throws StartupException, IOException { IoTDBDescriptor.getInstance().getConfig().setEnableParameterAdapter(false); - MManager.getInstance().init(); + IoTDB.metaManager.init(); IoTDBConfigDynamicAdapter.getInstance().setInitialized(true); createAllDir();