You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/04/13 12:48:23 UTC
[incubator-iotdb] branch add_disabled_mem_control updated (e4c192c
-> c6c8035)
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch add_disabled_mem_control
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from e4c192c add DisabledMemController
new 38147ac fix the future instance is replaced when the flush frequency is high (#145)
new 3702c4c add a log appender: put info, warn, error log into one file; disable log_info by default (#147)
new 8e89b5d small refactors in memcontrol (#144)
new 4456629 FileNodeManager: call the `Future#get()` returned from the merge thread (#146)
new 0fa0749 fix an unproperly initialized var (#148)
new c6c8035 Merge branch 'master' into add_disabled_mem_control
The 1569 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
iotdb/iotdb/conf/logback.xml | 22 +++++++-
.../engine/bufferwrite/BufferWriteProcessor.java | 49 ++++++++++------
.../iotdb/db/engine/filenode/FileNodeManager.java | 23 +++++++-
.../db/engine/filenode/FileNodeProcessor.java | 16 ++++++
.../iotdb/db/engine/filenode/TsFileResource.java | 4 ++
.../db/engine/memcontrol/BasicMemController.java | 24 +++++++-
.../db/engine/memcontrol/JVMMemController.java | 4 +-
.../db/engine/memcontrol/RecordMemController.java | 59 +++++++++-----------
.../db/engine/overflow/io/OverflowProcessor.java | 65 ++++++++++++++--------
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 +
.../IoTDBShutdownHook.java} | 19 ++++---
.../db/engine/memcontrol/MemControllerTest.java | 18 +++---
12 files changed, 208 insertions(+), 97 deletions(-)
copy iotdb/src/main/java/org/apache/iotdb/db/{engine/memcontrol/NoActPolicy.java => service/IoTDBShutdownHook.java} (62%)