You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/05/01 09:07:44 UTC

[iotdb] branch aggregator updated (5843336eeb -> c7bead9ad2)

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

xiangweiwei pushed a change to branch aggregator
in repository https://gitbox.apache.org/repos/asf/iotdb.git


    from 5843336eeb add unit tests
     add f1ffc0a054 Support Create aligned timeseries (#5727)
     add 5eb2308198 [IOTDB-3027] Feature/count storage group (#5728)
     add 2cef18fb9b Fix some bugs (#5725)
     add 1ddc50b749 Support order by time desc (#5729)
     add be72769252 Add outputColumnNames in ExchangeNode (#5730)
     add 8c6b8f82dc [IOTDB-2285] IoTDB Grafana Plugin: Grafana Connector Input Style (#5661)
     add 685ea15ed6 [IOTDB-3025] add permission check (#5699)
     add 7cf013bff3 [IOTDB-3046] Fix port binding error in ClientManagerTest (#5736)
     add 76a4e43955 [IOTDB-3018] Fix compation bugs on handling deleted target file and service shutdown deadlock (#5693)
     add 20c527ffd3 [IOTDB-3026] fix cannot load tsfile correctly after restart iotdb (#5702)
     add 512f2ffd54 [IOTDB-3039] Add standalone recovery (#5731)
     add 5b045e4864 [IOTDB-2993] Support IN, LIKE, and REGEXP expressions in Transform Operator (#5739)
     add d4647beaef [IOTDB-2803] support AlterTimeseries sql (#5735)
     add 2e7812282f [IoTDB-2991] Equal size bucket sampling UDFs: EQUAL_SIZE_BUCKET_OUTLIER_SAMPLE (#5682)
     add 99adc9dae8 Move time partition calculation from StorageEngine to StorageEngineV2 (#5708)
     add 6f953aa7bb [IOTDB-3020][IOTDB-3022]Multi-thread MLog recovery & Fix SchemaFile dirty page loses (#5695)
     add 057a8b96cc [IOTDB-3042] ConfigNode stop process (#5755)
     add c7bead9ad2 Fix conflicts

No new revisions were added by this update.

Summary of changes:
 README.md                                          |   2 +-
 README_ZH.md                                       |   2 +-
 .../cluster/log/snapshot/FileSnapshotTest.java     |  20 +-
 .../log/snapshot/PartitionedSnapshotTest.java      |   6 +-
 .../cluster/log/snapshot/PullSnapshotTaskTest.java |   2 +-
 .../src/assembly/resources/sbin/stop-confignode.sh |  15 +-
 .../confignode/manager/ClusterSchemaManager.java   |   3 +-
 .../iotdb/confignode/manager/ConfigManager.java    |  18 +-
 .../apache/iotdb/confignode/manager/Manager.java   |  12 +
 .../confignode/manager/PermissionManager.java      |  11 +
 .../iotdb/confignode/persistence/AuthorInfo.java   | 128 +++-
 .../confignode/persistence/ClusterSchemaInfo.java  |  10 +
 .../iotdb/confignode/persistence/DataNodeInfo.java |  14 +-
 .../confignode/persistence/PartitionInfo.java      |  23 +-
 .../iotdb/confignode/service/ConfigNode.java       |  27 +-
 .../thrift/ConfigNodeRPCServiceProcessor.java      |   7 +
 .../thrift/ConfigNodeRPCServiceProcessorTest.java  |  22 +
 .../utils/ConfigNodeEnvironmentUtils.java          | 134 ----
 .../consensus/standalone/StandAloneConsensus.java  |  50 +-
 .../iotdb/consensus/standalone/RecoveryTest.java   |  94 +++
 .../standalone/StandAloneConsensusTest.java        |   4 +-
 docs/UserGuide/Query-Data/Select-Expression.md     |  74 ++
 docs/zh/UserGuide/Query-Data/Select-Expression.md  |  76 ++
 grafana-plugin/pkg/plugin/plugin.go                |  77 +-
 grafana-plugin/src/QueryEditor.tsx                 | 295 +++++++-
 .../{WhereValue.tsx => AggregateFun.tsx}           |  40 +-
 .../componments/{WhereValue.tsx => FillValue.tsx}  |   8 +-
 grafana-plugin/src/componments/GroupBy.tsx         |  58 ++
 grafana-plugin/src/componments/SelectValue.tsx     |   1 +
 grafana-plugin/src/componments/TimeSeries.tsx      |  82 ++
 grafana-plugin/src/componments/WhereValue.tsx      |   1 +
 grafana-plugin/src/datasource.ts                   |  66 +-
 grafana-plugin/src/functions.ts                    |   3 +-
 grafana-plugin/src/types.ts                        |  30 +-
 .../iotdb/db/integration/IoTDBNestedQueryIT.java   |  25 +
 .../db/integration/IoTDBUDTFBuiltinFunctionIT.java | 138 ++++
 .../iotdb/commons/partition/DataPartition.java     |  11 +-
 .../iotdb/commons/partition/SchemaPartition.java   |  11 +-
 .../apache/iotdb/commons/ClientManagerTest.java    |   7 +-
 openapi/src/main/openapi3/iotdb-rest.yaml          |  23 +
 .../resources/conf/iotdb-engine.properties         |   4 -
 .../org/apache/iotdb/db/auth/AuthorityChecker.java | 138 +++-
 .../db/auth/authorizer/AuthorizerManager.java      |  44 ++
 .../db/auth/authorizer/ClusterAuthorizer.java      |  61 +-
 .../apache/iotdb/db/client/ConfigNodeClient.java   |  33 +
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  11 -
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |   5 -
 .../engine/compaction/CompactionTaskManager.java   |  45 +-
 .../compaction/cross/CrossSpaceCompactionTask.java |   2 +-
 .../compaction/inner/InnerSpaceCompactionTask.java |  34 +-
 .../impl/ReadPointCompactionPerformer.java         |   5 +-
 .../compaction/task/AbstractCompactionTask.java    |  19 +-
 .../compaction/task/CompactionTaskSummary.java}    |  16 +-
 .../iotdb/db/engine/storagegroup/DataRegion.java   |   4 +-
 .../metadata/SeriesOverflowException.java}         |  15 +-
 .../mtree/store/disk/MTreeFlushTaskManager.java    |   6 +-
 .../mtree/store/disk/MTreeReleaseTaskManager.java  |   3 +-
 .../mtree/store/disk/schemafile/SchemaFile.java    |  73 +-
 .../db/metadata/schemaregion/SchemaEngine.java     |  73 +-
 .../schemaregion/SchemaRegionMemoryImpl.java       |   9 +-
 .../schemaregion/SchemaRegionSchemaFileImpl.java   |  53 +-
 .../iotdb/db/mpp/common/header/HeaderConstant.java |  10 +-
 .../iotdb/db/mpp/common/schematree/SchemaTree.java |   2 +-
 .../db/mpp/execution/config/ConfigTaskVisitor.java |   7 +
 .../execution/config/CountStorageGroupTask.java    |  97 +++
 .../scheduler/SimpleFragInstanceDispatcher.java    |   3 +
 .../db/mpp/operator/process/TimeJoinOperator.java  |  17 +-
 .../process/merge/AscTimeComparator.java}          |  18 +-
 .../process/merge/DescTimeComparator.java}         |  18 +-
 .../operator/process/merge/SingleColumnMerger.java |  37 +-
 .../process/merge/TimeComparator.java}             |  14 +-
 .../db/mpp/operator/source/SeriesScanUtil.java     |   6 +-
 .../apache/iotdb/db/mpp/sql/analyze/Analyzer.java  |  12 +-
 .../mpp/sql/analyze/ClusterPartitionFetcher.java   |   4 +-
 .../db/mpp/sql/analyze/ClusterSchemaFetcher.java   |  28 +-
 .../apache/iotdb/db/mpp/sql/parser/ASTVisitor.java |   4 +-
 .../db/mpp/sql/planner/DistributionPlanner.java    |   1 +
 .../db/mpp/sql/planner/LocalExecutionPlanner.java  |  25 +-
 .../plan/node/metedata/read/SchemaFetchNode.java   |   4 +-
 .../node/metedata/write/AlterTimeSeriesNode.java   |  26 +-
 .../write/CreateAlignedTimeSeriesNode.java         |  30 +-
 .../planner/plan/node/process/ExchangeNode.java    |  34 +-
 .../planner/plan/node/sink/FragmentSinkNode.java   |   2 +-
 .../planner/plan/node/write/InsertTabletNode.java  |  11 +-
 .../iotdb/db/mpp/sql/statement/Statement.java      |   9 +
 .../db/mpp/sql/statement/StatementVisitor.java     |   6 +
 .../statement/crud/AggregationQueryStatement.java  |   2 +
 .../mpp/sql/statement/crud/FillQueryStatement.java |   1 +
 .../statement/crud/GroupByFillQueryStatement.java  |   1 +
 .../sql/statement/crud/GroupByQueryStatement.java  |   2 +
 .../sql/statement/crud/InsertBaseStatement.java    |   8 +
 .../crud/InsertMultiTabletsStatement.java          |   9 +
 .../mpp/sql/statement/crud/InsertRowStatement.java |  12 +
 .../crud/InsertRowsOfOneDeviceStatement.java       |  11 +
 .../sql/statement/crud/InsertRowsStatement.java    |   9 +
 .../db/mpp/sql/statement/crud/InsertStatement.java |  11 +
 .../sql/statement/crud/InsertTabletStatement.java  |  22 +-
 .../mpp/sql/statement/crud/LastQueryStatement.java |   2 +
 .../db/mpp/sql/statement/crud/QueryStatement.java  |   5 +
 .../mpp/sql/statement/crud/UDAFQueryStatement.java |   1 +
 .../mpp/sql/statement/crud/UDTFQueryStatement.java |   1 +
 .../metadata/AlterTimeSeriesStatement.java         |   7 +
 .../mpp/sql/statement/metadata/CountStatement.java |   8 +
 .../metadata/CountStorageGroupStatement.java       |  16 +-
 .../metadata/CreateAlignedTimeSeriesStatement.java |  20 +
 .../metadata/CreateTimeSeriesStatement.java        |   7 +
 .../statement/metadata/SchemaFetchStatement.java   |   8 +
 .../metadata/SetStorageGroupStatement.java         |  10 +
 .../statement/metadata/ShowDevicesStatement.java   |   8 +
 .../mpp/sql/statement/metadata/ShowStatement.java  |   9 +
 .../metadata/ShowStorageGroupStatement.java        |   8 +
 .../db/mpp/sql/statement/sys/AuthorStatement.java  |  63 +-
 .../protocol/rest/handler/QueryDataSetHandler.java |  14 +
 .../protocol/rest/impl/GrafanaApiServiceImpl.java  |  41 +
 .../expression/binary/AdditionExpression.java      |   4 +-
 .../query/expression/binary/BinaryExpression.java  |   2 +-
 .../expression/binary/DivisionExpression.java      |   4 +-
 .../query/expression/binary/EqualToExpression.java |   4 +-
 .../expression/binary/GreaterEqualExpression.java  |   4 +-
 .../expression/binary/GreaterThanExpression.java   |   4 +-
 .../expression/binary/LessEqualExpression.java     |   4 +-
 .../expression/binary/LessThanExpression.java      |   4 +-
 .../expression/binary/LogicAndExpression.java      |   4 +-
 .../query/expression/binary/LogicOrExpression.java |   4 +-
 .../query/expression/binary/ModuloExpression.java  |   4 +-
 .../binary/MultiplicationExpression.java           |   4 +-
 .../expression/binary/NonEqualExpression.java      |   4 +-
 .../expression/binary/SubtractionExpression.java   |   4 +-
 .../query/expression/multi/FunctionExpression.java |   8 +-
 .../db/query/expression/unary/LikeExpression.java  |  80 +-
 .../query/expression/unary/LogicNotExpression.java |   2 +-
 .../query/expression/unary/NegationExpression.java |   2 +-
 .../query/expression/unary/RegularExpression.java  |   5 +-
 .../query/reader/chunk/MemAlignedPageReader.java   |   2 +-
 .../iotdb/db/query/reader/chunk/MemPageReader.java |   4 +-
 .../db/query/udf/builtin/BuiltinFunction.java      |   4 +-
 .../udf/builtin/UDTFEqualSizeBucketM4Sample.java   |   8 +-
 .../builtin/UDTFEqualSizeBucketOutlierSample.java  | 834 +++++++++++++++++++++
 .../transformer/ArithmeticNegationTransformer.java |  80 --
 .../db/query/udf/core/transformer/Transformer.java |   2 +-
 .../core/transformer/TransparentTransformer.java   |  93 ---
 .../ArithmeticAdditionTransformer.java             |   2 +-
 .../{ => binary}/ArithmeticBinaryTransformer.java  |   2 +-
 .../ArithmeticDivisionTransformer.java             |   2 +-
 .../{ => binary}/ArithmeticModuloTransformer.java  |   2 +-
 .../ArithmeticMultiplicationTransformer.java       |   2 +-
 .../ArithmeticSubtractionTransformer.java          |   2 +-
 .../{ => binary}/BinaryTransformer.java            |   3 +-
 .../{ => binary}/CompareBinaryTransformer.java     |   2 +-
 .../{ => binary}/CompareEqualToTransformer.java    |   2 +-
 .../CompareGreaterEqualTransformer.java            |   2 +-
 .../CompareGreaterThanTransformer.java             |   2 +-
 .../{ => binary}/CompareLessEqualTransformer.java  |   2 +-
 .../{ => binary}/CompareLessThanTransformer.java   |   2 +-
 .../{ => binary}/CompareNonEqualTransformer.java   |   2 +-
 .../{ => binary}/LogicAndTransformer.java          |   2 +-
 .../{ => binary}/LogicBinaryTransformer.java       |   2 +-
 .../{ => binary}/LogicOrTransformer.java           |   2 +-
 .../{ => multi}/UDFQueryRowTransformer.java        |   2 +-
 .../{ => multi}/UDFQueryRowWindowTransformer.java  |   2 +-
 .../{ => multi}/UDFQueryTransformer.java           |   3 +-
 .../ArithmeticNegationTransformer.java}            |  36 +-
 .../udf/core/transformer/unary/InTransformer.java  | 149 ++++
 .../LogicNotTransformer.java}                      |  25 +-
 .../RegularTransformer.java}                       |  35 +-
 .../transformer/unary/TransparentTransformer.java  |  70 ++
 .../UnaryTransformer.java}                         |  34 +-
 .../thrift/impl/DataNodeTSIServiceImpl.java        |  79 +-
 .../service/thrift/impl/InternalServiceImpl.java   |   2 +-
 .../compaction/CompactionTaskManagerTest.java      |   2 +-
 .../inner/InnerCompactionEmptyTsFileTest.java      |  89 +++
 .../compaction/inner/InnerCompactionTest.java      |  63 +-
 .../iotdb/db/mpp/execution/DataDriverTest.java     |   6 +-
 .../iotdb/db/mpp/operator/LimitOperatorTest.java   |   6 +-
 .../db/mpp/operator/SingleColumnMergerTest.java    |  11 +-
 .../db/mpp/operator/TimeJoinOperatorTest.java      | 132 +++-
 .../java/org/apache/iotdb/rpc/TSStatusCode.java    |   4 +
 .../src/main/thrift/confignode.thrift              |   8 +
 .../iotdb/tsfile/read/common/block/TsBlock.java    |   7 +
 .../read/common/block/column/BinaryColumn.java     |  16 +
 .../read/common/block/column/BooleanColumn.java    |  16 +
 .../tsfile/read/common/block/column/Column.java    |   3 +
 .../read/common/block/column/DoubleColumn.java     |  16 +
 .../read/common/block/column/FloatColumn.java      |  16 +
 .../tsfile/read/common/block/column/IntColumn.java |  16 +
 .../read/common/block/column/LongColumn.java       |  16 +
 .../block/column/RunLengthEncodedColumn.java       |   5 +
 .../read/common/block/column/TimeColumn.java       |   9 +
 .../iotdb/tsfile/read/reader/IPageReader.java      |   2 +-
 .../tsfile/read/reader/page/AlignedPageReader.java |   2 +-
 .../iotdb/tsfile/read/reader/page/PageReader.java  |   3 +-
 191 files changed, 4142 insertions(+), 980 deletions(-)
 delete mode 100644 confignode/src/test/java/org/apache/iotdb/confignode/utils/ConfigNodeEnvironmentUtils.java
 create mode 100644 consensus/src/test/java/org/apache/iotdb/consensus/standalone/RecoveryTest.java
 copy grafana-plugin/src/componments/{WhereValue.tsx => AggregateFun.tsx} (56%)
 copy grafana-plugin/src/componments/{WhereValue.tsx => FillValue.tsx} (86%)
 create mode 100644 grafana-plugin/src/componments/GroupBy.tsx
 create mode 100644 grafana-plugin/src/componments/TimeSeries.tsx
 copy server/src/main/java/org/apache/iotdb/db/{mpp/sql/statement/metadata/CountStorageGroupStatement.java => engine/compaction/task/CompactionTaskSummary.java} (71%)
 copy server/src/main/java/org/apache/iotdb/db/{mpp/sql/statement/metadata/CountStorageGroupStatement.java => exception/metadata/SeriesOverflowException.java} (66%)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/execution/config/CountStorageGroupTask.java
 copy server/src/main/java/org/apache/iotdb/db/mpp/{sql/statement/crud/UDTFQueryStatement.java => operator/process/merge/AscTimeComparator.java} (67%)
 copy server/src/main/java/org/apache/iotdb/db/mpp/{sql/statement/crud/UDTFQueryStatement.java => operator/process/merge/DescTimeComparator.java} (67%)
 copy server/src/main/java/org/apache/iotdb/db/mpp/{sql/statement/metadata/CountStorageGroupStatement.java => operator/process/merge/TimeComparator.java} (70%)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/query/udf/builtin/UDTFEqualSizeBucketOutlierSample.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/ArithmeticNegationTransformer.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/TransparentTransformer.java
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ => binary}/ArithmeticAdditionTransformer.java (95%)
 copy server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ => binary}/ArithmeticBinaryTransformer.java (95%)
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ => binary}/ArithmeticDivisionTransformer.java (95%)
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ => binary}/ArithmeticModuloTransformer.java (95%)
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ => binary}/ArithmeticMultiplicationTransformer.java (95%)
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ => binary}/ArithmeticSubtractionTransformer.java (95%)
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ => binary}/BinaryTransformer.java (97%)
 copy server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ => binary}/CompareBinaryTransformer.java (95%)
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ => binary}/CompareEqualToTransformer.java (95%)
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ => binary}/CompareGreaterEqualTransformer.java (95%)
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ => binary}/CompareGreaterThanTransformer.java (95%)
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ => binary}/CompareLessEqualTransformer.java (95%)
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ => binary}/CompareLessThanTransformer.java (95%)
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ => binary}/CompareNonEqualTransformer.java (95%)
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ => binary}/LogicAndTransformer.java (95%)
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ => binary}/LogicBinaryTransformer.java (95%)
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ => binary}/LogicOrTransformer.java (95%)
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ => multi}/UDFQueryRowTransformer.java (96%)
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ => multi}/UDFQueryRowWindowTransformer.java (96%)
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ => multi}/UDFQueryTransformer.java (96%)
 copy server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ArithmeticBinaryTransformer.java => unary/ArithmeticNegationTransformer.java} (50%)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/unary/InTransformer.java
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{CompareBinaryTransformer.java => unary/LogicNotTransformer.java} (62%)
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{ArithmeticBinaryTransformer.java => unary/RegularTransformer.java} (51%)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/unary/TransparentTransformer.java
 rename server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{LogicNotTransformer.java => unary/UnaryTransformer.java} (60%)
 create mode 100644 server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionEmptyTsFileTest.java