You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ca...@apache.org on 2022/10/31 06:31:38 UTC

[iotdb] 01/02: Merge branch 'master' into beyyes/master

This is an automated email from the ASF dual-hosted git repository.

caogaofei pushed a commit to branch beyyes/master
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit ebcd784cc7d3cbe3d8166525e84223377b17b943
Merge: f182b32e53 0e843a7614
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Mon Oct 31 14:22:59 2022 +0800

    Merge branch 'master' into beyyes/master

 .../confignode/conf/ConfigNodeDescriptor.java      |   1 -
 docs/Download/README.md                            | 148 ++++++++++++++++--
 docs/UserGuide/Reference/Syntax-Conventions.md     | 169 +++-----------------
 docs/zh/Download/README.md                         | 143 +++++++++++++++--
 docs/zh/UserGuide/Reference/Syntax-Conventions.md  | 172 +++------------------
 .../resources/conf/iotdb-common.properties         |  37 +++--
 openapi/pom.xml                                    |  26 ----
 .../resources/conf/iotdb-datanode.properties       |   2 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  11 ++
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |   8 +-
 .../SchemaFileLogCorruptedException.java           |  34 ++++
 .../mtree/store/disk/schemafile/ISchemaPage.java   |   3 +
 .../mtree/store/disk/schemafile/InternalPage.java  |   2 +-
 .../mtree/store/disk/schemafile/SchemaFile.java    |  49 +++---
 .../store/disk/schemafile/SchemaFileConfig.java    |  28 +++-
 .../mtree/store/disk/schemafile/SchemaPage.java    |  14 +-
 .../mtree/store/disk/schemafile/SegmentedPage.java |   7 +
 .../disk/schemafile/log/SchemaFileLogReader.java   | 112 ++++++++++++++
 .../schemafile/log/SchemaFileLogSerializer.java    |  34 ++++
 .../disk/schemafile/log/SchemaFileLogWriter.java   |  68 ++++++++
 .../disk/schemafile/pagemgr/BTreePageManager.java  |   7 +-
 .../disk/schemafile/pagemgr/IPageManager.java      |   2 +
 .../store/disk/schemafile/pagemgr/PageManager.java | 146 +++++++++++++----
 .../MPPRestService.java => rest/RestService.java}  |  20 +--
 .../{mpprest => rest}/filter/ApiOriginFilter.java  |   2 +-
 .../filter/AuthorizationFilter.java                |   4 +-
 .../filter/BasicSecurityContext.java               |   2 +-
 .../db/protocol/{mpprest => rest}/filter/User.java |   2 +-
 .../{mpprest => rest}/filter/UserCache.java        |   2 +-
 .../handler/AuthorizationHandler.java              |   4 +-
 .../handler/ExceptionHandler.java                  |   4 +-
 .../handler/QueryDataSetHandler.java               |   4 +-
 .../handler/RequestValidationHandler.java          |   8 +-
 .../handler/StatementConstructionHandler.java      |   4 +-
 .../impl/GrafanaApiServiceImpl.java                |  20 +--
 .../{mpprest => rest}/impl/PingApiServiceImpl.java |   6 +-
 .../{mpprest => rest}/impl/RestApiServiceImpl.java |  20 +--
 .../java/org/apache/iotdb/db/service/DataNode.java |   4 +-
 .../java/org/apache/iotdb/db/service/NewIoTDB.java |   4 +-
 .../mtree/schemafile/SchemaFileLogTest.java        | 156 +++++++++++++++++++
 .../metadata/mtree/schemafile/SchemaFileTest.java  |  25 +--
 .../iotdb/db/tools/SchemaFileSketchTest.java       |   2 +-
 .../java/org/apache/iotdb/rpc/TSStatusCode.java    |   1 +
 43 files changed, 1016 insertions(+), 501 deletions(-)