This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch update_comparison in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 80e8aabd1ab0d88acfe0865e73272a232d0c6522 Merge: 19bd33f 5274c99 Author: HTHou <[email protected]> AuthorDate: Thu Dec 16 15:00:06 2021 +0800 Merge branch 'master' of https://github.com/apache/iotdb into update_comparison Jenkinsfile | 42 +- .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 6 +- client-py/iotdb/utils/IoTDBConstants.py | 15 + .../org/apache/iotdb/cluster/ClusterIoTDB.java | 6 + .../iotdb/cluster/query/ClusterPlanExecutor.java | 5 +- .../cluster/query/aggregate/ClusterAggregator.java | 9 +- .../cluster/query/reader/ClusterReaderFactory.java | 13 +- .../cluster/server/service/DataSyncService.java | 11 +- .../apache/iotdb/cluster/utils/PartitionUtils.java | 2 + docs/UserGuide/Cluster/Cluster-Setup-Example.md | 2 +- .../Programming-MQTT.md | 55 +- .../DML-Data-Manipulation-Language.md | 277 ++++++-- docs/zh/UserGuide/Cluster/Cluster-Setup-Example.md | 2 +- .../Programming-MQTT.md | 55 +- .../DML-Data-Manipulation-Language.md | 276 ++++++-- .../server/CustomizedJsonPayloadFormatter.java | 4 +- ...apache.iotdb.db.protocol.mqtt.PayloadFormatter} | 0 .../iotdb/db/query/udf/example/Accumulator.java | 30 +- .../apache/iotdb/db/query/udf/example/Adder.java | 0 .../apache/iotdb/db/query/udf/example/Counter.java | 39 +- .../db/query/udf/example/ExampleUDFConstant.java | 30 +- .../org/apache/iotdb/db/query/udf/example/Max.java | 0 .../iotdb/db/query/udf/example/Multiplier.java | 0 .../SlidingSizeWindowConstructorTester0.java | 0 .../SlidingSizeWindowConstructorTester1.java | 0 .../SlidingTimeWindowConstructionTester.java | 4 +- .../db/query/udf/example/TerminateTester.java | 0 .../iotdb/db/query/udf/example/ValidateTester.java | 0 .../iotdb/integration/env/ClusterEnvBase.java | 10 +- .../apache/iotdb/integration/env/ClusterNode.java | 1 + .../apache/iotdb/db/integration/IoTDBAliasIT.java | 37 +- .../apache/iotdb/db/integration/IoTDBFillIT.java | 261 +++++++- .../iotdb/db/integration/IoTDBGroupByFillIT.java | 184 ++++-- .../db/integration/IoTDBGroupByFillMixPathsIT.java | 733 ++++++++++----------- .../iotdb/db/integration/IoTDBMetadataFetchIT.java | 28 +- .../iotdb/db/integration/IoTDBNestedQueryIT.java | 54 +- .../apache/iotdb/db/integration/IoTDBTtlIT.java | 2 +- .../db/integration/IoTDBUDFWindowQueryIT.java | 34 +- .../db/integration/IoTDBUDTFHybridQueryIT.java | 12 +- .../aggregation/IoTDBAggregationLargeDataIT.java | 81 ++- .../aggregation/IoTDBAggregationSmallDataIT.java | 21 +- .../aggregation/IoTDBUDFNestAggregationIT.java | 550 ++++++++++++++++ .../IoTDBUserDefinedAggregationFunctionIT.java | 725 ++++++++++++++++++++ .../apache/iotdb/session/IoTDBSessionSimpleIT.java | 3 +- openapi/pom.xml | 6 +- .../resources/conf/iotdb-engine.properties | 20 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 22 - .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 21 +- .../db/cost/statistic/ConcurrentCircularArray.java | 67 -- .../iotdb/db/cost/statistic/Measurement.java | 423 ------------ .../iotdb/db/cost/statistic/MeasurementMBean.java | 60 -- .../db/engine/compaction/CompactionScheduler.java | 3 + .../inner/AbstractInnerSpaceCompactionTask.java | 4 - .../InnerSpaceCompactionExceptionHandler.java | 246 +++++++ .../SizeTieredCompactionRecoverTask.java | 12 +- .../inner/sizetiered/SizeTieredCompactionTask.java | 118 ++-- .../inner/utils/InnerSpaceCompactionUtils.java | 49 +- .../db/engine/storagegroup/TsFileManager.java | 10 + .../db/engine/storagegroup/TsFileResource.java | 21 +- .../db/engine/storagegroup/TsFileResourceList.java | 59 ++ .../org/apache/iotdb/db/metadata/MManager.java | 53 +- .../{ => protocol}/mqtt/BrokerAuthenticator.java | 2 +- .../{ => protocol}/mqtt/JSONPayloadFormatter.java | 2 +- .../iotdb/db/{ => protocol}/mqtt/Message.java | 2 +- .../{ => protocol}/mqtt/PayloadFormatManager.java | 2 +- .../db/{ => protocol}/mqtt/PayloadFormatter.java | 2 +- .../db/{ => protocol}/mqtt/PublishHandler.java | 2 +- .../iotdb/db/{ => protocol}/rest/RestService.java | 6 +- .../rest/filter/ApiOriginFilter.java | 2 +- .../rest/filter/AuthorizationFilter.java | 4 +- .../rest/filter/BasicSecurityContext.java | 2 +- .../iotdb/db/{ => protocol}/rest/filter/User.java | 2 +- .../db/{ => protocol}/rest/filter/UserCache.java | 2 +- .../rest/handler/AuthorizationHandler.java | 4 +- .../rest/handler/ExceptionHandler.java | 4 +- .../handler/PhysicalPlanConstructionHandler.java | 4 +- .../rest/handler/QueryDataSetHandler.java | 6 +- .../rest/handler/RequestValidationHandler.java | 6 +- .../rest/impl/PingApiServiceImpl.java | 6 +- .../rest/impl/RestApiServiceImpl.java | 20 +- .../apache/iotdb/db/qp/executor/PlanExecutor.java | 4 + .../qp/logical/crud/AggregationQueryOperator.java | 38 +- .../db/qp/logical/crud/FillClauseComponent.java | 9 + .../db/qp/logical/crud/FillQueryOperator.java | 4 +- .../logical/crud/GroupByFillClauseComponent.java | 9 + .../qp/logical/crud/GroupByFillQueryOperator.java | 2 + .../iotdb/db/qp/logical/crud/QueryOperator.java | 31 +- .../iotdb/db/qp/logical/crud/SelectComponent.java | 29 +- .../db/qp/logical/crud/UDAFQueryOperator.java | 179 +++++ ...DFQueryOperator.java => UDTFQueryOperator.java} | 6 +- .../iotdb/db/qp/physical/crud/FillQueryPlan.java | 9 + .../db/qp/physical/crud/GroupByTimeFillPlan.java | 9 + .../apache/iotdb/db/qp/physical/crud/UDAFPlan.java | 68 ++ .../apache/iotdb/db/qp/physical/crud/UDTFPlan.java | 17 +- .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 143 +++- .../iotdb/db/qp/utils/GroupByLevelController.java | 83 ++- ...{UDFInputDataSet.java => IUDFInputDataSet.java} | 10 +- .../dataset/RawQueryDataSetWithValueFilter.java | 2 +- .../dataset/RawQueryDataSetWithoutValueFilter.java | 2 + .../iotdb/db/query/dataset/UDFInputDataSet.java | 42 +- .../UDFRawQueryInputDataSetWithoutValueFilter.java | 2 +- .../db/query/dataset/UDTFAlignByTimeDataSet.java | 184 +++--- .../apache/iotdb/db/query/dataset/UDTFDataSet.java | 15 + .../db/query/dataset/UDTFNonAlignDataSet.java | 2 +- .../dataset/groupby/GroupByFillEngineDataSet.java | 22 +- .../groupby/GroupByFillWithValueFilterDataSet.java | 23 +- .../GroupByFillWithoutValueFilterDataSet.java | 24 +- .../iotdb/db/query/executor/FillQueryExecutor.java | 20 +- .../iotdb/db/query/executor/IQueryRouter.java | 6 + .../iotdb/db/query/executor/QueryRouter.java | 35 +- ...DTFQueryExecutor.java => UDFQueryExecutor.java} | 16 +- .../iotdb/db/query/executor/fill/ValueFill.java | 44 +- .../iotdb/db/query/expression/Expression.java | 48 +- .../iotdb/db/query/expression/ResultColumn.java | 17 + .../query/expression/binary/BinaryExpression.java | 24 +- .../db/query/expression/unary/ConstantOperand.java | 6 + .../query/expression/unary/FunctionExpression.java | 69 +- .../query/expression/unary/NegationExpression.java | 14 +- .../query/expression/unary/TimeSeriesOperand.java | 8 +- .../db/query/udf/core/executor/UDTFExecutor.java | 13 +- .../udf/core/layer/InputRowUtils.java} | 36 +- .../db/query/udf/core/layer/LayerCacheUtils.java | 53 +- .../layer/MultiInputColumnIntermediateLayer.java | 65 +- .../query/udf/core/layer/RawQueryInputLayer.java | 25 +- ...InputColumnMultiReferenceIntermediateLayer.java | 10 + ...nputColumnSingleReferenceIntermediateLayer.java | 11 +- .../udf/core/reader/ConstantLayerPointReader.java | 5 + .../db/query/udf/core/reader/LayerPointReader.java | 2 + .../db/query/udf/core/reader/LayerRowReader.java | 3 + .../transformer/ArithmeticBinaryTransformer.java | 12 +- .../transformer/ArithmeticNegationTransformer.java | 36 +- .../db/query/udf/core/transformer/Transformer.java | 10 +- .../core/transformer/TransparentTransformer.java | 93 +++ .../core/transformer/UDFQueryRowTransformer.java | 5 +- .../udf/core/transformer/UDFQueryTransformer.java | 14 +- .../row/ElasticSerializableRowRecordList.java | 30 +- .../row/SerializableRowRecordList.java | 3 +- .../tv/ElasticSerializableBinaryTVList.java | 8 +- .../tv/ElasticSerializableTVList.java | 47 ++ .../datastructure/tv/SerializableBinaryTVList.java | 5 +- .../tv/SerializableBooleanTVList.java | 5 +- .../datastructure/tv/SerializableDoubleTVList.java | 5 +- .../datastructure/tv/SerializableFloatTVList.java | 5 +- .../datastructure/tv/SerializableIntTVList.java | 3 +- .../datastructure/tv/SerializableLongTVList.java | 5 +- .../java/org/apache/iotdb/db/service/IoTDB.java | 4 +- .../org/apache/iotdb/db/service/MQTTService.java | 4 +- .../statistic => service/metrics}/Operation.java | 2 +- .../db/service/thrift/impl/TSServiceImpl.java | 125 +++- .../apache/iotdb/db/utils/ErrorHandlingUtils.java | 4 + .../apache/iotdb/db/utils/TypeInferenceUtils.java | 1 + ...apache.iotdb.db.protocol.mqtt.PayloadFormatter} | 2 +- .../db/cost/statistic/PerformanceStatTest.java | 105 --- .../inner/AbstractInnerSpaceCompactionTest.java | 295 +++++++++ .../compaction/inner/InnerSeqCompactionTest.java | 12 +- .../inner/InnerSpaceCompactionExceptionTest.java | 427 ++++++++++++ .../compaction/inner/InnerUnseqCompactionTest.java | 3 +- .../SizeTieredCompactionHandleExceptionTest.java | 197 ++++++ .../SizeTieredCompactionRecoverTest.java | 250 +------ .../storagegroup/TsFileResourceListTest.java | 30 + .../iotdb/db/metadata/MManagerBasicTest.java | 18 + .../mqtt/BrokerAuthenticatorTest.java | 2 +- .../mqtt/JSONPayloadFormatterTest.java | 2 +- .../mqtt/PayloadFormatManagerTest.java | 2 +- .../db/{ => protocol}/mqtt/PublishHandlerTest.java | 2 +- .../db/{ => protocol}/rest/IoTDBRestServiceIT.java | 2 +- .../ElasticSerializableRowRecordListTest.java | 127 +++- .../ElasticSerializableTVListTest.java | 175 +++-- .../org/apache/iotdb/db/sink/MQTTSinkTest.java | 18 +- .../write/UnSupportedDataTypeException.java | 2 +- .../iotdb/tsfile/utils/ReadWriteIOUtils.java | 3 +- 171 files changed, 6139 insertions(+), 2352 deletions(-)
