This is an automated email from the ASF dual-hosted git repository. xuekaifeng pushed a commit to branch virtual_partition_2_merge in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 1d2dd6e29175ebfd09c61d8543b6b8f404223a0b Merge: 59a861b 5fb992f Author: 151250176 <[email protected]> AuthorDate: Wed Dec 23 14:23:02 2020 +0800 Merge branch 'master' of https://github.com/apache/iotdb into virtual_partition_2_merge docs/UserGuide/Concept/SDT.md | 63 ++++++++++++++++++++++ docs/zh/UserGuide/Concept/SDT.md | 61 +++++++++++++++++++++ hadoop/pom.xml | 2 +- hive-connector/pom.xml | 2 +- .../db/query/control/QueryResourceManager.java | 2 +- .../db/sync/receiver/transfer/SyncServiceImpl.java | 25 ++++----- .../iotdb/db/sync/sender/transfer/SyncClient.java | 48 ++++++----------- spark-iotdb-connector/pom.xml | 2 +- 8 files changed, 156 insertions(+), 49 deletions(-)
