This is an automated email from the ASF dual-hosted git repository. xiangweiwei pushed a commit to branch clusterQueryOpt in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c40a850e8560791aedf1633a83dc19e482b07267 Merge: 1c18ddf 743f57d Author: Alima777 <[email protected]> AuthorDate: Sun Mar 14 15:14:57 2021 +0800 Merge branch 'master' into clusterQueryOpt .github/workflows/client.yml | 30 ++-- .github/workflows/greetings.yml | 13 ++ .github/workflows/sonar-coveralls.yml | 14 +- antlr/pom.xml | 19 +++ .../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 2 +- client-cpp/README.md | 6 +- .../resources/conf/iotdb-cluster.properties | 10 +- .../java/org/apache/iotdb/cluster/ClusterMain.java | 11 +- .../iotdb/cluster/client/DataClientProvider.java | 4 +- .../cluster/client/async/AsyncClientPool.java | 44 +++--- .../iotdb/cluster/client/sync/SyncClientPool.java | 69 ++++----- .../iotdb/cluster/client/sync/SyncDataClient.java | 9 +- .../iotdb/cluster/client/sync/SyncMetaClient.java | 10 +- .../apache/iotdb/cluster/config/ClusterConfig.java | 15 ++ .../iotdb/cluster/config/ClusterDescriptor.java | 11 ++ .../iotdb/cluster/coordinator/Coordinator.java | 27 ++-- .../exception/BadSeedUrlFormatException.java | 3 +- .../apache/iotdb/cluster/metadata/CMManager.java | 118 +++++++--------- .../apache/iotdb/cluster/metadata/MetaPuller.java | 14 +- .../cluster/query/ClusterDataQueryExecutor.java | 8 ++ .../cluster/query/ClusterPhysicalGenerator.java | 20 ++- .../iotdb/cluster/query/ClusterPlanExecutor.java | 41 +++--- .../cluster/query/aggregate/ClusterAggregator.java | 14 +- .../cluster/query/fill/ClusterPreviousFill.java | 14 +- .../query/groupby/RemoteGroupByExecutor.java | 27 ++-- .../query/last/ClusterLastQueryExecutor.java | 14 +- .../cluster/query/reader/ClusterReaderFactory.java | 24 ++-- .../cluster/query/reader/ClusterTimeGenerator.java | 4 +- .../iotdb/cluster/query/reader/DataSourceInfo.java | 12 +- .../apache/iotdb/cluster/server/ClientServer.java | 11 +- .../cluster/server/PullSnapshotHintService.java | 9 +- .../cluster/server/service/BaseSyncService.java | 15 +- .../cluster/server/service/DataSyncService.java | 7 +- .../cluster/server/service/MetaSyncService.java | 5 +- .../cluster/client/DataClientProviderTest.java | 154 +++++++++++++++++++++ .../cluster/client/sync/SyncClientPoolTest.java | 17 ++- .../cluster/client/sync/SyncDataClientTest.java | 51 +++++++ .../cluster/client/sync/SyncMetaClientTest.java | 47 +++++++ docs/UserGuide/Operation Manual/Kill Query.md | 2 +- .../Operation Manual/UDF User Defined Function.md | 2 +- docs/UserGuide/Server/Cluster Setup.md | 4 +- docs/zh/UserGuide/Operation Manual/Kill Query.md | 2 +- .../Operation Manual/UDF User Defined Function.md | 2 +- docs/zh/UserGuide/Server/Cluster Setup.md | 4 +- example/client-cpp-example/README.md | 2 +- hive-connector/pom.xml | 12 +- pom.xml | 2 +- .../resources/conf/iotdb-engine.properties | 2 +- server/src/assembly/resources/conf/iotdb-env.bat | 5 + server/src/assembly/resources/conf/iotdb-env.sh | 3 + .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 10 +- .../org/apache/iotdb/db/conf/IoTDBConstant.java | 1 - .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 4 +- .../db/engine/compaction/TsFileManagement.java | 8 ++ .../level/LevelCompactionTsFileManagement.java | 31 +++++ .../engine/compaction/utils/CompactionUtils.java | 3 + .../iotdb/db/query/control/QueryTimeManager.java | 2 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 2 +- .../iotdb/db/integration/IoTDBQueryDemoIT.java | 8 +- thrift/pom.xml | 19 +++ .../iotdb/tsfile/read/TsFileSequenceReader.java | 15 +- ...easurementChunkMetadataListMapIteratorTest.java | 65 +++++++-- .../zeppelin/iotdb/IoTDBInterpreterTest.java | 2 +- 63 files changed, 785 insertions(+), 350 deletions(-)
