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/25 04:05:29 UTC
[incubator-iotdb] 03/03: 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 e18401bf6f010b48246cef75a12b2d6364246557
Merge: 009eb86 8c30b4a
Author: qiaojialin <64...@qq.com>
AuthorDate: Tue Jun 25 12:05:03 2019 +0800
Merge remote-tracking branch 'origin/feature_async_close_tsfile' into feature_async_close_tsfile
.../engine/bufferwrite/BufferWriteProcessor.java | 4 +-
.../db/engine/filenode/FileNodeProcessor.java | 2 +-
.../db/qp/executor/IQueryProcessExecutor.java | 8 +-
.../groupby/GroupByWithValueFilterDataSet.java | 2 +-
.../db/query/executor/AggregateEngineExecutor.java | 6 +-
...rWithTimeGenerator.java => EngineExecutor.java} | 63 ++++-
.../EngineExecutorWithoutTimeGenerator.java | 103 -------
.../iotdb/db/query/executor/EngineQueryRouter.java | 17 +-
.../db/query/executor/FillEngineExecutor.java | 2 +-
.../db/query/factory/ISeriesReaderFactory.java | 12 +-
.../db/query/factory/SeriesReaderFactory.java | 312 ---------------------
.../db/query/factory/SeriesReaderFactoryImpl.java | 8 +-
.../java/org/apache/iotdb/db/query/fill/IFill.java | 2 +-
.../query/reader/sequence/SealedTsFilesReader.java | 183 ------------
.../sequence/SealedTsFilesReaderByTimestamp.java | 136 ---------
.../query/reader/sequence/SequenceDataReader.java | 148 ----------
.../sequence/SequenceDataReaderByTimestamp.java | 108 -------
.../reader/sequence/UnSealedTsFileReader.java | 101 -------
.../sequence/UnSealedTsFilesReaderByTimestamp.java | 64 -----
.../query/timegenerator/EngineNodeConstructor.java | 3 +-
.../org/apache/iotdb/db/service/StartupChecks.java | 2 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 4 +-
.../iotdb/db/integration/IoTDBAuthorizationIT.java | 2 +-
.../iotdb/db/integration/IoTDBLargeDataIT.java | 4 +-
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 4 +-
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 4 +-
.../iotdb/db/integration/IoTDBTimeZoneIT.java | 2 +-
.../org/apache/iotdb/db/qp/plan/QPUpdateTest.java | 2 +-
.../SequenceDataReaderByTimestampTest.java | 91 ------
...reateByTimestampReadersOfSelectedPathsTest.java | 2 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 6 +
31 files changed, 103 insertions(+), 1304 deletions(-)