You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2020/06/08 02:25:34 UTC

[incubator-iotdb] branch cluster_premerge updated (51c2ade -> a9b8650)

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

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


    from 51c2ade  Merge branch 'master' into cluster_premerge
     add b54923e  Update Last query design documentation (#1312)
     add ddd724e  add printing one resource file (#1316)
     add 6c188f8  Allow count timeseries group by level=x using default path (#1317)
     add 4407466  [IOTDB-744] Support upsert alias (#1315)
     add 9d5fc6a  [IOTDB-745] fix partial write and sync close bug (#1318)
     add 1e3c65b  [To rel/0.10] add config description (#1320)
     add 27c2ce0  [IOTDB-622] add count records for all databases
     add 2e5d682  [IOTDB-622] split group by level to two parts
     add 4f98a51  fix enable_parameter_adapter comment
     add a9b8650  Merge branch 'master' into cluster_premerge

No new revisions were added by this update.

Summary of changes:
 docs/SystemDesign/DataQuery/AggregationQuery.md    |  22 +++
 docs/SystemDesign/DataQuery/AlignByDeviceQuery.md  |   4 +-
 docs/SystemDesign/DataQuery/GroupByQuery.md        |  25 ++-
 docs/SystemDesign/DataQuery/LastQuery.md           |  67 +++++---
 docs/SystemDesign/SchemaManager/SchemaManager.md   |  18 +-
 .../DDL Data Definition Language.md                |   6 +-
 .../DML Data Manipulation Language.md              |  82 +++++++++
 docs/UserGuide/Operation Manual/SQL Reference.md   |   5 +-
 docs/zh/SystemDesign/DataQuery/AggregationQuery.md |  20 +++
 .../SystemDesign/DataQuery/AlignByDeviceQuery.md   |   4 +-
 docs/zh/SystemDesign/DataQuery/GroupByQuery.md     |  24 ++-
 docs/zh/SystemDesign/DataQuery/LastQuery.md        |  66 +++++---
 .../zh/SystemDesign/SchemaManager/SchemaManager.md |  13 +-
 .../DDL Data Definition Language.md                |   6 +-
 .../DML Data Manipulation Language.md              |  85 +++++++++-
 .../zh/UserGuide/Operation Manual/SQL Reference.md |   5 +-
 .../iotdb/flink/tsfile/RowRowRecordParser.java     |   2 +-
 server/pom.xml                                     |  10 ++
 .../resources/conf/iotdb-engine.properties         |  20 ++-
 .../org/apache/iotdb/db/qp/strategy/SqlBase.g4     |  25 ++-
 .../org/apache/iotdb/db/auth/AuthorityChecker.java |   2 +-
 .../db/conf/adapter/IoTDBConfigDynamicAdapter.java |   2 +-
 .../iotdb/db/engine/memtable/AbstractMemTable.java |   5 +-
 .../db/engine/storagegroup/TsFileProcessor.java    |   4 +-
 .../org/apache/iotdb/db/metadata/MLogWriter.java   |   6 +
 .../org/apache/iotdb/db/metadata/MManager.java     |  97 +++++++----
 .../org/apache/iotdb/db/metadata/MetaUtils.java    |   2 +-
 .../iotdb/db/metadata/MetadataOperationType.java   |   1 +
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  47 ++----
 .../org/apache/iotdb/db/qp/logical/Operator.java   |   2 +-
 .../iotdb/db/qp/logical/crud/QueryOperator.java    |  27 ++-
 .../db/qp/logical/sys/AlterTimeSeriesOperator.java |   9 +
 .../iotdb/db/qp/physical/crud/AggregationPlan.java |  10 ++
 .../db/qp/physical/crud/AlignByDevicePlan.java     |  12 +-
 ...oupByFillPlan.java => GroupByTimeFillPlan.java} |   4 +-
 .../{GroupByPlan.java => GroupByTimePlan.java}     |   7 +-
 .../iotdb/db/qp/physical/crud/InsertPlan.java      |   4 +
 .../db/qp/physical/sys/AlterTimeSeriesPlan.java    |  14 +-
 .../iotdb/db/qp/strategy/LogicalGenerator.java     | 173 ++++++++++---------
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |  82 +++++----
 .../db/query/dataset/AlignByDeviceDataSet.java     |  24 +--
 .../iotdb/db/query/dataset/SingleDataSet.java      |   4 +-
 .../dataset/groupby/GroupByEngineDataSet.java      |  16 +-
 .../query/dataset/groupby/GroupByFillDataSet.java  |  10 +-
 .../query/dataset/groupby/GroupByTimeDataSet.java  |  96 +++++++++++
 .../groupby/GroupByWithValueFilterDataSet.java     |  26 +--
 .../groupby/GroupByWithoutValueFilterDataSet.java  |  16 +-
 .../db/query/executor/AggregationExecutor.java     |  30 +++-
 .../iotdb/db/query/executor/IQueryRouter.java      |   4 +-
 .../iotdb/db/query/executor/LastQueryExecutor.java |   5 +-
 .../iotdb/db/query/executor/QueryRouter.java       |  78 ++++++---
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  35 ++--
 .../iotdb/db/tools/TsFileResourcePrinter.java      |  29 +++-
 .../org/apache/iotdb/db/utils/FilePathUtils.java   |  87 ++++++++++
 .../apache/iotdb/db/integration/IoTDBAliasIT.java  |  92 ++++++++--
 .../apache/iotdb/db/integration/IoTDBLastIT.java   |  44 +++++
 .../iotdb/db/integration/IoTDBSimpleQueryIT.java   |  33 +++-
 .../java/org/apache/iotdb/db/qp/PlannerTest.java   |   2 +-
 .../apache/iotdb/db/qp/plan/PhysicalPlanTest.java  |  20 +--
 .../db/query/dataset/GroupByLevelDataSetTest.java  | 169 +++++++++++++++++++
 .../db/query/dataset/GroupByTimeDataSetTest.java   | 186 +++++++++++++++++++++
 .../query/executor/GroupByEngineDataSetTest.java   |  62 +++----
 .../apache/iotdb/tsfile/read/common/RowRecord.java |   8 +
 63 files changed, 1645 insertions(+), 450 deletions(-)
 rename server/src/main/java/org/apache/iotdb/db/qp/physical/crud/{GroupByFillPlan.java => GroupByTimeFillPlan.java} (93%)
 rename server/src/main/java/org/apache/iotdb/db/qp/physical/crud/{GroupByPlan.java => GroupByTimePlan.java} (93%)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByTimeDataSet.java
 create mode 100644 server/src/test/java/org/apache/iotdb/db/query/dataset/GroupByLevelDataSetTest.java
 create mode 100644 server/src/test/java/org/apache/iotdb/db/query/dataset/GroupByTimeDataSetTest.java