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/23 02:17:14 UTC
[incubator-iotdb] branch rel/0.8 updated: update modules (#289)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/rel/0.8 by this push:
new ced4e7d update modules (#289)
ced4e7d is described below
commit ced4e7d48982bc30e7719e4f9e64e170f2c35e91
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Tue Jul 23 10:17:10 2019 +0800
update modules (#289)
* rename modules
---
.gitignore | 4 +
.travis.yml | 10 +-
{iotdb-cli => client}/cli/sbin/start-client.bat | 0
{iotdb-cli => client}/cli/sbin/start-client.sh | 0
{iotdb-cli => client}/cli/tools/export-csv.bat | 0
{iotdb-cli => client}/cli/tools/export-csv.sh | 0
{iotdb-cli => client}/cli/tools/import-csv.bat | 0
{iotdb-cli => client}/cli/tools/import-csv.sh | 0
{iotdb-cli => client}/pom.xml | 4 +-
.../apache/iotdb/cli/client/AbstractClient.java | 0
.../java/org/apache/iotdb/cli/client/Client.java | 0
.../org/apache/iotdb/cli/client/WinClient.java | 0
.../iotdb/cli/exception/ArgsErrorException.java | 0
.../org/apache/iotdb/cli/tool/AbstractCsvTool.java | 0
.../java/org/apache/iotdb/cli/tool/ExportCsv.java | 0
.../java/org/apache/iotdb/cli/tool/ImportCsv.java | 0
.../apache/iotdb/cli/client/AbstractClientIT.java | 0
.../apache/iotdb/cli/client/AbstractScript.java | 0
.../iotdb/cli/client/StartClientScriptIT.java | 0
.../org/apache/iotdb/cli/tool/ExportCsvTestIT.java | 0
.../org/apache/iotdb/cli/tool/ImportCsvTestIT.java | 0
.../src/test/resources/logback.xml | 0
jdbc/LICENSE | 201 ---------------------
pom.xml | 10 +-
.../iotdb/conf/iotdb-engine.properties | 0
{iotdb => server}/iotdb/conf/iotdb-env.bat | 0
{iotdb => server}/iotdb/conf/iotdb-env.sh | 0
.../iotdb/conf/iotdb-sync-client.properties | 0
{iotdb => server}/iotdb/conf/logback-tool.xml | 0
{iotdb => server}/iotdb/conf/logback.xml | 0
.../iotdb/conf/tsfile-format.properties | 0
{iotdb => server}/iotdb/sbin/start-server.bat | 0
{iotdb => server}/iotdb/sbin/start-server.sh | 0
{iotdb => server}/iotdb/sbin/stop-server.bat | 0
{iotdb => server}/iotdb/sbin/stop-server.sh | 0
{iotdb => server}/iotdb/tools/memory-tool.bat | 0
{iotdb => server}/iotdb/tools/memory-tool.sh | 0
{iotdb => server}/iotdb/tools/start-WalChecker.bat | 0
{iotdb => server}/iotdb/tools/start-WalChecker.sh | 0
.../iotdb/tools/start-sync-client.bat | 0
{iotdb => server}/iotdb/tools/start-sync-client.sh | 0
{iotdb => server}/iotdb/tools/stop-sync-client.bat | 0
{iotdb => server}/iotdb/tools/stop-sync-client.sh | 0
{iotdb => server}/pom.xml | 4 +-
.../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 | 0
.../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
{iotdb => server}/src/test/resources/logback.xml | 0
.../src/test/resources/start-sync-test.sh | 0
.../src/test/resources/stop-sync-test.sh | 0
{spark => spark-tsfile}/README.md | 0
{spark => spark-tsfile}/pom.xml | 3 +-
.../java/org/apache/iotdb/tsfile/io/HDFSInput.java | 0
.../org/apache/iotdb/tsfile/io/HDFSOutput.java | 0
.../apache/iotdb/tsfile/io/TsFileOutputFormat.java | 0
.../apache/iotdb/tsfile/io/TsFileRecordWriter.java | 0
.../scala/org/apache/iotdb/tsfile/Converter.scala | 0
.../org/apache/iotdb/tsfile/DefaultSource.scala | 0
.../apache/iotdb/tsfile/TsFileOutputWriter.scala | 0
.../apache/iotdb/tsfile/TsFileWriterFactory.scala | 0
.../scala/org/apache/iotdb/tsfile/package.scala | 0
.../scala/org/apache/iotdb/tool/TsFileExample.java | 0
.../org/apache/iotdb/tool/TsFileWriteTool.java | 0
.../org/apache/iotdb/tsfile/ConverterTest.scala | 0
.../org/apache/iotdb/tsfile/HDFSInputTest.java | 0
.../scala/org/apache/iotdb/tsfile/TSFileSuit.scala | 0
457 files changed, 19 insertions(+), 217 deletions(-)
diff --git a/.gitignore b/.gitignore
index d8c86d0..66819c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,10 @@ iotdb/iotdb/logs/*
iotdb/iotdb/lib/*
iotdb/unsequence/
iotdb/testunsequence
+conf/*
+lib/*
+sbin/*
+tools/*
tsfile/src/test/resources/perTestInputData
# Eclipse IDE files
diff --git a/.travis.yml b/.travis.yml
index 21cc04d..7b2a8ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ matrix:
- java -version
- mvn -version
- mvn -B apache-rat:check
- - mvn -B clean package -pl iotdb,grafana,iotdb-cli,example,:kafka-example,:rocketmq-example -am integration-test
+ - mvn -B clean package -pl server,grafana,client,example,:kafka-example,:rocketmq-example -am integration-test
- os: osx
osx_image: xcode9.3 # with JDK1.8.0_112-b16 installed
name: osx-oraclejdk8
@@ -53,7 +53,7 @@ matrix:
- java -version
- mvn -version
- mvn -B apache-rat:check
- - mvn -B clean package -pl iotdb,grafana,iotdb-cli,example,:kafka-example,:rocketmq-example -am integration-test
+ - mvn -B clean package -pl server,grafana,client,example,:kafka-example,:rocketmq-example -am integration-test
- os: osx
osx_image: xcode9.3 # with JDK1.8.0_112-b16 installed
name: osx-openjdk8
@@ -79,7 +79,7 @@ matrix:
# script:
# - java -version
# - mvn -version
-# - mvn -B clean package -pl iotdb,grafana,iotdb-cli,example,:kafka-example,:rocketmq-example -am integration-test
+# - mvn -B clean package -pl server,grafana,client,example,:kafka-example,:rocketmq-example -am integration-test
- os: windows
language: c
@@ -112,7 +112,7 @@ matrix:
- export PATH=$JAVA_HOME/bin:$PATH
script:
- java -version
- - mvn -B clean package -pl iotdb,grafana,iotdb-cli,example,:kafka-example,:rocketmq-example -am integration-test
+ - mvn -B clean package -pl server,grafana,client,example,:kafka-example,:rocketmq-example -am integration-test
- os: linux
name: linux-openjdk8
dist: trusty
@@ -129,7 +129,7 @@ matrix:
# - java -version
# - mvn -version
# - mvn -B apache-rat:check
-# - mvn -B clean package -pl iotdb,grafana,iotdb-cli,example,:kafka-example,:rocketmq-example -am integration-test
+# - mvn -B clean package -pl server,grafana,client,example,:kafka-example,:rocketmq-example -am integration-test
cache:
directories:
diff --git a/iotdb-cli/cli/sbin/start-client.bat b/client/cli/sbin/start-client.bat
similarity index 100%
rename from iotdb-cli/cli/sbin/start-client.bat
rename to client/cli/sbin/start-client.bat
diff --git a/iotdb-cli/cli/sbin/start-client.sh b/client/cli/sbin/start-client.sh
similarity index 100%
rename from iotdb-cli/cli/sbin/start-client.sh
rename to client/cli/sbin/start-client.sh
diff --git a/iotdb-cli/cli/tools/export-csv.bat b/client/cli/tools/export-csv.bat
similarity index 100%
rename from iotdb-cli/cli/tools/export-csv.bat
rename to client/cli/tools/export-csv.bat
diff --git a/iotdb-cli/cli/tools/export-csv.sh b/client/cli/tools/export-csv.sh
similarity index 100%
rename from iotdb-cli/cli/tools/export-csv.sh
rename to client/cli/tools/export-csv.sh
diff --git a/iotdb-cli/cli/tools/import-csv.bat b/client/cli/tools/import-csv.bat
similarity index 100%
rename from iotdb-cli/cli/tools/import-csv.bat
rename to client/cli/tools/import-csv.bat
diff --git a/iotdb-cli/cli/tools/import-csv.sh b/client/cli/tools/import-csv.sh
similarity index 100%
rename from iotdb-cli/cli/tools/import-csv.sh
rename to client/cli/tools/import-csv.sh
diff --git a/iotdb-cli/pom.xml b/client/pom.xml
similarity index 99%
rename from iotdb-cli/pom.xml
rename to client/pom.xml
index 464808a..2ff500b 100644
--- a/iotdb-cli/pom.xml
+++ b/client/pom.xml
@@ -27,8 +27,8 @@
<version>0.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>iotdb-cli</artifactId>
- <name>IoTDB Cli</name>
+ <artifactId>iotdb-client</artifactId>
+ <name>IoTDB Client</name>
<description>A Client tool.</description>
<properties>
<common.cli.version>1.3.1</common.cli.version>
diff --git a/iotdb-cli/src/main/java/org/apache/iotdb/cli/client/AbstractClient.java b/client/src/main/java/org/apache/iotdb/cli/client/AbstractClient.java
similarity index 100%
rename from iotdb-cli/src/main/java/org/apache/iotdb/cli/client/AbstractClient.java
rename to client/src/main/java/org/apache/iotdb/cli/client/AbstractClient.java
diff --git a/iotdb-cli/src/main/java/org/apache/iotdb/cli/client/Client.java b/client/src/main/java/org/apache/iotdb/cli/client/Client.java
similarity index 100%
rename from iotdb-cli/src/main/java/org/apache/iotdb/cli/client/Client.java
rename to client/src/main/java/org/apache/iotdb/cli/client/Client.java
diff --git a/iotdb-cli/src/main/java/org/apache/iotdb/cli/client/WinClient.java b/client/src/main/java/org/apache/iotdb/cli/client/WinClient.java
similarity index 100%
rename from iotdb-cli/src/main/java/org/apache/iotdb/cli/client/WinClient.java
rename to client/src/main/java/org/apache/iotdb/cli/client/WinClient.java
diff --git a/iotdb-cli/src/main/java/org/apache/iotdb/cli/exception/ArgsErrorException.java b/client/src/main/java/org/apache/iotdb/cli/exception/ArgsErrorException.java
similarity index 100%
rename from iotdb-cli/src/main/java/org/apache/iotdb/cli/exception/ArgsErrorException.java
rename to client/src/main/java/org/apache/iotdb/cli/exception/ArgsErrorException.java
diff --git a/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/AbstractCsvTool.java b/client/src/main/java/org/apache/iotdb/cli/tool/AbstractCsvTool.java
similarity index 100%
rename from iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/AbstractCsvTool.java
rename to client/src/main/java/org/apache/iotdb/cli/tool/AbstractCsvTool.java
diff --git a/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ExportCsv.java b/client/src/main/java/org/apache/iotdb/cli/tool/ExportCsv.java
similarity index 100%
rename from iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ExportCsv.java
rename to client/src/main/java/org/apache/iotdb/cli/tool/ExportCsv.java
diff --git a/iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ImportCsv.java b/client/src/main/java/org/apache/iotdb/cli/tool/ImportCsv.java
similarity index 100%
rename from iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ImportCsv.java
rename to client/src/main/java/org/apache/iotdb/cli/tool/ImportCsv.java
diff --git a/iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractClientIT.java b/client/src/test/java/org/apache/iotdb/cli/client/AbstractClientIT.java
similarity index 100%
rename from iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractClientIT.java
rename to client/src/test/java/org/apache/iotdb/cli/client/AbstractClientIT.java
diff --git a/iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractScript.java b/client/src/test/java/org/apache/iotdb/cli/client/AbstractScript.java
similarity index 100%
rename from iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractScript.java
rename to client/src/test/java/org/apache/iotdb/cli/client/AbstractScript.java
diff --git a/iotdb-cli/src/test/java/org/apache/iotdb/cli/client/StartClientScriptIT.java b/client/src/test/java/org/apache/iotdb/cli/client/StartClientScriptIT.java
similarity index 100%
rename from iotdb-cli/src/test/java/org/apache/iotdb/cli/client/StartClientScriptIT.java
rename to client/src/test/java/org/apache/iotdb/cli/client/StartClientScriptIT.java
diff --git a/iotdb-cli/src/test/java/org/apache/iotdb/cli/tool/ExportCsvTestIT.java b/client/src/test/java/org/apache/iotdb/cli/tool/ExportCsvTestIT.java
similarity index 100%
rename from iotdb-cli/src/test/java/org/apache/iotdb/cli/tool/ExportCsvTestIT.java
rename to client/src/test/java/org/apache/iotdb/cli/tool/ExportCsvTestIT.java
diff --git a/iotdb-cli/src/test/java/org/apache/iotdb/cli/tool/ImportCsvTestIT.java b/client/src/test/java/org/apache/iotdb/cli/tool/ImportCsvTestIT.java
similarity index 100%
rename from iotdb-cli/src/test/java/org/apache/iotdb/cli/tool/ImportCsvTestIT.java
rename to client/src/test/java/org/apache/iotdb/cli/tool/ImportCsvTestIT.java
diff --git a/iotdb-cli/src/test/resources/logback.xml b/client/src/test/resources/logback.xml
similarity index 100%
rename from iotdb-cli/src/test/resources/logback.xml
rename to client/src/test/resources/logback.xml
diff --git a/jdbc/LICENSE b/jdbc/LICENSE
deleted file mode 100644
index 8dada3e..0000000
--- a/jdbc/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "{}"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright {yyyy} {name of copyright owner}
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/pom.xml b/pom.xml
index 2c0fe93..10e2758 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,14 +135,14 @@
</dependencies>
<modules>
<module>tsfile</module>
- <module>jdbc</module>
- <module>iotdb</module>
- <module>grafana</module>
<module>service-rpc</module>
- <module>iotdb-cli</module>
+ <module>jdbc</module>
+ <module>client</module>
+ <module>server</module>
<module>example</module>
+ <module>grafana</module>
+ <module>spark-tsfile</module>
<!-- <module>hadoop</module> -->
- <module>spark</module>
</modules>
<build>
<pluginManagement>
diff --git a/iotdb/iotdb/conf/iotdb-engine.properties b/server/iotdb/conf/iotdb-engine.properties
similarity index 100%
rename from iotdb/iotdb/conf/iotdb-engine.properties
rename to server/iotdb/conf/iotdb-engine.properties
diff --git a/iotdb/iotdb/conf/iotdb-env.bat b/server/iotdb/conf/iotdb-env.bat
similarity index 100%
rename from iotdb/iotdb/conf/iotdb-env.bat
rename to server/iotdb/conf/iotdb-env.bat
diff --git a/iotdb/iotdb/conf/iotdb-env.sh b/server/iotdb/conf/iotdb-env.sh
similarity index 100%
rename from iotdb/iotdb/conf/iotdb-env.sh
rename to server/iotdb/conf/iotdb-env.sh
diff --git a/iotdb/iotdb/conf/iotdb-sync-client.properties b/server/iotdb/conf/iotdb-sync-client.properties
similarity index 100%
rename from iotdb/iotdb/conf/iotdb-sync-client.properties
rename to server/iotdb/conf/iotdb-sync-client.properties
diff --git a/iotdb/iotdb/conf/logback-tool.xml b/server/iotdb/conf/logback-tool.xml
similarity index 100%
rename from iotdb/iotdb/conf/logback-tool.xml
rename to server/iotdb/conf/logback-tool.xml
diff --git a/iotdb/iotdb/conf/logback.xml b/server/iotdb/conf/logback.xml
similarity index 100%
rename from iotdb/iotdb/conf/logback.xml
rename to server/iotdb/conf/logback.xml
diff --git a/iotdb/iotdb/conf/tsfile-format.properties b/server/iotdb/conf/tsfile-format.properties
similarity index 100%
rename from iotdb/iotdb/conf/tsfile-format.properties
rename to server/iotdb/conf/tsfile-format.properties
diff --git a/iotdb/iotdb/sbin/start-server.bat b/server/iotdb/sbin/start-server.bat
similarity index 100%
rename from iotdb/iotdb/sbin/start-server.bat
rename to server/iotdb/sbin/start-server.bat
diff --git a/iotdb/iotdb/sbin/start-server.sh b/server/iotdb/sbin/start-server.sh
similarity index 100%
rename from iotdb/iotdb/sbin/start-server.sh
rename to server/iotdb/sbin/start-server.sh
diff --git a/iotdb/iotdb/sbin/stop-server.bat b/server/iotdb/sbin/stop-server.bat
similarity index 100%
rename from iotdb/iotdb/sbin/stop-server.bat
rename to server/iotdb/sbin/stop-server.bat
diff --git a/iotdb/iotdb/sbin/stop-server.sh b/server/iotdb/sbin/stop-server.sh
similarity index 100%
rename from iotdb/iotdb/sbin/stop-server.sh
rename to server/iotdb/sbin/stop-server.sh
diff --git a/iotdb/iotdb/tools/memory-tool.bat b/server/iotdb/tools/memory-tool.bat
similarity index 100%
rename from iotdb/iotdb/tools/memory-tool.bat
rename to server/iotdb/tools/memory-tool.bat
diff --git a/iotdb/iotdb/tools/memory-tool.sh b/server/iotdb/tools/memory-tool.sh
similarity index 100%
rename from iotdb/iotdb/tools/memory-tool.sh
rename to server/iotdb/tools/memory-tool.sh
diff --git a/iotdb/iotdb/tools/start-WalChecker.bat b/server/iotdb/tools/start-WalChecker.bat
similarity index 100%
rename from iotdb/iotdb/tools/start-WalChecker.bat
rename to server/iotdb/tools/start-WalChecker.bat
diff --git a/iotdb/iotdb/tools/start-WalChecker.sh b/server/iotdb/tools/start-WalChecker.sh
similarity index 100%
rename from iotdb/iotdb/tools/start-WalChecker.sh
rename to server/iotdb/tools/start-WalChecker.sh
diff --git a/iotdb/iotdb/tools/start-sync-client.bat b/server/iotdb/tools/start-sync-client.bat
similarity index 100%
rename from iotdb/iotdb/tools/start-sync-client.bat
rename to server/iotdb/tools/start-sync-client.bat
diff --git a/iotdb/iotdb/tools/start-sync-client.sh b/server/iotdb/tools/start-sync-client.sh
similarity index 100%
rename from iotdb/iotdb/tools/start-sync-client.sh
rename to server/iotdb/tools/start-sync-client.sh
diff --git a/iotdb/iotdb/tools/stop-sync-client.bat b/server/iotdb/tools/stop-sync-client.bat
similarity index 100%
rename from iotdb/iotdb/tools/stop-sync-client.bat
rename to server/iotdb/tools/stop-sync-client.bat
diff --git a/iotdb/iotdb/tools/stop-sync-client.sh b/server/iotdb/tools/stop-sync-client.sh
similarity index 100%
rename from iotdb/iotdb/tools/stop-sync-client.sh
rename to server/iotdb/tools/stop-sync-client.sh
diff --git a/iotdb/pom.xml b/server/pom.xml
similarity index 99%
rename from iotdb/pom.xml
rename to server/pom.xml
index 7a00458..3eca1e9 100644
--- a/iotdb/pom.xml
+++ b/server/pom.xml
@@ -27,8 +27,8 @@
<version>0.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>iotdb</artifactId>
- <name>IoTDB</name>
+ <artifactId>iotdb-server</artifactId>
+ <name>IoTDB Server</name>
<properties>
<antlr3.version>3.5.2</antlr3.version>
<common.lang3.version>3.8.1</common.lang3.version>
diff --git a/iotdb/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g b/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
similarity index 100%
rename from iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
rename to server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 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/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 server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
diff --git a/iotdb/src/test/resources/logback.xml b/server/src/test/resources/logback.xml
similarity index 100%
rename from iotdb/src/test/resources/logback.xml
rename to server/src/test/resources/logback.xml
diff --git a/iotdb/src/test/resources/start-sync-test.sh b/server/src/test/resources/start-sync-test.sh
similarity index 100%
rename from iotdb/src/test/resources/start-sync-test.sh
rename to server/src/test/resources/start-sync-test.sh
diff --git a/iotdb/src/test/resources/stop-sync-test.sh b/server/src/test/resources/stop-sync-test.sh
similarity index 100%
rename from iotdb/src/test/resources/stop-sync-test.sh
rename to server/src/test/resources/stop-sync-test.sh
diff --git a/spark/README.md b/spark-tsfile/README.md
similarity index 100%
rename from spark/README.md
rename to spark-tsfile/README.md
diff --git a/spark/pom.xml b/spark-tsfile/pom.xml
similarity index 97%
rename from spark/pom.xml
rename to spark-tsfile/pom.xml
index 7ede55f..48054ae 100644
--- a/spark/pom.xml
+++ b/spark-tsfile/pom.xml
@@ -27,8 +27,7 @@
<version>0.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.iotdb</groupId>
- <artifactId>tsfile-spark-connector</artifactId>
+ <artifactId>spark-tsfile</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/io/HDFSInput.java b/spark-tsfile/src/main/java/org/apache/iotdb/tsfile/io/HDFSInput.java
similarity index 100%
rename from spark/src/main/java/org/apache/iotdb/tsfile/io/HDFSInput.java
rename to spark-tsfile/src/main/java/org/apache/iotdb/tsfile/io/HDFSInput.java
diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/io/HDFSOutput.java b/spark-tsfile/src/main/java/org/apache/iotdb/tsfile/io/HDFSOutput.java
similarity index 100%
rename from spark/src/main/java/org/apache/iotdb/tsfile/io/HDFSOutput.java
rename to spark-tsfile/src/main/java/org/apache/iotdb/tsfile/io/HDFSOutput.java
diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/io/TsFileOutputFormat.java b/spark-tsfile/src/main/java/org/apache/iotdb/tsfile/io/TsFileOutputFormat.java
similarity index 100%
rename from spark/src/main/java/org/apache/iotdb/tsfile/io/TsFileOutputFormat.java
rename to spark-tsfile/src/main/java/org/apache/iotdb/tsfile/io/TsFileOutputFormat.java
diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/io/TsFileRecordWriter.java b/spark-tsfile/src/main/java/org/apache/iotdb/tsfile/io/TsFileRecordWriter.java
similarity index 100%
rename from spark/src/main/java/org/apache/iotdb/tsfile/io/TsFileRecordWriter.java
rename to spark-tsfile/src/main/java/org/apache/iotdb/tsfile/io/TsFileRecordWriter.java
diff --git a/spark/src/main/scala/org/apache/iotdb/tsfile/Converter.scala b/spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/Converter.scala
similarity index 100%
rename from spark/src/main/scala/org/apache/iotdb/tsfile/Converter.scala
rename to spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/Converter.scala
diff --git a/spark/src/main/scala/org/apache/iotdb/tsfile/DefaultSource.scala b/spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/DefaultSource.scala
similarity index 100%
rename from spark/src/main/scala/org/apache/iotdb/tsfile/DefaultSource.scala
rename to spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/DefaultSource.scala
diff --git a/spark/src/main/scala/org/apache/iotdb/tsfile/TsFileOutputWriter.scala b/spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/TsFileOutputWriter.scala
similarity index 100%
rename from spark/src/main/scala/org/apache/iotdb/tsfile/TsFileOutputWriter.scala
rename to spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/TsFileOutputWriter.scala
diff --git a/spark/src/main/scala/org/apache/iotdb/tsfile/TsFileWriterFactory.scala b/spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/TsFileWriterFactory.scala
similarity index 100%
rename from spark/src/main/scala/org/apache/iotdb/tsfile/TsFileWriterFactory.scala
rename to spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/TsFileWriterFactory.scala
diff --git a/spark/src/main/scala/org/apache/iotdb/tsfile/package.scala b/spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/package.scala
similarity index 100%
rename from spark/src/main/scala/org/apache/iotdb/tsfile/package.scala
rename to spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/package.scala
diff --git a/spark/src/test/scala/org/apache/iotdb/tool/TsFileExample.java b/spark-tsfile/src/test/scala/org/apache/iotdb/tool/TsFileExample.java
similarity index 100%
rename from spark/src/test/scala/org/apache/iotdb/tool/TsFileExample.java
rename to spark-tsfile/src/test/scala/org/apache/iotdb/tool/TsFileExample.java
diff --git a/spark/src/test/scala/org/apache/iotdb/tool/TsFileWriteTool.java b/spark-tsfile/src/test/scala/org/apache/iotdb/tool/TsFileWriteTool.java
similarity index 100%
rename from spark/src/test/scala/org/apache/iotdb/tool/TsFileWriteTool.java
rename to spark-tsfile/src/test/scala/org/apache/iotdb/tool/TsFileWriteTool.java
diff --git a/spark/src/test/scala/org/apache/iotdb/tsfile/ConverterTest.scala b/spark-tsfile/src/test/scala/org/apache/iotdb/tsfile/ConverterTest.scala
similarity index 100%
rename from spark/src/test/scala/org/apache/iotdb/tsfile/ConverterTest.scala
rename to spark-tsfile/src/test/scala/org/apache/iotdb/tsfile/ConverterTest.scala
diff --git a/spark/src/test/scala/org/apache/iotdb/tsfile/HDFSInputTest.java b/spark-tsfile/src/test/scala/org/apache/iotdb/tsfile/HDFSInputTest.java
similarity index 100%
rename from spark/src/test/scala/org/apache/iotdb/tsfile/HDFSInputTest.java
rename to spark-tsfile/src/test/scala/org/apache/iotdb/tsfile/HDFSInputTest.java
diff --git a/spark/src/test/scala/org/apache/iotdb/tsfile/TSFileSuit.scala b/spark-tsfile/src/test/scala/org/apache/iotdb/tsfile/TSFileSuit.scala
similarity index 100%
rename from spark/src/test/scala/org/apache/iotdb/tsfile/TSFileSuit.scala
rename to spark-tsfile/src/test/scala/org/apache/iotdb/tsfile/TSFileSuit.scala