You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/10/30 05:26:55 UTC

[iotdb] branch IOTDB-4741 updated (f7d02745ff -> 2a1264fc09)

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

jackietien pushed a change to branch IOTDB-4741
in repository https://gitbox.apache.org/repos/asf/iotdb.git


    from f7d02745ff resolve conflicts
     add 2a1264fc09 fix ci

No new revisions were added by this update.

Summary of changes:
 .../iotdb/db/client/DataNodeInternalClient.java    |  19 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |   4 +-
 .../org/apache/iotdb/db/engine/cq/CQLogReader.java |  47 --
 .../org/apache/iotdb/db/engine/cq/CQLogWriter.java |  74 ---
 .../engine/cq/ContinuousQuerySchemaCheckTask.java  |  99 ----
 .../iotdb/db/engine/cq/ContinuousQueryService.java | 305 -------------
 .../iotdb/db/engine/cq/ContinuousQueryTask.java    | 200 ---------
 .../engine/cq/ContinuousQueryTaskPoolManager.java  | 107 -----
 .../org/apache/iotdb/db/mpp/plan/Coordinator.java  |  15 +-
 .../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java  |   6 +-
 .../db/mpp/plan/analyze/ClusterSchemaFetcher.java  |   6 +-
 .../db/protocol/influxdb/handler/QueryHandler.java | 500 ---------------------
 .../influxdb/handler/QueryHandlerFactory.java      |   2 +-
 .../influxdb/meta/InfluxDBMetaManager.java         | 221 ---------
 .../influxdb/meta/InfluxDBMetaManagerFactory.java  |   2 +-
 .../mpprest/impl/GrafanaApiServiceImpl.java        |   6 +-
 .../protocol/mpprest/impl/RestApiServiceImpl.java  |   6 +-
 .../iotdb/db/protocol/mqtt/MPPPublishHandler.java  |  20 +-
 .../iotdb/db/protocol/mqtt/PublishHandler.java     | 148 ------
 .../apache/iotdb/db/protocol/rest/RestService.java | 161 -------
 .../db/protocol/rest/filter/ApiOriginFilter.java   |  45 --
 .../protocol/rest/filter/AuthorizationFilter.java  | 138 ------
 .../protocol/rest/filter/BasicSecurityContext.java |  56 ---
 .../apache/iotdb/db/protocol/rest/filter/User.java |  38 --
 .../iotdb/db/protocol/rest/filter/UserCache.java   |  56 ---
 .../rest/handler/AuthorizationHandler.java         |  47 --
 .../db/protocol/rest/handler/ExceptionHandler.java |  75 ----
 .../handler/PhysicalPlanConstructionHandler.java   | 163 -------
 .../handler/PhysicalPlanValidationHandler.java     |  81 ----
 .../protocol/rest/handler/QueryDataSetHandler.java | 332 --------------
 .../rest/handler/RequestValidationHandler.java     |  53 ---
 .../protocol/rest/impl/GrafanaApiServiceImpl.java  | 225 ----------
 .../db/protocol/rest/impl/PingApiServiceImpl.java  |  51 ---
 .../db/protocol/rest/impl/RestApiServiceImpl.java  | 169 -------
 .../main/java/org/apache/iotdb/db/qp/Planner.java  |  19 -
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  56 +--
 .../iotdb/db/query/context/QueryContext.java       |  14 +-
 .../db/query/control/QueryResourceManager.java     |  11 +-
 .../iotdb/db/query/control/QueryTimeManager.java   |  46 +-
 .../iotdb/db/query/control/SessionManager.java     | 240 ++++------
 .../db/query/control/SessionTimeoutManager.java    | 132 ------
 .../query/control/clientsession/ClientSession.java |  35 +-
 .../control/clientsession/IClientSession.java      |  18 +-
 .../clientsession/InternalClientSession.java       |  37 +-
 .../control/clientsession/MqttClientSession.java   |  24 +-
 .../java/org/apache/iotdb/db/service/DataNode.java |   2 -
 .../java/org/apache/iotdb/db/service/IoTDB.java    |  12 +-
 .../org/apache/iotdb/db/service/MQTTService.java   |   3 +-
 .../java/org/apache/iotdb/db/service/NewIoTDB.java |   2 -
 .../iotdb/db/service/basic/ServiceProvider.java    |   1 -
 .../service/thrift/impl/ClientRPCServiceImpl.java  |  72 ++-
 .../impl/DataNodeInternalRPCServiceImpl.java       |  17 +-
 .../service/thrift/impl/InfluxDBServiceImpl.java   | 187 --------
 .../db/service/thrift/impl/TSServiceImpl.java      | 164 +------
 .../db/sync/receiver/load/DeletionLoader.java      |   2 +-
 .../iotdb/db/sync/receiver/load/TsFileLoader.java  |   2 +-
 .../db/mpp/plan/StandaloneCoordinatorTest.java     |  14 +-
 .../apache/iotdb/db/utils/EnvironmentUtils.java    |   9 +-
 58 files changed, 287 insertions(+), 4309 deletions(-)
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/cq/CQLogReader.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/cq/CQLogWriter.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/cq/ContinuousQuerySchemaCheckTask.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/cq/ContinuousQueryService.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/cq/ContinuousQueryTask.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/cq/ContinuousQueryTaskPoolManager.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/influxdb/handler/QueryHandler.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/influxdb/meta/InfluxDBMetaManager.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/mqtt/PublishHandler.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/rest/RestService.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/ApiOriginFilter.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/AuthorizationFilter.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/BasicSecurityContext.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/User.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/UserCache.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/AuthorizationHandler.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/ExceptionHandler.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/PhysicalPlanConstructionHandler.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/PhysicalPlanValidationHandler.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/QueryDataSetHandler.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/rest/handler/RequestValidationHandler.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/PingApiServiceImpl.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/control/SessionTimeoutManager.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/service/thrift/impl/InfluxDBServiceImpl.java