You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by su...@apache.org on 2020/02/04 06:35:44 UTC
[incubator-iotdb] branch jira_335 updated (93ed6e3 -> ef2ebf3)
This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a change to branch jira_335
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 93ed6e3 [IOTDB-335] Separate query executions of the same timeseries with different aggregate functions may be optimized
add b8a9146 move SeqTsFileRecoverTest output to target
add 0241e4a Merge remote-tracking branch 'origin/new_series_reader' into new_series_reader
add 51ed987 Clear the relation of SeriesReaders (#764)
add 4c3a1d6 Merge remote-tracking branch 'upstream/new_series_reader' into new_series_reader
add ef2ebf3 Solve conflict
No new revisions were added by this update.
Summary of changes:
.../db/query/dataset/NonAlignEngineDataSet.java | 29 ++--
.../dataset/RawQueryDataSetWithoutValueFilter.java | 36 ++---
.../groupby/GroupByWithoutValueFilterDataSet.java | 22 +--
.../db/query/executor/AggregationExecutor.java | 10 +-
.../db/query/executor/RawDataQueryExecutor.java | 11 +-
.../java/org/apache/iotdb/db/query/fill/IFill.java | 6 +-
.../iotdb/db/query/reader/ManagedSeriesReader.java | 7 +-
.../reader/seriesRelated/AggregateReader.java | 100 ++++++++++++
.../{ISeriesReader.java => IAggregateReader.java} | 6 +-
.../reader/seriesRelated/RawDataBatchReader.java | 125 +++++++++++++++
.../reader/seriesRelated/RawDataPointReader.java | 111 +++++++++++++
.../query/reader/seriesRelated/SeriesReader.java | 178 +--------------------
.../db/query/timegenerator/EngineLeafNode.java | 4 +-
.../query/timegenerator/EngineNodeConstructor.java | 3 +-
.../iotdb/db/engine/merge/MergeOverLapTest.java | 7 +-
.../iotdb/db/engine/merge/MergeTaskTest.java | 37 ++---
.../iotdb/db/engine/storagegroup/TTLTest.java | 7 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 3 +-
18 files changed, 431 insertions(+), 271 deletions(-)
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/AggregateReader.java
rename server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/{ISeriesReader.java => IAggregateReader.java} (92%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/RawDataBatchReader.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/RawDataPointReader.java