This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch cluster_premerge
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 4934084 remove EnvironmentUtils in cross test
add c1fcaa4 add more tracing log
add 0496d75 fix typo
add d40fbcb remove tracing dir reInitial
add efbe467 merge master and fix review comments
add c924847 Merge pull request #1845 from Alima777/addMoreTracing
add 78954ea fix tsfilemanage concurrent bug (#1849)
add c2b6c5a Revert "[IOTDB-955] Add more tracing log" (#1858)
add 3053112 IOTDB-889 (#1857)
add 6fef74a [IOTDB-951] Fix auto-creating schema in parallel may write
unrecognizable timeseries in mlog.txt (#1851)
add b52b2e1 update comment of VersionController (#1848)
add 03d37b0 [IOTDB-958] Fix MLog bug and add switch for MTree snapshot
(#1863)
add 0c85956 [IOTDB-716] add lz4 doc and support compression=lz4 statement
(#1860)
add 797c193 Merge branch 'master' into cluster_premerge
No new revisions were added by this update.
Summary of changes:
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 5 +
docs/SystemDesign/TsFile/Format.md | 1 +
docs/UserGuide/Concept/Compression.md | 4 +-
docs/zh/SystemDesign/TsFile/Format.md | 1 +
docs/zh/UserGuide/Concept/Compression.md | 3 +-
.../resources/conf/iotdb-engine.properties | 7 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 13 +++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 2 +
.../level/LevelTsFileManagement.java | 49 +++++-----
.../iotdb/db/engine/version/VersionController.java | 8 +-
.../org/apache/iotdb/db/metadata/MLogWriter.java | 102 ++++++++++++---------
.../org/apache/iotdb/db/metadata/MManager.java | 20 ++--
.../apache/iotdb/db/qp/constant/SQLConstant.java | 3 -
.../iotdb/tsfile/common/conf/TSFileConfig.java | 3 +-
14 files changed, 138 insertions(+), 83 deletions(-)