[incubator-iotdb] branch jira_452 updated (f20f9ce -> e291c91)

[su...@apache.org]

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

sunzesong pushed a change to branch jira_452
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


 discard f20f9ce  Solve conflicts
 discard a1f4066  Merge remote-tracking branch 'upstream/new_series_reader' into new_series_reader
 discard 41afe11  [IOTDB-452] Do all aggregations of one series at one pass in GroupBy
     add 0b636dc  fixed new_series_reader problem reported in sonar (#768)
     add c311b36  Merge new_series_reader and solve conflicts
     add e291c91  Rename

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (f20f9ce)
            \
             N -- N -- N   refs/heads/jira_452 (e291c91)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .../db/engine/merge/manage/MergeResource.java      |   2 +-
 .../exception/query/LogicalOperatorException.java  |   3 +-
 .../main/java/org/apache/iotdb/db/qp/Planner.java  |   3 +-
 .../dataset/RawQueryDataSetWithoutValueFilter.java |  28 ++--
 .../groupby/GroupByWithValueFilterDataSet.java     |   2 +-
 .../groupby/GroupByWithoutValueFilterDataSet.java  | 163 ++++++++-------------
 .../db/query/executor/AggregationExecutor.java     |  36 ++---
 .../db/query/executor/RawDataQueryExecutor.java    |   5 +-
 .../query/externalsort/ExternalSortJobEngine.java  |   2 +-
 .../externalsort/SimpleExternalSortEngine.java     |   2 +-
 .../SingleSourceExternalSortJobPart.java           |   2 +-
 .../java/org/apache/iotdb/db/query/fill/IFill.java |   2 +-
 .../org/apache/iotdb/db/query/fill/LinearFill.java |   2 +-
 .../apache/iotdb/db/query/fill/PreviousFill.java   |   2 +-
 .../iotdb/db/query/reader/MemChunkLoader.java      |   9 +-
 .../reader/chunkRelated/CachedDiskChunkReader.java |  88 -----------
 .../ChunkDataIterator.java                         |   3 +-
 .../ChunkReaderWrap.java                           |   2 +-
 .../DiskChunkReaderByTimestamp.java                |   2 +-
 .../MemChunkReader.java                            |   2 +-
 .../MemPageReader.java                             |   2 +-
 .../CachedUnseqResourceMergeReader.java            |   6 +-
 .../IAggregateReader.java                          |   2 +-
 .../SeriesAggregateReader.java                     |   2 +-
 .../SeriesRawDataBatchReader.java                  |   5 +-
 .../SeriesRawDataPointReader.java                  |   3 +-
 .../SeriesReader.java                              |   6 +-
 .../SeriesReaderByTimestamp.java                   |   9 +-
 .../query/timegenerator/EngineNodeConstructor.java |   2 +-
 .../apache/iotdb/db/utils/TimeValuePairUtils.java  |  26 ----
 .../iotdb/db/engine/merge/MergeOverLapTest.java    |   2 +-
 .../iotdb/db/engine/merge/MergeTaskTest.java       |   2 +-
 .../iotdb/db/engine/storagegroup/TTLTest.java      |   2 +-
 .../query/externalsort/ExternalSortEngineTest.java |   2 +-
 .../db/query/externalsort/FakeChunkReaderWrap.java |   2 +-
 .../SeriesReaderTest.java                          |   2 +-
 .../writelog/recover/UnseqTsFileRecoverTest.java   |   2 +-
 37 files changed, 141 insertions(+), 296 deletions(-)
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/CachedDiskChunkReader.java
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{chunkRelated => chunkrelated}/ChunkDataIterator.java (95%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{chunkRelated => chunkrelated}/ChunkReaderWrap.java (98%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{chunkRelated => chunkrelated}/DiskChunkReaderByTimestamp.java (97%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{chunkRelated => chunkrelated}/MemChunkReader.java (98%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{chunkRelated => chunkrelated}/MemPageReader.java (96%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{resourceRelated => resourcerelated}/CachedUnseqResourceMergeReader.java (87%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{seriesRelated => seriesrelated}/IAggregateReader.java (96%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{seriesRelated => seriesrelated}/SeriesAggregateReader.java (98%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{seriesRelated => seriesrelated}/SeriesRawDataBatchReader.java (96%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{seriesRelated => seriesrelated}/SeriesRawDataPointReader.java (97%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{seriesRelated => seriesrelated}/SeriesReader.java (98%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/{seriesRelated => seriesrelated}/SeriesReaderByTimestamp.java (92%)
 rename server/src/test/java/org/apache/iotdb/db/query/reader/{seriesRelated => seriesrelated}/SeriesReaderTest.java (99%)