This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch f_batch_reader
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 774c3ba fix valuefilter
add 542889d add aggregation reader
No new revisions were added by this update.
Summary of changes:
.../db/query/aggregation/AggregateFunction.java | 4 +-
.../db/query/aggregation/impl/AvgAggrFunc.java | 4 +-
.../db/query/aggregation/impl/CountAggrFunc.java | 4 +-
.../query/aggregation/impl/FirstValueAggrFunc.java | 4 +-
.../query/aggregation/impl/LastValueAggrFunc.java | 4 +-
.../db/query/aggregation/impl/MaxTimeAggrFunc.java | 4 +-
.../query/aggregation/impl/MaxValueAggrFunc.java | 4 +-
.../db/query/aggregation/impl/MinTimeAggrFunc.java | 4 +-
.../query/aggregation/impl/MinValueAggrFunc.java | 4 +-
.../dataset/EngineDataSetWithValueFilter.java | 10 +-
...ava => NewEngineDataSetWithoutValueFilter.java} | 12 +-
.../OldEngineDataSetWithoutValueFilter.java | 152 +++++++++++++++++++++
.../dataset/groupby/GroupByEngineDataSet.java | 2 +-
.../groupby/GroupByWithValueFilterDataSet.java | 6 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 147 ++++++++++----------
.../db/query/executor/AggregateEngineExecutor.java | 138 ++++++++++---------
.../iotdb/db/query/executor/EngineExecutor.java | 8 +-
.../iotdb/db/query/executor/EngineQueryRouter.java | 27 ----
.../db/query/executor/FillEngineExecutor.java | 14 +-
.../query/externalsort/ExternalSortJobEngine.java | 4 +-
.../iotdb/db/query/externalsort/LineMerger.java | 2 -
.../externalsort/SimpleExternalSortEngine.java | 12 +-
.../adapter/ByTimestampReaderAdapter.java | 4 +-
.../java/org/apache/iotdb/db/query/fill/IFill.java | 2 +-
.../org/apache/iotdb/db/query/fill/LinearFill.java | 6 +-
.../apache/iotdb/db/query/fill/PreviousFill.java | 4 +-
...derByTimestamp.java => IReaderByTimestamp.java} | 2 +-
.../query/reader/chunkRelated/ChunkReaderWrap.java | 4 +-
.../query/reader/chunkRelated/DiskChunkReader.java | 3 +-
.../chunkRelated/DiskChunkReaderByTimestamp.java | 6 +-
.../query/reader/chunkRelated/MemChunkReader.java | 18 ++-
.../chunkRelated/MemChunkReaderByTimestamp.java | 6 +-
.../FileSeriesReaderByTimestampAdapter.java | 6 +-
.../fileRelated/UnSealedTsFileIterateReader.java | 3 +-
.../UnSealedTsFileReaderByTimestamp.java | 8 +-
...eader.java => NewUnseqResourceMergeReader.java} | 5 +-
...stamp.java => OldUnseqResourceMergeReader.java} | 75 +++++++---
.../resourceRelated/SeqResourceIterateReader.java | 4 +-
.../SeqResourceReaderByTimestamp.java | 8 +-
.../UnseqResourceReaderByTimestamp.java | 6 +-
.../SeriesReaderWithoutValueFilter.java | 59 +++++++-
.../db/query/reader/universal/IterateReader.java | 17 ++-
.../reader/universal/PriorityMergeReader.java | 36 ++---
.../universal/PriorityMergeReaderByTimestamp.java | 10 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 6 +-
.../iotdb/db/integration/IOTDBGroupByIT.java | 146 ++++++++++----------
.../db/query/externalsort/FakeChunkReaderWrap.java | 4 +-
.../iotdb/db/query/reader/ReaderTestHelper.java | 3 +-
.../resourceRelated/UnseqResourceReaderTest.java | 15 +-
.../SeriesReaderWithValueFilterTest.java | 4 -
.../universal/FakedSeriesReaderByTimestamp.java | 4 +-
.../PriorityMergeReaderByTimestampTest.java | 10 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 1 -
.../{IBatchReader.java => IAggregateReader.java} | 16 ++-
.../reader/series/AbstractFileSeriesReader.java | 4 +-
55 files changed, 650 insertions(+), 425 deletions(-)
rename
server/src/main/java/org/apache/iotdb/db/query/dataset/{EngineDataSetWithoutValueFilter.java
=> NewEngineDataSetWithoutValueFilter.java} (95%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/dataset/OldEngineDataSetWithoutValueFilter.java
rename
server/src/main/java/org/apache/iotdb/db/query/reader/{IPointReaderByTimestamp.java
=> IReaderByTimestamp.java} (97%)
rename
server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/{UnseqResourceMergeReader.java
=> NewUnseqResourceMergeReader.java} (97%)
copy
server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/{UnseqResourceReaderByTimestamp.java
=> OldUnseqResourceMergeReader.java} (59%)
copy
tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/{IBatchReader.java =>
IAggregateReader.java} (70%)
