This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a change to branch xingtanzjr/logical_to_distributed
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from b17c657 complete source rewriter for distributed plan
add 95164c1 [IOTDB-2765] Fix grafana plugin compile error on lastest arm
macos (#5282)
add 5a699d0 Fix sonar-coveralls aways be cancelled (#5283)
add d8fd5b3 [IOTDB-2730] Config node server (#5284)
add 00f1005 [IOTDB-2713] Generate statement from AST for MPP query - Part
1 (#5288)
add c83ccfa [IOTDB-2767] Add Operators and PlanVisitor definitions for
mpp (#5286)
new 86bb0c2 Merge branch 'master' into xingtanzjr/logical_to_distributed
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/grafana-plugin.yml | 2 +-
.github/workflows/greetings.yml | 4 -
.github/workflows/sonar-coveralls.yml | 7 -
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 8 +-
.../java/org/apache/iotdb/cluster/ClientMain.java | 2 +-
.../org/apache/iotdb/cluster/ClusterIoTDB.java | 20 +-
.../iotdb/cluster/config/ClusterDescriptor.java | 2 +-
.../iotdb/cluster/coordinator/Coordinator.java | 2 +-
.../apache/iotdb/cluster/log/LogDispatcher.java | 4 +-
.../iotdb/cluster/log/catchup/LogCatchUpTask.java | 2 +-
.../iotdb/cluster/log/manage/RaftLogManager.java | 2 +-
.../serializable/SyncLogDequeSerializer.java | 2 +-
.../iotdb/cluster/metadata/CSchemaEngine.java | 2 +-
.../iotdb/cluster/query/ClusterPlanExecutor.java | 2 +-
.../query/last/ClusterLastQueryExecutor.java | 2 +-
.../iotdb/cluster/server/ClusterRPCService.java | 10 +-
.../cluster/server/ClusterRPCServiceMBean.java | 2 +-
.../cluster/server/PullSnapshotHintService.java | 2 +-
.../server/clusterinfo/ClusterInfoServer.java | 10 +-
.../cluster/server/member/DataGroupMember.java | 6 +-
.../cluster/server/member/MetaGroupMember.java | 6 +-
.../iotdb/cluster/server/member/RaftMember.java | 8 +-
.../cluster/server/raft/AbstractRaftService.java | 6 +-
.../server/raft/DataRaftHeartBeatService.java | 8 +-
.../iotdb/cluster/server/raft/DataRaftService.java | 8 +-
.../server/raft/MetaRaftHeartBeatService.java | 8 +-
.../iotdb/cluster/server/raft/MetaRaftService.java | 8 +-
.../cluster/server/service/DataGroupEngine.java | 6 +-
.../apache/iotdb/cluster/utils/PlanSerializer.java | 4 +-
.../cluster/utils/nodetool/ClusterMonitor.java | 14 +-
.../org/apache/iotdb/cluster/common/IoTDBTest.java | 4 +-
.../iotdb/cluster/integration/SingleNodeTest.java | 2 +-
.../iotdb/cluster/log/LogDispatcherTest.java | 2 +-
.../cluster/log/applier/DataLogApplierTest.java | 8 +-
.../cluster/log/catchup/LogCatchUpTaskTest.java | 2 +-
.../manage/MetaSingleSnapshotLogManagerTest.java | 2 +-
.../serializable/SyncLogDequeSerializerTest.java | 2 +-
.../cluster/log/snapshot/DataSnapshotTest.java | 2 +-
.../log/snapshot/MetaSimpleSnapshotTest.java | 5 +-
.../cluster/log/snapshot/PullSnapshotTaskTest.java | 2 +-
.../query/ClusterUDTFQueryExecutorTest.java | 2 +-
.../iotdb/cluster/server/member/BaseMember.java | 2 +-
.../resources/conf/iotdb-confignode.properties | 41 +-
.../iotdb/confignode/conf/ConfigNodeConf.java | 116 +-
.../iotdb/confignode/service/ConfigNode.java | 31 +-
.../confignode/service/register/IService.java | 51 -
.../confignode/service/register/JMXService.java | 105 -
.../service/register/RegisterManager.java | 82 -
.../confignode/service/startup/StartupCheck.java | 28 -
.../confignode/service/startup/StartupChecks.java | 89 -
.../service/thrift/server/ConfigNodeRPCServer.java | 88 +-
...rver.java => ConfigNodeRPCServerProcessor.java} | 6 +-
.../thrift/server/ConfigNodeRPCServiceHandler.java | 52 +
.../utils/ConfigNodeEnvironmentUtils.java | 9 +-
docs/UserGuide/Query-Data/Overview.md | 27 +-
docs/zh/UserGuide/Query-Data/Overview.md | 27 +-
grafana-plugin/package.json | 4 +-
grafana-plugin/src/componments/ControlValue.tsx | 5 +-
grafana-plugin/src/componments/FromValue.tsx | 8 +-
grafana-plugin/src/componments/SelectValue.tsx | 8 +-
grafana-plugin/src/componments/WhereValue.tsx | 5 +-
grafana-plugin/src/datasource.ts | 16 +-
grafana-plugin/yarn.lock | 10529 +++++++++----------
.../apache/iotdb/db/integration/IoTDBDaemonIT.java | 2 +-
.../iotdb/db/integration/IoTDBLargeDataIT.java | 2 +-
.../iotdb/db/integration/IoTDBMetadataFetchIT.java | 2 +-
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 2 +-
.../db/integration/IoTDBRecoverUnclosedIT.java | 2 +-
.../iotdb/db/integration/IoTDBUDFManagementIT.java | 6 +-
.../iotdb/session/IoTDBSessionComplexIT.java | 2 +-
.../iotdb/session/IoTDBSessionIteratorIT.java | 2 +-
.../apache/iotdb/session/IoTDBSessionSimpleIT.java | 2 +-
.../session/IoTDBSessionSyntaxConventionIT.java | 2 +-
integration/src/test/resources/logback.xml | 4 +-
{iotdb-commons => node-commons}/pom.xml | 20 +-
.../apache/iotdb/commons/ServerCommandLine.java | 0
.../apache/iotdb/commons}/concurrent/HashLock.java | 2 +-
.../concurrent/IoTDBDaemonThreadFactory.java | 2 +-
.../IoTDBDefaultThreadExceptionHandler.java | 2 +-
.../concurrent/IoTDBThreadPoolFactory.java | 10 +-
.../commons}/concurrent/IoTThreadFactory.java | 2 +-
.../iotdb/commons}/concurrent/ThreadName.java | 2 +-
.../iotdb/commons}/concurrent/WrappedRunnable.java | 2 +-
.../concurrent/threadpool/IThreadPoolMBean.java | 2 +-
.../WrappedScheduledExecutorService.java | 6 +-
.../WrappedScheduledExecutorServiceMBean.java | 2 +-
.../WrappedSingleThreadExecutorService.java | 6 +-
.../WrappedSingleThreadExecutorServiceMBean.java | 2 +-
.../WrappedSingleThreadScheduledExecutor.java | 6 +-
.../WrappedSingleThreadScheduledExecutorMBean.java | 2 +-
.../threadpool/WrappedThreadPoolExecutor.java | 8 +-
.../threadpool/WrappedThreadPoolExecutorMBean.java | 2 +-
.../apache/iotdb/commons}/conf/IoTDBConstant.java | 2 +-
.../iotdb/commons}/exception/IoTDBException.java | 2 +-
.../commons}/exception/ShutdownException.java | 2 +-
.../iotdb/commons}/exception/StartupException.java | 2 +-
.../exception/runtime/RPCServiceException.java | 2 +-
.../apache/iotdb/commons/hash/APHashExecutor.java | 0
.../iotdb/commons/hash/BKDRHashExecutor.java | 0
.../commons/hash/DeviceGroupHashExecutor.java | 0
.../apache/iotdb/commons/hash/JSHashExecutor.java | 0
.../iotdb/commons/hash/SDBMHashExecutor.java | 0
.../service/AbstractThriftServiceThread.java | 35 +-
.../apache/iotdb/commons}/service/IService.java | 6 +-
.../apache/iotdb/commons}/service/JMXService.java | 4 +-
.../iotdb/commons}/service/RegisterManager.java | 6 +-
.../apache/iotdb/commons}/service/ServiceType.java | 9 +-
.../iotdb/commons}/service/StartupCheck.java | 4 +-
.../iotdb/commons}/service/StartupChecks.java | 10 +-
.../iotdb/commons/service}/ThriftService.java | 10 +-
.../iotdb/commons/service/ThriftServiceThread.java | 89 +
.../apache/iotdb/commons/utils/JVMCommonUtils.java | 81 +
.../org/apache/iotdb/commons/utils/TestOnly.java | 0
.../IoTDBDefaultThreadExceptionHandlerTest.java | 2 +-
.../iotdb/commons}/IoTDBThreadPoolFactoryTest.java | 5 +-
pom.xml | 2 +-
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 2 +-
.../iotdb/db/auth/authorizer/BasicAuthorizer.java | 8 +-
.../iotdb/db/auth/role/BasicRoleManager.java | 2 +-
.../iotdb/db/auth/role/LocalFileRoleAccessor.java | 2 +-
.../iotdb/db/auth/user/BasicUserManager.java | 2 +-
.../iotdb/db/auth/user/LocalFileUserAccessor.java | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 1 +
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 1 +
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 5 +-
.../db/conf/directories/DirectoryManager.java | 2 +-
.../directories/strategy/DirectoryStrategy.java | 4 +-
.../strategy/MaxDiskUsableSpaceFirstStrategy.java | 6 +-
.../MinFolderOccupiedSpaceFirstStrategy.java | 6 +-
.../strategy/RandomOnDiskUsableSpaceStrategy.java | 4 +-
.../directories/strategy/SequenceStrategy.java | 6 +-
.../db/conf/rest/IoTDBRestServiceDescriptor.java | 2 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 10 +-
.../db/engine/cache/CacheHitRatioMonitor.java | 10 +-
.../db/engine/cache/TimeSeriesMetadataCache.java | 2 +-
.../engine/compaction/CompactionTaskManager.java | 12 +-
.../db/engine/compaction/CompactionUtils.java | 2 +-
.../db/engine/compaction/TsFileIdentifier.java | 2 +-
.../CrossSpaceCompactionExceptionHandler.java | 2 +-
.../RewriteCrossSpaceCompactionSelector.java | 2 +-
.../task/RewriteCrossCompactionRecoverTask.java | 2 +-
.../task/RewriteCrossSpaceCompactionTask.java | 2 +-
.../inner/AbstractInnerSpaceCompactionTask.java | 2 +-
.../InnerSpaceCompactionExceptionHandler.java | 2 +-
.../SizeTieredCompactionRecoverTask.java | 2 +-
.../sizetiered/SizeTieredCompactionSelector.java | 2 +-
.../inner/sizetiered/SizeTieredCompactionTask.java | 2 +-
.../inner/utils/InnerSpaceCompactionUtils.java | 2 +-
.../compaction/task/AbstractCompactionTask.java | 2 +-
.../compaction/task/CompactionRecoverTask.java | 2 +-
.../utils/log/CompactionLogAnalyzer.java | 2 +-
.../iotdb/db/engine/cq/ContinuousQueryService.java | 8 +-
.../iotdb/db/engine/cq/ContinuousQueryTask.java | 4 +-
.../engine/cq/ContinuousQueryTaskPoolManager.java | 4 +-
.../apache/iotdb/db/engine/flush/FlushManager.java | 10 +-
.../engine/flush/pool/FlushSubTaskPoolManager.java | 4 +-
.../db/engine/flush/pool/FlushTaskPoolManager.java | 4 +-
.../apache/iotdb/db/engine/settle/SettleTask.java | 2 +-
.../db/engine/storagegroup/TsFileManager.java | 2 +-
.../engine/storagegroup/TsFileNameGenerator.java | 4 +-
.../db/engine/storagegroup/TsFileResource.java | 2 +-
.../storagegroup/VirtualStorageGroupProcessor.java | 8 +-
.../virtualSg/StorageGroupManager.java | 2 +-
.../service/TriggerRegistrationService.java | 22 +-
.../iotdb/db/engine/upgrade/UpgradeTask.java | 2 +-
.../iotdb/db/exception/ConfigurationException.java | 1 +
.../iotdb/db/exception/LoadFileException.java | 1 +
.../apache/iotdb/db/exception/MergeException.java | 1 +
.../db/exception/QueryIdNotExsitException.java | 1 +
.../exception/QueryInBatchStatementException.java | 1 +
.../iotdb/db/exception/StorageEngineException.java | 1 +
.../exception/StorageGroupProcessorException.java | 1 +
.../db/exception/SyncConnectionException.java | 1 +
.../SyncDeviceOwnerConflictException.java | 1 +
.../iotdb/db/exception/SystemCheckException.java | 1 +
.../db/exception/TsFileProcessorException.java | 1 +
.../iotdb/db/exception/WriteProcessException.java | 1 +
.../db/exception/index/IndexManagerException.java | 2 +-
.../db/exception/metadata/MetadataException.java | 2 +-
.../exception/query/LogicalOperatorException.java | 2 +-
.../exception/query/LogicalOptimizeException.java | 2 +-
.../db/exception/query/QueryProcessException.java | 2 +-
.../{runtime => sql}/SQLParserException.java | 2 +-
.../StatementAnalyzeException.java} | 21 +-
.../apache/iotdb/db/metadata/MetadataConstant.java | 2 +-
.../org/apache/iotdb/db/metadata/SchemaEngine.java | 4 +-
.../db/metadata/StorageGroupSchemaManager.java | 4 +-
.../org/apache/iotdb/db/metadata/mnode/MNode.java | 2 +-
.../iotdb/db/metadata/mtree/MTreeAboveSG.java | 4 +-
.../iotdb/db/metadata/mtree/MTreeBelowSG.java | 2 +-
.../db/metadata/mtree/traverser/Traverser.java | 6 +-
.../iotdb/db/metadata/path/MeasurementPath.java | 2 +-
.../apache/iotdb/db/metadata/path/PartialPath.java | 4 +-
.../db/metadata/template/TemplateManager.java | 2 +-
.../db/metadata/upgrade/MetadataUpgrader.java | 4 +-
.../iotdb/db/metadata/utils/MetaFormatUtils.java | 10 +-
.../apache/iotdb/db/metadata/utils/MetaUtils.java | 2 +-
.../org/apache/iotdb/db/mpp/common/Analysis.java | 48 +-
.../org/apache/iotdb/db/mpp/common/DataRegion.java | 39 +-
.../iotdb/db/mpp/common/DataRegionTimeSlice.java | 5 +-
.../mpp/common/{TreeNode.java => FragmentId.java} | 40 +-
.../{InstanceId.java => FragmentInstanceId.java} | 4 +-
.../{QueryContext.java => MPPQueryContext.java} | 2 +-
.../org/apache/iotdb/db/mpp/common/OrderBy.java | 27 -
.../org/apache/iotdb/db/mpp/common/QueryId.java | 90 +-
.../apache/iotdb/db/mpp/common/SchemaRegion.java | 10 +-
.../org/apache/iotdb/db/mpp/common/TsBlock.java | 25 +
.../FragmentInfo.java} | 33 +-
...ceContext.java => FragmentInstanceContext.java} | 35 +-
.../db/mpp/execution/FragmentInstanceState.java | 68 +
.../iotdb/db/mpp/execution/FragmentState.java | 71 +
.../iotdb/db/mpp/execution/QueryExecution.java | 12 +-
.../mpp/execution/executor/InstanceExecutor.java | 39 -
.../db/mpp/execution/executor/InstanceHandle.java | 31 -
.../ClusterScheduler.java} | 32 +-
.../scheduler/IScheduler.java} | 33 +-
.../scheduler/StandaloneScheduler.java} | 39 +-
.../iotdb/db/mpp/operator/OperatorContext.java | 4 +
.../db/mpp/operator/process/LimitOperator.java | 32 +-
.../iotdb/db/mpp/operator/sink/SinkOperator.java | 2 +-
.../db/mpp/sql/planner/LocalExecutionPlanner.java | 14 +-
.../sql/planner/optimization/PlanOptimizer.java | 5 +-
.../mpp/sql/planner/plan/DistributedQueryPlan.java | 4 +-
.../mpp/sql/planner/plan/DistributionPlanner.java | 142 +-
.../db/mpp/sql/planner/plan/FragmentInstance.java | 2 +
.../mpp/sql/planner/plan/FragmentInstanceId.java | 30 -
.../db/mpp/sql/planner/plan/LogicalPlanner.java | 7 +-
.../db/mpp/sql/planner/plan/LogicalQueryPlan.java | 8 +-
.../sql/planner/plan/node/PlanNodeAllocator.java | 11 +-
.../db/mpp/sql/planner/plan/node/PlanNodeUtil.java | 27 +-
.../planner/plan/node/SimplePlanNodeRewriter.java | 31 +-
.../planner/plan/node/process/DeviceMergeNode.java | 2 +-
.../sql/planner/plan/node/process/OffsetNode.java | 2 +-
.../sql/planner/plan/node/process/SortNode.java | 2 +-
.../planner/plan/node/process/TimeJoinNode.java | 8 +-
.../planner/plan/node/source/SeriesScanNode.java | 7 +-
.../influxdb/meta/InfluxDBMetaManager.java | 2 +-
.../apache/iotdb/db/protocol/rest/RestService.java | 6 +-
.../db/protocol/rest/handler/ExceptionHandler.java | 2 +-
.../protocol/rest/impl/GrafanaApiServiceImpl.java | 2 +-
.../db/protocol/rest/impl/PingApiServiceImpl.java | 2 +-
.../db/protocol/rest/impl/RestApiServiceImpl.java | 2 +-
.../main/java/org/apache/iotdb/db/qp/Planner.java | 2 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 76 +-
.../db/qp/logical/crud/BasicFunctionOperator.java | 2 +-
.../db/qp/logical/crud/BasicOperatorType.java | 4 +-
.../db/qp/logical/crud/DeleteDataOperator.java | 2 +-
.../db/qp/logical/crud/FillQueryOperator.java | 2 +-
.../iotdb/db/qp/logical/crud/InsertOperator.java | 2 +-
.../sys/CreateAlignedTimeSeriesOperator.java | 2 +-
.../iotdb/db/qp/physical/crud/InsertRowPlan.java | 2 +-
.../iotdb/db/qp/physical/sys/SetTemplatePlan.java | 2 +-
.../db/qp/physical/sys/UnsetTemplatePlan.java | 2 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 15 +-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 4 +-
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 2 +-
.../iotdb/db/qp/utils/GroupByLevelController.java | 2 +-
.../iotdb/db/query/control/QueryTimeManager.java | 6 +-
.../iotdb/db/query/control/SessionManager.java | 2 +-
.../db/query/control/SessionTimeoutManager.java | 2 +-
.../db/query/dataset/NonAlignEngineDataSet.java | 2 +-
.../dataset/RawQueryDataSetWithoutValueFilter.java | 2 +-
.../iotdb/db/query/dataset/ShowDevicesDataSet.java | 6 +-
.../db/query/dataset/ShowTimeseriesDataSet.java | 16 +-
.../db/query/executor/AggregationExecutor.java | 2 +-
.../iotdb/db/query/executor/LastQueryExecutor.java | 6 +-
.../query/expression/unary/FunctionExpression.java | 2 +-
.../iotdb/db/query/pool/QueryTaskManager.java | 4 +-
.../db/query/pool/RawQueryReadTaskPoolManager.java | 4 +-
.../row/SerializableRowRecordList.java | 2 +-
.../datastructure/tv/SerializableBinaryTVList.java | 2 +-
.../tv/SerializableBooleanTVList.java | 2 +-
.../datastructure/tv/SerializableDoubleTVList.java | 2 +-
.../datastructure/tv/SerializableFloatTVList.java | 2 +-
.../datastructure/tv/SerializableIntTVList.java | 2 +-
.../datastructure/tv/SerializableLongTVList.java | 2 +-
.../udf/service/TemporaryQueryDataFileService.java | 6 +-
.../query/udf/service/UDFClassLoaderManager.java | 6 +-
.../query/udf/service/UDFRegistrationService.java | 6 +-
.../org/apache/iotdb/db/rescon/SystemInfo.java | 2 +-
.../iotdb/db/service/InfluxDBRPCService.java | 9 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 9 +-
.../org/apache/iotdb/db/service/MQTTService.java | 2 +
.../org/apache/iotdb/db/service/RPCService.java | 9 +-
.../apache/iotdb/db/service/RPCServiceMBean.java | 2 +-
.../org/apache/iotdb/db/service/SettleService.java | 6 +-
.../org/apache/iotdb/db/service/StaticResps.java | 6 +-
.../org/apache/iotdb/db/service/UpgradeSevice.java | 4 +-
.../db/service/basic/QueryFrequencyRecorder.java | 2 +-
.../iotdb/db/service/basic/ServiceProvider.java | 2 +-
.../iotdb/db/service/metrics/MetricsService.java | 10 +-
.../db/service/metrics/MetricsServiceMBean.java | 2 +-
.../db/service/thrift/impl/TSServiceImpl.java | 4 +-
.../iotdb/db/sql/constant/FilterConstant.java | 102 +
.../iotdb/db/sql/constant/StatementType.java | 134 +
.../org/apache/iotdb/db/sql/parser/ASTVisitor.java | 1368 +++
.../iotdb/db/sql/parser/StatementGenerator.java | 184 +
.../statement/AggregationQueryStatement.java} | 35 +-
.../statement/FillQueryStatement.java} | 20 +-
.../statement/GroupByFillQueryStatement.java} | 28 +-
.../db/sql/statement/GroupByQueryStatement.java | 29 +-
.../statement/LastQueryStatement.java} | 14 +-
.../iotdb/db/sql/statement/QueryStatement.java | 211 +
.../statement/ShowDevicesStatement.java} | 16 +-
.../statement/ShowTimeSeriesStatement.java} | 16 +-
.../statement/Statement.java} | 39 +-
.../iotdb/db/sql/statement/UDAFQueryStatement.java | 10 +-
.../iotdb/db/sql/statement/UDTFQueryStatement.java | 10 +-
.../db/sql/statement/component/FillComponent.java | 36 +-
.../db/sql/statement/component/FromComponent.java | 29 +-
.../statement/component/GroupByLevelComponent.java | 31 +-
.../statement/component/GroupByTimeComponent.java | 99 +
.../iotdb/db/sql/statement/component/OrderBy.java | 9 +-
.../db/sql/statement/component/ResultColumn.java | 168 +
.../sql/statement/component/ResultSetFormat.java | 10 +-
.../sql/statement/component/SelectComponent.java | 99 +
.../statement/component/WhereCondition.java} | 27 +-
.../db/sql/statement/component/WithoutPolicy.java | 59 +
.../statement/filter/BasicFilterType.java} | 18 +-
.../statement/filter/BasicFunctionFilter.java} | 35 +-
.../statement/filter/FunctionFilter.java} | 36 +-
.../iotdb/db/sql/statement/filter/InFilter.java | 201 +
.../iotdb/db/sql/statement/filter/LikeFilter.java | 134 +
.../iotdb/db/sql/statement/filter/QueryFilter.java | 295 +
.../db/sql/statement/filter/RegexpFilter.java | 134 +
.../iotdb/db/sync/conf/SyncSenderDescriptor.java | 2 +-
.../iotdb/db/sync/receiver/SyncServerManager.java | 10 +-
.../db/sync/receiver/SyncServerManagerMBean.java | 2 +-
.../db/sync/receiver/load/FileLoaderManager.java | 4 +-
.../db/sync/receiver/transfer/SyncServiceImpl.java | 2 +-
.../db/sync/sender/manage/SyncFileManager.java | 2 +-
.../iotdb/db/sync/sender/transfer/SyncClient.java | 4 +-
.../org/apache/iotdb/db/tools/TsFileSplitTool.java | 2 +-
.../java/org/apache/iotdb/db/utils/AuthUtils.java | 2 +-
.../org/apache/iotdb/db/utils/CommonUtils.java | 57 -
.../apache/iotdb/db/utils/ErrorHandlingUtils.java | 4 +-
.../java/org/apache/iotdb/db/utils/MemUtils.java | 2 +-
.../org/apache/iotdb/db/utils/OpenFileNumUtil.java | 2 +-
.../org/apache/iotdb/db/utils/ThreadUtils.java | 2 +-
.../windowing/runtime/WindowEvaluationTask.java | 2 +-
.../runtime/WindowEvaluationTaskPoolManager.java | 6 +-
.../writelog/manager/MultiFileLogNodeManager.java | 8 +-
.../db/writelog/node/ExclusiveWriteLogNode.java | 4 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 2 +-
.../apache/iotdb/db/conf/IoTDBDescriptorTest.java | 2 +
.../strategy/DirectoryStrategyTest.java | 24 +-
.../iotdb/db/engine/cache/ChunkCacheTest.java | 2 +-
.../db/engine/compaction/CompactionUtilsTest.java | 2 +-
.../cross/CrossSpaceCompactionExceptionTest.java | 2 +-
.../db/engine/compaction/cross/MergeTest.java | 2 +-
.../engine/compaction/cross/MergeUpgradeTest.java | 2 +-
.../cross/RewriteCompactionFileSelectorTest.java | 2 +-
.../RewriteCrossSpaceCompactionRecoverTest.java | 2 +-
.../cross/RewriteCrossSpaceCompactionTest.java | 4 +-
.../inner/AbstractInnerSpaceCompactionTest.java | 4 +-
.../inner/InnerCompactionMoreDataTest.java | 4 +-
.../compaction/inner/InnerCompactionTest.java | 4 +-
.../inner/InnerSpaceCompactionUtilsOldTest.java | 2 +-
.../SizeTieredCompactionRecoverTest.java | 2 +-
.../inner/sizetiered/SizeTieredCompactionTest.java | 4 +-
...eCrossSpaceCompactionRecoverCompatibleTest.java | 2 +-
.../recover/SizeTieredCompactionRecoverTest.java | 2 +-
.../compaction/utils/CompactionClearUtils.java | 2 +-
.../utils/CompactionFileGeneratorUtils.java | 2 +-
.../storagegroup/StorageGroupProcessorTest.java | 2 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 2 +-
.../db/engine/storagegroup/TsFileManagerTest.java | 2 +-
.../db/metadata/upgrade/MetadataUpgradeTest.java | 2 +-
.../db/mpp/sql/plan/DistributionPlannerTest.java | 101 +-
.../iotdb/db/protocol/rest/IoTDBRestServiceIT.java | 2 +-
.../java/org/apache/iotdb/db/qp/PlannerTest.java | 4 +-
.../iotdb/db/qp/logical/LogicalPlanSmallTest.java | 2 +-
.../iotdb/db/qp/physical/PhysicalPlanTest.java | 2 +-
.../apache/iotdb/db/qp/sql/ASTVisitorTest.java} | 32 +-
.../iotdb/db/qp/sql/IoTDBsqlVisitorTest.java | 2 +-
.../query/reader/series/SeriesReaderTestUtil.java | 2 +-
.../iotdb/db/rescon/ResourceManagerTest.java | 4 +-
.../iotdb/db/sql/StatementGeneratorTest.java | 75 +
.../db/sync/receiver/load/FileLoaderTest.java | 2 +-
.../recover/SyncReceiverLogAnalyzerTest.java | 2 +-
.../db/sync/sender/manage/SyncFileManagerTest.java | 2 +-
.../sender/recover/SyncSenderLogAnalyzerTest.java | 4 +-
.../sync/sender/recover/SyncSenderLoggerTest.java | 2 +-
.../db/sync/sender/transfer/SyncClientTest.java | 2 +-
.../apache/iotdb/db/tools/IoTDBWatermarkTest.java | 2 +-
.../iotdb/db/writelog/IoTDBLogFileSizeTest.java | 2 +-
.../recover/RecoverResourceFromReaderTest.java | 2 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 2 +-
server/src/test/resources/logback.xml | 4 +-
.../session/IoTDBSessionDisableMemControlIT.java | 2 +-
.../iotdb/session/IoTDBSessionVectorInsertIT.java | 2 +-
.../java/org/apache/iotdb/session/SessionTest.java | 2 +-
.../apache/iotdb/session/pool/SessionPoolTest.java | 2 +-
.../apache/iotdb/session/template/TemplateUT.java | 2 +-
.../apache/iotdb/spark/db/EnvironmentUtils.java | 2 +-
.../org/apache/iotdb/spark/db/IoTDBTest.scala | 3 +-
.../org/apache/iotdb/spark/db/IoTDBWriteTest.scala | 3 +-
.../iotdb/spark/db/unit/DataFrameToolsTest.scala | 4 +-
.../zeppelin/iotdb/IoTDBInterpreterTest.java | 2 +-
399 files changed, 10163 insertions(+), 7463 deletions(-)
delete mode 100644
confignode/src/main/java/org/apache/iotdb/confignode/service/register/IService.java
delete mode 100644
confignode/src/main/java/org/apache/iotdb/confignode/service/register/JMXService.java
delete mode 100644
confignode/src/main/java/org/apache/iotdb/confignode/service/register/RegisterManager.java
delete mode 100644
confignode/src/main/java/org/apache/iotdb/confignode/service/startup/StartupCheck.java
delete mode 100644
confignode/src/main/java/org/apache/iotdb/confignode/service/startup/StartupChecks.java
copy
confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/server/{ConfigNodeRPCServer.java
=> ConfigNodeRPCServerProcessor.java} (93%)
create mode 100644
confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/server/ConfigNodeRPCServiceHandler.java
rename {iotdb-commons => node-commons}/pom.xml (90%)
rename {iotdb-commons =>
node-commons}/src/main/java/org/apache/iotdb/commons/ServerCommandLine.java
(100%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/concurrent/HashLock.java
(97%)
copy {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/concurrent/IoTDBDaemonThreadFactory.java
(96%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/concurrent/IoTDBDefaultThreadExceptionHandler.java
(96%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/concurrent/IoTDBThreadPoolFactory.java
(96%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/concurrent/IoTThreadFactory.java
(98%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/concurrent/ThreadName.java
(98%)
copy {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/concurrent/WrappedRunnable.java
(97%)
copy {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/concurrent/threadpool/IThreadPoolMBean.java
(95%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/concurrent/threadpool/WrappedScheduledExecutorService.java
(97%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/concurrent/threadpool/WrappedScheduledExecutorServiceMBean.java
(94%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/concurrent/threadpool/WrappedSingleThreadExecutorService.java
(95%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/concurrent/threadpool/WrappedSingleThreadExecutorServiceMBean.java
(93%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/concurrent/threadpool/WrappedSingleThreadScheduledExecutor.java
(96%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/concurrent/threadpool/WrappedSingleThreadScheduledExecutorMBean.java
(93%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/concurrent/threadpool/WrappedThreadPoolExecutor.java
(91%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/concurrent/threadpool/WrappedThreadPoolExecutorMBean.java
(94%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/conf/IoTDBConstant.java
(99%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/exception/IoTDBException.java
(97%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/exception/ShutdownException.java
(96%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/exception/StartupException.java
(97%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/exception/runtime/RPCServiceException.java
(95%)
rename {iotdb-commons =>
node-commons}/src/main/java/org/apache/iotdb/commons/hash/APHashExecutor.java
(100%)
copy {iotdb-commons =>
node-commons}/src/main/java/org/apache/iotdb/commons/hash/BKDRHashExecutor.java
(100%)
rename {iotdb-commons =>
node-commons}/src/main/java/org/apache/iotdb/commons/hash/DeviceGroupHashExecutor.java
(100%)
rename {iotdb-commons =>
node-commons}/src/main/java/org/apache/iotdb/commons/hash/JSHashExecutor.java
(100%)
rename {iotdb-commons =>
node-commons}/src/main/java/org/apache/iotdb/commons/hash/SDBMHashExecutor.java
(100%)
rename
server/src/main/java/org/apache/iotdb/db/service/thrift/ThriftServiceThread.java
=>
node-commons/src/main/java/org/apache/iotdb/commons/service/AbstractThriftServiceThread.java
(91%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/service/IService.java (89%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/service/JMXService.java
(97%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/service/RegisterManager.java
(94%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/service/ServiceType.java
(94%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/service/StartupCheck.java
(90%)
rename {server/src/main/java/org/apache/iotdb/db =>
node-commons/src/main/java/org/apache/iotdb/commons}/service/StartupChecks.java
(90%)
rename {server/src/main/java/org/apache/iotdb/db/service/thrift =>
node-commons/src/main/java/org/apache/iotdb/commons/service}/ThriftService.java
(94%)
create mode 100644
node-commons/src/main/java/org/apache/iotdb/commons/service/ThriftServiceThread.java
create mode 100644
node-commons/src/main/java/org/apache/iotdb/commons/utils/JVMCommonUtils.java
rename {iotdb-commons =>
node-commons}/src/main/java/org/apache/iotdb/commons/utils/TestOnly.java (100%)
rename {server/src/test/java/org/apache/iotdb/db/concurrent =>
node-commons/src/test/java/org/apache/iotdb/commons}/IoTDBDefaultThreadExceptionHandlerTest.java
(98%)
rename {server/src/test/java/org/apache/iotdb/db/concurrent =>
node-commons/src/test/java/org/apache/iotdb/commons}/IoTDBThreadPoolFactoryTest.java
(97%)
rename server/src/main/java/org/apache/iotdb/db/exception/{runtime =>
sql}/SQLParserException.java (96%)
copy
server/src/main/java/org/apache/iotdb/db/exception/{query/LogicalOptimizeException.java
=> sql/StatementAnalyzeException.java} (64%)
copy server/src/main/java/org/apache/iotdb/db/mpp/common/{TreeNode.java =>
FragmentId.java} (50%)
rename server/src/main/java/org/apache/iotdb/db/mpp/common/{InstanceId.java =>
FragmentInstanceId.java} (92%)
rename server/src/main/java/org/apache/iotdb/db/mpp/common/{QueryContext.java
=> MPPQueryContext.java} (97%)
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/common/OrderBy.java
copy
server/src/main/java/org/apache/iotdb/db/mpp/{sql/planner/plan/LogicalPlanner.java
=> execution/FragmentInfo.java} (57%)
rename
server/src/main/java/org/apache/iotdb/db/mpp/execution/{InstanceContext.java =>
FragmentInstanceContext.java} (52%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/execution/FragmentInstanceState.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/execution/FragmentState.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/execution/executor/InstanceExecutor.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/execution/executor/InstanceHandle.java
rename
server/src/main/java/org/apache/iotdb/db/mpp/execution/{QueryScheduler.java =>
scheduler/ClusterScheduler.java} (67%)
rename server/src/main/java/org/apache/iotdb/db/mpp/{common/TreeNode.java =>
execution/scheduler/IScheduler.java} (61%)
copy
server/src/main/java/org/apache/iotdb/db/mpp/{operator/process/LimitOperator.java
=> execution/scheduler/StandaloneScheduler.java} (51%)
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/FragmentInstanceId.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/sql/constant/FilterConstant.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/sql/constant/StatementType.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/sql/parser/ASTVisitor.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/sql/parser/StatementGenerator.java
copy
server/src/main/java/org/apache/iotdb/db/{utils/windowing/runtime/WindowEvaluationTask.java
=> sql/statement/AggregationQueryStatement.java} (52%)
copy
server/src/main/java/org/apache/iotdb/db/{exception/LoadFileException.java =>
sql/statement/FillQueryStatement.java} (66%)
copy
server/src/main/java/org/apache/iotdb/db/{concurrent/IoTDBDaemonThreadFactory.java
=> sql/statement/GroupByFillQueryStatement.java} (60%)
copy
confignode/src/main/java/org/apache/iotdb/confignode/service/register/ServiceType.java
=>
server/src/main/java/org/apache/iotdb/db/sql/statement/GroupByQueryStatement.java
(57%)
copy
server/src/main/java/org/apache/iotdb/db/{mpp/common/DataRegionTimeSlice.java
=> sql/statement/LastQueryStatement.java} (77%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/sql/statement/QueryStatement.java
copy
server/src/main/java/org/apache/iotdb/db/{exception/QueryIdNotExsitException.java
=> sql/statement/ShowDevicesStatement.java} (75%)
copy
server/src/main/java/org/apache/iotdb/db/{exception/QueryIdNotExsitException.java
=> sql/statement/ShowTimeSeriesStatement.java} (75%)
copy
server/src/main/java/org/apache/iotdb/db/{exception/WriteProcessException.java
=> sql/statement/Statement.java} (50%)
copy
confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNodeMBean.java
=>
server/src/main/java/org/apache/iotdb/db/sql/statement/UDAFQueryStatement.java
(80%)
copy
confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNodeMBean.java
=>
server/src/main/java/org/apache/iotdb/db/sql/statement/UDTFQueryStatement.java
(80%)
copy
confignode/src/main/java/org/apache/iotdb/confignode/service/register/ServiceType.java
=>
server/src/main/java/org/apache/iotdb/db/sql/statement/component/FillComponent.java
(54%)
rename
iotdb-commons/src/main/java/org/apache/iotdb/commons/hash/BKDRHashExecutor.java
=>
server/src/main/java/org/apache/iotdb/db/sql/statement/component/FromComponent.java
(62%)
rename
confignode/src/main/java/org/apache/iotdb/confignode/service/register/ServiceType.java
=>
server/src/main/java/org/apache/iotdb/db/sql/statement/component/GroupByLevelComponent.java
(55%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/sql/statement/component/GroupByTimeComponent.java
copy
confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNodeMBean.java
=>
server/src/main/java/org/apache/iotdb/db/sql/statement/component/OrderBy.java
(83%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/sql/statement/component/ResultColumn.java
rename
confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNodeMBean.java
=>
server/src/main/java/org/apache/iotdb/db/sql/statement/component/ResultSetFormat.java
(82%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/sql/statement/component/SelectComponent.java
rename
server/src/main/java/org/apache/iotdb/db/{concurrent/IoTDBDaemonThreadFactory.java
=> sql/statement/component/WhereCondition.java} (61%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/sql/statement/component/WithoutPolicy.java
copy
server/src/main/java/org/apache/iotdb/db/{qp/logical/crud/BasicOperatorType.java
=> sql/statement/filter/BasicFilterType.java} (90%)
copy
server/src/main/java/org/apache/iotdb/db/{qp/logical/crud/BasicFunctionOperator.java
=> sql/statement/filter/BasicFunctionFilter.java} (81%)
rename
server/src/main/java/org/apache/iotdb/db/{concurrent/WrappedRunnable.java =>
sql/statement/filter/FunctionFilter.java} (53%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/sql/statement/filter/InFilter.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/sql/statement/filter/LikeFilter.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/sql/statement/filter/QueryFilter.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/sql/statement/filter/RegexpFilter.java
rename
server/src/{main/java/org/apache/iotdb/db/concurrent/threadpool/IThreadPoolMBean.java
=> test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java} (66%)
create mode 100644
server/src/test/java/org/apache/iotdb/db/sql/StatementGeneratorTest.java