This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch iotdb-1971 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit e2dc690d47c403fec2d84f7b08b0fa35d2064810 Merge: 85d1a91 521f562 Author: Steve Yurong Su <[email protected]> AuthorDate: Sun Nov 28 18:50:12 2021 +0800 Merge branch 'master' of github.com:apache/iotdb into iotdb-1971 .../org/apache/iotdb/cli/utils/JlineUtils.java | 14 +---- .../resources/conf/iotdb-engine.properties | 7 +-- server/src/assembly/resources/conf/iotdb-env.bat | 4 ++ server/src/assembly/resources/conf/iotdb-env.sh | 7 ++- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 12 ++-- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 9 +-- .../iotdb/db/query/pool/QueryTaskPoolManager.java | 10 +++- .../apache/iotdb/tsfile/compress/ICompressor.java | 58 ++++++++++++++++++- .../compress/GZIPCompressOverflowException.java | 26 +++++++++ .../iotdb/tsfile/read/TsFileSequenceReader.java | 66 ++++++++++++++++------ .../apache/iotdb/tsfile/write/page/PageWriter.java | 4 ++ .../iotdb/tsfile/write/page/TimePageWriter.java | 4 ++ .../iotdb/tsfile/write/page/ValuePageWriter.java | 4 ++ .../org/apache/iotdb/tsfile/compress/GZIPTest.java | 17 +++++- .../org/apache/iotdb/tsfile/compress/LZ4Test.java | 17 +++++- .../apache/iotdb/tsfile/compress/SnappyTest.java | 17 +++++- 16 files changed, 225 insertions(+), 51 deletions(-)
