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/04/17 14:34:58 UTC
[incubator-iotdb] 02/03: Merge remote-tracking branch
'origin/refactor_bufferwrite' 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 93f75a63c4f526d0ded1fcda37654ea47a207b84
Merge: 20c8ee8 f2254a4
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed Apr 17 14:01:39 2019 +0800
Merge remote-tracking branch 'origin/refactor_bufferwrite' into refactor_overflow
.travis.yml | 10 +-
.../org/apache/iotdb/cli/tool/AbstractCsvTool.java | 3 +-
.../java/org/apache/iotdb/cli/tool/ExportCsv.java | 5 +-
.../java/org/apache/iotdb/cli/tool/ImportCsv.java | 7 +-
iotdb/iotdb/conf/logback.xml | 22 +++-
.../engine/bufferwrite/BufferWriteProcessor.java | 53 +++++----
.../iotdb/db/engine/filenode/FileNodeManager.java | 23 +++-
.../db/engine/filenode/FileNodeProcessor.java | 36 ++++--
.../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 +++++++----
.../version/SimpleFileVersionController.java | 31 ++++--
.../dataset/EngineDataSetWithTimeGenerator.java | 50 +++++++--
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 +
.../apache/iotdb/db/service/IoTDBShutdownHook.java | 39 +++++++
.../db/engine/memcontrol/MemControllerTest.java | 18 +--
.../version/SimpleFileVersionControllerTest.java | 15 +--
.../iotdb/db/integration/IoTDBLimitSlimitIT.java | 4 +-
.../iotdb/db/integration/IoTDBVersionIT.java | 84 ++++++++++++++
.../org/apache/iotdb/db/qp/QueryProcessorTest.java | 3 +-
.../EngineDataSetWithTimeGeneratorTest.java | 123 +++++++++++++++++++++
23 files changed, 535 insertions(+), 149 deletions(-)