This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch iotdb-3227 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 8a95d8325da9cdb8e7d2216a9f44ad9dfe0be7f9 Merge: ffffe4f723 7d354edc08 Author: Steve Yurong Su <[email protected]> AuthorDate: Tue May 24 12:26:06 2022 +0800 Merge branch 'master' of github.com:apache/iotdb into iotdb-3227 docs/UserGuide/Reference/Config-Manual.md | 12 +- docs/zh/UserGuide/Reference/Config-Manual.md | 10 +- .../resources/conf/iotdb-engine.properties | 4 +- .../tools/tsfileToolSet/validate-tsfile.bat | 62 +++ .../tools/tsfileToolSet/validate-tsfile.sh | 48 +++ .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +- .../db/tools/validate/TsFileValidationTool.java | 453 +++++++++++++++++++++ .../cross/RewriteCompactionFileSelectorTest.java | 2 +- .../iotdb/spark/tsfile/qp/common/SQLConstant.java | 26 +- 9 files changed, 591 insertions(+), 28 deletions(-)
