This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch force_ci/UserDefinedTime
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 7ab8ee61ef3 Load: Fixed the extra time column of user defined time
(#17113)
add d05276e2955 Decouple rest from iotdb-server using ExternalService
framework (#17099)
add dad8ec8824e Remove text involve DataNodeId when assert two results.
(#17107)
add 12b5bc3e9af Fix binary allocator test & querying type-altered chunks
in memory may affect the result of flush (#17105)
add 498197b31e4 Add mqtt IT for json mode. (#17090)
add 5f641b262c3 Fix timeseries alias display in last for TreeModel (#17109)
add 256f2fce84f update chunk metadata after rewrite (#17110)
add ba95e5fd4c0 Set MQTT address to empty string. (#17111)
add 938f8149430 Pipe: add inclusion/exclusion pattern keys for pipe source
filtering (#17091)
add b076988adf5 Resolve conflicts
No new revisions were added by this update.
Summary of changes:
distribution/pom.xml | 6 +
distribution/src/assembly/all.xml | 4 +
distribution/src/assembly/datanode.xml | 4 +
.../src/assembly/external-service-impl.xml | 4 +
.../org/apache/iotdb/mqtt/MPPPublishHandler.java | 2 +-
external-service-impl/pom.xml | 2 +
.../rest-openapi}/pom.xml | 34 +-
.../src/main/openapi3/iotdb_rest_common.yaml | 0
.../src/main/openapi3/iotdb_rest_table_v1.yaml | 0
.../src/main/openapi3/iotdb_rest_v1.yaml | 0
.../src/main/openapi3/iotdb_rest_v2.yaml | 0
external-service-impl/{mqtt => rest}/pom.xml | 153 ++--
.../java/org/apache/iotdb/rest}/RestService.java | 30 +-
.../rest/protocol}/filter/ApiOriginFilter.java | 2 +-
.../rest/protocol}/filter/AuthorizationFilter.java | 4 +-
.../protocol}/filter/BasicSecurityContext.java | 2 +-
.../apache/iotdb/rest/protocol}/filter/User.java | 2 +-
.../iotdb/rest/protocol}/filter/UserCache.java | 2 +-
.../protocol}/handler/AuthorizationHandler.java | 4 +-
.../rest/protocol}/impl/PingApiServiceImpl.java | 6 +-
.../table/v1/handler/ExceptionHandler.java | 4 +-
.../table/v1/handler/ExecuteStatementHandler.java | 2 +-
.../table/v1/handler/QueryDataSetHandler.java | 6 +-
.../table/v1/handler/RequestValidationHandler.java | 6 +-
.../v1/handler/StatementConstructionHandler.java | 4 +-
.../table/v1/impl/RestApiServiceImpl.java | 26 +-
.../rest/protocol}/utils/InsertRowDataUtils.java | 2 +-
.../protocol}/utils/InsertTabletSortDataUtils.java | 2 +-
.../protocol/v1}/handler/ExceptionHandler.java | 4 +-
.../v1/handler/ExecuteStatementHandler.java | 2 +-
.../protocol}/v1/handler/QueryDataSetHandler.java | 26 +-
.../v1/handler/RequestValidationHandler.java | 8 +-
.../v1/handler/StatementConstructionHandler.java | 4 +-
.../protocol}/v1/impl/GrafanaApiServiceImpl.java | 18 +-
.../rest/protocol}/v1/impl/RestApiServiceImpl.java | 32 +-
.../protocol/v2}/handler/ExceptionHandler.java | 4 +-
.../v2/handler/ExecuteStatementHandler.java | 2 +-
.../rest/protocol}/v2/handler/FastLastHandler.java | 10 +-
.../protocol}/v2/handler/QueryDataSetHandler.java | 22 +-
.../v2/handler/RequestValidationHandler.java | 12 +-
.../v2/handler/StatementConstructionHandler.java | 8 +-
.../protocol}/v2/impl/GrafanaApiServiceImpl.java | 18 +-
.../rest/protocol}/v2/impl/RestApiServiceImpl.java | 36 +-
integration-test/pom.xml | 7 +
integration-test/src/assembly/mpp-share.xml | 4 +
.../db/it/aligned/IoTDBAlignedLastQueryIT.java | 10 +-
...stCache2IT.java => IoTDBLastQueryAlias2IT.java} | 2 +-
.../iotdb/db/it/last/IoTDBLastQueryAliasIT.java | 164 ++++
.../iotdb/db/it/mqtt/IoTDBMQTTServiceJsonIT.java | 363 ++++++++
.../db/it/schema/IoTDBAlterTimeSeriesTypeIT.java | 4 +-
.../auto/basic/IoTDBTreePatternFormatIT.java | 258 +-----
.../treemodel/manual/IoTDBPipeInclusionIT.java | 13 +-
.../relational/it/mqtt/IoTDBMQTTServiceIT.java | 1 +
iotdb-core/confignode/pom.xml | 6 -
iotdb-core/datanode/pom.xml | 58 +-
.../db/pipe/agent/task/PipeDataNodeTaskAgent.java | 23 +-
.../source/dataregion/IoTDBDataRegionSource.java | 9 +-
.../db/protocol/session/MqttClientSession.java | 6 +-
.../AlignedUpdateViewPathLastCacheOperator.java | 25 +-
.../process/last/UpdateLastCacheOperator.java | 2 +-
.../last/UpdateViewPathLastCacheOperator.java | 2 +-
.../queryengine/plan/analyze/AnalyzeVisitor.java | 6 +-
.../plan/planner/LogicalPlanBuilder.java | 48 +-
.../plan/planner/OperatorTreeGenerator.java | 27 +-
.../plan/planner/plan/node/PlanGraphPrinter.java | 7 +-
.../plan/node/process/last/LastQueryNode.java | 6 +-
.../plan/node/source/LastQueryScanNode.java | 104 ++-
.../schemaregion/utils/ResourceByPathUtils.java | 19 +-
.../java/org/apache/iotdb/db/service/DataNode.java | 4 -
.../externalservice/BuiltinExternalServices.java | 4 +-
.../dataregion/memtable/ReadOnlyMemChunk.java | 4 +
.../org/apache/iotdb/db/utils/SchemaUtils.java | 20 +-
.../db/pipe/pattern/TreePatternPruningTest.java | 59 +-
.../db/pipe/source/IoTDBDataRegionSourceTest.java | 4 -
.../db/protocol/rest/GrafanaApiServiceTest.java | 450 ----------
.../db/protocol/rest/IoTDBRestServiceTest.java | 918 ---------------------
.../plan/planner/distribution/LastQueryTest.java | 3 +
.../logical/DataQueryLogicalPlannerTest.java | 11 +-
.../planner/node/source/SourceNodeSerdeTest.java | 2 +
.../org/apache/iotdb/db/utils/SchemaUtilsTest.java | 18 +-
.../iotdb/commons/binaryallocator/arena/Arena.java | 7 +-
.../pipe/config/constant/PipeSourceConstant.java | 2 +
.../pipe/datastructure/pattern/TreePattern.java | 198 +++--
.../apache/iotdb/commons/service/ServiceType.java | 1 -
iotdb-protocol/pom.xml | 1 -
pom.xml | 2 +-
86 files changed, 1303 insertions(+), 2098 deletions(-)
rename {iotdb-protocol/openapi => external-service-impl/rest-openapi}/pom.xml
(87%)
rename {iotdb-protocol/openapi =>
external-service-impl/rest-openapi}/src/main/openapi3/iotdb_rest_common.yaml
(100%)
rename {iotdb-protocol/openapi =>
external-service-impl/rest-openapi}/src/main/openapi3/iotdb_rest_table_v1.yaml
(100%)
rename {iotdb-protocol/openapi =>
external-service-impl/rest-openapi}/src/main/openapi3/iotdb_rest_v1.yaml (100%)
rename {iotdb-protocol/openapi =>
external-service-impl/rest-openapi}/src/main/openapi3/iotdb_rest_v2.yaml (100%)
copy external-service-impl/{mqtt => rest}/pom.xml (59%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest}/RestService.java
(87%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/filter/ApiOriginFilter.java
(97%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/filter/AuthorizationFilter.java
(98%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/filter/BasicSecurityContext.java
(96%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/filter/User.java
(96%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/filter/UserCache.java
(97%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/handler/AuthorizationHandler.java
(93%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/impl/PingApiServiceImpl.java
(91%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/table/v1/handler/ExceptionHandler.java
(97%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/table/v1/handler/ExecuteStatementHandler.java
(99%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/table/v1/handler/QueryDataSetHandler.java
(97%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/table/v1/handler/RequestValidationHandler.java
(95%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/table/v1/handler/StatementConstructionHandler.java
(98%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/table/v1/impl/RestApiServiceImpl.java
(92%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/utils/InsertRowDataUtils.java
(98%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/utils/InsertTabletSortDataUtils.java
(97%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest/v2
=>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1}/handler/ExceptionHandler.java
(97%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/v1/handler/ExecuteStatementHandler.java
(98%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/v1/handler/QueryDataSetHandler.java
(93%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/v1/handler/RequestValidationHandler.java
(90%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/v1/handler/StatementConstructionHandler.java
(98%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/v1/impl/GrafanaApiServiceImpl.java
(94%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/v1/impl/RestApiServiceImpl.java
(91%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest/v1
=>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2}/handler/ExceptionHandler.java
(97%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/v2/handler/ExecuteStatementHandler.java
(98%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/v2/handler/FastLastHandler.java
(87%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/v2/handler/QueryDataSetHandler.java
(94%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/v2/handler/RequestValidationHandler.java
(93%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/v2/handler/StatementConstructionHandler.java
(97%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/v2/impl/GrafanaApiServiceImpl.java
(94%)
rename {iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest =>
external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol}/v2/impl/RestApiServiceImpl.java
(94%)
copy
integration-test/src/test/java/org/apache/iotdb/db/it/last/{IoTDBLastQueryLastCache2IT.java
=> IoTDBLastQueryAlias2IT.java} (96%)
create mode 100644
integration-test/src/test/java/org/apache/iotdb/db/it/last/IoTDBLastQueryAliasIT.java
create mode 100644
integration-test/src/test/java/org/apache/iotdb/db/it/mqtt/IoTDBMQTTServiceJsonIT.java
delete mode 100644
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/protocol/rest/GrafanaApiServiceTest.java
delete mode 100644
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/protocol/rest/IoTDBRestServiceTest.java
