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

Posted to commits@iotdb.apache.org by hx...@apache.org on 2019/05/08 06:21:14 UTC

[incubator-iotdb] 01/01: Merge remote-tracking branch 'origin/refactor_bufferwrite_new' into refactor_overflow

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

hxd pushed a commit to branch refactor_overflow
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit 3f81ff026e9a5286286f1f772a6de10a25e4cdce
Merge: aa5189a 86553cd
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed May 8 14:20:54 2019 +0800

    Merge remote-tracking branch 'origin/refactor_bufferwrite_new' into refactor_overflow

 iotdb/iotdb/conf/iotdb-env.sh                      |   2 +-
 .../engine/bufferwrite/BufferWriteProcessor.java   |  23 +--
 .../iotdb/db/engine/filenode/FileNodeManager.java  |  18 +--
 .../db/engine/filenode/FileNodeProcessor.java      | 156 ++++++++++++---------
 .../db/engine/overflow/io/OverflowProcessor.java   |  33 +----
 .../db/engine/querycontext/ReadOnlyMemChunk.java   |   2 +
 .../db/engine/tsfiledata/TsFileProcessor.java      |  27 +---
 .../db/exception/FileNodeManagerException.java     |   4 +
 8 files changed, 119 insertions(+), 146 deletions(-)