You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xu...@apache.org on 2021/03/14 12:42:48 UTC
[iotdb] 02/02: Merge branch 'master' of
https://github.com/apache/iotdb into improve_aggregation_with_value_filter
This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a commit to branch improve_aggregation_with_value_filter
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 9dbe8d8e4da10940f845ee445d2d9e6c949bb838
Merge: d7a25c2 ff3a0f9
Author: 151250176 <15...@smail.nju.edu.cn>
AuthorDate: Fri Mar 12 17:03:10 2021 +0800
Merge branch 'master' of https://github.com/apache/iotdb into improve_aggregation_with_value_filter
.github/workflows/client.yml | 30 ++---
.github/workflows/greetings.yml | 13 ++
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 | 4 +-
.../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 | 136 +++++++++++++++++++++
.../cluster/client/sync/SyncClientPoolTest.java | 17 ++-
.../cluster/client/sync/SyncDataClientTest.java | 51 ++++++++
.../cluster/client/sync/SyncMetaClientTest.java | 47 +++++++
.../Operation Manual/UDF User Defined Function.md | 2 +-
docs/UserGuide/Server/Cluster Setup.md | 4 +-
.../Operation Manual/UDF User Defined Function.md | 2 +-
docs/zh/UserGuide/Server/Cluster Setup.md | 4 +-
example/client-cpp-example/README.md | 2 +-
pom.xml | 2 +-
server/src/assembly/resources/conf/iotdb-env.bat | 5 +
server/src/assembly/resources/conf/iotdb-env.sh | 3 +
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 1 -
.../db/engine/compaction/TsFileManagement.java | 8 ++
.../level/LevelCompactionTsFileManagement.java | 31 +++++
.../engine/compaction/utils/CompactionUtils.java | 3 +
.../iotdb/db/integration/IoTDBQueryDemoIT.java | 8 +-
thrift/pom.xml | 19 +++
.../zeppelin/iotdb/IoTDBInterpreterTest.java | 2 +-
52 files changed, 671 insertions(+), 309 deletions(-)