You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2021/08/24 01:40:05 UTC

[iotdb] 01/02: Merge branch 'rel/0.12' into clusterDescBug

This is an automated email from the ASF dual-hosted git repository.

xiangweiwei pushed a commit to branch clusterDescBug
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit d1f78a76d1077d8ee15a30c47680b7642ffab043
Merge: 8dbcd2f fb40695
Author: Alima777 <wx...@gmail.com>
AuthorDate: Tue Aug 24 09:18:38 2021 +0800

    Merge branch 'rel/0.12' into clusterDescBug

 .gitattributes                                     |    1 +
 .github/workflows/client.yml                       |   11 +-
 RELEASE_NOTES.md                                   |   78 +
 .../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4   |   47 +-
 client-cpp/src/main/Session.cpp                    | 2263 ++++++++++----------
 client-cpp/src/main/Session.h                      | 1406 ++++++------
 client-cpp/src/test/main.cpp                       |    6 +-
 .../iotdb/cluster/client/DataClientProvider.java   |    9 +-
 .../iotdb/cluster/client/sync/SyncClientPool.java  |    2 +-
 .../iotdb/cluster/coordinator/Coordinator.java     |   17 +-
 .../apache/iotdb/cluster/metadata/CMManager.java   |   71 +-
 .../apache/iotdb/cluster/metadata/MetaPuller.java  |   18 +-
 .../iotdb/cluster/query/ClusterPlanExecutor.java   |   39 +-
 .../apache/iotdb/cluster/query/ClusterPlanner.java |   13 +-
 .../iotdb/cluster/query/LocalQueryExecutor.java    |   32 +-
 .../cluster/query/aggregate/ClusterAggregator.java |    9 +-
 .../cluster/query/fill/ClusterPreviousFill.java    |   25 +-
 .../query/groupby/RemoteGroupByExecutor.java       |   21 +-
 .../query/last/ClusterLastQueryExecutor.java       |   11 +-
 .../cluster/query/manage/ClusterQueryManager.java  |    8 +-
 .../cluster/query/reader/ClusterReaderFactory.java |    8 +-
 .../iotdb/cluster/query/reader/DataSourceInfo.java |   36 +-
 .../reader/RemoteSeriesReaderByTimestamp.java      |    2 +
 .../query/reader/RemoteSimpleSeriesReader.java     |    2 +
 .../query/reader/mult/MultDataSourceInfo.java      |   15 +-
 .../query/reader/mult/RemoteMultSeriesReader.java  |   17 +-
 .../apache/iotdb/cluster/server/ClientServer.java  |    8 +-
 .../cluster/server/heartbeat/HeartbeatThread.java  |   41 +-
 .../cluster/server/member/MetaGroupMember.java     |   13 +-
 .../iotdb/cluster/server/member/RaftMember.java    |    1 -
 .../cluster/client/DataClientProviderTest.java     |    5 +-
 .../org/apache/iotdb/cluster/common/IoTDBTest.java |    3 +-
 .../query/ClusterAggregateExecutorTest.java        |    4 +-
 .../query/ClusterDataQueryExecutorTest.java        |   10 +-
 .../cluster/query/ClusterFillExecutorTest.java     |    4 +-
 .../cluster/query/ClusterPlanExecutorTest.java     |    4 +-
 .../cluster/query/ClusterQueryRouterTest.java      |   14 +-
 .../query/ClusterUDTFQueryExecutorTest.java        |    4 +-
 .../ClusterGroupByNoVFilterDataSetTest.java        |    2 +-
 .../groupby/ClusterGroupByVFilterDataSetTest.java  |    2 +-
 .../query/groupby/MergeGroupByExecutorTest.java    |    4 +-
 .../query/groupby/RemoteGroupByExecutorTest.java   |    4 +-
 .../query/manage/ClusterQueryManagerTest.java      |   12 +-
 .../query/reader/ClusterReaderFactoryTest.java     |    2 +-
 .../query/reader/ClusterTimeGeneratorTest.java     |    4 +-
 .../cluster/server/member/DataGroupMemberTest.java |    2 +-
 .../cluster/server/member/MetaGroupMemberTest.java |    4 +-
 compile-tools/thrift/pom.xml                       |    3 +-
 docs/SystemDesign/SchemaManager/SchemaManager.md   |    2 +-
 docs/UserGuide/API/Programming-JDBC.md             |    4 +
 docs/UserGuide/Appendix/SQL-Reference.md           |   26 +
 .../Ecosystem Integration/Zeppelin-IoTDB.md        |    2 +-
 .../DML-Data-Manipulation-Language.md              |   52 +-
 .../IoTDB-SQL-Language/Maintenance-Command.md      |   27 +-
 .../UserGuide/System-Tools/Load-External-Tsfile.md |   32 +-
 .../zh/SystemDesign/SchemaManager/SchemaManager.md |    2 +-
 docs/zh/UserGuide/API/Programming-JDBC.md          |    3 +
 docs/zh/UserGuide/Appendix/SQL-Reference.md        |   24 +
 .../Ecosystem Integration/Zeppelin-IoTDB.md        |    2 +-
 .../DDL-Data-Definition-Language.md                |    6 +-
 .../DML-Data-Manipulation-Language.md              |   62 +-
 .../IoTDB-SQL-Language/Maintenance-Command.md      |   28 +-
 .../UserGuide/System-Tools/Load-External-Tsfile.md |   56 +-
 .../org/apache/iotdb/SessionConcurrentExample.java |  198 ++
 pom.xml                                            |    1 +
 .../resources/conf/iotdb-engine.properties         |   52 +-
 .../org/apache/iotdb/db/auth/AuthorityChecker.java |    1 +
 .../db/concurrent/IoTDBThreadPoolFactory.java      |   89 +-
 .../db/concurrent/threadpool/IThreadPoolMBean.java |   38 +-
 .../WrappedScheduledExecutorService.java           |  192 ++
 .../WrappedScheduledExecutorServiceMBean.java      |   17 +-
 .../WrappedSingleThreadExecutorService.java        |  118 +
 .../WrappedSingleThreadExecutorServiceMBean.java   |   17 +-
 .../WrappedSingleThreadScheduledExecutor.java      |  123 ++
 .../WrappedSingleThreadScheduledExecutorMBean.java |   17 +-
 .../threadpool/WrappedThreadPoolExecutor.java      |   88 +
 .../threadpool/WrappedThreadPoolExecutorMBean.java |   17 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  126 +-
 .../org/apache/iotdb/db/conf/IoTDBConstant.java    |    1 +
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |   99 +-
 .../org/apache/iotdb/db/engine/StorageEngine.java  |  161 +-
 .../compaction/CompactionMergeTaskPoolManager.java |   35 +-
 .../db/engine/compaction/TsFileManagement.java     |  158 +-
 .../level/LevelCompactionTsFileManagement.java     |   44 +-
 .../compaction/utils/CompactionLogAnalyzer.java    |   20 +-
 .../engine/compaction/utils/CompactionUtils.java   |    7 +-
 .../apache/iotdb/db/engine/flush/FlushManager.java |    4 +-
 .../iotdb/db/engine/memtable/AbstractMemTable.java |   21 +-
 .../apache/iotdb/db/engine/memtable/IMemTable.java |    8 +
 .../iotdb/db/engine/merge/manage/MergeManager.java |   20 +-
 .../db/engine/merge/manage/MergeResource.java      |    3 +-
 .../merge/selector/MaxFileMergeFileSelector.java   |   15 +-
 .../merge/task/CompactionMergeRecoverTask.java     |   81 +
 .../iotdb/db/engine/merge/task/MergeFileTask.java  |    8 +-
 .../db/engine/merge/task/RecoverMergeTask.java     |    4 +-
 .../engine/storagegroup/StorageGroupProcessor.java |  398 ++--
 .../db/engine/storagegroup/TsFileProcessor.java    |   67 +-
 .../db/engine/storagegroup/TsFileResource.java     |    2 +-
 .../virtualSg/VirtualStorageGroupManager.java      |   27 +
 .../version/SimpleFileVersionController.java       |    2 +-
 .../metadata/StorageGroupAlreadySetException.java  |    7 +
 .../exception/query/PathNumOverLimitException.java |    9 +-
 .../org/apache/iotdb/db/metadata/MManager.java     |   90 +-
 .../java/org/apache/iotdb/db/metadata/MTree.java   |   84 +-
 .../org/apache/iotdb/db/monitor/StatMonitor.java   |    2 +-
 .../main/java/org/apache/iotdb/db/qp/Planner.java  |   32 +-
 .../apache/iotdb/db/qp/constant/SQLConstant.java   |    2 +
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |   44 +
 .../org/apache/iotdb/db/qp/logical/Operator.java   |    4 +-
 .../db/qp/logical/crud/BasicFunctionOperator.java  |   21 +-
 .../iotdb/db/qp/logical/crud/InOperator.java       |    4 +
 .../iotdb/db/qp/logical/crud/LikeOperator.java     |  131 ++
 .../iotdb/db/qp/logical/sys/LoadFilesOperator.java |   21 +-
 .../db/qp/logical/sys/SetSystemModeOperator.java   |   28 +-
 .../iotdb/db/qp/physical/sys/OperateFilePlan.java  |   23 +-
 .../sys/SetSystemModePlan.java}                    |   32 +-
 .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java    |   97 +-
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |   43 +-
 .../qp/strategy/optimizer/ConcatPathOptimizer.java |   38 +-
 .../qp/strategy/optimizer/ILogicalOptimizer.java   |    3 +-
 .../iotdb/db/query/control/QueryFileManager.java   |    2 +-
 .../db/query/control/QueryResourceManager.java     |  100 +-
 .../iotdb/db/query/control/SessionManager.java     |   27 +-
 .../apache/iotdb/db/query/control/TracingInfo.java |   84 +
 .../iotdb/db/query/control/TracingManager.java     |  139 +-
 .../iotdb/db/query/executor/fill/ValueFill.java    |  110 +
 .../iotdb/db/query/reader/series/SeriesReader.java |  101 +-
 .../reader/universal/DescPriorityMergeReader.java  |    5 +-
 .../reader/universal/PriorityMergeReader.java      |   13 +-
 .../apache/iotdb/db/rescon/MemTableManager.java    |    4 +
 .../iotdb/db/rescon/PrimitiveArrayManager.java     |   17 +-
 .../apache/iotdb/db/service/MetricsService.java    |    4 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |   91 +-
 .../org/apache/iotdb/db/service/UpgradeSevice.java |    7 +-
 .../apache/iotdb/db/tools/TsFileRewriteTool.java   |  141 +-
 .../db/tools/upgrade/TsFileOnlineUpgradeTool.java  |  150 +-
 .../writelog/manager/MultiFileLogNodeManager.java  |   12 +-
 .../db/writelog/node/ExclusiveWriteLogNode.java    |   86 +-
 .../writelog/recover/TsFileRecoverPerformer.java   |   27 +-
 .../compaction/LevelCompactionRecoverTest.java     |   16 +-
 .../storagegroup/StorageGroupProcessorTest.java    |  178 +-
 .../iotdb/db/integration/IoTDBAlignByDeviceIT.java |   54 +
 .../db/integration/IoTDBAutoCreateSchemaIT.java    |    8 +-
 .../db/integration/IoTDBCreateStorageGroupIT.java  |    4 +-
 .../db/integration/IoTDBCreateTimeseriesIT.java    |    8 +-
 .../iotdb/db/integration/IoTDBDeletionIT.java      |   81 +
 .../apache/iotdb/db/integration/IoTDBFillIT.java   |   32 +
 .../org/apache/iotdb/db/integration/IoTDBInIT.java |  255 +++
 .../apache/iotdb/db/integration/IoTDBJMXTest.java  |   62 +
 .../db/integration/IoTDBLoadExternalTsfileIT.java  |  121 +-
 .../db/integration/IoTDBNewTsFileCompactionIT.java | 1057 ---------
 .../iotdb/db/integration/IoTDBQueryDemoIT.java     |  220 ++
 .../db/integration/IoTDBQueryMemoryControlIT.java  |    7 +-
 .../iotdb/db/integration/IoTDBRestartIT.java       |   48 +
 .../db/integration/IoTDBSequenceDataQueryIT.java   |    9 +-
 .../iotdb/db/integration/IoTDBSeriesReaderIT.java  |   11 +-
 ....java => IoTDBSetSystemReadOnlyWritableIT.java} |  296 +--
 .../db/integration/IoTDBUDFWindowQueryIT.java      |   35 +-
 .../integration/IoTDBUDTFAlignByTimeQueryIT.java   |  147 +-
 .../db/integration/IoTDBUDTFBuiltinFunctionIT.java |   35 +-
 .../db/integration/IoTDBUDTFHybridQueryIT.java     |   28 +-
 .../db/integration/IoTDBUDTFNonAlignQueryIT.java   |   42 +-
 .../aggregation/IoTDBAggregationSmallDataIT.java   |    5 +-
 .../iotdb/db/metadata/MManagerBasicTest.java       |  255 ++-
 .../iotdb/db/qp/logical/LogicalPlanSmallTest.java  |    2 +-
 .../iotdb/db/qp/physical/PhysicalPlanTest.java     |   59 +-
 .../iotdb/db/query/control/TracingManagerTest.java |    7 +-
 .../dataset/groupby/GroupByFillDataSetTest.java    |    2 +-
 .../apache/iotdb/db/utils/EnvironmentUtils.java    |    6 +-
 .../iotdb/db/utils/TsFileRewriteToolTest.java      |    4 +-
 .../apache/iotdb/db/writelog/PerformanceTest.java  |    2 +-
 site/src/main/.vuepress/config.js                  |   16 +-
 .../apache/iotdb/spark/db/EnvironmentUtils.java    |  111 +-
 .../read/expression/util/ExpressionOptimizer.java  |   34 +-
 .../iotdb/tsfile/read/filter/ValueFilter.java      |   43 +
 .../read/filter/factory/FilterSerializeId.java     |    3 +-
 .../iotdb/tsfile/read/filter/operator/Like.java    |  114 +
 .../read/query/timegenerator/node/LeafNode.java    |    2 +-
 .../write/writer/RestorableTsFileIOWriter.java     |   41 +
 .../iotdb/tsfile/write/writer/TsFileOutput.java    |    4 +-
 .../iotdb/tsfile/read/ReadOnlyTsFileTest.java      |   69 +
 181 files changed, 7355 insertions(+), 4937 deletions(-)