This is an automated email from the ASF dual-hosted git repository.
chaow pushed a change to branch rel/0.12
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from b080306 avoid double import in C++ client (#4500)
add 47c5a81 [To rel/0.12] IOTDB-1823 group by multi level (#4494)
No new revisions were added by this update.
Summary of changes:
.../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 4 +-
client-cpp/pom.xml | 4 +-
compile-tools/pom.xml | 6 +-
distribution/pom.xml | 2 +-
example/client-cpp-example/pom.xml | 2 +-
example/udf/pom.xml | 2 +-
grafana/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
pom.xml | 8 +-
.../db/qp/logical/crud/GroupByLevelController.java | 143 ++++++++++++++++++
.../iotdb/db/qp/logical/crud/QueryOperator.java | 31 ++--
.../iotdb/db/qp/logical/crud/SFWOperator.java | 10 ++
.../iotdb/db/qp/logical/crud/SelectOperator.java | 41 +++++
.../iotdb/db/qp/physical/crud/AggregationPlan.java | 70 +++++----
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 18 ++-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 8 +-
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 166 +++++++++++++--------
.../query/dataset/groupby/GroupByTimeDataSet.java | 3 +-
.../db/query/executor/AggregationExecutor.java | 2 +-
.../iotdb/db/query/executor/QueryRouter.java | 11 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 2 +-
.../org/apache/iotdb/db/utils/AggregateUtils.java | 67 +++++----
.../aggregation/IoTDBAggregationByLevelIT.java | 161 +++++++++++++++++++-
.../dataset/groupby/GroupByLevelDataSetTest.java | 10 ++
24 files changed, 597 insertions(+), 178 deletions(-)
create mode 100644
server/src/main/java/org/apache/iotdb/db/qp/logical/crud/GroupByLevelController.java
