You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/07/20 08:12:35 UTC
[incubator-iotdb] branch release_folder created (now 8567188)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch release_folder
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at 8567188 add iotdb release folder
This branch includes the following new commits:
new 8567188 add iotdb release folder
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-iotdb] 01/01: add iotdb release folder
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch release_folder
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 85671883652128037ccb8e1f40164f3ce68533bd
Author: qiaojialin <64...@qq.com>
AuthorDate: Sat Jul 20 16:12:15 2019 +0800
add iotdb release folder
---
RELEASE_NOTES | 2 +-
.../OtherMaterial-ReleaseNotesV0.7.0.md | 2 +-
.../UserGuideV0.7.0/1-Overview/4-Features.md | 4 +-
.../3-Operation Manual/2-Data Model Selection.md | 2 +-
.../3-Operation Manual/3-Data Import.md | 2 +-
.../3-Operation Manual/4-Data Query.md | 4 +-
.../3-Operation Manual/5-Data Maintenance.md | 4 +-
.../4-Deployment and Management/2-Configuration.md | 2 +-
.../3-System Monitor.md | 4 +-
.../1-IoTDB Query Statement.md | 2 +-
docs/Documentation/Frequently asked questions.md | 4 +-
.../OtherMaterial-ReleaseNotesV0.7.0.md | 6 +--
.../3-Operation Manual/2-Data Model Selection.md | 2 +-
.../3-Operation Manual/3-Data Import.md | 2 +-
.../3-Operation Manual/4-Data Query.md | 4 +-
.../3-Operation Manual/5-Data Maintenance.md | 4 +-
.../4-Deployment and Management/1-Deployment.md | 4 +-
.../3-System Monitor.md | 2 +-
.../7-Build and use IoTDB by Dockerfile.md | 4 +-
.../1-IoTDB Query Statement.md | 2 +-
.../UserGuideV0.7.0/6-JDBC API/1-JDBC API.md | 2 +-
.../Documentation/UserGuideV0.7.0/8-Tools-spark.md | 6 +--
example/kafka/pom.xml | 2 +-
example/kafka/readme.md | 4 +-
example/rocketmq/readme.md | 4 +-
hadoop/pom.xml | 2 +-
iotdb-cli/pom.xml | 18 +------
{iotdb => iotdb-server}/pom.xml | 34 ++-----------
.../antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g | 0
.../org/apache/iotdb/db/sql/parse/TSParser.g | 0
.../org/apache/iotdb/db/auth/AuthException.java | 0
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 0
.../iotdb/db/auth/authorizer/BasicAuthorizer.java | 0
.../iotdb/db/auth/authorizer/IAuthorizer.java | 0
.../db/auth/authorizer/LocalFileAuthorizer.java | 0
.../apache/iotdb/db/auth/entity/PathPrivilege.java | 0
.../apache/iotdb/db/auth/entity/PrivilegeType.java | 0
.../java/org/apache/iotdb/db/auth/entity/Role.java | 0
.../java/org/apache/iotdb/db/auth/entity/User.java | 0
.../iotdb/db/auth/role/BasicRoleManager.java | 0
.../apache/iotdb/db/auth/role/IRoleAccessor.java | 0
.../apache/iotdb/db/auth/role/IRoleManager.java | 0
.../iotdb/db/auth/role/LocalFileRoleAccessor.java | 0
.../iotdb/db/auth/role/LocalFileRoleManager.java | 0
.../iotdb/db/auth/user/BasicUserManager.java | 0
.../apache/iotdb/db/auth/user/IUserAccessor.java | 0
.../apache/iotdb/db/auth/user/IUserManager.java | 0
.../iotdb/db/auth/user/LocalFileUserAccessor.java | 0
.../iotdb/db/auth/user/LocalFileUserManager.java | 0
.../org/apache/iotdb/db/concurrent/HashLock.java | 0
.../IoTDBDefaultThreadExceptionHandler.java | 0
.../db/concurrent/IoTDBThreadPoolFactory.java | 0
.../iotdb/db/concurrent/IoTThreadFactory.java | 0
.../org/apache/iotdb/db/concurrent/ThreadName.java | 0
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 0
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 2 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 0
.../iotdb/db/conf/adapter/CompressionRatio.java | 0
.../iotdb/db/conf/adapter/IDynamicAdapter.java | 0
.../db/conf/adapter/IoTDBConfigDynamicAdapter.java | 0
.../db/conf/directories/DirectoryManager.java | 0
.../directories/strategy/DirectoryStrategy.java | 0
.../strategy/MaxDiskUsableSpaceFirstStrategy.java | 0
.../MinFolderOccupiedSpaceFirstStrategy.java | 0
.../directories/strategy/SequenceStrategy.java | 0
.../db/cost/statistic/ConcurrentCircularArray.java | 0
.../iotdb/db/cost/statistic/Measurement.java | 0
.../iotdb/db/cost/statistic/MeasurementMBean.java | 0
.../apache/iotdb/db/cost/statistic/Operation.java | 0
.../org/apache/iotdb/db/engine/StorageEngine.java | 0
.../iotdb/db/engine/cache/DeviceMetaDataCache.java | 0
.../iotdb/db/engine/cache/TsFileMetaDataCache.java | 0
.../iotdb/db/engine/cache/TsFileMetadataUtils.java | 0
.../iotdb/db/engine/memtable/AbstractMemTable.java | 0
.../iotdb/db/engine/memtable/ChunkBufferPool.java | 0
.../apache/iotdb/db/engine/memtable/IMemTable.java | 0
.../db/engine/memtable/IWritableMemChunk.java | 0
.../db/engine/memtable/MemSeriesLazyMerger.java | 0
.../db/engine/memtable/MemTableFlushTask.java | 0
.../db/engine/memtable/NotifyFlushMemTable.java | 0
.../db/engine/memtable/PrimitiveMemTable.java | 0
.../engine/memtable/TimeValuePairInMemTable.java | 0
.../db/engine/memtable/TimeValuePairSorter.java | 0
.../iotdb/db/engine/memtable/WritableMemChunk.java | 0
.../iotdb/db/engine/modification/Deletion.java | 0
.../iotdb/db/engine/modification/Modification.java | 0
.../db/engine/modification/ModificationFile.java | 0
.../io/LocalTextModificationAccessor.java | 0
.../engine/modification/io/ModificationReader.java | 0
.../engine/modification/io/ModificationWriter.java | 0
.../iotdb/db/engine/modification/package-info.java | 0
.../iotdb/db/engine/pool/FlushPoolManager.java | 0
.../db/engine/pool/FlushSubTaskPoolManager.java | 0
.../db/engine/querycontext/QueryDataSource.java | 0
.../db/engine/querycontext/ReadOnlyMemChunk.java | 0
.../iotdb/db/engine/storagegroup/FlushManager.java | 0
.../engine/storagegroup/StorageGroupProcessor.java | 0
.../db/engine/storagegroup/TsFileProcessor.java | 0
.../db/engine/storagegroup/TsFileResource.java | 0
.../version/SimpleFileVersionController.java | 0
.../engine/version/SysTimeVersionController.java | 0
.../iotdb/db/engine/version/VersionController.java | 0
.../iotdb/db/exception/ArgsErrorException.java | 0
.../db/exception/ConfigAdjusterException.java | 0
.../db/exception/DeltaEngineRunningException.java | 0
.../exception/DiskSpaceInsufficientException.java | 0
.../iotdb/db/exception/FlushRunTimeException.java | 0
.../iotdb/db/exception/MetadataErrorException.java | 0
.../iotdb/db/exception/PathErrorException.java | 0
.../iotdb/db/exception/ProcessorException.java | 0
.../db/exception/QueryInBatchStmtException.java | 0
.../iotdb/db/exception/StartupException.java | 0
.../iotdb/db/exception/StorageEngineException.java | 0
.../exception/StorageEngineFailureException.java | 0
.../exception/StorageGroupProcessorException.java | 0
.../db/exception/SyncConnectionException.java | 0
.../iotdb/db/exception/SysCheckException.java | 0
.../db/exception/TsFileProcessorException.java | 0
.../db/exception/UnSupportedFillTypeException.java | 0
.../db/exception/qp/IllegalASTFormatException.java | 0
.../db/exception/qp/LogicalOperatorException.java | 0
.../db/exception/qp/LogicalOptimizeException.java | 0
.../db/exception/qp/QueryProcessorException.java | 0
.../java/org/apache/iotdb/db/metadata/MGraph.java | 0
.../org/apache/iotdb/db/metadata/MManager.java | 0
.../java/org/apache/iotdb/db/metadata/MNode.java | 0
.../java/org/apache/iotdb/db/metadata/MTree.java | 0
.../org/apache/iotdb/db/metadata/Metadata.java | 0
.../apache/iotdb/db/metadata/MetadataConstant.java | 0
.../iotdb/db/metadata/MetadataOperationType.java | 0
.../java/org/apache/iotdb/db/metadata/PNode.java | 0
.../java/org/apache/iotdb/db/metadata/PTree.java | 0
.../org/apache/iotdb/db/monitor/IStatistic.java | 0
.../apache/iotdb/db/monitor/MonitorConstants.java | 0
.../org/apache/iotdb/db/monitor/StatMonitor.java | 0
.../iotdb/db/monitor/collector/FileSize.java | 0
.../monitor/collector/MemTableWriteTimeCost.java | 0
.../org/apache/iotdb/db/qp/QueryProcessor.java | 0
.../apache/iotdb/db/qp/constant/DatetimeUtils.java | 0
.../apache/iotdb/db/qp/constant/SQLConstant.java | 0
.../iotdb/db/qp/constant/TSParserConstant.java | 0
.../db/qp/exception/DateTimeFormatException.java | 0
.../qp/executor/AbstractQueryProcessExecutor.java | 0
.../db/qp/executor/IQueryProcessExecutor.java | 0
.../iotdb/db/qp/executor/QueryProcessExecutor.java | 0
.../org/apache/iotdb/db/qp/logical/Operator.java | 0
.../apache/iotdb/db/qp/logical/RootOperator.java | 0
.../db/qp/logical/crud/BasicFunctionOperator.java | 0
.../db/qp/logical/crud/BasicOperatorType.java | 0
.../iotdb/db/qp/logical/crud/DeleteOperator.java | 0
.../iotdb/db/qp/logical/crud/FilterOperator.java | 0
.../iotdb/db/qp/logical/crud/FromOperator.java | 0
.../iotdb/db/qp/logical/crud/FunctionOperator.java | 0
.../iotdb/db/qp/logical/crud/InsertOperator.java | 0
.../iotdb/db/qp/logical/crud/QueryOperator.java | 0
.../iotdb/db/qp/logical/crud/SFWOperator.java | 0
.../iotdb/db/qp/logical/crud/SelectOperator.java | 0
.../iotdb/db/qp/logical/crud/UpdateOperator.java | 0
.../iotdb/db/qp/logical/sys/AuthorOperator.java | 0
.../iotdb/db/qp/logical/sys/LoadDataOperator.java | 0
.../iotdb/db/qp/logical/sys/MetadataOperator.java | 0
.../iotdb/db/qp/logical/sys/PropertyOperator.java | 0
.../apache/iotdb/db/qp/physical/PhysicalPlan.java | 0
.../iotdb/db/qp/physical/crud/AggregationPlan.java | 0
.../iotdb/db/qp/physical/crud/DeletePlan.java | 0
.../iotdb/db/qp/physical/crud/FillQueryPlan.java | 0
.../iotdb/db/qp/physical/crud/GroupByPlan.java | 0
.../iotdb/db/qp/physical/crud/InsertPlan.java | 0
.../iotdb/db/qp/physical/crud/QueryPlan.java | 0
.../iotdb/db/qp/physical/crud/UpdatePlan.java | 0
.../iotdb/db/qp/physical/sys/AuthorPlan.java | 0
.../iotdb/db/qp/physical/sys/LoadDataPlan.java | 0
.../iotdb/db/qp/physical/sys/MetadataPlan.java | 0
.../iotdb/db/qp/physical/sys/PropertyPlan.java | 0
.../iotdb/db/qp/strategy/LogicalGenerator.java | 0
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 0
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 0
.../qp/strategy/optimizer/DnfFilterOptimizer.java | 0
.../db/qp/strategy/optimizer/IFilterOptimizer.java | 0
.../qp/strategy/optimizer/ILogicalOptimizer.java | 0
.../optimizer/MergeSingleFilterOptimizer.java | 0
.../qp/strategy/optimizer/RemoveNotOptimizer.java | 0
.../db/query/aggregation/AggreResultData.java | 0
.../db/query/aggregation/AggregateFunction.java | 0
.../db/query/aggregation/impl/CountAggrFunc.java | 0
.../db/query/aggregation/impl/FirstAggrFunc.java | 0
.../db/query/aggregation/impl/LastAggrFunc.java | 0
.../db/query/aggregation/impl/MaxTimeAggrFunc.java | 0
.../query/aggregation/impl/MaxValueAggrFunc.java | 0
.../db/query/aggregation/impl/MeanAggrFunc.java | 0
.../db/query/aggregation/impl/MinTimeAggrFunc.java | 0
.../query/aggregation/impl/MinValueAggrFunc.java | 0
.../db/query/aggregation/impl/SumAggrFunc.java | 0
.../iotdb/db/query/context/QueryContext.java | 0
.../iotdb/db/query/control/FileReaderManager.java | 0
.../iotdb/db/query/control/JobFileManager.java | 0
.../db/query/control/QueryResourceManager.java | 0
.../query/dataset/AggreResultDataPointReader.java | 0
.../apache/iotdb/db/query/dataset/AuthDataSet.java | 0
.../dataset/EngineDataSetWithValueFilter.java | 0
.../dataset/EngineDataSetWithoutValueFilter.java | 0
.../dataset/groupby/GroupByEngineDataSet.java | 0
.../groupby/GroupByWithValueFilterDataSet.java | 0
.../groupby/GroupByWithoutValueFilterDataSet.java | 0
.../db/query/executor/AggregateEngineExecutor.java | 0
.../iotdb/db/query/executor/EngineExecutor.java | 0
.../iotdb/db/query/executor/EngineQueryRouter.java | 0
.../db/query/executor/FillEngineExecutor.java | 0
.../db/query/executor/IEngineQueryRouter.java | 0
.../iotdb/db/query/factory/AggreFuncFactory.java | 0
.../java/org/apache/iotdb/db/query/fill/IFill.java | 0
.../org/apache/iotdb/db/query/fill/LinearFill.java | 0
.../apache/iotdb/db/query/fill/PreviousFill.java | 0
.../iotdb/db/query/reader/IAggregateReader.java | 0
.../apache/iotdb/db/query/reader/IBatchReader.java | 0
.../apache/iotdb/db/query/reader/IPointReader.java | 0
.../iotdb/db/query/reader/IReaderByTimestamp.java | 0
.../query/reader/chunkRelated/DiskChunkReader.java | 0
.../chunkRelated/DiskChunkReaderByTimestamp.java | 0
.../query/reader/chunkRelated/MemChunkReader.java | 0
.../chunkRelated/MemChunkReaderByTimestamp.java | 0
.../fileRelated/FileSeriesReaderAdapter.java | 0
.../FileSeriesReaderByTimestampAdapter.java | 0
.../fileRelated/UnSealedTsFileIterateReader.java | 0
.../UnSealedTsFileReaderByTimestamp.java | 0
.../resourceRelated/SeqResourceIterateReader.java | 0
.../SeqResourceReaderByTimestamp.java | 0
.../resourceRelated/UnseqResourceMergeReader.java | 0
.../UnseqResourceReaderByTimestamp.java | 0
.../seriesRelated/SeriesReaderByTimestamp.java | 0
.../seriesRelated/SeriesReaderWithValueFilter.java | 0
.../SeriesReaderWithoutValueFilter.java | 0
.../db/query/reader/universal/IterateReader.java | 0
.../reader/universal/PriorityMergeReader.java | 0
.../universal/PriorityMergeReaderByTimestamp.java | 0
.../timegenerator/AbstractNodeConstructor.java | 0
.../db/query/timegenerator/EngineLeafNode.java | 0
.../query/timegenerator/EngineNodeConstructor.java | 0
.../query/timegenerator/EngineTimeGenerator.java | 0
.../org/apache/iotdb/db/rescon/MemTablePool.java | 0
.../apache/iotdb/db/rescon/PrimitiveArrayPool.java | 0
.../apache/iotdb/db/rescon/TVListAllocator.java | 0
.../iotdb/db/rescon/TVListAllocatorMBean.java | 0
.../org/apache/iotdb/db/rescon/package-info.java | 0
.../java/org/apache/iotdb/db/service/IService.java | 0
.../java/org/apache/iotdb/db/service/IoTDB.java | 0
.../org/apache/iotdb/db/service/IoTDBMBean.java | 0
.../apache/iotdb/db/service/IoTDBShutdownHook.java | 0
.../org/apache/iotdb/db/service/JDBCService.java | 0
.../iotdb/db/service/JDBCServiceEventHandler.java | 0
.../apache/iotdb/db/service/JDBCServiceMBean.java | 0
.../org/apache/iotdb/db/service/JMXService.java | 0
.../java/org/apache/iotdb/db/service/Monitor.java | 0
.../org/apache/iotdb/db/service/MonitorMBean.java | 0
.../apache/iotdb/db/service/RegisterManager.java | 0
.../org/apache/iotdb/db/service/ServiceType.java | 0
.../org/apache/iotdb/db/service/StartupCheck.java | 0
.../org/apache/iotdb/db/service/StartupChecks.java | 0
.../org/apache/iotdb/db/service/TSServiceImpl.java | 0
.../org/apache/iotdb/db/sql/ParseGenerator.java | 0
.../apache/iotdb/db/sql/parse/AstErrorNode.java | 0
.../org/apache/iotdb/db/sql/parse/AstNode.java | 0
.../apache/iotdb/db/sql/parse/AstNodeOrigin.java | 0
.../java/org/apache/iotdb/db/sql/parse/Node.java | 0
.../org/apache/iotdb/db/sql/parse/ParseDriver.java | 0
.../org/apache/iotdb/db/sql/parse/ParseError.java | 0
.../apache/iotdb/db/sql/parse/ParseException.java | 0
.../org/apache/iotdb/db/sql/parse/ParseUtils.java | 0
.../org/apache/iotdb/db/sync/conf/Constans.java | 0
.../iotdb/db/sync/conf/SyncSenderConfig.java | 0
.../iotdb/db/sync/conf/SyncSenderDescriptor.java | 0
.../iotdb/db/sync/receiver/SyncServerManager.java | 0
.../iotdb/db/sync/receiver/SyncServiceImpl.java | 0
.../iotdb/db/sync/sender/SyncFileManager.java | 0
.../apache/iotdb/db/sync/sender/SyncSender.java | 0
.../iotdb/db/sync/sender/SyncSenderImpl.java | 0
.../apache/iotdb/db/tools/MemEst/MemEstTool.java | 0
.../iotdb/db/tools/MemEst/MemEstToolCmd.java | 0
.../java/org/apache/iotdb/db/tools/WalChecker.java | 0
.../java/org/apache/iotdb/db/utils/AuthUtils.java | 0
.../org/apache/iotdb/db/utils/CommonUtils.java | 0
.../iotdb/db/utils/CopyOnReadLinkedList.java | 0
.../org/apache/iotdb/db/utils/FilePathUtils.java | 0
.../org/apache/iotdb/db/utils/FileSchemaUtils.java | 0
.../java/org/apache/iotdb/db/utils/IOUtils.java | 0
.../java/org/apache/iotdb/db/utils/MathUtils.java | 0
.../java/org/apache/iotdb/db/utils/MemUtils.java | 0
.../org/apache/iotdb/db/utils/OpenFileNumUtil.java | 0
.../apache/iotdb/db/utils/QueryDataSetUtils.java | 0
.../java/org/apache/iotdb/db/utils/QueryUtils.java | 0
.../apache/iotdb/db/utils/RandomDeleteCache.java | 0
.../java/org/apache/iotdb/db/utils/SyncUtils.java | 0
.../org/apache/iotdb/db/utils/TimeValuePair.java | 0
.../apache/iotdb/db/utils/TimeValuePairUtils.java | 0
.../org/apache/iotdb/db/utils/TsPrimitiveType.java | 0
.../iotdb/db/utils/datastructure/BinaryTVList.java | 0
.../db/utils/datastructure/BooleanTVList.java | 0
.../iotdb/db/utils/datastructure/DoubleTVList.java | 0
.../iotdb/db/utils/datastructure/FloatTVList.java | 0
.../iotdb/db/utils/datastructure/IntTVList.java | 0
.../iotdb/db/utils/datastructure/LongTVList.java | 0
.../iotdb/db/utils/datastructure/TVList.java | 0
.../iotdb/db/writelog/io/BatchLogReader.java | 0
.../apache/iotdb/db/writelog/io/ILogReader.java | 0
.../apache/iotdb/db/writelog/io/ILogWriter.java | 0
.../org/apache/iotdb/db/writelog/io/LogWriter.java | 0
.../iotdb/db/writelog/io/MultiFileLogReader.java | 0
.../iotdb/db/writelog/io/SingleFileLogReader.java | 0
.../writelog/manager/MultiFileLogNodeManager.java | 0
.../db/writelog/manager/WriteLogNodeManager.java | 0
.../db/writelog/node/ExclusiveWriteLogNode.java | 0
.../iotdb/db/writelog/node/WriteLogNode.java | 0
.../iotdb/db/writelog/recover/LogReplayer.java | 0
.../writelog/recover/TsFileRecoverPerformer.java | 0
.../iotdb/db/auth/LocalFIleRoleAccessorTest.java | 0
.../iotdb/db/auth/LocalFileAuthorizerTest.java | 0
.../iotdb/db/auth/LocalFileRoleManagerTest.java | 0
.../iotdb/db/auth/LocalFileUserAccessorTest.java | 0
.../iotdb/db/auth/LocalFileUserManagerTest.java | 0
.../IoTDBDefaultThreadExceptionHandlerTest.java | 0
.../db/concurrent/IoTDBThreadPoolFactoryTest.java | 0
.../db/conf/adapter/CompressionRatioTest.java | 0
.../adapter/IoTDBConfigDynamicAdapterTest.java | 0
.../strategy/DirectoryStrategyTest.java | 0
.../db/cost/statistic/PerformanceStatTest.java | 0
.../iotdb/db/engine/MetadataManagerHelper.java | 0
.../db/engine/memtable/ChunkBufferPoolTest.java | 0
.../db/engine/memtable/MemTableFlushTaskTest.java | 0
.../iotdb/db/engine/memtable/MemTablePoolTest.java | 0
.../db/engine/memtable/MemTableTestUtils.java | 0
.../db/engine/memtable/MemtableBenchmark.java | 0
.../db/engine/memtable/PrimitiveMemTableTest.java | 0
.../engine/modification/DeletionFileNodeTest.java | 0
.../db/engine/modification/DeletionQueryTest.java | 0
.../engine/modification/ModificationFileTest.java | 0
.../io/LocalTextModificationAccessorTest.java | 0
.../storagegroup/FileNodeManagerBenchmark.java | 0
.../storagegroup/StorageGroupProcessorTest.java | 0
.../engine/storagegroup/TsFileProcessorTest.java | 0
.../version/SimpleFileVersionControllerTest.java | 0
.../version/SysTimeVersionControllerTest.java | 0
.../org/apache/iotdb/db/integration/Constant.java | 0
.../apache/iotdb/db/integration/IOTDBFillIT.java | 0
.../iotdb/db/integration/IOTDBGroupByIT.java | 0
.../iotdb/db/integration/IoTDBAggregationIT.java | 0
.../integration/IoTDBAggregationLargeDataIT.java | 0
.../integration/IoTDBAggregationSmallDataIT.java | 0
.../iotdb/db/integration/IoTDBAuthorizationIT.java | 0
.../iotdb/db/integration/IoTDBCompleteIT.java | 0
.../apache/iotdb/db/integration/IoTDBDaemonIT.java | 0
.../iotdb/db/integration/IoTDBDeletionIT.java | 0
.../db/integration/IoTDBEngineTimeGeneratorIT.java | 0
.../db/integration/IoTDBFloatPrecisionIT.java | 0
.../db/integration/IoTDBFlushQueryMergeTest.java | 0
.../iotdb/db/integration/IoTDBLargeDataIT.java | 0
.../iotdb/db/integration/IoTDBLimitSlimitIT.java | 0
.../iotdb/db/integration/IoTDBMetadataFetchIT.java | 0
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 0
.../iotdb/db/integration/IoTDBPreparedStmtIT.java | 0
.../db/integration/IoTDBSequenceDataQueryIT.java | 0
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 0
.../iotdb/db/integration/IoTDBTimeZoneIT.java | 0
.../iotdb/db/integration/IoTDBVersionIT.java | 0
.../org/apache/iotdb/db/metadata/MGraphTest.java | 0
.../iotdb/db/metadata/MManagerAdvancedTest.java | 0
.../iotdb/db/metadata/MManagerBasicTest.java | 0
.../iotdb/db/metadata/MManagerImproveTest.java | 0
.../org/apache/iotdb/db/metadata/MTreeTest.java | 0
.../org/apache/iotdb/db/metadata/MetadataTest.java | 0
.../iotdb/db/monitor/collector/FileSizeTest.java | 0
.../org/apache/iotdb/db/qp/QueryProcessorTest.java | 0
.../iotdb/db/qp/bench/QueryParseBenchmark.java | 0
.../iotdb/db/qp/other/TSPlanContextAuthorTest.java | 0
.../db/qp/other/TSPlanContextPropertyTest.java | 0
.../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 0
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 0
.../org/apache/iotdb/db/qp/plan/QPUpdateTest.java | 0
.../iotdb/db/qp/plan/TestConcatOptimizer.java | 0
.../iotdb/db/qp/strategy/LogicalGeneratorTest.java | 0
.../apache/iotdb/db/qp/utils/MemIntQpExecutor.java | 0
.../iotdb/db/query/component/SimpleFileWriter.java | 0
.../db/query/control/FileReaderManagerTest.java | 0
.../db/query/control/QueryResourceManagerTest.java | 0
.../dataset/EngineDataSetWithValueFilterTest.java | 0
.../query/executor/GroupByEngineDataSetTest.java | 0
.../iotdb/db/query/reader/ReaderTestHelper.java | 0
.../fileRelated/UnSealedTsFileReaderTest.java | 0
.../resourceRelated/SeqResourceReaderTest.java | 0
.../resourceRelated/UnseqResourceReaderTest.java | 0
.../reader/seriesRelated/FakedIBatchPoint.java | 0
.../reader/seriesRelated/FakedIPointReader.java | 0
.../SeriesReaderWithValueFilterTest.java | 0
.../SeriesReaderWithoutValueFilterTest.java | 0
.../universal/FakedSeriesReaderByTimestamp.java | 0
.../PriorityMergeReaderByTimestampTest.java | 0
.../reader/universal/PriorityMergeReaderTest.java | 0
.../reader/universal/PriorityMergeReaderTest2.java | 0
.../org/apache/iotdb/db/script/EnvScriptIT.java | 0
.../db/sql/DatetimeQueryDataSetUtilsTest.java | 0
.../org/apache/iotdb/db/sql/SQLParserTest.java | 0
.../db/sync/sender/MultipleClientSyncTest.java | 0
.../iotdb/db/sync/sender/SingleClientSyncTest.java | 0
.../iotdb/db/sync/sender/SyncFileManagerTest.java | 0
.../org/apache/iotdb/db/sync/test/RandomNum.java | 0
.../apache/iotdb/db/sync/test/SyncTestClient1.java | 0
.../apache/iotdb/db/sync/test/SyncTestClient2.java | 0
.../apache/iotdb/db/sync/test/SyncTestClient3.java | 0
.../java/org/apache/iotdb/db/sync/test/Utils.java | 0
.../org/apache/iotdb/db/tools/WalCheckerTest.java | 0
.../apache/iotdb/db/utils/EnvironmentUtils.java | 0
.../iotdb/db/utils/MathQueryDataSetUtilsTest.java | 0
.../apache/iotdb/db/utils/OpenFileNumUtilTest.java | 0
.../db/utils/datastructure/LongTVListTest.java | 0
.../iotdb/db/writelog/IoTDBLogFileSizeTest.java | 0
.../apache/iotdb/db/writelog/PerformanceTest.java | 0
.../iotdb/db/writelog/WriteLogNodeManagerTest.java | 0
.../apache/iotdb/db/writelog/WriteLogNodeTest.java | 0
.../iotdb/db/writelog/io/LogWriterReaderTest.java | 0
.../db/writelog/io/MultiFileLogReaderTest.java | 0
.../iotdb/db/writelog/recover/LogReplayerTest.java | 0
.../db/writelog/recover/SeqTsFileRecoverTest.java | 0
.../writelog/recover/UnseqTsFileRecoverTest.java | 0
.../src/test/resources/logback.xml | 0
.../src/test/resources/start-sync-test.sh | 0
.../src/test/resources/stop-sync-test.sh | 0
iotdb/{iotdb => }/conf/iotdb-engine.properties | 0
iotdb/{iotdb => }/conf/iotdb-env.bat | 0
iotdb/{iotdb => }/conf/iotdb-env.sh | 0
.../{iotdb => }/conf/iotdb-sync-client.properties | 0
iotdb/{iotdb => }/conf/logback-tool.xml | 0
iotdb/{iotdb => }/conf/logback.xml | 0
iotdb/{iotdb => }/conf/tsfile-format.properties | 0
{iotdb-cli/cli/bin => iotdb/sbin}/start-client.bat | 0
{iotdb-cli/cli/bin => iotdb/sbin}/start-client.sh | 0
iotdb/{iotdb => }/sbin/start-server.bat | 0
iotdb/{iotdb => }/sbin/start-server.sh | 0
iotdb/{iotdb => }/sbin/stop-server.bat | 0
iotdb/{iotdb => }/sbin/stop-server.sh | 0
{iotdb-cli/cli/bin => iotdb/tools}/export-csv.bat | 0
{iotdb-cli/cli/bin => iotdb/tools}/export-csv.sh | 0
{iotdb-cli/cli/bin => iotdb/tools}/import-csv.bat | 0
{iotdb-cli/cli/bin => iotdb/tools}/import-csv.sh | 0
iotdb/{iotdb => }/tools/memory-tool.bat | 0
iotdb/{iotdb => }/tools/memory-tool.sh | 0
iotdb/{iotdb => }/tools/start-WalChecker.bat | 0
iotdb/{iotdb => }/tools/start-WalChecker.sh | 0
iotdb/{iotdb => }/tools/start-sync-client.bat | 0
iotdb/{iotdb => }/tools/start-sync-client.sh | 0
iotdb/{iotdb => }/tools/stop-sync-client.bat | 0
iotdb/{iotdb => }/tools/stop-sync-client.sh | 0
jdbc/README.md | 2 +-
.../main/java/org/apache/iotdb/jdbc/Constant.java | 2 +-
pom.xml | 55 ++++++++++++++++++++--
spark/README.md | 6 +--
tsfile/README.md | 2 +-
tsfile/example/readme.md | 2 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 2 +-
457 files changed, 107 insertions(+), 100 deletions(-)
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 1ec2210..b158516 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,5 +1,5 @@
==============================================================
-Apache IoTDB (incubating) 0.8.0
+Apache IoTDB (incubating) 0.9.0
==============================================================
This is the first official release of Apache IoTDB after joining the Incubator.
diff --git a/docs/Documentation-CHN/OtherMaterial-ReleaseNotesV0.7.0.md b/docs/Documentation-CHN/OtherMaterial-ReleaseNotesV0.7.0.md
index ca448da..7c84813 100644
--- a/docs/Documentation-CHN/OtherMaterial-ReleaseNotesV0.7.0.md
+++ b/docs/Documentation-CHN/OtherMaterial-ReleaseNotesV0.7.0.md
@@ -19,6 +19,6 @@
-->
-### v0.7.0 Release Notes
+### v0.9.0 Release Notes
Coming Soon.
\ No newline at end of file
diff --git a/docs/Documentation-CHN/UserGuideV0.7.0/1-Overview/4-Features.md b/docs/Documentation-CHN/UserGuideV0.7.0/1-Overview/4-Features.md
index 6ddfeb1..9323d5b 100644
--- a/docs/Documentation-CHN/UserGuideV0.7.0/1-Overview/4-Features.md
+++ b/docs/Documentation-CHN/UserGuideV0.7.0/1-Overview/4-Features.md
@@ -40,12 +40,12 @@ IoTDB具有以下特点：
* 以及同时具备上述特点的混合负载
* 面向时间序列的丰富查询语义
* 跨设备、跨传感器的时间序列时间对齐
- * 面向时序数据特征的计算（频域变换，0.7.0版本不支持）
+ * 面向时序数据特征的计算（频域变换，0.9.0版本不支持）
* 提供面向时间维度的丰富聚合函数支持
* 极低的学习门槛
* 支持类SQL的数据操作
* 提供JDBC的编程接口
- * 完善的导入导出工具（0.7.0版本不支持）
+ * 完善的导入导出工具（0.9.0版本不支持）
* 完美对接开源生态环境
* 支持开源数据分析生态系统：Hadoop、Spark
* 支持开源可视化工具对接：Grafana
diff --git a/docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/2-Data Model Selection.md b/docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/2-Data Model Selection.md
index 814fbb9..aae314a 100644
--- a/docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/2-Data Model Selection.md
+++ b/docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/2-Data Model Selection.md
@@ -107,7 +107,7 @@ IoTDB> show timeseries root.ln
### 注意事项
-0.7.0版本对用户操作的数据规模进行一些限制：
+0.9.0版本对用户操作的数据规模进行一些限制：
限制1：假设运行时IoTDB分配到的JVM内存大小为p，用户自定义的每次将内存中的数据写入到磁盘时的大小（[group_size_in_byte](/#/Documents/latest/chap4/sec2)）为q。存储组的数量不能超过p/q。
diff --git a/docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/3-Data Import.md b/docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/3-Data Import.md
index 89e11e2..77f64ad 100644
--- a/docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/3-Data Import.md
+++ b/docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/3-Data Import.md
@@ -24,7 +24,7 @@
## 数据接入
### 历史数据导入
-0.7.0版本中暂不支持此功能。
+0.9.0版本中暂不支持此功能。
### 实时数据接入
diff --git a/docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/4-Data Query.md b/docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/4-Data Query.md
index e65cd93..bdb039b 100644
--- a/docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/4-Data Query.md
+++ b/docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/4-Data Query.md
@@ -178,7 +178,7 @@ select count(status), max_value(temperature) from root.ln.wf01.wt01 where time >
自动补值功能是指在针对单列或多列的时间序列查询中，根据用户的指定方法以及有效时间范围填充空值，若查询的点有值则自动补值功能不生效。
-> 注：当前0.7.0版本中IoTDB为用户提供使用前一个数值填充（Previous）和使用线性拟合填充（Linear）两种方法。且填充仅可用在对某一个时间点进行查询传感器数值结果为空的情况。
+> 注：当前0.9.0版本中IoTDB为用户提供使用前一个数值填充（Previous）和使用线性拟合填充（Linear）两种方法。且填充仅可用在对某一个时间点进行查询传感器数值结果为空的情况。
#### 填充方法
* Previous方法
@@ -279,7 +279,7 @@ select temperature from root.sgcc.wf03.wt01 where time = 2017-11-01T16:37:50.000
|text|previous, 0|
</center>
-> 注意: 0.7.0版本中Fill语句内至少指定一种填充类型。
+> 注意: 0.9.0版本中Fill语句内至少指定一种填充类型。
### 查询结果的分页控制
为方便用户在对IoTDB进行查询时更好的进行结果阅读，IoTDB为用户提供了[LIMIT/SLIMIT](/#/Documents/latest/chap5/sec1)子句以及[OFFSET/SOFFSET](/#/Documents/latest/chap5/sec1)子句。使用LIMIT和SLIMIT子句可以允许用户对查询结果的行数和列数进行控制，使用OFFSET和SOFFSET子句可以允许用户设定结果展示的起始位置。
diff --git a/docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/5-Data Maintenance.md b/docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/5-Data Maintenance.md
index d247860..565f29f 100644
--- a/docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/5-Data Maintenance.md
+++ b/docs/Documentation-CHN/UserGuideV0.7.0/3-Operation Manual/5-Data Maintenance.md
@@ -27,7 +27,7 @@
### 数据更新
-用户使用[UPDATE语句](/#/Documents/latest/chap5/sec1)可以更新指定的时间序列中一段时间的数据。在更新数据时，用户可以选择需要更新的一个时间序列（0.7.0版本暂不支持多个时间序列的更新）并指定更新某个时间点或时间段的数据（0.7.0版本必须有时间过滤条件）。
+用户使用[UPDATE语句](/#/Documents/latest/chap5/sec1)可以更新指定的时间序列中一段时间的数据。在更新数据时，用户可以选择需要更新的一个时间序列（0.9.0版本暂不支持多个时间序列的更新）并指定更新某个时间点或时间段的数据（0.9.0版本必须有时间过滤条件）。
在JAVA编程环境中，您可以使用[JDBC API](/#/Documents/latest/chap6/sec1)单条或批量执行UPDATE语句。
@@ -54,7 +54,7 @@ Msg: do not select any existing series
### 数据删除
-用户使用[DELETE语句](/#/Documents/latest/chap5/sec1)可以删除指定的时间序列中符合时间删除条件的数据。在删除数据时，用户可以选择需要删除的一个或多个时间序列、时间序列的前缀、时间序列带*路径对某时间之前的数据进行删除（0.7.0版本暂不支持删除某一闭时间区间范围内的数据）。
+用户使用[DELETE语句](/#/Documents/latest/chap5/sec1)可以删除指定的时间序列中符合时间删除条件的数据。在删除数据时，用户可以选择需要删除的一个或多个时间序列、时间序列的前缀、时间序列带*路径对某时间之前的数据进行删除（0.9.0版本暂不支持删除某一闭时间区间范围内的数据）。
在JAVA编程环境中，您可以使用[JDBC API](/#/Documents/latest/chap6/sec1)单条或批量执行UPDATE语句。
diff --git a/docs/Documentation-CHN/UserGuideV0.7.0/4-Deployment and Management/2-Configuration.md b/docs/Documentation-CHN/UserGuideV0.7.0/4-Deployment and Management/2-Configuration.md
index d8816bc..5058acd 100644
--- a/docs/Documentation-CHN/UserGuideV0.7.0/4-Deployment and Management/2-Configuration.md
+++ b/docs/Documentation-CHN/UserGuideV0.7.0/4-Deployment and Management/2-Configuration.md
@@ -78,7 +78,7 @@
### 系统配置项
-系统配置项是IoTDB Server运行的核心配置，它主要用于设置IoTDB Server文件层和引擎层的参数，便于用户根据自身需求调整Server的相关配置，以达到较好的性能表现。系统配置项可分为两大模块：文件层配置项和引擎层配置项。用户可以通过查看`tsfile-format.properties`, `iotdb-engine.properties`,文件查看和修改两种配置项的内容。在0.7.0版本中字符串类型的配置项大小写敏感。
+系统配置项是IoTDB Server运行的核心配置，它主要用于设置IoTDB Server文件层和引擎层的参数，便于用户根据自身需求调整Server的相关配置，以达到较好的性能表现。系统配置项可分为两大模块：文件层配置项和引擎层配置项。用户可以通过查看`tsfile-format.properties`, `iotdb-engine.properties`,文件查看和修改两种配置项的内容。在0.9.0版本中字符串类型的配置项大小写敏感。
#### 文件层配置
diff --git a/docs/Documentation-CHN/UserGuideV0.7.0/4-Deployment and Management/3-System Monitor.md b/docs/Documentation-CHN/UserGuideV0.7.0/4-Deployment and Management/3-System Monitor.md
index f611441..d4b3cb9 100644
--- a/docs/Documentation-CHN/UserGuideV0.7.0/4-Deployment and Management/3-System Monitor.md
+++ b/docs/Documentation-CHN/UserGuideV0.7.0/4-Deployment and Management/3-System Monitor.md
@@ -31,7 +31,7 @@
### 数据统计监控
-本模块是IoTDB为用户提供的对其中存储数据信息的数据统计监控方式，我们会在系统中为您记录各个模块的数据统计信息，并将其汇总存入数据库中。当前0.7.0版本的IoTDB提供IoTDB写入数据的统计功能。
+本模块是IoTDB为用户提供的对其中存储数据信息的数据统计监控方式，我们会在系统中为您记录各个模块的数据统计信息，并将其汇总存入数据库中。当前0.9.0版本的IoTDB提供IoTDB写入数据的统计功能。
用户可以选择开启或关闭数据统计监控功能（您可以设定配置文件中的`enable_stat_monitor`项，详细信息参见[第4.2节](/#/Documents/latest/chap4/sec2)）。
@@ -41,7 +41,7 @@
为了避免统计信息占用过多空间，我们为统计信息加入定期清除无效数据的机制。系统将每隔一段时间删除无效数据。用户可以通过设置删除机制触发频率（`stat_monitor_retain_interval_in_second`项，默认为600s，详细信息参见本文[4.2节](/#/Documents/latest/chap4/sec2)）配置删除数据的频率，通过设置有效数据的期限（`stat_monitor_detect_freq_in_second`项，默认为600s，详细信息参见本文[4.2节](/#/Documents/latest/chap4/sec2)）设置有效数据的范围，即距离清除操作触发时间为`stat_monitor_detect_freq_in_second`以内的数据为有效数据。为了保证系统的稳定，不允许频繁地删除统计量，因此如果配置参数的时间小于默认值，系统不采用配置参数而使用默认参数。
-注：当前 0.7.0 版本统计的写入数据统计信息会同时统计用户写入的数据与系统内部监控数据。
+注：当前 0.9.0 版本统计的写入数据统计信息会同时统计用户写入的数据与系统内部监控数据。
写入数据统计项列表：
diff --git a/docs/Documentation-CHN/UserGuideV0.7.0/5-IoTDB SQL Documentation/1-IoTDB Query Statement.md b/docs/Documentation-CHN/UserGuideV0.7.0/5-IoTDB SQL Documentation/1-IoTDB Query Statement.md
index 44ddc82..d62aa37 100644
--- a/docs/Documentation-CHN/UserGuideV0.7.0/5-IoTDB SQL Documentation/1-IoTDB Query Statement.md
+++ b/docs/Documentation-CHN/UserGuideV0.7.0/5-IoTDB SQL Documentation/1-IoTDB Query Statement.md
@@ -148,7 +148,7 @@ Eg. IoTDB > SELECT MIN_VALUE(temperature) FROM root.ln.wf01.wt01 WHERE root.ln.w
Eg. IoTDB > SELECT MAX_VALUE(temperature) FROM root.ln.wf01.wt01 WHERE root.ln.wf01.wt01.temperature < 25
Note: the statement needs to satisfy this constraint: <Path>(SelectClause) + <PrefixPath>(FromClause) = <Timeseries>
Note: If the <SensorExpr>(WhereClause) is started with <Path> and not with ROOT, the statement needs to satisfy this constraint: <PrefixPath>(FromClause) + <Path>(SensorExpr) = <Timeseries>
-Note: In Version 0.7.0, if <WhereClause> includes `OR`, time filter can not be used.
+Note: In Version 0.9.0, if <WhereClause> includes `OR`, time filter can not be used.
```
* Group By语句
diff --git a/docs/Documentation/Frequently asked questions.md b/docs/Documentation/Frequently asked questions.md
index ec77c07..29dc874 100644
--- a/docs/Documentation/Frequently asked questions.md
+++ b/docs/Documentation/Frequently asked questions.md
@@ -49,13 +49,13 @@ There are several ways to identify the version of IoTDB that you are using:
| | .--.|_/ | | \_| | | `. \ | |_) |
| | / .'`\ \ | | | | | | | __'.
_| |_| \__. | _| |_ _| |_.' /_| |__) |
-|_____|'.__.' |_____| |______.'|_______/ version 0.7.0
+|_____|'.__.' |_____| |______.'|_______/ version 0.9.0
```
* Check pom.xml file:
```
-<version>0.7.0</version>
+<version>0.9.0</version>
```
* Use JDBC API:
diff --git a/docs/Documentation/OtherMaterial-ReleaseNotesV0.7.0.md b/docs/Documentation/OtherMaterial-ReleaseNotesV0.7.0.md
index 8bf1c16..403e82f 100644
--- a/docs/Documentation/OtherMaterial-ReleaseNotesV0.7.0.md
+++ b/docs/Documentation/OtherMaterial-ReleaseNotesV0.7.0.md
@@ -23,7 +23,7 @@
## Outline
-- v0.7.0 Release Notes
+- v0.9.0 Release Notes
- Features
- IoTDB
- IoTDB-Transfer-Tool
@@ -32,9 +32,9 @@
- System Organization
<!-- /TOC -->
-### v0.7.0 Release Notes
+### v0.9.0 Release Notes
-Add postback tools, multi-path data storage mechanism, ```SHOW TIMESERIES / STORAGE GROUP``` SQL extended expressions, and other new features. Fix several issues in version 0.6.0. Improve system stability.
+Add postback tools, multi-path data storage mechanism, ```SHOW TIMESERIES / STORAGE GROUP``` SQL extended expressions, and other new features. Fix several issues in version 0.8.0. Improve system stability.
#### Features
diff --git a/docs/Documentation/UserGuideV0.7.0/3-Operation Manual/2-Data Model Selection.md b/docs/Documentation/UserGuideV0.7.0/3-Operation Manual/2-Data Model Selection.md
index 4545305..957390d 100644
--- a/docs/Documentation/UserGuideV0.7.0/3-Operation Manual/2-Data Model Selection.md
+++ b/docs/Documentation/UserGuideV0.7.0/3-Operation Manual/2-Data Model Selection.md
@@ -103,7 +103,7 @@ It is worth noting that when the queried path does not exist, the system will re
### Precautions
-Version 0.7.0 imposes some limitations on the scale of data that users can operate:
+Version 0.9.0 imposes some limitations on the scale of data that users can operate:
Limit 1: Assuming that the JVM memory allocated to IoTDB at runtime is p and the user-defined size of data in memory written to disk ([group\_size\_in\_byte](/#/Documents/latest/chap4/sec2)) is Q, then the number of storage groups should not exceed p/q.
diff --git a/docs/Documentation/UserGuideV0.7.0/3-Operation Manual/3-Data Import.md b/docs/Documentation/UserGuideV0.7.0/3-Operation Manual/3-Data Import.md
index 8c942b9..41fb186 100644
--- a/docs/Documentation/UserGuideV0.7.0/3-Operation Manual/3-Data Import.md
+++ b/docs/Documentation/UserGuideV0.7.0/3-Operation Manual/3-Data Import.md
@@ -24,7 +24,7 @@
## Data Import
### Import Historical Data
-This feature is not supported in version 0.7.0.
+This feature is not supported in version 0.9.0.
### Import Real-time Data
diff --git a/docs/Documentation/UserGuideV0.7.0/3-Operation Manual/4-Data Query.md b/docs/Documentation/UserGuideV0.7.0/3-Operation Manual/4-Data Query.md
index 8a6dbf8..d1ccbdd 100644
--- a/docs/Documentation/UserGuideV0.7.0/3-Operation Manual/4-Data Query.md
+++ b/docs/Documentation/UserGuideV0.7.0/3-Operation Manual/4-Data Query.md
@@ -167,7 +167,7 @@ In the actual use of IoTDB, when doing the query operation of timeseries, situat
Automated fill function refers to filling empty values according to the user's specified method and effective time range when performing timeseries queries for single or multiple columns. If the queried point's value is not null, the fill function will not work.
-> Note: In the current version 0.7.0, IoTDB provides users with two methods: Previous and Linear. The previous method fills blanks with previous value. The linear method fills blanks through linear fitting. And the fill function can only be used when performing point-in-time queries.
+> Note: In the current version 0.9.0, IoTDB provides users with two methods: Previous and Linear. The previous method fills blanks with previous value. The linear method fills blanks through linear fitting. And the fill function can only be used when performing point-in-time queries.
#### Fill Function
* Previous Function
@@ -269,7 +269,7 @@ When the fill method is not specified, each data type bears its own default fill
|text|previous, 0|
</center>
-> Note: In version 0.7.0, at least one fill method should be specified in the Fill statement.
+> Note: In version 0.9.0, at least one fill method should be specified in the Fill statement.
### Row and Column Control over Query Results
diff --git a/docs/Documentation/UserGuideV0.7.0/3-Operation Manual/5-Data Maintenance.md b/docs/Documentation/UserGuideV0.7.0/3-Operation Manual/5-Data Maintenance.md
index 669868f..113d203 100644
--- a/docs/Documentation/UserGuideV0.7.0/3-Operation Manual/5-Data Maintenance.md
+++ b/docs/Documentation/UserGuideV0.7.0/3-Operation Manual/5-Data Maintenance.md
@@ -26,7 +26,7 @@
<!-- >
### Data Update
-Users can use [UPDATE statements](/#/Documents/latest/chap5/sec1) to update data over a period of time in a specified timeseries. When updating data, users can select a timeseries to be updated (version 0.7.0 does not support multiple timeseries updates) and specify a time point or period to be updated (version 0.7.0 must have time filtering conditions).
+Users can use [UPDATE statements](/#/Documents/latest/chap5/sec1) to update data over a period of time in a specified timeseries. When updating data, users can select a timeseries to be updated (version 0.9.0 does not support multiple timeseries updates) and specify a time point or period to be updated (version 0.9.0 must have time filtering conditions).
In a JAVA programming environment, you can use the [Java JDBC](/#/Documents/latest/chap6/sec1) to execute single or batch UPDATE statements.
@@ -54,7 +54,7 @@ Msg: do not select any existing series
### Data Deletion
-Users can delete data that meet the deletion condition in the specified timeseries by using the [DELETE statement](/#/Documents/latest/chap5/sec1). When deleting data, users can select one or more timeseries paths, prefix paths, or paths with star to delete data before a certain time (version 0.7.0 does not support the deletion of data within a closed time interval).
+Users can delete data that meet the deletion condition in the specified timeseries by using the [DELETE statement](/#/Documents/latest/chap5/sec1). When deleting data, users can select one or more timeseries paths, prefix paths, or paths with star to delete data before a certain time (version 0.9.0 does not support the deletion of data within a closed time interval).
In a JAVA programming environment, you can use the [Java JDBC](/#/Documents/latest/chap6/sec1) to execute single or batch UPDATE statements.
diff --git a/docs/Documentation/UserGuideV0.7.0/4-Deployment and Management/1-Deployment.md b/docs/Documentation/UserGuideV0.7.0/4-Deployment and Management/1-Deployment.md
index 15d73c2..7581475 100644
--- a/docs/Documentation/UserGuideV0.7.0/4-Deployment and Management/1-Deployment.md
+++ b/docs/Documentation/UserGuideV0.7.0/4-Deployment and Management/1-Deployment.md
@@ -34,8 +34,8 @@ To install and use IoTDB, you need to have:
1. Java >= 1.8 (Please make sure the environment path has been set)
2. Maven >= 3.0 (If you want to compile and install IoTDB from source code)
-3. TsFile >= 0.7.0 (TsFile Github page: [https://github.com/thulab/tsfile](https://github.com/thulab/tsfile))
-4. IoTDB-JDBC >= 0.7.0 (IoTDB-JDBC Github page: [https://github.com/thulab/iotdb-jdbc](https://github.com/thulab/iotdb-jdbc))
+3. TsFile >= 0.9.0 (TsFile Github page: [https://github.com/thulab/tsfile](https://github.com/thulab/tsfile))
+4. IoTDB-JDBC >= 0.9.0 (IoTDB-JDBC Github page: [https://github.com/thulab/iotdb-jdbc](https://github.com/thulab/iotdb-jdbc))
TODO: TsFile and IoTDB-JDBC dependencies will be removed after the project reconstruct.
diff --git a/docs/Documentation/UserGuideV0.7.0/4-Deployment and Management/3-System Monitor.md b/docs/Documentation/UserGuideV0.7.0/4-Deployment and Management/3-System Monitor.md
index b6077b7..1c0b426 100644
--- a/docs/Documentation/UserGuideV0.7.0/4-Deployment and Management/3-System Monitor.md
+++ b/docs/Documentation/UserGuideV0.7.0/4-Deployment and Management/3-System Monitor.md
@@ -148,7 +148,7 @@ There are several attributes under Monitor, including the numbers of files opene
### Data Status Monitoring
-This module is the statistical monitoring method provided by IoTDB for users to store data information. We will record the statistical data in the system and store it in the database. The current 0.7.0 version of IoTDB provides statistics for writing data.
+This module is the statistical monitoring method provided by IoTDB for users to store data information. We will record the statistical data in the system and store it in the database. The current 0.9.0 version of IoTDB provides statistics for writing data.
The user can choose to enable or disable the data statistics monitoring function (set the `enable_stat_monitor` item in the configuration file, see [Engine Layer](/#/Documents/latest/chap4/sec2) for details).
diff --git a/docs/Documentation/UserGuideV0.7.0/4-Deployment and Management/7-Build and use IoTDB by Dockerfile.md b/docs/Documentation/UserGuideV0.7.0/4-Deployment and Management/7-Build and use IoTDB by Dockerfile.md
index 47afb0c..3f50c0c 100644
--- a/docs/Documentation/UserGuideV0.7.0/4-Deployment and Management/7-Build and use IoTDB by Dockerfile.md
+++ b/docs/Documentation/UserGuideV0.7.0/4-Deployment and Management/7-Build and use IoTDB by Dockerfile.md
@@ -82,11 +82,11 @@ $ start-client.sh -h localhost -p 6667 -u root -pw root
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</dependency>
```
Some example about how to use IoTDB with IoTDB-JDBC can be found at: https://github.com/apache/incubator-iotdb/tree/master/jdbc/src/test/java/org/apache/iotdb/jdbc/demo
-(Notice that because we have not published Apache IoTDB version 0.8.0 now, you have to compile the source code by `mvn install -DskipTests` to install the dependence into your local maven repository)
+(Notice that because we have not published Apache IoTDB version 0.9.0 now, you have to compile the source code by `mvn install -DskipTests` to install the dependence into your local maven repository)
6. Now enjoy it!
diff --git a/docs/Documentation/UserGuideV0.7.0/5-IoTDB SQL Documentation/1-IoTDB Query Statement.md b/docs/Documentation/UserGuideV0.7.0/5-IoTDB SQL Documentation/1-IoTDB Query Statement.md
index 9b34bb4..4771b64 100644
--- a/docs/Documentation/UserGuideV0.7.0/5-IoTDB SQL Documentation/1-IoTDB Query Statement.md
+++ b/docs/Documentation/UserGuideV0.7.0/5-IoTDB SQL Documentation/1-IoTDB Query Statement.md
@@ -157,7 +157,7 @@ Eg. IoTDB > SELECT MIN_VALUE(temperature) FROM root.ln.wf01.wt01 WHERE root.ln.w
Eg. IoTDB > SELECT MAX_VALUE(temperature) FROM root.ln.wf01.wt01 WHERE root.ln.wf01.wt01.temperature < 25
Note: the statement needs to satisfy this constraint: <Path>(SelectClause) + <PrefixPath>(FromClause) = <Timeseries>
Note: If the <SensorExpr>(WhereClause) is started with <Path> and not with ROOT, the statement needs to satisfy this constraint: <PrefixPath>(FromClause) + <Path>(SensorExpr) = <Timeseries>
-Note: In Version 0.7.0, if <WhereClause> includes `OR`, time filter can not be used.
+Note: In Version 0.9.0, if <WhereClause> includes `OR`, time filter can not be used.
```
* Group By Statement
diff --git a/docs/Documentation/UserGuideV0.7.0/6-JDBC API/1-JDBC API.md b/docs/Documentation/UserGuideV0.7.0/6-JDBC API/1-JDBC API.md
index e194a35..c22559e 100644
--- a/docs/Documentation/UserGuideV0.7.0/6-JDBC API/1-JDBC API.md
+++ b/docs/Documentation/UserGuideV0.7.0/6-JDBC API/1-JDBC API.md
@@ -45,7 +45,7 @@ In root directory:
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</dependency>
</dependencies>
```
diff --git a/docs/Documentation/UserGuideV0.7.0/8-Tools-spark.md b/docs/Documentation/UserGuideV0.7.0/8-Tools-spark.md
index bce6078..cc5fe77 100644
--- a/docs/Documentation/UserGuideV0.7.0/8-Tools-spark.md
+++ b/docs/Documentation/UserGuideV0.7.0/8-Tools-spark.md
@@ -59,7 +59,7 @@ With this connector, you can
|Spark Version | Scala Version | Java Version | TsFile |
|------------- | ------------- | ------------ |------------ |
-| `2.4.3` | `2.11.8` | `1.8` | `0.8.0-SNAPSHOT`|
+| `2.4.3` | `2.11.8` | `1.8` | `0.9.0-SNAPSHOT`|
> Note: For more information about how to download and use TsFile, please see the following link: https://github.com/apache/incubator-iotdb/tree/master/tsfile.
@@ -69,7 +69,7 @@ With this connector, you can
Start Spark with TsFile-Spark-Connector in local mode:
```
-./<spark-shell-path> --jars tsfile-spark-connector.jar,tsfile-0.8.0-SNAPSHOT-jar-with-dependencies.jar
+./<spark-shell-path> --jars tsfile-spark-connector.jar,tsfile-0.9.0-SNAPSHOT-jar-with-dependencies.jar
```
Note:
@@ -84,7 +84,7 @@ Note:
Start Spark with TsFile-Spark-Connector in distributed mode (That is, the spark cluster is connected by spark-shell):
```
-. /<spark-shell-path> --jars tsfile-spark-connector.jar,tsfile-0.8.0-SNAPSHOT-jar-with-dependencies.jar --master spark://ip:7077
+. /<spark-shell-path> --jars tsfile-spark-connector.jar,tsfile-0.9.0-SNAPSHOT-jar-with-dependencies.jar --master spark://ip:7077
```
Note:
diff --git a/example/kafka/pom.xml b/example/kafka/pom.xml
index 5e0c2f2..0863efb 100644
--- a/example/kafka/pom.xml
+++ b/example/kafka/pom.xml
@@ -24,7 +24,7 @@
<!-- you need to add the following content if you remove the parent pom.
<groupId>org.apache.iotdb.example</groupId>
<artifactId>kafka-example</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
-->
<parent>
<groupId>org.apache.iotdb</groupId>
diff --git a/example/kafka/readme.md b/example/kafka/readme.md
index 60f4e63..231b87f 100644
--- a/example/kafka/readme.md
+++ b/example/kafka/readme.md
@@ -25,7 +25,7 @@ The example is to show how to send data from localhost to IoTDB through Kafka.
```
## Usage
### Version usage
-IoTDB: 0.8.0-SNAPSHOT
+IoTDB: 0.9.0-SNAPSHOT
Kafka: 0.8.2.0
### Dependencies with Maven
@@ -39,7 +39,7 @@ Kafka: 0.8.2.0
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</dependency>
</dependencies>
```
diff --git a/example/rocketmq/readme.md b/example/rocketmq/readme.md
index fac4cca..c9286e1 100644
--- a/example/rocketmq/readme.md
+++ b/example/rocketmq/readme.md
@@ -46,7 +46,7 @@ Producers insert IoTDB insert statements into partitions according to devices, e
## Usage
### Version usage
-IoTDB: 0.8.0-SNAPSHOT
+IoTDB: 0.9.0-SNAPSHOT
Kafka: 4.4.0
### Dependencies with Maven
@@ -55,7 +55,7 @@ Kafka: 4.4.0
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.rocketmq</groupId>
diff --git a/hadoop/pom.xml b/hadoop/pom.xml
index 4b87cad..a67850b 100644
--- a/hadoop/pom.xml
+++ b/hadoop/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>root</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.iotdb.tsfile</groupId>
diff --git a/iotdb-cli/pom.xml b/iotdb-cli/pom.xml
index 2276380..6305616 100644
--- a/iotdb-cli/pom.xml
+++ b/iotdb-cli/pom.xml
@@ -67,20 +67,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${project.basedir}/cli/lib</directory>
- <includes>
- <include>**/*.jar</include>
- </includes>
- <followSymlinks>false</followSymlinks>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -91,7 +77,7 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <outputDirectory>${project.basedir}/cli/lib</outputDirectory>
+ <outputDirectory>${maven.multiModuleProjectDirectory}/iotdb/lib</outputDirectory>
</configuration>
</execution>
</executions>
@@ -100,7 +86,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <outputDirectory>${project.basedir}/cli/lib</outputDirectory>
+ <outputDirectory>${maven.multiModuleProjectDirectory}/iotdb/lib</outputDirectory>
</configuration>
</plugin>
<!--using `mvn test` to run UT, `mvn verify` to run ITs
diff --git a/iotdb/pom.xml b/iotdb-server/pom.xml
similarity index 85%
rename from iotdb/pom.xml
rename to iotdb-server/pom.xml
index 25ff02b..728524d 100644
--- a/iotdb/pom.xml
+++ b/iotdb-server/pom.xml
@@ -27,7 +27,7 @@
<version>0.9.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>iotdb</artifactId>
+ <artifactId>iotdb-server</artifactId>
<name>IoTDB</name>
<properties>
<antlr3.version>3.5.2</antlr3.version>
@@ -97,34 +97,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${project.basedir}/iotdb/lib</directory>
- <includes>
- <include>**/*.jar</include>
- </includes>
- <followSymlinks>false</followSymlinks>
- </fileset>
- <fileset>
- <directory>${project.basedir}/data</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <followSymlinks>false</followSymlinks>
- </fileset>
- <fileset>
- <directory>${project.basedir}/logs</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <followSymlinks>false</followSymlinks>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr3-maven-plugin</artifactId>
<version>${antlr3.version}</version>
@@ -147,7 +119,7 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <outputDirectory>${project.basedir}/iotdb/lib</outputDirectory>
+ <outputDirectory>${maven.multiModuleProjectDirectory}/iotdb/lib</outputDirectory>
</configuration>
</execution>
</executions>
@@ -156,7 +128,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <outputDirectory>${project.basedir}/iotdb/lib</outputDirectory>
+ <outputDirectory>${maven.multiModuleProjectDirectory}/iotdb/lib</outputDirectory>
</configuration>
</plugin>
<!--using `mvn test` to run UT, `mvn verify` to run ITs
diff --git a/iotdb/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g b/iotdb-server/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g
similarity index 100%
rename from iotdb/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g
rename to iotdb-server/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g
diff --git a/iotdb/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSParser.g b/iotdb-server/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSParser.g
similarity index 100%
rename from iotdb/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSParser.g
rename to iotdb-server/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSParser.g
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/AuthException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/AuthException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/AuthException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/AuthException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/BasicAuthorizer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/authorizer/BasicAuthorizer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/BasicAuthorizer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/authorizer/BasicAuthorizer.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/IAuthorizer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/authorizer/IAuthorizer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/IAuthorizer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/authorizer/IAuthorizer.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizer.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/PathPrivilege.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/entity/PathPrivilege.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/entity/PathPrivilege.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/entity/PathPrivilege.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/PrivilegeType.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/entity/PrivilegeType.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/entity/PrivilegeType.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/entity/PrivilegeType.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/Role.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/entity/Role.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/entity/Role.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/entity/Role.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/User.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/entity/User.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/entity/User.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/entity/User.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/BasicRoleManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/role/BasicRoleManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/role/BasicRoleManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/role/BasicRoleManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/IRoleAccessor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/role/IRoleAccessor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/role/IRoleAccessor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/role/IRoleAccessor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/IRoleManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/role/IRoleManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/role/IRoleManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/role/IRoleManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleAccessor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleAccessor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleAccessor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleAccessor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/role/LocalFileRoleManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/IUserAccessor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/user/IUserAccessor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/user/IUserAccessor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/user/IUserAccessor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/IUserManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/user/IUserManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/user/IUserManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/user/IUserManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/HashLock.java b/iotdb-server/src/main/java/org/apache/iotdb/db/concurrent/HashLock.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/concurrent/HashLock.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/concurrent/HashLock.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandler.java b/iotdb-server/src/main/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandler.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandler.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandler.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactory.java b/iotdb-server/src/main/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactory.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactory.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactory.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTThreadFactory.java b/iotdb-server/src/main/java/org/apache/iotdb/db/concurrent/IoTThreadFactory.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTThreadFactory.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/concurrent/IoTThreadFactory.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/concurrent/ThreadName.java b/iotdb-server/src/main/java/org/apache/iotdb/db/concurrent/ThreadName.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/concurrent/ThreadName.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/concurrent/ThreadName.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
similarity index 98%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
index a4779af..5feb01b 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
+++ b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
@@ -26,7 +26,7 @@ public class IoTDBConstant {
public static final String ENV_FILE_NAME = "iotdb-env";
public static final String IOTDB_CONF = "IOTDB_CONF";
public static final String GLOBAL_DB_NAME = "IoTDB";
- public static final String VERSION = "0.7.0";
+ public static final String VERSION = "0.9.0";
public static final String REMOTE_JMX_PORT_NAME = "com.sun.management.jmxremote.port";
public static final String IOTDB_LOCAL_JMX_PORT_NAME = "iotdb.jmx.local.port";
public static final String IOTDB_REMOTE_JMX_PORT_NAME = "iotdb.jmx.remote.port";
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/adapter/CompressionRatio.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/adapter/CompressionRatio.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/adapter/CompressionRatio.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/adapter/CompressionRatio.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/adapter/IDynamicAdapter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/adapter/IDynamicAdapter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/adapter/IDynamicAdapter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/adapter/IDynamicAdapter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategy.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategy.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategy.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategy.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MaxDiskUsableSpaceFirstStrategy.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MaxDiskUsableSpaceFirstStrategy.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MaxDiskUsableSpaceFirstStrategy.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MaxDiskUsableSpaceFirstStrategy.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinFolderOccupiedSpaceFirstStrategy.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinFolderOccupiedSpaceFirstStrategy.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinFolderOccupiedSpaceFirstStrategy.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinFolderOccupiedSpaceFirstStrategy.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/SequenceStrategy.java b/iotdb-server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/SequenceStrategy.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/SequenceStrategy.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/SequenceStrategy.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/cost/statistic/ConcurrentCircularArray.java b/iotdb-server/src/main/java/org/apache/iotdb/db/cost/statistic/ConcurrentCircularArray.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/cost/statistic/ConcurrentCircularArray.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/cost/statistic/ConcurrentCircularArray.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/cost/statistic/Measurement.java b/iotdb-server/src/main/java/org/apache/iotdb/db/cost/statistic/Measurement.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/cost/statistic/Measurement.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/cost/statistic/Measurement.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/cost/statistic/MeasurementMBean.java b/iotdb-server/src/main/java/org/apache/iotdb/db/cost/statistic/MeasurementMBean.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/cost/statistic/MeasurementMBean.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/cost/statistic/MeasurementMBean.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/cost/statistic/Operation.java b/iotdb-server/src/main/java/org/apache/iotdb/db/cost/statistic/Operation.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/cost/statistic/Operation.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/cost/statistic/Operation.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/DeviceMetaDataCache.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/cache/DeviceMetaDataCache.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/cache/DeviceMetaDataCache.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/cache/DeviceMetaDataCache.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetaDataCache.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetaDataCache.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetaDataCache.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetaDataCache.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetadataUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetadataUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetadataUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetadataUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPool.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPool.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPool.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPool.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemSeriesLazyMerger.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/MemSeriesLazyMerger.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemSeriesLazyMerger.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/MemSeriesLazyMerger.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTask.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTask.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTask.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTask.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/NotifyFlushMemTable.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/NotifyFlushMemTable.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/NotifyFlushMemTable.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/NotifyFlushMemTable.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTable.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTable.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTable.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTable.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairInMemTable.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairInMemTable.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairInMemTable.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairInMemTable.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairSorter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairSorter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairSorter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairSorter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/Deletion.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/Deletion.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/modification/Deletion.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/Deletion.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/Modification.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/Modification.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/modification/Modification.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/Modification.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/ModificationFile.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/ModificationFile.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/modification/ModificationFile.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/ModificationFile.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/io/ModificationReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/io/ModificationReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/modification/io/ModificationReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/io/ModificationReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/io/ModificationWriter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/io/ModificationWriter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/modification/io/ModificationWriter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/io/ModificationWriter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/modification/package-info.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/package-info.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/modification/package-info.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/modification/package-info.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/pool/FlushPoolManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/pool/FlushPoolManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/pool/FlushPoolManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/pool/FlushPoolManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/pool/FlushSubTaskPoolManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/pool/FlushSubTaskPoolManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/pool/FlushSubTaskPoolManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/pool/FlushSubTaskPoolManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/QueryDataSource.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/querycontext/QueryDataSource.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/QueryDataSource.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/querycontext/QueryDataSource.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/ReadOnlyMemChunk.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/querycontext/ReadOnlyMemChunk.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/querycontext/ReadOnlyMemChunk.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/querycontext/ReadOnlyMemChunk.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/storagegroup/FlushManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/storagegroup/FlushManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/storagegroup/FlushManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/storagegroup/FlushManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/version/SimpleFileVersionController.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/version/SimpleFileVersionController.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/version/SimpleFileVersionController.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/version/SimpleFileVersionController.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/version/SysTimeVersionController.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/version/SysTimeVersionController.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/version/SysTimeVersionController.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/version/SysTimeVersionController.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/version/VersionController.java b/iotdb-server/src/main/java/org/apache/iotdb/db/engine/version/VersionController.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/engine/version/VersionController.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/engine/version/VersionController.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/ArgsErrorException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/ArgsErrorException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/ArgsErrorException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/ArgsErrorException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/ConfigAdjusterException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/ConfigAdjusterException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/ConfigAdjusterException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/ConfigAdjusterException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/DeltaEngineRunningException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/DeltaEngineRunningException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/DeltaEngineRunningException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/DeltaEngineRunningException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/DiskSpaceInsufficientException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/DiskSpaceInsufficientException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/DiskSpaceInsufficientException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/DiskSpaceInsufficientException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/FlushRunTimeException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/FlushRunTimeException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/FlushRunTimeException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/FlushRunTimeException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/MetadataErrorException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/MetadataErrorException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/MetadataErrorException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/MetadataErrorException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/PathErrorException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/PathErrorException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/PathErrorException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/PathErrorException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/ProcessorException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/ProcessorException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/ProcessorException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/ProcessorException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/QueryInBatchStmtException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/QueryInBatchStmtException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/QueryInBatchStmtException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/QueryInBatchStmtException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/StartupException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/StartupException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/StartupException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/StartupException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/StorageEngineException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/StorageEngineException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/StorageEngineException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/StorageEngineException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/StorageEngineFailureException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/StorageEngineFailureException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/StorageEngineFailureException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/StorageEngineFailureException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/StorageGroupProcessorException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/StorageGroupProcessorException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/StorageGroupProcessorException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/StorageGroupProcessorException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/SyncConnectionException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/SyncConnectionException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/SyncConnectionException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/SyncConnectionException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/SysCheckException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/SysCheckException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/SysCheckException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/SysCheckException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/TsFileProcessorException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/TsFileProcessorException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/TsFileProcessorException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/TsFileProcessorException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/UnSupportedFillTypeException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/UnSupportedFillTypeException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/UnSupportedFillTypeException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/UnSupportedFillTypeException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/IllegalASTFormatException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/qp/IllegalASTFormatException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/qp/IllegalASTFormatException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/qp/IllegalASTFormatException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOperatorException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOperatorException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOperatorException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOperatorException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOptimizeException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOptimizeException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOptimizeException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/qp/LogicalOptimizeException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/exception/qp/QueryProcessorException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/exception/qp/QueryProcessorException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/exception/qp/QueryProcessorException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/exception/qp/QueryProcessorException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MGraph.java b/iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MGraph.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/metadata/MGraph.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MGraph.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/metadata/MManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MNode.java b/iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MNode.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/metadata/MNode.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MNode.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MTree.java b/iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/metadata/MTree.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/Metadata.java b/iotdb-server/src/main/java/org/apache/iotdb/db/metadata/Metadata.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/metadata/Metadata.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/metadata/Metadata.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MetadataConstant.java b/iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MetadataConstant.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/metadata/MetadataConstant.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MetadataConstant.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MetadataOperationType.java b/iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MetadataOperationType.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/metadata/MetadataOperationType.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/metadata/MetadataOperationType.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/PNode.java b/iotdb-server/src/main/java/org/apache/iotdb/db/metadata/PNode.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/metadata/PNode.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/metadata/PNode.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/PTree.java b/iotdb-server/src/main/java/org/apache/iotdb/db/metadata/PTree.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/metadata/PTree.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/metadata/PTree.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/monitor/IStatistic.java b/iotdb-server/src/main/java/org/apache/iotdb/db/monitor/IStatistic.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/monitor/IStatistic.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/monitor/IStatistic.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/monitor/MonitorConstants.java b/iotdb-server/src/main/java/org/apache/iotdb/db/monitor/MonitorConstants.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/monitor/MonitorConstants.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/monitor/MonitorConstants.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java b/iotdb-server/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/monitor/collector/MemTableWriteTimeCost.java b/iotdb-server/src/main/java/org/apache/iotdb/db/monitor/collector/MemTableWriteTimeCost.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/monitor/collector/MemTableWriteTimeCost.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/monitor/collector/MemTableWriteTimeCost.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/QueryProcessor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/QueryProcessor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/QueryProcessor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/QueryProcessor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/constant/DatetimeUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/constant/DatetimeUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/constant/DatetimeUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/constant/DatetimeUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/constant/SQLConstant.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/constant/SQLConstant.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/constant/SQLConstant.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/constant/SQLConstant.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/constant/TSParserConstant.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/constant/TSParserConstant.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/constant/TSParserConstant.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/constant/TSParserConstant.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/exception/DateTimeFormatException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/exception/DateTimeFormatException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/exception/DateTimeFormatException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/exception/DateTimeFormatException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/IQueryProcessExecutor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/executor/IQueryProcessExecutor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/executor/IQueryProcessExecutor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/executor/IQueryProcessExecutor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/QueryProcessExecutor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/executor/QueryProcessExecutor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/executor/QueryProcessExecutor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/executor/QueryProcessExecutor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/RootOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/RootOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/RootOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/RootOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicFunctionOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicFunctionOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicFunctionOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicFunctionOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicOperatorType.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicOperatorType.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicOperatorType.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicOperatorType.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/DeleteOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/DeleteOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/DeleteOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/DeleteOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FilterOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/FilterOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FilterOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/FilterOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FromOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/FromOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FromOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/FromOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FunctionOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/FunctionOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/FunctionOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/FunctionOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/InsertOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/InsertOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/InsertOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/InsertOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/SFWOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/SFWOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/SFWOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/SFWOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/SelectOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/SelectOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/SelectOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/SelectOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/UpdateOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/UpdateOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/crud/UpdateOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/crud/UpdateOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/AuthorOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/sys/AuthorOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/AuthorOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/sys/AuthorOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/LoadDataOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/sys/LoadDataOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/LoadDataOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/sys/LoadDataOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/MetadataOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/sys/MetadataOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/MetadataOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/sys/MetadataOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/PropertyOperator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/sys/PropertyOperator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/logical/sys/PropertyOperator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/logical/sys/PropertyOperator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/PhysicalPlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/FillQueryPlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/FillQueryPlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/FillQueryPlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/FillQueryPlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/GroupByPlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/GroupByPlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/GroupByPlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/GroupByPlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/UpdatePlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UpdatePlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/crud/UpdatePlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UpdatePlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/sys/AuthorPlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/sys/LoadDataPlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/MetadataPlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MetadataPlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/MetadataPlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MetadataPlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/PropertyPlan.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/sys/PropertyPlan.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/physical/sys/PropertyPlan.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/physical/sys/PropertyPlan.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/DnfFilterOptimizer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/DnfFilterOptimizer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/DnfFilterOptimizer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/DnfFilterOptimizer.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/IFilterOptimizer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/IFilterOptimizer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/IFilterOptimizer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/IFilterOptimizer.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ILogicalOptimizer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ILogicalOptimizer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ILogicalOptimizer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ILogicalOptimizer.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/MergeSingleFilterOptimizer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/MergeSingleFilterOptimizer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/MergeSingleFilterOptimizer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/MergeSingleFilterOptimizer.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/RemoveNotOptimizer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/RemoveNotOptimizer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/RemoveNotOptimizer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/RemoveNotOptimizer.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/AggreResultData.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/AggreResultData.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/AggreResultData.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/AggreResultData.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/AggregateFunction.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/AggregateFunction.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/AggregateFunction.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/AggregateFunction.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/CountAggrFunc.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/CountAggrFunc.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/CountAggrFunc.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/CountAggrFunc.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/FirstAggrFunc.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/FirstAggrFunc.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/FirstAggrFunc.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/FirstAggrFunc.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/LastAggrFunc.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/LastAggrFunc.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/LastAggrFunc.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/LastAggrFunc.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxTimeAggrFunc.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxTimeAggrFunc.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxTimeAggrFunc.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxTimeAggrFunc.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxValueAggrFunc.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxValueAggrFunc.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxValueAggrFunc.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MaxValueAggrFunc.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MeanAggrFunc.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MeanAggrFunc.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MeanAggrFunc.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MeanAggrFunc.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinTimeAggrFunc.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinTimeAggrFunc.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinTimeAggrFunc.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinTimeAggrFunc.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinValueAggrFunc.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinValueAggrFunc.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinValueAggrFunc.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/MinValueAggrFunc.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/SumAggrFunc.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/SumAggrFunc.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/SumAggrFunc.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/SumAggrFunc.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/context/QueryContext.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/context/QueryContext.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/context/QueryContext.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/context/QueryContext.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/control/JobFileManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/control/JobFileManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/control/JobFileManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/control/JobFileManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/AggreResultDataPointReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/AggreResultDataPointReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/dataset/AggreResultDataPointReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/AggreResultDataPointReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/AuthDataSet.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/AuthDataSet.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/dataset/AuthDataSet.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/AuthDataSet.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithValueFilter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithValueFilter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithValueFilter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithValueFilter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithoutValueFilter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithoutValueFilter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithoutValueFilter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithoutValueFilter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByEngineDataSet.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByEngineDataSet.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByEngineDataSet.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByEngineDataSet.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithValueFilterDataSet.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithValueFilterDataSet.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithValueFilterDataSet.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithValueFilterDataSet.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineQueryRouter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/executor/EngineQueryRouter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineQueryRouter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/executor/EngineQueryRouter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/FillEngineExecutor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/executor/FillEngineExecutor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/executor/FillEngineExecutor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/executor/FillEngineExecutor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/IEngineQueryRouter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/executor/IEngineQueryRouter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/executor/IEngineQueryRouter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/executor/IEngineQueryRouter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/factory/AggreFuncFactory.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/factory/AggreFuncFactory.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/factory/AggreFuncFactory.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/factory/AggreFuncFactory.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/fill/IFill.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/fill/IFill.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/fill/IFill.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/fill/IFill.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/fill/LinearFill.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/fill/LinearFill.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/fill/LinearFill.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/fill/LinearFill.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/fill/PreviousFill.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/fill/PreviousFill.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/fill/PreviousFill.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/fill/PreviousFill.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/IAggregateReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/IAggregateReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/IAggregateReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/IAggregateReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/IBatchReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/IBatchReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/IBatchReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/IBatchReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/IPointReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/IPointReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/IPointReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/IPointReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/IReaderByTimestamp.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/IReaderByTimestamp.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/IReaderByTimestamp.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/IReaderByTimestamp.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/DiskChunkReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/DiskChunkReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/DiskChunkReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/DiskChunkReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/DiskChunkReaderByTimestamp.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/DiskChunkReaderByTimestamp.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/DiskChunkReaderByTimestamp.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/DiskChunkReaderByTimestamp.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/MemChunkReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/MemChunkReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/MemChunkReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/MemChunkReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/MemChunkReaderByTimestamp.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/MemChunkReaderByTimestamp.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/MemChunkReaderByTimestamp.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/MemChunkReaderByTimestamp.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/FileSeriesReaderAdapter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/FileSeriesReaderAdapter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/FileSeriesReaderAdapter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/FileSeriesReaderAdapter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/FileSeriesReaderByTimestampAdapter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/FileSeriesReaderByTimestampAdapter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/FileSeriesReaderByTimestampAdapter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/FileSeriesReaderByTimestampAdapter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileIterateReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileIterateReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileIterateReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileIterateReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileReaderByTimestamp.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileReaderByTimestamp.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileReaderByTimestamp.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileReaderByTimestamp.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceIterateReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceIterateReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceIterateReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceIterateReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceReaderByTimestamp.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceReaderByTimestamp.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceReaderByTimestamp.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceReaderByTimestamp.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceMergeReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceMergeReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceMergeReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceMergeReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceReaderByTimestamp.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceReaderByTimestamp.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceReaderByTimestamp.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceReaderByTimestamp.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderByTimestamp.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderByTimestamp.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderByTimestamp.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderByTimestamp.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/universal/IterateReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/universal/IterateReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/universal/IterateReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/universal/IterateReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestamp.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestamp.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestamp.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestamp.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/AbstractNodeConstructor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/timegenerator/AbstractNodeConstructor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/AbstractNodeConstructor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/timegenerator/AbstractNodeConstructor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineLeafNode.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineLeafNode.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineLeafNode.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineLeafNode.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineTimeGenerator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineTimeGenerator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineTimeGenerator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineTimeGenerator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/rescon/MemTablePool.java b/iotdb-server/src/main/java/org/apache/iotdb/db/rescon/MemTablePool.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/rescon/MemTablePool.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/rescon/MemTablePool.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/rescon/PrimitiveArrayPool.java b/iotdb-server/src/main/java/org/apache/iotdb/db/rescon/PrimitiveArrayPool.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/rescon/PrimitiveArrayPool.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/rescon/PrimitiveArrayPool.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/rescon/TVListAllocator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/rescon/TVListAllocator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/rescon/TVListAllocator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/rescon/TVListAllocator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/rescon/TVListAllocatorMBean.java b/iotdb-server/src/main/java/org/apache/iotdb/db/rescon/TVListAllocatorMBean.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/rescon/TVListAllocatorMBean.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/rescon/TVListAllocatorMBean.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/rescon/package-info.java b/iotdb-server/src/main/java/org/apache/iotdb/db/rescon/package-info.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/rescon/package-info.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/rescon/package-info.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/IService.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/IService.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/IService.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/IService.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/IoTDB.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDBMBean.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/IoTDBMBean.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/IoTDBMBean.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/IoTDBMBean.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/IoTDBShutdownHook.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/IoTDBShutdownHook.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/IoTDBShutdownHook.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/IoTDBShutdownHook.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCService.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/JDBCService.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/JDBCService.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/JDBCService.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCServiceEventHandler.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/JDBCServiceEventHandler.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/JDBCServiceEventHandler.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/JDBCServiceEventHandler.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCServiceMBean.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/JDBCServiceMBean.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/JDBCServiceMBean.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/JDBCServiceMBean.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/JMXService.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/JMXService.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/JMXService.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/JMXService.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/Monitor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/Monitor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/Monitor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/Monitor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/MonitorMBean.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/MonitorMBean.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/MonitorMBean.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/MonitorMBean.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/RegisterManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/RegisterManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/RegisterManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/RegisterManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/ServiceType.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/ServiceType.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/ServiceType.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/ServiceType.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/StartupCheck.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/StartupCheck.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/StartupCheck.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/StartupCheck.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/StartupChecks.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/StartupChecks.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/StartupChecks.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/StartupChecks.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java b/iotdb-server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/ParseGenerator.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sql/ParseGenerator.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sql/ParseGenerator.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sql/ParseGenerator.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstNode.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/AstNode.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstNode.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/AstNode.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstNodeOrigin.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/AstNodeOrigin.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstNodeOrigin.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/AstNodeOrigin.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/Node.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/Node.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sql/parse/Node.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/Node.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseDriver.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/ParseDriver.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseDriver.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/ParseDriver.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseError.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/ParseError.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseError.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/ParseError.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseException.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/ParseException.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseException.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/ParseException.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/ParseUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sql/parse/ParseUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sync/conf/Constans.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sync/conf/Constans.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sync/conf/Constans.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sync/conf/Constans.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sync/conf/SyncSenderConfig.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sync/conf/SyncSenderConfig.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sync/conf/SyncSenderConfig.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sync/conf/SyncSenderConfig.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sync/conf/SyncSenderDescriptor.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sync/conf/SyncSenderDescriptor.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sync/conf/SyncSenderDescriptor.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sync/conf/SyncSenderDescriptor.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sync/receiver/SyncServerManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sync/receiver/SyncServerManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sync/receiver/SyncServerManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sync/receiver/SyncServerManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sync/receiver/SyncServiceImpl.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sync/receiver/SyncServiceImpl.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sync/receiver/SyncServiceImpl.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sync/receiver/SyncServiceImpl.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sync/sender/SyncFileManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sync/sender/SyncFileManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sync/sender/SyncFileManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sync/sender/SyncFileManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sync/sender/SyncSender.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sync/sender/SyncSender.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sync/sender/SyncSender.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sync/sender/SyncSender.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sync/sender/SyncSenderImpl.java b/iotdb-server/src/main/java/org/apache/iotdb/db/sync/sender/SyncSenderImpl.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/sync/sender/SyncSenderImpl.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/sync/sender/SyncSenderImpl.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/tools/MemEst/MemEstTool.java b/iotdb-server/src/main/java/org/apache/iotdb/db/tools/MemEst/MemEstTool.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/tools/MemEst/MemEstTool.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/tools/MemEst/MemEstTool.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/tools/MemEst/MemEstToolCmd.java b/iotdb-server/src/main/java/org/apache/iotdb/db/tools/MemEst/MemEstToolCmd.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/tools/MemEst/MemEstToolCmd.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/tools/MemEst/MemEstToolCmd.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/tools/WalChecker.java b/iotdb-server/src/main/java/org/apache/iotdb/db/tools/WalChecker.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/tools/WalChecker.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/tools/WalChecker.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/CopyOnReadLinkedList.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/CopyOnReadLinkedList.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/CopyOnReadLinkedList.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/CopyOnReadLinkedList.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/FilePathUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/FilePathUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/FilePathUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/FilePathUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/FileSchemaUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/FileSchemaUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/FileSchemaUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/FileSchemaUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/IOUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/IOUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/IOUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/IOUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/MathUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/MathUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/MathUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/MathUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/MemUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/MemUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/MemUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/MemUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/QueryDataSetUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/QueryDataSetUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/QueryDataSetUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/QueryDataSetUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/QueryUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/QueryUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/QueryUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/QueryUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/RandomDeleteCache.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/RandomDeleteCache.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/RandomDeleteCache.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/RandomDeleteCache.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/SyncUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/SyncUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/SyncUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/SyncUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/TimeValuePair.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/TimeValuePair.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/TimeValuePair.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/TimeValuePair.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/TimeValuePairUtils.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/TimeValuePairUtils.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/TimeValuePairUtils.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/TimeValuePairUtils.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/TsPrimitiveType.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/TsPrimitiveType.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/TsPrimitiveType.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/TsPrimitiveType.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/BinaryTVList.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/BooleanTVList.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/BooleanTVList.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/BooleanTVList.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/BooleanTVList.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/DoubleTVList.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/FloatTVList.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/IntTVList.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/IntTVList.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/IntTVList.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/IntTVList.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/LongTVList.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/LongTVList.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/LongTVList.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/LongTVList.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java b/iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/BatchLogReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/BatchLogReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/io/BatchLogReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/BatchLogReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/ILogReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/ILogReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/io/ILogReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/ILogReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/ILogWriter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/ILogWriter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/io/ILogWriter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/ILogWriter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/LogWriter.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/LogWriter.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/io/LogWriter.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/LogWriter.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/MultiFileLogReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/MultiFileLogReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/io/MultiFileLogReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/MultiFileLogReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/io/SingleFileLogReader.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/SingleFileLogReader.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/io/SingleFileLogReader.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/io/SingleFileLogReader.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/manager/MultiFileLogNodeManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/manager/MultiFileLogNodeManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/manager/MultiFileLogNodeManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/manager/MultiFileLogNodeManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/manager/WriteLogNodeManager.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/manager/WriteLogNodeManager.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/manager/WriteLogNodeManager.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/manager/WriteLogNodeManager.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/node/ExclusiveWriteLogNode.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/node/ExclusiveWriteLogNode.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/node/ExclusiveWriteLogNode.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/node/ExclusiveWriteLogNode.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/node/WriteLogNode.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/node/WriteLogNode.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/node/WriteLogNode.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/node/WriteLogNode.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/LogReplayer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/recover/LogReplayer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/LogReplayer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/recover/LogReplayer.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java b/iotdb-server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java
rename to iotdb-server/src/main/java/org/apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFIleRoleAccessorTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/auth/LocalFIleRoleAccessorTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFIleRoleAccessorTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/auth/LocalFIleRoleAccessorTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileAuthorizerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/auth/LocalFileAuthorizerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileAuthorizerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/auth/LocalFileAuthorizerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileRoleManagerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/auth/LocalFileRoleManagerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileRoleManagerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/auth/LocalFileRoleManagerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileUserAccessorTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/auth/LocalFileUserAccessorTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileUserAccessorTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/auth/LocalFileUserAccessorTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileUserManagerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/auth/LocalFileUserManagerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/auth/LocalFileUserManagerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/auth/LocalFileUserManagerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandlerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandlerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandlerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandlerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactoryTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactoryTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactoryTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactoryTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/conf/adapter/CompressionRatioTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/conf/adapter/CompressionRatioTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/conf/adapter/CompressionRatioTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/conf/adapter/CompressionRatioTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapterTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapterTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapterTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapterTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategyTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategyTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategyTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategyTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/cost/statistic/PerformanceStatTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/cost/statistic/PerformanceStatTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/cost/statistic/PerformanceStatTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/cost/statistic/PerformanceStatTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPoolTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPoolTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPoolTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPoolTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTaskTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTaskTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTaskTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTaskTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTablePoolTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTablePoolTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTablePoolTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTablePoolTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemtableBenchmark.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/MemtableBenchmark.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemtableBenchmark.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/MemtableBenchmark.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/ModificationFileTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/modification/ModificationFileTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/modification/ModificationFileTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/modification/ModificationFileTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessorTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessorTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessorTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/modification/io/LocalTextModificationAccessorTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/storagegroup/FileNodeManagerBenchmark.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/storagegroup/FileNodeManagerBenchmark.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/storagegroup/FileNodeManagerBenchmark.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/storagegroup/FileNodeManagerBenchmark.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/version/SimpleFileVersionControllerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/version/SimpleFileVersionControllerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/version/SimpleFileVersionControllerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/version/SimpleFileVersionControllerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/version/SysTimeVersionControllerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/engine/version/SysTimeVersionControllerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/engine/version/SysTimeVersionControllerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/engine/version/SysTimeVersionControllerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/Constant.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/Constant.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/Constant.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/Constant.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IOTDBFillIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IOTDBFillIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IOTDBFillIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IOTDBFillIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationLargeDataIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationSmallDataIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationSmallDataIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationSmallDataIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationSmallDataIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBFloatPrecisionIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBFloatPrecisionIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBFloatPrecisionIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBFloatPrecisionIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBPreparedStmtIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBPreparedStmtIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBPreparedStmtIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBPreparedStmtIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBVersionIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBVersionIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBVersionIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/integration/IoTDBVersionIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MGraphTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MGraphTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/metadata/MGraphTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MGraphTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerAdvancedTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MManagerAdvancedTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerAdvancedTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MManagerAdvancedTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MManagerImproveTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MTreeTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MTreeTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/metadata/MTreeTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MTreeTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/metadata/MetadataTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MetadataTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/metadata/MetadataTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/metadata/MetadataTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/monitor/collector/FileSizeTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/monitor/collector/FileSizeTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/monitor/collector/FileSizeTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/monitor/collector/FileSizeTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/QueryProcessorTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/qp/QueryProcessorTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/qp/QueryProcessorTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/qp/QueryProcessorTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/bench/QueryParseBenchmark.java b/iotdb-server/src/test/java/org/apache/iotdb/db/qp/bench/QueryParseBenchmark.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/qp/bench/QueryParseBenchmark.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/qp/bench/QueryParseBenchmark.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextAuthorTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextAuthorTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextAuthorTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextAuthorTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextPropertyTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextPropertyTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextPropertyTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/qp/other/TSPlanContextPropertyTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/LogicalPlanSmallTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/qp/plan/LogicalPlanSmallTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/qp/plan/LogicalPlanSmallTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/qp/plan/LogicalPlanSmallTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/qp/plan/PhysicalPlanTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/QPUpdateTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/qp/plan/QPUpdateTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/qp/plan/QPUpdateTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/qp/plan/QPUpdateTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/TestConcatOptimizer.java b/iotdb-server/src/test/java/org/apache/iotdb/db/qp/plan/TestConcatOptimizer.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/qp/plan/TestConcatOptimizer.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/qp/plan/TestConcatOptimizer.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/strategy/LogicalGeneratorTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/qp/strategy/LogicalGeneratorTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/qp/strategy/LogicalGeneratorTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/qp/strategy/LogicalGeneratorTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/utils/MemIntQpExecutor.java b/iotdb-server/src/test/java/org/apache/iotdb/db/qp/utils/MemIntQpExecutor.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/qp/utils/MemIntQpExecutor.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/qp/utils/MemIntQpExecutor.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/component/SimpleFileWriter.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/component/SimpleFileWriter.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/component/SimpleFileWriter.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/component/SimpleFileWriter.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/control/FileReaderManagerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/control/FileReaderManagerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/control/FileReaderManagerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/control/FileReaderManagerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/control/QueryResourceManagerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/control/QueryResourceManagerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/control/QueryResourceManagerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/control/QueryResourceManagerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithValueFilterTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithValueFilterTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithValueFilterTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/dataset/EngineDataSetWithValueFilterTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/executor/GroupByEngineDataSetTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/executor/GroupByEngineDataSetTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/executor/GroupByEngineDataSetTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/executor/GroupByEngineDataSetTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/ReaderTestHelper.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/ReaderTestHelper.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/ReaderTestHelper.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/ReaderTestHelper.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileReaderTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileReaderTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileReaderTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileReaderTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceReaderTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceReaderTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceReaderTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceReaderTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceReaderTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceReaderTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceReaderTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceReaderTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/FakedIBatchPoint.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/FakedIBatchPoint.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/FakedIBatchPoint.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/FakedIBatchPoint.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/FakedIPointReader.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/FakedIPointReader.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/FakedIPointReader.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/FakedIPointReader.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilterTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilterTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilterTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilterTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilterTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilterTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilterTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilterTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/universal/FakedSeriesReaderByTimestamp.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/universal/FakedSeriesReaderByTimestamp.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/universal/FakedSeriesReaderByTimestamp.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/universal/FakedSeriesReaderByTimestamp.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestampTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestampTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestampTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestampTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest2.java b/iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest2.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest2.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderTest2.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/script/EnvScriptIT.java b/iotdb-server/src/test/java/org/apache/iotdb/db/script/EnvScriptIT.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/script/EnvScriptIT.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/script/EnvScriptIT.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sql/DatetimeQueryDataSetUtilsTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/sql/DatetimeQueryDataSetUtilsTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/sql/DatetimeQueryDataSetUtilsTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/sql/DatetimeQueryDataSetUtilsTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sql/SQLParserTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/sql/SQLParserTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/sql/SQLParserTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/sql/SQLParserTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sync/sender/MultipleClientSyncTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/sync/sender/MultipleClientSyncTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/sync/sender/MultipleClientSyncTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/sync/sender/MultipleClientSyncTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sync/sender/SingleClientSyncTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/sync/sender/SingleClientSyncTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/sync/sender/SingleClientSyncTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/sync/sender/SingleClientSyncTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sync/sender/SyncFileManagerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/sync/sender/SyncFileManagerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/sync/sender/SyncFileManagerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/sync/sender/SyncFileManagerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sync/test/RandomNum.java b/iotdb-server/src/test/java/org/apache/iotdb/db/sync/test/RandomNum.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/sync/test/RandomNum.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/sync/test/RandomNum.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient1.java b/iotdb-server/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient1.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient1.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient1.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient2.java b/iotdb-server/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient2.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient2.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient2.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient3.java b/iotdb-server/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient3.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient3.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/sync/test/SyncTestClient3.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sync/test/Utils.java b/iotdb-server/src/test/java/org/apache/iotdb/db/sync/test/Utils.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/sync/test/Utils.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/sync/test/Utils.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/tools/WalCheckerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/tools/WalCheckerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/tools/WalCheckerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/tools/WalCheckerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java b/iotdb-server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/utils/MathQueryDataSetUtilsTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/utils/MathQueryDataSetUtilsTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/utils/MathQueryDataSetUtilsTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/utils/MathQueryDataSetUtilsTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/utils/OpenFileNumUtilTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/utils/OpenFileNumUtilTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/utils/OpenFileNumUtilTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/utils/OpenFileNumUtilTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/utils/datastructure/LongTVListTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/utils/datastructure/LongTVListTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/utils/datastructure/LongTVListTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/utils/datastructure/LongTVListTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/IoTDBLogFileSizeTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/writelog/IoTDBLogFileSizeTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/writelog/IoTDBLogFileSizeTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/writelog/IoTDBLogFileSizeTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/PerformanceTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/writelog/PerformanceTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/writelog/PerformanceTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/writelog/PerformanceTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeManagerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeManagerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeManagerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeManagerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/io/LogWriterReaderTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/writelog/io/LogWriterReaderTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/writelog/io/LogWriterReaderTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/writelog/io/LogWriterReaderTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/io/MultiFileLogReaderTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/writelog/io/MultiFileLogReaderTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/writelog/io/MultiFileLogReaderTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/writelog/io/MultiFileLogReaderTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java b/iotdb-server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
similarity index 100%
rename from iotdb/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
rename to iotdb-server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
diff --git a/iotdb/src/test/resources/logback.xml b/iotdb-server/src/test/resources/logback.xml
similarity index 100%
rename from iotdb/src/test/resources/logback.xml
rename to iotdb-server/src/test/resources/logback.xml
diff --git a/iotdb/src/test/resources/start-sync-test.sh b/iotdb-server/src/test/resources/start-sync-test.sh
similarity index 100%
rename from iotdb/src/test/resources/start-sync-test.sh
rename to iotdb-server/src/test/resources/start-sync-test.sh
diff --git a/iotdb/src/test/resources/stop-sync-test.sh b/iotdb-server/src/test/resources/stop-sync-test.sh
similarity index 100%
rename from iotdb/src/test/resources/stop-sync-test.sh
rename to iotdb-server/src/test/resources/stop-sync-test.sh
diff --git a/iotdb/iotdb/conf/iotdb-engine.properties b/iotdb/conf/iotdb-engine.properties
similarity index 100%
rename from iotdb/iotdb/conf/iotdb-engine.properties
rename to iotdb/conf/iotdb-engine.properties
diff --git a/iotdb/iotdb/conf/iotdb-env.bat b/iotdb/conf/iotdb-env.bat
similarity index 100%
rename from iotdb/iotdb/conf/iotdb-env.bat
rename to iotdb/conf/iotdb-env.bat
diff --git a/iotdb/iotdb/conf/iotdb-env.sh b/iotdb/conf/iotdb-env.sh
similarity index 100%
rename from iotdb/iotdb/conf/iotdb-env.sh
rename to iotdb/conf/iotdb-env.sh
diff --git a/iotdb/iotdb/conf/iotdb-sync-client.properties b/iotdb/conf/iotdb-sync-client.properties
similarity index 100%
rename from iotdb/iotdb/conf/iotdb-sync-client.properties
rename to iotdb/conf/iotdb-sync-client.properties
diff --git a/iotdb/iotdb/conf/logback-tool.xml b/iotdb/conf/logback-tool.xml
similarity index 100%
rename from iotdb/iotdb/conf/logback-tool.xml
rename to iotdb/conf/logback-tool.xml
diff --git a/iotdb/iotdb/conf/logback.xml b/iotdb/conf/logback.xml
similarity index 100%
rename from iotdb/iotdb/conf/logback.xml
rename to iotdb/conf/logback.xml
diff --git a/iotdb/iotdb/conf/tsfile-format.properties b/iotdb/conf/tsfile-format.properties
similarity index 100%
rename from iotdb/iotdb/conf/tsfile-format.properties
rename to iotdb/conf/tsfile-format.properties
diff --git a/iotdb-cli/cli/bin/start-client.bat b/iotdb/sbin/start-client.bat
similarity index 100%
rename from iotdb-cli/cli/bin/start-client.bat
rename to iotdb/sbin/start-client.bat
diff --git a/iotdb-cli/cli/bin/start-client.sh b/iotdb/sbin/start-client.sh
similarity index 100%
rename from iotdb-cli/cli/bin/start-client.sh
rename to iotdb/sbin/start-client.sh
diff --git a/iotdb/iotdb/sbin/start-server.bat b/iotdb/sbin/start-server.bat
similarity index 100%
rename from iotdb/iotdb/sbin/start-server.bat
rename to iotdb/sbin/start-server.bat
diff --git a/iotdb/iotdb/sbin/start-server.sh b/iotdb/sbin/start-server.sh
similarity index 100%
rename from iotdb/iotdb/sbin/start-server.sh
rename to iotdb/sbin/start-server.sh
diff --git a/iotdb/iotdb/sbin/stop-server.bat b/iotdb/sbin/stop-server.bat
similarity index 100%
rename from iotdb/iotdb/sbin/stop-server.bat
rename to iotdb/sbin/stop-server.bat
diff --git a/iotdb/iotdb/sbin/stop-server.sh b/iotdb/sbin/stop-server.sh
similarity index 100%
rename from iotdb/iotdb/sbin/stop-server.sh
rename to iotdb/sbin/stop-server.sh
diff --git a/iotdb-cli/cli/bin/export-csv.bat b/iotdb/tools/export-csv.bat
similarity index 100%
rename from iotdb-cli/cli/bin/export-csv.bat
rename to iotdb/tools/export-csv.bat
diff --git a/iotdb-cli/cli/bin/export-csv.sh b/iotdb/tools/export-csv.sh
similarity index 100%
rename from iotdb-cli/cli/bin/export-csv.sh
rename to iotdb/tools/export-csv.sh
diff --git a/iotdb-cli/cli/bin/import-csv.bat b/iotdb/tools/import-csv.bat
similarity index 100%
rename from iotdb-cli/cli/bin/import-csv.bat
rename to iotdb/tools/import-csv.bat
diff --git a/iotdb-cli/cli/bin/import-csv.sh b/iotdb/tools/import-csv.sh
similarity index 100%
rename from iotdb-cli/cli/bin/import-csv.sh
rename to iotdb/tools/import-csv.sh
diff --git a/iotdb/iotdb/tools/memory-tool.bat b/iotdb/tools/memory-tool.bat
similarity index 100%
rename from iotdb/iotdb/tools/memory-tool.bat
rename to iotdb/tools/memory-tool.bat
diff --git a/iotdb/iotdb/tools/memory-tool.sh b/iotdb/tools/memory-tool.sh
similarity index 100%
rename from iotdb/iotdb/tools/memory-tool.sh
rename to iotdb/tools/memory-tool.sh
diff --git a/iotdb/iotdb/tools/start-WalChecker.bat b/iotdb/tools/start-WalChecker.bat
similarity index 100%
rename from iotdb/iotdb/tools/start-WalChecker.bat
rename to iotdb/tools/start-WalChecker.bat
diff --git a/iotdb/iotdb/tools/start-WalChecker.sh b/iotdb/tools/start-WalChecker.sh
similarity index 100%
rename from iotdb/iotdb/tools/start-WalChecker.sh
rename to iotdb/tools/start-WalChecker.sh
diff --git a/iotdb/iotdb/tools/start-sync-client.bat b/iotdb/tools/start-sync-client.bat
similarity index 100%
rename from iotdb/iotdb/tools/start-sync-client.bat
rename to iotdb/tools/start-sync-client.bat
diff --git a/iotdb/iotdb/tools/start-sync-client.sh b/iotdb/tools/start-sync-client.sh
similarity index 100%
rename from iotdb/iotdb/tools/start-sync-client.sh
rename to iotdb/tools/start-sync-client.sh
diff --git a/iotdb/iotdb/tools/stop-sync-client.bat b/iotdb/tools/stop-sync-client.bat
similarity index 100%
rename from iotdb/iotdb/tools/stop-sync-client.bat
rename to iotdb/tools/stop-sync-client.bat
diff --git a/iotdb/iotdb/tools/stop-sync-client.sh b/iotdb/tools/stop-sync-client.sh
similarity index 100%
rename from iotdb/iotdb/tools/stop-sync-client.sh
rename to iotdb/tools/stop-sync-client.sh
diff --git a/jdbc/README.md b/jdbc/README.md
index 3e77c38..3ba9693 100644
--- a/jdbc/README.md
+++ b/jdbc/README.md
@@ -43,7 +43,7 @@ In root directory:
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</dependency>
</dependencies>
```
diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/Constant.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/Constant.java
index faa79c7..2d9b1f9 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/Constant.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/Constant.java
@@ -24,7 +24,7 @@ public class Constant {
public static final String GLOBAL_DB_NAME = "IoTDB";
- public static final String GLOBAL_DB_VERSION = "0.8.0-SNAPSHOT";
+ public static final String GLOBAL_DB_VERSION = "0.9.0-SNAPSHOT";
public static final String GLOBAL_COLUMN_REQ = "COLUMN";
diff --git a/pom.xml b/pom.xml
index fbfc7a0..0901f90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,12 +135,12 @@
</dependencies>
<modules>
<module>tsfile</module>
- <module>jdbc</module>
- <module>iotdb</module>
- <module>grafana</module>
<module>service-rpc</module>
+ <module>jdbc</module>
+ <module>iotdb-server</module>
<module>iotdb-cli</module>
<module>example</module>
+ <module>grafana</module>
<!-- <module>hadoop</module> -->
<module>spark</module>
</modules>
@@ -148,6 +148,34 @@
<pluginManagement>
<plugins>
<plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${project.basedir}/iotdb/lib</directory>
+ <includes>
+ <include>**/*.jar</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ <fileset>
+ <directory>${project.basedir}/iotdb/data</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ <fileset>
+ <directory>${project.basedir}/iotdb/logs</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
@@ -222,6 +250,27 @@
</plugins>
</pluginManagement>
<plugins>
+ <!--<plugin>-->
+ <!--<groupId>org.commonjava.maven.plugins</groupId>-->
+ <!--<artifactId>directory-maven-plugin</artifactId>-->
+ <!--<version>0.1</version>-->
+ <!--<executions>-->
+ <!--<execution>-->
+ <!--<id>directories</id>-->
+ <!--<goals>-->
+ <!--<goal>directory-of</goal>-->
+ <!--</goals>-->
+ <!--<phase>initialize</phase>-->
+ <!--<configuration>-->
+ <!--<property>root.basedir</property>-->
+ <!--<project>-->
+ <!--<groupId>com.my.domain</groupId>-->
+ <!--<artifactId>my-root-artifact</artifactId>-->
+ <!--</project>-->
+ <!--</configuration>-->
+ <!--</execution>-->
+ <!--</executions>-->
+ <!--</plugin>-->
<!--
Strange xthings usually happen if you run with a too low Java version.
This plugin not only checks the minimum java version of 1.8, but also
diff --git a/spark/README.md b/spark/README.md
index 1d50a05..e1996c4 100644
--- a/spark/README.md
+++ b/spark/README.md
@@ -61,7 +61,7 @@ With this connector, you can
|Spark Version | Scala Version | Java Version | TsFile |
|------------- | ------------- | ------------ |------------ |
-| `2.4.3` | `2.11.8` | `1.8` | `0.8.0-SNAPSHOT`|
+| `2.4.3` | `2.11.8` | `1.8` | `0.9.0-SNAPSHOT`|
> Note: For more information about how to download and use TsFile, please see the following link: https://github.com/apache/incubator-iotdb/tree/master/tsfile.
@@ -73,7 +73,7 @@ With this connector, you can
Start Spark with TsFile-Spark-Connector in local mode:
```
-./<spark-shell-path> --jars tsfile-spark-connector.jar,tsfile-0.8.0-SNAPSHOT-jar-with-dependencies.jar
+./<spark-shell-path> --jars tsfile-spark-connector.jar,tsfile-0.9.0-SNAPSHOT-jar-with-dependencies.jar
```
Note:
@@ -89,7 +89,7 @@ Note:
Start Spark with TsFile-Spark-Connector in distributed mode (That is, the spark cluster is connected by spark-shell):
```
-. /<spark-shell-path> --jars tsfile-spark-connector.jar,tsfile-0.8.0-SNAPSHOT-jar-with-dependencies.jar --master spark://ip:7077
+. /<spark-shell-path> --jars tsfile-spark-connector.jar,tsfile-0.9.0-SNAPSHOT-jar-with-dependencies.jar --master spark://ip:7077
```
Note:
diff --git a/tsfile/README.md b/tsfile/README.md
index b8977fd..d30a955 100644
--- a/tsfile/README.md
+++ b/tsfile/README.md
@@ -25,7 +25,7 @@ ___________ ___________.__.__
\__ ___/____\_ _____/|__| | ____
| | / ___/| __) | | | _/ __ \
| | \___ \ | \ | | |_\ ___/
- |____|/____ >\___ / |__|____/\___ > version 0.8.0
+ |____|/____ >\___ / |__|____/\___ > version 0.9.0
\/ \/ \/
</pre>
## Abstract
diff --git a/tsfile/example/readme.md b/tsfile/example/readme.md
index 0a3849a..9615cdd 100644
--- a/tsfile/example/readme.md
+++ b/tsfile/example/readme.md
@@ -31,7 +31,7 @@ The example is to show how to write and read a TsFile File.
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>tsfile</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</dependency>
</dependencies>
```
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
index 25c0bc8..26ce848 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
@@ -48,7 +48,7 @@ public class TSFileConfig {
public static final int BYTE_SIZE_PER_CHAR = 4;
public static final String STRING_ENCODING = "UTF-8";
public static final String CONFIG_FILE_NAME = "tsfile-format.properties";
- public static final String MAGIC_STRING = "TsFilev0.8.0";
+ public static final String MAGIC_STRING = "TsFilev0.9.0";
/**
* Current version is 3.
*/