This is an automated email from the ASF dual-hosted git repository. sunzesong pushed a commit to branch insertTablet in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 2e667d326430b4cdba3f6d3097c41a49b3a47cb5 Merge: 14f8046 a9d6687 Author: samperson1997 <[email protected]> AuthorDate: Sun Mar 14 12:18:06 2021 +0800 Merge remote-tracking branch 'origin/Vector' into Vector .github/workflows/client.yml | 30 ++--- 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 | 7 ++ .../cluster/client/async/AsyncClientPool.java | 10 +- .../iotdb/cluster/client/sync/SyncClientPool.java | 10 +- .../apache/iotdb/cluster/config/ClusterConfig.java | 15 +++ .../iotdb/cluster/config/ClusterDescriptor.java | 11 ++ .../iotdb/cluster/coordinator/Coordinator.java | 27 ++--- .../apache/iotdb/cluster/metadata/CMManager.java | 40 +++---- .../cluster/query/ClusterPhysicalGenerator.java | 20 +++- .../iotdb/cluster/query/ClusterPlanExecutor.java | 4 + 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 +- .../resources/conf/iotdb-engine.properties | 2 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 10 +- .../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/engine/flush/MemTableFlushTask.java | 94 ++++++---------- .../db/engine/storagegroup/TsFileProcessor.java | 11 +- .../org/apache/iotdb/db/metadata/MManager.java | 10 ++ .../iotdb/db/metadata/template/Template.java | 70 ++++++++++++ .../apache/iotdb/db/qp/executor/PlanExecutor.java | 26 +++++ .../org/apache/iotdb/db/qp/logical/Operator.java | 4 +- .../db/qp/physical/crud/CreateTemplatePlan.java | 78 +++++++++++++ .../db/qp/physical/crud/SetDeviceTemplatePlan.java | 23 ++++ .../iotdb/db/query/control/QueryTimeManager.java | 2 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 79 ++++++++++++- .../iotdb/db/utils/datastructure/VectorTVList.java | 122 ++++++++++++++++++++- .../iotdb/db/integration/IoTDBQueryDemoIT.java | 8 +- .../java/org/apache/iotdb/session/Session.java | 54 +++++++++ .../apache/iotdb/session/SessionConnection.java | 40 +++++++ .../java/org/apache/iotdb/session/SessionUT.java | 47 ++++++++ thrift/pom.xml | 19 ++++ thrift/src/main/thrift/rpc.thrift | 19 ++++ .../file/metadata/statistics/Statistics.java | 2 + .../iotdb/tsfile/read/TsFileSequenceReader.java | 15 ++- ...easurementChunkMetadataListMapIteratorTest.java | 65 +++++++++-- .../zeppelin/iotdb/IoTDBInterpreterTest.java | 2 +- 49 files changed, 911 insertions(+), 178 deletions(-)
