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/09/18 06:31:12 UTC

[incubator-iotdb] branch cluster_new updated (4c3395a -> 03cdb71)

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

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


    from 4c3395a  refactor timer
     add f1c4228  minor fixes
     add 4d4fdca  merge non-cluster code changes into master
     add 7f4d7c5  self review and fix
     add 78b4db6  fix cross tests
     add 3aaf7de  [IOTDB-840] Encode the three enum fields in MeasurementSchema to save memory (#1724)
     add 2323f26  fix bug that cross-test generates data out of the target folder (#1738)
     add da54ec5  [IOTDB-850] check list user/role privilege  (#1698)
     add fc795d3  [IOTDB-848] support order by time asc/desc (#1650)
     add 4e4df33  [IOTDB-877] fix prefix bug on show storage group and show devices (#1723)
     add e9defff  [Doc]Add wal test doc (#1735)
     add 686f066  [IOTDB-876] Add count storage group DDL (#1734)
     add fcf0eb9  Merge branch 'master' into cluster_premerge
     add dd7b761  Merge branch 'cluster_premerge' into cluster_new
     add 03cdb71  Merge branch 'cluster_new' of github.com:apache/incubator-iotdb into cluster_new

No new revisions were added by this update.

Summary of changes:
 .../org/apache/iotdb/db/qp/strategy/SqlBase.g4     |  23 +-
 .../manage/FilePartitionedSnapshotLogManager.java  |   2 +-
 .../iotdb/cluster/query/ClusterPlanRouter.java     |   4 +-
 cross-tests/pom.xml                                |  39 +--
 .../tests/tools/importCsv/AbstractScript.java      |   1 -
 .../tests/tools/importCsv/ImportCsvTestIT.java     |   4 +-
 .../iotdb/cross/tests/utils/EnvironmentUtils.java  |   1 +
 .../iotdb/cross/tests/utils/TestConstant.java      | 107 -------
 cross-tests/src/test/logback.xml                   |  55 ----
 .../test/{ => resources}/iotdb-engine.properties   |   0
 docs/SystemDesign/StorageEngine/WAL.md             |  24 +-
 .../DML Data Manipulation Language.md              |  11 +-
 docs/UserGuide/Operation Manual/SQL Reference.md   |  13 +
 docs/UserGuide/Server/Cluster Setup.md             |  30 +-
 docs/UserGuide/Server/ServerFileList.md            |  48 +--
 docs/UserGuide/System Tools/NodeTool.md            |  87 +++---
 docs/zh/SystemDesign/DataQuery/DataQuery.md        |   2 +
 docs/zh/SystemDesign/DataQuery/OrderByTimeQuery.md | 190 +++++++++++
 docs/zh/SystemDesign/StorageEngine/WAL.md          |  23 ++
 .../DML Data Manipulation Language.md              |  10 +-
 .../zh/UserGuide/Operation Manual/SQL Reference.md |  13 +
 docs/zh/UserGuide/Server/Cluster Setup.md          |  30 +-
 docs/zh/UserGuide/Server/ServerFileList.md         |   8 +-
 docs/zh/UserGuide/System Tools/NodeTool.md         |  38 +--
 .../org/apache/iotdb/db/engine/StorageEngine.java  |  11 +-
 ...ception.java => DataTypeMismatchException.java} |  23 +-
 .../exception/metadata/PathNotExistException.java  |  16 +-
 .../org/apache/iotdb/db/metadata/MManager.java     |  33 +-
 .../java/org/apache/iotdb/db/metadata/MTree.java   |  46 ++-
 .../apache/iotdb/db/qp/constant/SQLConstant.java   |   1 +
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  51 ++-
 .../iotdb/db/qp/logical/crud/QueryOperator.java    |  20 ++
 .../apache/iotdb/db/qp/physical/PhysicalPlan.java  |  11 +
 .../iotdb/db/qp/physical/crud/InsertPlan.java      |   9 +-
 .../db/qp/physical/crud/InsertTabletPlan.java      |   5 +
 .../iotdb/db/qp/physical/crud/QueryPlan.java       |  10 +
 .../iotdb/db/qp/physical/sys/AuthorPlan.java       |  10 +-
 .../apache/iotdb/db/qp/physical/sys/FlushPlan.java |  24 +-
 .../apache/iotdb/db/qp/physical/sys/ShowPlan.java  |   2 +-
 .../iotdb/db/qp/strategy/LogicalGenerator.java     |  22 ++
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |   4 +
 .../db/query/aggregation/AggregateResult.java      |   7 +-
 .../db/query/aggregation/impl/AvgAggrResult.java   |   7 +-
 .../db/query/aggregation/impl/CountAggrResult.java |   4 +-
 .../aggregation/impl/FirstValueAggrResult.java     |   9 +-
 .../aggregation/impl/LastValueAggrResult.java      |  15 +-
 .../query/aggregation/impl/MaxTimeAggrResult.java  |   7 +-
 .../query/aggregation/impl/MaxValueAggrResult.java |  13 +-
 .../query/aggregation/impl/MinTimeAggrResult.java  |   9 +-
 .../query/aggregation/impl/MinValueAggrResult.java |  11 +-
 .../db/query/aggregation/impl/SumAggrResult.java   |   7 +-
 .../db/query/dataset/AlignByDeviceDataSet.java     |   4 +
 .../apache/iotdb/db/query/dataset/ListDataSet.java |   4 +
 .../dataset/RawQueryDataSetWithValueFilter.java    |   7 +-
 .../dataset/RawQueryDataSetWithoutValueFilter.java |  39 ++-
 .../dataset/groupby/GroupByEngineDataSet.java      |  45 ++-
 .../db/query/dataset/groupby/GroupByExecutor.java  |   3 +
 .../query/dataset/groupby/GroupByFillDataSet.java  |  58 +++-
 .../groupby/GroupByWithValueFilterDataSet.java     | 118 +++++--
 .../groupby/GroupByWithoutValueFilterDataSet.java  |  57 ++--
 .../dataset/groupby/LocalGroupByExecutor.java      | 108 +++++--
 .../db/query/executor/AggregationExecutor.java     |  58 ++--
 .../iotdb/db/query/executor/LastQueryExecutor.java |  18 +-
 .../iotdb/db/query/executor/QueryRouter.java       |   6 +-
 .../db/query/executor/RawDataQueryExecutor.java    |  73 ++---
 .../iotdb/db/query/executor/fill/LinearFill.java   |   8 +-
 .../db/query/reader/chunk/MemChunkReader.java      |  28 +-
 .../iotdb/db/query/reader/chunk/MemPageReader.java |  38 ++-
 .../reader/series/DescSeriesReaderByTimestamp.java |  53 ++++
 .../db/query/reader/series/IReaderByTimestamp.java |  15 +-
 .../query/reader/series/SeriesAggregateReader.java |   6 +-
 .../reader/series/SeriesRawDataBatchReader.java    |   9 +-
 .../iotdb/db/query/reader/series/SeriesReader.java | 347 ++++++++++++++++-----
 .../reader/series/SeriesReaderByTimestamp.java     |  26 +-
 .../universal/DescPriorityMergeReader.java}        |  39 ++-
 .../reader/universal/PriorityMergeReader.java      |  28 +-
 .../query/timegenerator/ServerTimeGenerator.java   |  15 +-
 .../org/apache/iotdb/db/service/StaticResps.java   |   4 +
 .../org/apache/iotdb/db/service/TSServiceImpl.java |   6 +
 .../org/apache/iotdb/db/utils/SchemaUtils.java     |  13 +-
 .../iotdb/db/writelog/recover/LogReplayer.java     |  13 +-
 .../iotdb/db/engine/merge/MergeManagerTest.java    |   8 +-
 .../iotdb/db/engine/merge/MergeOverLapTest.java    |   2 +-
 .../iotdb/db/engine/merge/MergeTaskTest.java       |  14 +-
 .../iotdb/db/engine/storagegroup/TTLTest.java      |   2 +-
 .../iotdb/db/integration/IoTDBAuthorizationIT.java |  60 +++-
 .../apache/iotdb/db/integration/IoTDBLastIT.java   | 109 ++++---
 .../iotdb/db/integration/IoTDBMetadataFetchIT.java |  80 ++++-
 .../iotdb/db/integration/IoTDBSimpleQueryIT.java   | 166 +++++-----
 .../iotdb/db/metadata/MManagerBasicTest.java       |   2 +-
 .../dataset/EngineDataSetWithValueFilterTest.java  |  25 +-
 .../db/query/dataset/GroupByFillDataSetTest.java   | 188 +++++++++++
 .../db/query/dataset/GroupByTimeDataSetTest.java   | 150 ++++++---
 .../query/executor/GroupByEngineDataSetTest.java   |  12 +-
 .../reader/series/SeriesAggregateReaderTest.java   |  22 +-
 .../reader/series/SeriesReaderByTimestampTest.java |  11 +-
 .../db/query/reader/series/SeriesReaderTest.java   |  54 +++-
 .../apache/iotdb/tsfile/read/common/BatchData.java |  40 ++-
 .../iotdb/tsfile/read/common/BatchDataFactory.java |  23 +-
 .../iotdb/tsfile/read/common/DescBatchData.java    |  66 ++++
 .../iotdb/tsfile/read/common/TimeColumn.java       | 111 -------
 .../tsfile/read/query/dataset/QueryDataSet.java    |   8 +
 .../read/query/timegenerator/TimeGenerator.java    |   6 +-
 .../query/timegenerator/TsFileTimeGenerator.java   |   5 +
 .../read/query/timegenerator/node/AndNode.java     |  57 ++--
 .../read/query/timegenerator/node/LeafNode.java    |   1 -
 .../read/query/timegenerator/node/OrNode.java      |  38 ++-
 .../iotdb/tsfile/read/reader/IPageReader.java      |   7 +-
 .../iotdb/tsfile/read/reader/page/PageReader.java  |   7 +-
 .../tsfile/write/schema/MeasurementSchema.java     |  49 +--
 .../tsfile/read/query/timegenerator/NodeTest.java  |   2 -
 .../tsfile/read/reader/FakedTimeGenerator.java     |   4 +
 .../iotdb/tsfile/utils/ReadWriteIOUtilsTest.java   |  24 +-
 113 files changed, 2550 insertions(+), 1199 deletions(-)
 delete mode 100644 cross-tests/src/test/java/org/apache/iotdb/cross/tests/utils/TestConstant.java
 delete mode 100644 cross-tests/src/test/logback.xml
 rename cross-tests/src/test/{ => resources}/iotdb-engine.properties (100%)
 create mode 100644 docs/zh/SystemDesign/DataQuery/OrderByTimeQuery.md
 copy server/src/main/java/org/apache/iotdb/db/exception/metadata/{DeleteFailedException.java => DataTypeMismatchException.java} (67%)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/series/DescSeriesReaderByTimestamp.java
 copy server/src/main/java/org/apache/iotdb/db/query/{externalsort/ExternalSortJob.java => reader/universal/DescPriorityMergeReader.java} (51%)
 create mode 100644 server/src/test/java/org/apache/iotdb/db/query/dataset/GroupByFillDataSetTest.java
 copy server/src/main/java/org/apache/iotdb/db/exception/query/UnSupportedFillTypeException.java => tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/BatchDataFactory.java (65%)
 create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/DescBatchData.java
 delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/TimeColumn.java