This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch memtsblock in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 9f5c19dcabdf2712f9f5ac901bd1d398ec68f3b5 Merge: 178959f32e a4a8656cec Author: HTHou <[email protected]> AuthorDate: Mon May 2 14:56:17 2022 +0800 Merge branch 'master' of https://github.com/apache/iotdb into memtsblock README.md | 2 +- README_ZH.md | 2 +- .../apache/iotdb/db/qp/sql/InfluxDBSqlParser.g4 | 9 +- .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 138 ++-- .../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 15 +- .../iotdb/cluster/metadata/CSchemaProcessor.java | 6 +- .../cluster/query/ClusterDataQueryExecutor.java | 6 +- .../query/aggregate/ClusterAggregateExecutor.java | 2 +- .../cluster/query/fill/ClusterFillExecutor.java | 2 +- .../groupby/ClusterGroupByVFilterDataSet.java | 2 +- .../cluster/query/reader/ClusterReaderFactory.java | 3 +- .../cluster/query/reader/ClusterTimeGenerator.java | 4 +- .../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 | 13 +- .../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 +- .../Data-Concept/Data-Model-and-Terminology.md | 35 +- docs/UserGuide/Process-Data/Triggers.md | 9 +- docs/UserGuide/Query-Data/Select-Expression.md | 74 ++ docs/UserGuide/Query-Data/Without-Null.md | 8 +- docs/UserGuide/Reference/Syntax-Conventions.md | 453 ++++++++--- .../Data-Concept/Data-Model-and-Terminology.md | 30 +- docs/zh/UserGuide/Process-Data/Triggers.md | 7 +- docs/zh/UserGuide/Query-Data/Select-Expression.md | 76 ++ docs/zh/UserGuide/Query-Data/Without-Null.md | 8 +- docs/zh/UserGuide/Reference/Syntax-Conventions.md | 492 +++++++++--- .../org/apache/iotdb/DataMigrationExample.java | 2 +- 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 +- .../apache/iotdb/db/integration/IoTDBAliasIT.java | 2 +- .../org/apache/iotdb/db/integration/IoTDBAsIT.java | 2 +- .../db/integration/IoTDBCreateTimeseriesIT.java | 18 +- .../iotdb/db/integration/IoTDBDeletionIT.java | 16 +- .../iotdb/db/integration/IoTDBExecuteBatchIT.java | 6 +- .../db/integration/IoTDBFloatPrecisionIT.java | 2 +- .../iotdb/db/integration/IoTDBInsertNaNIT.java | 2 +- .../iotdb/db/integration/IoTDBMetadataFetchIT.java | 8 +- .../iotdb/db/integration/IoTDBNestedQueryIT.java | 25 + .../iotdb/db/integration/IoTDBQuotedPathIT.java | 24 +- .../iotdb/db/integration/IoTDBSimpleQueryIT.java | 29 +- .../integration/IoTDBSortedShowTimeseriesIT.java | 38 +- .../db/integration/IoTDBSyntaxConventionIT.java | 468 ------------ .../IoTDBSyntaxConventionIdentifierIT.java | 838 +++++++++++++++++++++ .../IoTDBSyntaxConventionStringLiteralIT.java | 764 +++++++++++++++++++ .../iotdb/db/integration/IoTDBTagAlterIT.java | 46 +- .../apache/iotdb/db/integration/IoTDBTagIT.java | 220 ++++-- .../db/integration/IoTDBUDTFBuiltinFunctionIT.java | 138 ++++ .../aggregation/IoTDBAggregationIT.java | 5 + .../db/integration/aligned/IoTDBDeletionIT.java | 16 +- .../db/integration/sync/IoTDBSyncSenderIT.java | 56 +- .../versionadaption/IoTDBDDLVersionAdaptionIT.java | 6 +- .../IoTDBSyntaxConventionVersionAdaptionIT.java | 100 --- .../IoTDBWithoutNullAllFilterIT.java | 16 +- .../IoTDBWithoutNullAnyFilterIT.java | 8 +- .../session/IoTDBSessionSyntaxConventionIT.java | 39 +- .../iotdb/commons/partition/DataPartition.java | 9 + .../iotdb/commons/partition/SchemaPartition.java | 9 + .../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 | 16 + .../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 +- .../utils/SingleSeriesCompactionExecutor.java | 2 +- .../impl/ReadPointCompactionPerformer.java | 5 +- .../compaction/task/AbstractCompactionTask.java | 19 +- .../compaction/task/CompactionTaskSummary.java} | 17 +- .../iotdb/db/engine/modification/Modification.java | 2 +- .../selectinto/InsertTabletPlansIterator.java | 2 +- .../iotdb/db/engine/storagegroup/DataRegion.java | 7 +- .../db/engine/storagegroup/TsFileManager.java | 2 +- .../metadata/SeriesOverflowException.java} | 18 +- .../db/metadata/idtable/IDTableHashmapImpl.java | 9 +- .../mtree/store/disk/MTreeFlushTaskManager.java | 6 +- .../mtree/store/disk/MTreeReleaseTaskManager.java | 3 +- .../mtree/store/disk/schemafile/SchemaFile.java | 73 +- .../apache/iotdb/db/metadata/path/AlignedPath.java | 10 +- .../iotdb/db/metadata/path/MeasurementPath.java | 13 +- .../apache/iotdb/db/metadata/path/PartialPath.java | 32 +- .../db/metadata/schemaregion/SchemaEngine.java | 73 +- .../schemaregion/SchemaRegionMemoryImpl.java | 9 +- .../schemaregion/SchemaRegionSchemaFileImpl.java | 53 +- .../iotdb/db/metadata/utils/MetaFormatUtils.java | 17 +- .../apache/iotdb/db/metadata/utils/MetaUtils.java | 82 +- .../db/metadata/utils/ResourceByPathUtils.java | 9 +- .../iotdb/db/mpp/buffer/DataBlockManager.java | 106 ++- .../iotdb/db/mpp/buffer/IDataBlockManager.java | 24 +- .../iotdb/db/mpp/buffer/LocalSinkHandle.java | 146 ++++ .../iotdb/db/mpp/buffer/LocalSourceHandle.java | 125 +++ .../iotdb/db/mpp/buffer/SharedTsBlockQueue.java | 152 ++++ .../apache/iotdb/db/mpp/execution/DataDriver.java | 2 +- .../db/mpp/operator/source/SeriesScanUtil.java | 23 +- .../apache/iotdb/db/mpp/sql/analyze/Analysis.java | 2 +- .../apache/iotdb/db/mpp/sql/parser/ASTVisitor.java | 267 ++++--- .../db/mpp/sql/planner/DistributionPlanner.java | 10 +- .../iotdb/db/mpp/sql/planner/LogicalPlanner.java | 2 - .../node/metedata/write/AlterTimeSeriesNode.java | 27 +- .../write/CreateAlignedTimeSeriesNode.java | 7 - .../node/metedata/write/CreateTimeSeriesNode.java | 2 +- .../plan/node/source/AlignedSeriesScanNode.java | 10 +- .../planner/plan/node/write/InsertTabletNode.java | 11 +- .../iotdb/db/mpp/sql/statement/Statement.java | 9 + .../sql/statement/component/SelectComponent.java | 4 +- .../statement/crud/AggregationQueryStatement.java | 4 +- .../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 | 7 +- .../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/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 +- .../db/protocol/influxdb/handler/QueryHandler.java | 2 +- .../protocol/rest/handler/QueryDataSetHandler.java | 14 + .../protocol/rest/impl/GrafanaApiServiceImpl.java | 41 + .../apache/iotdb/db/qp/executor/PlanExecutor.java | 2 +- .../db/qp/physical/crud/AlignByDevicePlan.java | 2 +- .../db/qp/physical/crud/RawDataQueryPlan.java | 9 +- .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 316 ++++---- .../db/query/control/QueryResourceManager.java | 6 +- .../groupby/GroupByWithValueFilterDataSet.java | 2 +- .../groupby/GroupByWithoutValueFilterDataSet.java | 2 +- .../db/query/executor/AggregationExecutor.java | 6 +- .../iotdb/db/query/executor/FillQueryExecutor.java | 4 +- .../iotdb/db/query/executor/LastQueryExecutor.java | 2 +- .../db/query/executor/RawDataQueryExecutor.java | 4 +- .../db/query/executor/fill/LastPointReader.java | 6 +- .../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 +- .../iotdb/db/query/reader/series/SeriesReader.java | 18 +- .../query/timegenerator/ServerTimeGenerator.java | 2 +- .../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 | 4 +- .../{ => binary}/ArithmeticBinaryTransformer.java | 14 +- .../ArithmeticDivisionTransformer.java | 4 +- .../{ => binary}/ArithmeticModuloTransformer.java | 4 +- .../ArithmeticMultiplicationTransformer.java | 4 +- .../ArithmeticSubtractionTransformer.java | 4 +- .../{ => binary}/BinaryTransformer.java | 79 +- .../{ => binary}/CompareBinaryTransformer.java | 14 +- .../{ => binary}/CompareEqualToTransformer.java | 24 +- .../CompareGreaterEqualTransformer.java | 4 +- .../CompareGreaterThanTransformer.java | 4 +- .../{ => binary}/CompareLessEqualTransformer.java | 4 +- .../{ => binary}/CompareLessThanTransformer.java | 4 +- .../{ => binary}/CompareNonEqualTransformer.java | 24 +- .../{ => binary}/LogicAndTransformer.java | 5 +- .../{ => binary}/LogicBinaryTransformer.java | 20 +- .../{ => binary}/LogicOrTransformer.java | 4 +- .../{ => multi}/UDFQueryRowTransformer.java | 2 +- .../{ => multi}/UDFQueryRowWindowTransformer.java | 2 +- .../{ => multi}/UDFQueryTransformer.java | 3 +- .../ArithmeticNegationTransformer.java} | 36 +- .../udf/core/transformer/unary/InTransformer.java | 149 ++++ .../LogicNotTransformer.java} | 26 +- .../RegularTransformer.java} | 35 +- .../transformer/unary/TransparentTransformer.java | 70 ++ .../UnaryTransformer.java} | 34 +- .../thrift/impl/DataNodeTSIServiceImpl.java | 79 +- .../db/sync/sender/manager/TsFileSyncManager.java | 12 - .../iotdb/db/sync/sender/pipe/IoTDBPipeSink.java | 4 +- .../iotdb/db/sync/sender/pipe/TsFilePipe.java | 13 +- .../db/sync/sender/recovery/TsFilePipeLogger.java | 5 + .../org/apache/iotdb/db/tools/TsFileSplitTool.java | 2 +- .../org/apache/iotdb/db/utils/FileLoaderUtils.java | 4 +- .../file/UnsealedTsFileRecoverPerformer.java | 2 +- .../compaction/CompactionTaskManagerTest.java | 2 +- .../inner/InnerCompactionEmptyTsFileTest.java | 89 +++ .../compaction/inner/InnerCompactionTest.java | 63 +- .../compaction/utils/CompactionCheckerUtils.java | 2 +- .../utils/CompactionFileGeneratorUtils.java | 6 +- .../apache/iotdb/db/metadata/MetaUtilsTest.java | 71 +- .../apache/iotdb/db/metadata/SchemaBasicTest.java | 24 +- .../rocksdb/RocksDBBenchmarkEngine.java | 2 +- .../iotdb/db/mpp/buffer/DataBlockManagerTest.java | 121 +++ .../iotdb/db/mpp/buffer/LocalSinkHandleTest.java | 151 ++++ .../iotdb/db/mpp/buffer/LocalSourceHandleTest.java | 119 +++ .../db/mpp/buffer/SharedTsBlockQueueTest.java | 160 ++++ .../iotdb/db/mpp/buffer/SourceHandleTest.java | 2 +- .../java/org/apache/iotdb/db/mpp/buffer/Utils.java | 6 + .../iotdb/db/mpp/sql/analyze/AnalyzerTest.java | 2 +- .../iotdb/db/mpp/sql/plan/LogicalPlannerTest.java | 24 +- .../iotdb/db/qp/physical/PhysicalPlanTest.java | 6 +- .../iotdb/db/query/dataset/ListDataSetTest.java | 2 +- .../iotdb/db/query/dataset/SingleDataSetTest.java | 2 +- .../query/dataset/groupby/GroupByDataSetTest.java | 4 +- .../dataset/groupby/GroupByLevelDataSetTest.java | 4 +- .../java/org/apache/iotdb/rpc/TSStatusCode.java | 4 + .../apache/iotdb/spark/tsfile/DefaultSource.scala | 2 +- .../iotdb/spark/tsfile/NarrowConverter.scala | 2 +- .../apache/iotdb/spark/tsfile/WideConverter.scala | 4 +- .../src/main/thrift/confignode.thrift | 8 + .../tsfile/common/constant/TsFileConstant.java | 1 + .../iotdb/tsfile/read/TsFileSequenceReader.java | 10 +- .../org/apache/iotdb/tsfile/read/common/Path.java | 2 +- .../read/controller/MetadataQuerierByFileImpl.java | 8 +- .../tsfile/v2/read/TsFileSequenceReaderForV2.java | 7 +- .../apache/iotdb/tsfile/write/TsFileWriter.java | 8 +- .../iotdb/tsfile/write/writer/TsFileIOWriter.java | 2 +- .../apache/iotdb/tsfile/read/TsFileReaderTest.java | 2 +- .../apache/iotdb/tsfile/read/common/PathTest.java | 10 +- .../org/apache/iotdb/tsfile/write/WriteTest.java | 6 +- 270 files changed, 8280 insertions(+), 2548 deletions(-)
