This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git.
from 545be9f --other=fix maven-shaded-plugin overwrite META-INF/services
in default (#2135)
add 57df9a2 [INLONG-2109][manager] support db SQL collect (#2110)
No new revisions were added by this update.
Summary of changes:
.../inlong/agent/constants/JobConstants.java | 2 +
.../org/apache/inlong/agent/db/JobProfileDb.java | 16 +-
.../apache/inlong/agent/db/TestBerkeleyDBImp.java | 3 +-
.../org/apache/inlong/agent/core/AgentManager.java | 22 ++-
.../apache/inlong/agent/core/conf/ConfigJetty.java | 2 +-
.../apache/inlong/agent/core/job/JobManager.java | 106 +++++++----
.../agent/core/task/TaskPositionManager.java | 2 +-
.../inlong/agent/core/trigger/TriggerManager.java | 2 +-
.../agent/plugin/fetcher/ManagerFetcher.java | 196 ++++++++++++++-----
.../plugin/fetcher/ManagerResultFormatter.java | 73 +------
.../plugin/fetcher/constants/FetcherConstants.java | 10 +-
.../dtos/{DataConfig.java => DbCollectorTask.java} | 30 +--
...eturnDto.java => DbCollectorTaskReportDto.java} | 8 +-
...Dto.java => DbCollectorTaskReportResponse.java} | 8 +-
...turnDto.java => DbCollectorTaskRequestDto.java} | 8 +-
...kRequestDto.java => DbCollectorTaskResult.java} | 24 ++-
.../agent/plugin/fetcher/dtos/JobProfileDto.java | 69 ++++++-
.../plugin/fetcher/dtos/SqlJobProfileDto.java | 131 +++++++++++++
.../agent/plugin/fetcher/dtos/TaskResult.java | 11 +-
.../org/apache/inlong/agent/plugin/MiniAgent.java | 2 +-
...java => DBCollectorDetailTaskEntityStatus.java} | 32 ++--
...ationType.java => DBCollectorTaskConstant.java} | 6 +-
.../common/enums/DBCollectorTaskReturnCode.java | 29 +--
.../DBCollectorReportTaskRequest.java} | 26 +--
.../pojo/dbcollector/DBCollectorTaskInfo.java | 212 +++++++++++++++++++++
.../DBCollectorTaskRequest.java} | 17 +-
...ntity.java => DBCollectorDetailTaskEntity.java} | 28 +--
...apper.java => DBCollectorDetailTaskMapper.java} | 20 +-
.../mappers/DBCollectorDetailTaskEntityMapper.xml | 70 +++++++
...eatService.java => DBCollectorTaskService.java} | 9 +-
.../core/impl/DBCollectorTaskServiceImpl.java | 116 +++++++++++
.../manager-web/sql/apache_inlong_manager.sql | 32 ++++
.../web/controller/openapi/AgentController.java | 2 +-
.../DBCollectorController.java} | 44 ++---
pom.xml | 1 -
35 files changed, 1049 insertions(+), 320 deletions(-)
copy
inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/{DataConfig.java
=> DbCollectorTask.java} (71%)
copy
inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/{ManagerReturnDto.java
=> DbCollectorTaskReportDto.java} (88%)
copy
inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/{ManagerReturnDto.java
=> DbCollectorTaskReportResponse.java} (88%)
copy
inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/{ManagerReturnDto.java
=> DbCollectorTaskRequestDto.java} (88%)
copy
inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/{TaskRequestDto.java
=> DbCollectorTaskResult.java} (64%)
create mode 100644
inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/dtos/SqlJobProfileDto.java
copy
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/{UserTypeEnum.java
=> DBCollectorDetailTaskEntityStatus.java} (63%)
copy
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/{AuthenticationType.java
=> DBCollectorTaskConstant.java} (86%)
copy
inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/enums/ErrorCode.java
=>
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/DBCollectorTaskReturnCode.java
(64%)
copy
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/{business/BusinessExtInfo.java
=> dbcollector/DBCollectorReportTaskRequest.java} (67%)
create mode 100644
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dbcollector/DBCollectorTaskInfo.java
copy
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/{user/LoginUser.java
=> dbcollector/DBCollectorTaskRequest.java} (76%)
copy
inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/{CommonFileServerEntity.java
=> DBCollectorDetailTaskEntity.java} (69%)
copy
inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/{RoleEntityMapper.java
=> DBCollectorDetailTaskMapper.java} (67%)
create mode 100644
inlong-manager/manager-dao/src/main/resources/mappers/DBCollectorDetailTaskEntityMapper.xml
copy
inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/{AgentHeartBeatService.java
=> DBCollectorTaskService.java} (67%)
create mode 100644
inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DBCollectorTaskServiceImpl.java
copy
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/{ThirdPartController.java
=> openapi/DBCollectorController.java} (52%)