You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/02/22 06:04:14 UTC
[iotdb] 04/04: Merge branch 'master' of https://github.com/apache/iotdb into wincppfix
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch wincppfix
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit acf5d504ea44c09e71f617d5272909a310bd8256
Merge: 966a463 aa9efee
Author: HTHou <hh...@outlook.com>
AuthorDate: Tue Feb 22 14:01:17 2022 +0800
Merge branch 'master' of https://github.com/apache/iotdb into wincppfix
.github/workflows/client-go.yml | 2 +
.github/workflows/client.yml | 4 +-
.github/workflows/grafana-plugin.yml | 2 +
.github/workflows/main-unix.yml | 5 +-
.github/workflows/main-win.yml | 3 +-
.github/workflows/sonar-coveralls.yml | 5 +-
.../org/apache/iotdb/db/qp/sql/IoTDBSqlLexer.g4 | 14 +-
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 8 +-
.../cluster/client/sync/SyncClientAdaptor.java | 11 +-
.../apache/iotdb/cluster/metadata/CMManager.java | 57 +++++--
.../iotdb/cluster/query/LocalQueryExecutor.java | 13 +-
.../cluster/server/service/DataAsyncService.java | 5 +-
.../server/service/DataGroupServiceImpls.java | 14 +-
.../cluster/server/service/DataSyncService.java | 6 +-
.../cluster/client/sync/SyncClientAdaptorTest.java | 28 +++-
.../iotdb/cluster/common/TestAsyncDataClient.java | 7 +-
docs/UserGuide/API/RestService.md | 30 +++-
docs/UserGuide/Reference/Syntax-Conventions.md | 51 ++++--
docs/zh/UserGuide/API/RestService.md | 30 +++-
docs/zh/UserGuide/Reference/Syntax-Conventions.md | 55 +++++--
.../iotdb/db/integration/IoTDBDeletionIT.java | 10 +-
.../iotdb/db/integration/IoTDBQuotedPathIT.java | 2 +-
.../db/integration/IoTDBSyntaxConventionIT.java | 177 +++++++++++++++++++--
.../db/integration/aligned/IoTDBDeletionIT.java | 10 +-
.../IoTDBSyntaxConventionVersionAdaptionIT.java | 16 ++
.../apache/iotdb/session/IoTDBSessionSimpleIT.java | 53 ------
.../session/IoTDBSessionSyntaxConventionIT.java | 146 +++++++++++++++++
.../org/apache/iotdb/db/concurrent/ThreadName.java | 1 +
.../org/apache/iotdb/db/engine/StorageEngine.java | 49 +++---
.../storagegroup/VirtualStorageGroupProcessor.java | 16 +-
.../virtualSg/StorageGroupManager.java | 13 +-
.../org/apache/iotdb/db/metadata/MManager.java | 15 +-
.../org/apache/iotdb/db/metadata/mtree/MTree.java | 39 ++++-
.../db/metadata/template/TemplateManager.java | 18 ++-
.../apache/iotdb/db/metadata/utils/MetaUtils.java | 6 +
.../db/protocol/rest/impl/PingApiServiceImpl.java | 13 ++
.../db/qp/physical/crud/GroupByTimeFillPlan.java | 8 +
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 177 +++++++++------------
.../iotdb/db/query/executor/QueryRouter.java | 4 +-
.../iotdb/db/service/thrift/ThriftService.java | 6 +-
.../db/service/thrift/impl/TSServiceImpl.java | 52 +++---
.../org/apache/iotdb/db/utils/ThreadUtils.java | 51 ++++++
.../writelog/manager/MultiFileLogNodeManager.java | 1 +
.../db/writelog/node/ExclusiveWriteLogNode.java | 31 +++-
.../iotdb/db/writelog/node/WriteLogNode.java | 6 +
.../iotdb/db/metadata/MManagerBasicTest.java | 9 ++
.../org/apache/iotdb/db/metadata/TemplateTest.java | 75 +++++++++
.../iotdb/db/protocol/rest/IoTDBRestServiceIT.java | 16 +-
thrift-cluster/src/main/thrift/cluster.thrift | 10 +-
49 files changed, 1011 insertions(+), 369 deletions(-)