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/12/31 07:35:36 UTC

[iotdb] branch master updated (8966bf1 -> af1da9d)

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

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


    from 8966bf1  Merge pull request #2391 from neuyilan/apache_master_1230_fix_restart_bug
     add af1da9d  [IOTDB-1069] restrict the flushing memtable number to avoid OOM when mem_control is disabled (#2315)

No new revisions were added by this update.

Summary of changes:
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  13 +++
 .../engine/storagegroup/StorageGroupProcessor.java |   2 +-
 .../db/engine/storagegroup/TsFileProcessor.java    |  19 +++-
 .../org/apache/iotdb/db/metadata/MManager.java     |   8 ++
 .../apache/iotdb/db/rescon/MemTableManager.java    | 116 +++++++++++++++++++++
 .../org/apache/iotdb/db/rescon/SystemInfo.java     |   1 +
 6 files changed, 156 insertions(+), 3 deletions(-)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/rescon/MemTableManager.java