This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from a88b6b5 Modify cross priority param to upper case in doc (#5242)
add c3d34b6 [IOTDB-2590] Group by time query: support time sliding step
less than the time interval (#5196)
No new revisions were added by this update.
Summary of changes:
.../iotdb/cluster/query/LocalQueryExecutor.java | 4 +-
.../groupby/ClusterGroupByNoVFilterDataSet.java | 4 +-
.../groupby/ClusterGroupByVFilterDataSet.java | 2 +-
.../query/groupby/MergeGroupByExecutor.java | 2 +-
.../query/groupby/RemoteGroupByExecutor.java | 2 +-
.../cluster/query/manage/ClusterQueryManager.java | 2 +-
.../cluster/query/reader/ClusterReaderFactory.java | 2 +-
.../iotdb/cluster/query/reader/EmptyReader.java | 2 +-
.../query/groupby/RemoteGroupByExecutorTest.java | 2 +-
docs/UserGuide/Query-Data/Aggregate-Query.md | 28 +-
docs/UserGuide/Query-Data/Overview.md | 2 +-
docs/zh/UserGuide/Query-Data/Aggregate-Query.md | 37 +-
docs/zh/UserGuide/Query-Data/Overview.md | 2 +-
.../IoTDBGroupByQueryWithoutValueFilterIT.java | 14 -
...roupBySlidingWindowQueryWithValueFilterIT.java} | 485 ++++++----------
...pBySlidingWindowQueryWithoutValueFilterIT.java} | 551 ++++++++----------
.../integration/{ => groupby}/IOTDBGroupByIT.java | 2 +-
.../{ => groupby}/IOTDBGroupByInnerIntervalIT.java | 2 +-
.../{ => groupby}/IoTDBGroupByFillIT.java | 2 +-
.../{ => groupby}/IoTDBGroupByFillMixPathsIT.java | 2 +-
.../{ => groupby}/IoTDBGroupByFillWithRangeIT.java | 2 +-
.../{ => groupby}/IoTDBGroupByMonthFillIT.java | 2 +-
.../{ => groupby}/IoTDBGroupByMonthIT.java | 95 ++-
.../{ => groupby}/IoTDBGroupByUnseqIT.java | 2 +-
.../iotdb/db/qp/physical/crud/AggregationPlan.java | 2 +-
.../db/qp/physical/crud/GroupByTimeFillPlan.java | 7 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 4 -
.../apache/iotdb/db/qp/utils/DatetimeUtils.java | 22 +
.../db/query/aggregation/AggregateResult.java | 53 +-
.../aggregation/RemovableAggregateResult.java} | 11 +-
.../db/query/aggregation/impl/AvgAggrResult.java | 22 +-
.../db/query/aggregation/impl/CountAggrResult.java | 14 +-
.../query/aggregation/impl/ExtremeAggrResult.java | 8 +-
.../aggregation/impl/FirstValueAggrResult.java | 3 -
.../aggregation/impl/LastValueAggrResult.java | 3 -
.../query/aggregation/impl/MaxTimeAggrResult.java | 5 +
.../query/aggregation/impl/MaxValueAggrResult.java | 4 +
.../query/aggregation/impl/MinTimeAggrResult.java | 5 +
.../query/aggregation/impl/MinValueAggrResult.java | 4 +
.../db/query/aggregation/impl/SumAggrResult.java | 20 +-
.../dataset/groupby/GroupByEngineDataSet.java | 239 --------
.../query/dataset/groupby/GroupByFillDataSet.java | 2 +-
.../query/dataset/groupby/GroupByLevelDataSet.java | 2 +-
.../query/dataset/groupby/GroupByTimeDataSet.java | 177 ++++++
.../dataset/groupby/GroupByTimeEngineDataSet.java | 91 +++
.../groupby/GroupByWithValueFilterDataSet.java | 85 +--
.../groupby/GroupByWithoutValueFilterDataSet.java | 104 ++--
.../iotdb/db/query/executor/QueryRouter.java | 10 +-
.../apache/iotdb/db/query/executor/fill/IFill.java | 13 +-
.../groupby/AlignedGroupByExecutor.java | 2 +-
.../groupby/GroupByExecutor.java | 2 +-
.../groupby/SlidingWindowGroupByExecutor.java | 66 +++
.../SlidingWindowGroupByExecutorFactory.java | 117 ++++
.../EmptyQueueSlidingWindowGroupByExecutor.java | 51 ++
.../groupby/impl}/LocalAlignedGroupByExecutor.java | 3 +-
.../groupby/impl}/LocalGroupByExecutor.java | 3 +-
...MonotonicQueueSlidingWindowGroupByExecutor.java | 73 +++
.../NormalQueueSlidingWindowGroupByExecutor.java | 61 ++
.../SmoothQueueSlidingWindowGroupByExecutor.java | 55 ++
.../db/query/factory/AggregateResultFactory.java | 2 +
.../iotdb/db/utils/datastructure/TimeSelector.java | 18 +
.../timerangeiterator/AggrWindowIterator.java | 149 +++++
.../timerangeiterator/ITimeRangeIterator.java | 20 +-
.../timerangeiterator/PreAggrWindowIterator.java | 142 +++++
.../PreAggrWindowWithNaturalMonthIterator.java | 109 ++++
.../TimeRangeIteratorFactory.java | 69 +++
...imeDataSetTest.java => GroupByDataSetTest.java} | 4 +-
.../dataset/groupby/GroupByEngineDataSetTest.java | 504 ----------------
.../dataset/groupby/GroupByTimeDataSetTest.java | 636 +++++++++++++++------
.../iotdb/db/utils/TimeRangeIteratorTest.java | 220 +++++++
.../db/utils/datastructure/TimeSelectorTest.java | 22 +
71 files changed, 2753 insertions(+), 1735 deletions(-)
copy
integration/src/test/java/org/apache/iotdb/db/integration/aligned/{IoTDBGroupByQueryWithValueFilterIT.java
=> IoTDBGroupBySlidingWindowQueryWithValueFilterIT.java} (69%)
copy
integration/src/test/java/org/apache/iotdb/db/integration/aligned/{IoTDBGroupByFillQueryIT.java
=> IoTDBGroupBySlidingWindowQueryWithoutValueFilterIT.java} (65%)
rename integration/src/test/java/org/apache/iotdb/db/integration/{ =>
groupby}/IOTDBGroupByIT.java (99%)
rename integration/src/test/java/org/apache/iotdb/db/integration/{ =>
groupby}/IOTDBGroupByInnerIntervalIT.java (99%)
rename integration/src/test/java/org/apache/iotdb/db/integration/{ =>
groupby}/IoTDBGroupByFillIT.java (99%)
rename integration/src/test/java/org/apache/iotdb/db/integration/{ =>
groupby}/IoTDBGroupByFillMixPathsIT.java (99%)
rename integration/src/test/java/org/apache/iotdb/db/integration/{ =>
groupby}/IoTDBGroupByFillWithRangeIT.java (99%)
rename integration/src/test/java/org/apache/iotdb/db/integration/{ =>
groupby}/IoTDBGroupByMonthFillIT.java (99%)
rename integration/src/test/java/org/apache/iotdb/db/integration/{ =>
groupby}/IoTDBGroupByMonthIT.java (75%)
rename integration/src/test/java/org/apache/iotdb/db/integration/{ =>
groupby}/IoTDBGroupByUnseqIT.java (99%)
copy
server/src/main/java/org/apache/iotdb/db/{metadata/idtable/entry/IDeviceID.java
=> query/aggregation/RemovableAggregateResult.java} (75%)
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByEngineDataSet.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByTimeDataSet.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByTimeEngineDataSet.java
rename server/src/main/java/org/apache/iotdb/db/query/{dataset =>
executor}/groupby/AlignedGroupByExecutor.java (96%)
rename server/src/main/java/org/apache/iotdb/db/query/{dataset =>
executor}/groupby/GroupByExecutor.java (96%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/executor/groupby/SlidingWindowGroupByExecutor.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/executor/groupby/SlidingWindowGroupByExecutorFactory.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/executor/groupby/impl/EmptyQueueSlidingWindowGroupByExecutor.java
rename server/src/main/java/org/apache/iotdb/db/query/{dataset/groupby =>
executor/groupby/impl}/LocalAlignedGroupByExecutor.java (98%)
rename server/src/main/java/org/apache/iotdb/db/query/{dataset/groupby =>
executor/groupby/impl}/LocalGroupByExecutor.java (98%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/executor/groupby/impl/MonotonicQueueSlidingWindowGroupByExecutor.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/executor/groupby/impl/NormalQueueSlidingWindowGroupByExecutor.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/executor/groupby/impl/SmoothQueueSlidingWindowGroupByExecutor.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/utils/timerangeiterator/AggrWindowIterator.java
copy
grafana-connector/src/main/java/org/apache/iotdb/web/grafana/dao/BasicDao.java
=>
server/src/main/java/org/apache/iotdb/db/utils/timerangeiterator/ITimeRangeIterator.java
(63%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/utils/timerangeiterator/PreAggrWindowIterator.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/utils/timerangeiterator/PreAggrWindowWithNaturalMonthIterator.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/utils/timerangeiterator/TimeRangeIteratorFactory.java
copy
server/src/test/java/org/apache/iotdb/db/query/dataset/groupby/{GroupByTimeDataSetTest.java
=> GroupByDataSetTest.java} (98%)
delete mode 100644
server/src/test/java/org/apache/iotdb/db/query/dataset/groupby/GroupByEngineDataSetTest.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/utils/TimeRangeIteratorTest.java
