This is an automated email from the ASF dual-hosted git repository. xiangweiwei pushed a commit to branch clusterVector in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 69f2d965c180b7cd8bb9b094aa660c9e1170391f Merge: 334209f 9579b58 Author: Alima777 <[email protected]> AuthorDate: Fri Oct 15 17:11:22 2021 +0800 Merge branch 'master' into clusterVector .github/dependabot.yml | 30 ++ .../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 6 +- cli/pom.xml | 2 +- .../java/org/apache/iotdb/cli/AbstractCli.java | 67 +++++ client-cpp/pom.xml | 2 +- .../iotdb/cluster/log/StableEntryManager.java | 6 + .../cluster/log/manage/CommittedEntryManager.java | 12 + .../manage/FilePartitionedSnapshotLogManager.java | 12 +- .../iotdb/cluster/log/manage/RaftLogManager.java | 6 +- .../serializable/SyncLogDequeSerializer.java | 25 ++ .../cluster/server/member/DataGroupMember.java | 2 +- compile-tools/thrift/pom.xml | 2 +- .../UserGuide/Ecosystem Integration/Spark IoTDB.md | 18 +- .../System-Tools/Performance-Tracing-Tool.md | 56 ++-- docs/zh/UserGuide/Appendix/Config-Manual.md | 18 -- .../UserGuide/Ecosystem Integration/Spark IoTDB.md | 18 +- .../System-Tools/Performance-Tracing-Tool.md | 58 ++-- .../main/java/org/apache/iotdb/JDBCExample.java | 6 +- .../org/apache/iotdb/PrepareStatementDemo.java | 2 +- example/trigger/pom.xml | 2 +- example/udf/pom.xml | 2 +- .../flink/tsfile/RowTsFileInputFormatTest.java | 14 +- hive-connector/pom.xml | 2 +- influxdb-protocol/pom.xml | 4 +- .../iotdb/jdbc/AbstractIoTDBJDBCResultSet.java | 22 ++ .../main/java/org/apache/iotdb/jdbc/Constant.java | 12 + .../org/apache/iotdb/jdbc/IoTDBConnection.java | 6 +- .../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 25 ++ .../org/apache/iotdb/jdbc/IoTDBJDBCResultSet.java | 11 + .../iotdb/jdbc/IoTDBNonAlignJDBCResultSet.java | 6 + .../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 4 + .../org/apache/iotdb/jdbc/IoTDBTracingInfo.java | 103 +++++++ pom.xml | 18 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 11 - .../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 4 +- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 8 - .../org/apache/iotdb/db/engine/StorageEngine.java | 2 +- .../engine/storagegroup/StorageGroupProcessor.java | 1 - .../virtualSg/VirtualStorageGroupManager.java | 2 +- .../iotdb/db/metadata/logfile/MLogUpgrader.java | 290 ++++++++++++++++++ .../iotdb/db/metadata/logfile/MLogWriter.java | 200 +----------- .../apache/iotdb/db/qp/executor/PlanExecutor.java | 18 +- .../iotdb/db/qp/logical/crud/QueryOperator.java | 13 + .../iotdb/db/qp/physical/crud/AggregationPlan.java | 42 +-- .../iotdb/db/qp/physical/crud/QueryPlan.java | 13 + .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 1 + .../iotdb/db/query/context/QueryContext.java | 9 + .../db/query/control/QueryResourceManager.java | 34 +-- .../apache/iotdb/db/query/control/TracingInfo.java | 85 ------ .../iotdb/db/query/control/TracingManager.java | 229 -------------- .../db/query/control/tracing/TracingConstant.java | 17 +- .../db/query/control/tracing/TracingInfo.java | 156 ++++++++++ .../db/query/control/tracing/TracingManager.java | 82 +++++ .../db/query/dataset/AlignByDeviceDataSet.java | 4 +- .../dataset/groupby/GroupByEngineDataSet.java | 6 + .../query/dataset/groupby/GroupByTimeDataSet.java | 42 ++- .../groupby/GroupByWithValueFilterDataSet.java | 26 +- .../groupby/GroupByWithoutValueFilterDataSet.java | 25 +- .../db/query/executor/AggregationExecutor.java | 31 +- .../db/query/executor/RawDataQueryExecutor.java | 1 + .../iotdb/db/query/reader/series/SeriesReader.java | 24 +- .../reader/universal/PriorityMergeReader.java | 13 +- .../java/org/apache/iotdb/db/service/IoTDB.java | 4 - .../org/apache/iotdb/db/service/TSServiceImpl.java | 82 +++-- .../org/apache/iotdb/db/utils/AggregateUtils.java | 123 +------- .../db/integration/IoTDBContinuousQueryIT.java | 38 ++- .../db/integration/IoTDBRemovePartitionIT.java | 4 +- .../iotdb/db/integration/IoTDBTracingIT.java | 61 ++-- .../db/integration/IoTDBTriggerExecutionIT.java | 154 ++++++---- .../aggregation/IoTDBAggregationByLevelIT.java | 16 +- .../iotdb/db/metadata/mlog/MLogUpgraderTest.java | 104 +++++++ .../iotdb/db/query/control/TracingManagerTest.java | 115 ------- .../apache/iotdb/db/utils/EnvironmentUtils.java | 7 +- .../main/java/org/apache/iotdb/session/Config.java | 4 + .../org/apache/iotdb/session/InsertConsumer.java | 16 +- .../java/org/apache/iotdb/session/Session.java | 237 +++++++-------- .../apache/iotdb/session/SessionConnection.java | 1 + .../org/apache/iotdb/session/pool/SessionPool.java | 37 ++- .../iotdb/session/{ => util}/SessionUtils.java | 2 +- .../org/apache/iotdb/session/util/ThreadUtils.java | 45 +++ .../apache/iotdb/session/pool/SessionPoolTest.java | 27 +- .../apache/iotdb/session/util/ThreadUtilsTest.java | 22 +- site/pom.xml | 12 +- spark-iotdb-connector/Readme.md | 168 ----------- spark-tsfile/README.md | 335 --------------------- thrift/rpc-changelist.md | 22 ++ thrift/src/main/thrift/rpc.thrift | 15 + zeppelin-interpreter/pom.xml | 2 +- 88 files changed, 1749 insertions(+), 1872 deletions(-)
