You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/11/22 10:15:22 UTC

[iotdb] 11/21: Merge remote-tracking branch 'origin/master'

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

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 751aaa463064a00553c89d8c6a14a41faefd186b
Merge: 76dafbb d5be2f9
Author: qiaojialin <64...@qq.com>
AuthorDate: Wed Nov 11 15:17:37 2020 +0800

    Merge remote-tracking branch 'origin/master'

 docs/SystemDesign/Tools/Sync.md                    |  2 +-
 docs/UserGuide/Server/ServerFileList.md            |  4 +-
 docs/UserGuide/Server/Single Node Setup.md         |  4 +-
 docs/UserGuide/System Tools/JMX Tool.md            |  2 +-
 .../UserGuide/System Tools/Load External Tsfile.md |  4 +-
 .../System Tools/Monitor and Log Tools.md          | 31 +++++++-------
 .../Query History Visualization Tool.md            |  6 +--
 docs/UserGuide/System Tools/Sync Tool.md           |  2 +-
 docs/UserGuide/System Tools/Watermark Tool.md      |  2 +-
 docs/UserGuide/UserGuideReadme.md                  |  4 +-
 .../level/LevelCompactionTsFileManagement.java     | 48 +++++++++++++++++-----
 .../compaction/utils/CompactionLogAnalyzer.java    | 12 +++---
 .../engine/storagegroup/StorageGroupProcessor.java | 44 ++++++++++----------
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  8 ++--
 .../writelog/recover/TsFileRecoverPerformer.java   | 18 ++++----
 .../recover/RecoverResourceFromReaderTest.java     |  2 +-
 .../db/writelog/recover/SeqTsFileRecoverTest.java  |  4 +-
 .../writelog/recover/UnseqTsFileRecoverTest.java   |  2 +-
 .../java/org/apache/iotdb/session/Session.java     |  6 +++
 19 files changed, 122 insertions(+), 83 deletions(-)