This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch mem_control
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from a84387e Merge branch 'master' into mem_control
add da517ad fix conflicts
No new revisions were added by this update.
Summary of changes:
.../db/engine/storagegroup/TsFileProcessor.java | 12 +++---
.../org/apache/iotdb/db/metadata/MManager.java | 4 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 45 ----------------------
.../db/engine/memtable/PrimitiveMemTableTest.java | 9 +++--
4 files changed, 13 insertions(+), 57 deletions(-)
