This is an automated email from the ASF dual-hosted git repository.
hui pushed a change to branch lmh/PredicatePushDown
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 3d4bb1c6d2b fix ut
add 8b5a6d7bfa7 [IOTDB-6298] Fix number overflow in group by time interval
add b5dfbfd4129 [IOTDB-6299] Fix bug in merging overlapped data process
caused by filter & offset push down
add 537ce806635 Merge remote-tracking branch 'origin/master' into
lmh/PredicatePushDown
add 21ecd5378ce merge master
No new revisions were added by this update.
Summary of changes:
.../db/it/aligned/IoTDBAlignedSeriesQueryIT.java | 48 ++++++++++++++
.../execution/operator/source/SeriesScanUtil.java | 75 +++++++---------------
.../org/apache/iotdb/db/utils/DateTimeUtils.java | 6 +-
.../AlignedSeriesScanPredicatePushDownTest.java | 7 +-
.../series/SeriesScanLimitOffsetPushDownTest.java | 5 ++
.../series/SeriesScanPredicatePushDownTest.java | 23 +++++--
.../apache/iotdb/db/utils/DateTimeUtilsTest.java | 3 +
.../tsfile/read/common/block/TsBlockUtil.java | 55 ++++++++++++++++
.../tsfile/read/reader/page/AlignedPageReader.java | 54 ++--------------
9 files changed, 166 insertions(+), 110 deletions(-)
