This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch new_TsFile
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 60565b3 merge master
add 40ae1e9 Cheery pick changes from cluster_new (#901)
add 6bcdce6 resolve conflict
No new revisions were added by this update.
Summary of changes:
.../org/apache/iotdb/db/engine/StorageEngine.java | 24 ++-
.../iotdb/db/qp/physical/crud/AggregationPlan.java | 4 +
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 1 -
.../db/query/aggregation/AggregateResult.java | 100 +++++-----
.../db/query/aggregation/impl/AvgAggrResult.java | 9 +
.../aggregation/impl/FirstValueAggrResult.java | 6 +
.../aggregation/impl/LastValueAggrResult.java | 6 +
.../dataset/groupby/GroupByEngineDataSet.java | 13 +-
.../dataset/groupby/GroupByExecutor.java} | 23 ++-
.../groupby/GroupByWithValueFilterDataSet.java | 27 ++-
.../groupby/GroupByWithoutValueFilterDataSet.java | 215 ++++-----------------
.../dataset/groupby/LocalGroupByExecutor.java | 203 +++++++++++++++++++
.../db/query/executor/AggregationExecutor.java | 19 +-
.../iotdb/db/query/executor/FillQueryExecutor.java | 13 +-
.../iotdb/db/query/executor/QueryRouter.java | 23 ++-
.../java/org/apache/iotdb/db/query/fill/IFill.java | 8 +
.../iotdb/db/query/reader/series/SeriesReader.java | 4 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 35 ++--
.../org/apache/iotdb/db/utils/FilePathUtils.java | 6 +
.../tsfile/read/query/dataset/QueryDataSet.java | 3 +
20 files changed, 457 insertions(+), 285 deletions(-)
copy
server/src/main/java/org/apache/iotdb/db/{qp/strategy/optimizer/IFilterOptimizer.java
=> query/dataset/groupby/GroupByExecutor.java} (61%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutor.java
