This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch tsfileprocessortest_8181_port
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 060960a merge with origin/new_series_reader
add f10b0c4 revert incorrect error log level to debug level in
TsFileProcessor; add catch clause in some MergeTask classes
No new revisions were added by this update.
Summary of changes:
.../apache/iotdb/db/engine/merge/manage/MergeManager.java | 10 ++++++++++
.../org/apache/iotdb/db/engine/merge/task/MergeFileTask.java | 6 +++++-
.../apache/iotdb/db/engine/storagegroup/TsFileProcessor.java | 12 ++++++++----
.../java/org/apache/iotdb/db/integration/IoTDBMergeTest.java | 3 +++
server/src/test/resources/logback.xml | 1 +
5 files changed, 27 insertions(+), 5 deletions(-)
