You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2019/06/25 04:15:00 UTC

[incubator-iotdb] 03/04: Merge branch 'feature_async_close_tsfile' of github.com:apache/incubator-iotdb into feature_async_close_tsfile

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

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

commit dcd6feb7c23a0673626b39040019b5689817e852
Merge: f73d593 39f6d01
Author: lta <li...@163.com>
AuthorDate: Tue Jun 25 12:09:39 2019 +0800

    Merge branch 'feature_async_close_tsfile' of github.com:apache/incubator-iotdb into feature_async_close_tsfile

 .../engine/bufferwrite/BufferWriteProcessor.java   |   4 +-
 .../db/engine/filenode/FileNodeProcessor.java      |   2 +-
 .../db/engine/filenodeV2/FileNodeProcessorV2.java  |   4 +-
 .../db/engine/memtable/MemTableFlushTaskV2.java    |  38 ++-
 .../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/engine/memtable/MemTablePoolTest.java |  68 +++++
 .../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 +
 34 files changed, 195 insertions(+), 1322 deletions(-)