You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/06/27 08:22:39 UTC
[incubator-iotdb] 02/04: Merge remote-tracking branch
'origin/feature_async_close_tsfile' into feature_async_close_tsfile
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch feature_async_close_tsfile
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit b382fe3404d2284d56c1d2f4a4f3a025d3915e8e
Merge: 02922e9 3b384b7
Author: qiaojialin <64...@qq.com>
AuthorDate: Thu Jun 27 16:04:56 2019 +0800
Merge remote-tracking branch 'origin/feature_async_close_tsfile' into feature_async_close_tsfile
iotdb/iotdb/conf/iotdb-engine.properties | 4 ++--
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 4 ++--
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 4 ++--
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 4 ++--
.../java/org/apache/iotdb/db/engine/Processor.java | 10 ++++-----
.../engine/bufferwrite/BufferWriteProcessor.java | 12 +++++-----
.../bufferwrite/RestorableTsFileIOWriter.java | 8 +++----
.../iotdb/db/engine/cache/TsFileMetaDataCache.java | 2 +-
.../iotdb/db/engine/cache/TsFileMetadataUtils.java | 2 +-
.../iotdb/db/engine/filenode/FileNodeManager.java | 26 +++++++++++-----------
.../db/engine/filenode/FileNodeProcessor.java | 14 ++++++------
.../db/engine/filenode/FileNodeProcessorStore.java | 4 ++--
.../iotdb/db/engine/filenode/TsFileResource.java | 4 ++--
.../db/engine/filenodeV2/FileNodeManagerV2.java | 6 ++---
.../db/engine/filenodeV2/FileNodeProcessorV2.java | 2 +-
.../filenodeV2/UnsealedTsFileProcessorV2.java | 2 +-
.../db/engine/memcontrol/BasicMemController.java | 2 +-
.../db/engine/overflow/io/OverflowResource.java | 2 +-
.../iotdb/db/engine/pool/MergePoolManager.java | 2 +-
.../org/apache/iotdb/db/metadata/MManager.java | 6 ++---
.../org/apache/iotdb/db/monitor/StatMonitor.java | 2 +-
.../iotdb/db/qp/executor/OverflowQPExecutor.java | 2 +-
.../db/qp/physical/transfer/CodecInstances.java | 20 ++++++++---------
.../db/query/aggregation/AggregateFunction.java | 8 +++----
.../iotdb/db/query/context/QueryContext.java | 2 +-
.../iotdb/db/query/control/FileReaderManager.java | 2 +-
.../query/dataset/AggreResultDataPointReader.java | 2 +-
.../java/org/apache/iotdb/db/query/fill/IFill.java | 2 +-
.../apache/iotdb/db/service/CloseMergeService.java | 20 ++++++++---------
.../org/apache/iotdb/db/service/JDBCService.java | 6 ++---
.../org/apache/iotdb/db/service/JMXService.java | 2 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 6 ++---
.../iotdb/db/sync/conf/SyncSenderDescriptor.java | 4 ++--
.../iotdb/db/sync/receiver/SyncServerManager.java | 2 +-
.../iotdb/db/sync/receiver/SyncServiceImpl.java | 10 ++++-----
.../iotdb/db/sync/sender/SyncSenderImpl.java | 2 +-
.../java/org/apache/iotdb/db/utils/IOUtils.java | 8 +++----
.../org/apache/iotdb/db/utils/LoadDataUtils.java | 4 ++--
.../writelog/recover/TsFileRecoverPerformer.java | 2 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 4 ++--
.../apache/iotdb/db/utils/OpenFileNumUtilTest.java | 4 ++--
41 files changed, 117 insertions(+), 117 deletions(-)