This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 535617f7c [INLONG-3544][Manager] Refactor file source APIs (#3551)
535617f7c is described below
commit 535617f7c859b89f34167aba757584de3648f4c2
Author: healchow <[email protected]>
AuthorDate: Wed Apr 6 15:56:48 2022 +0800
[INLONG-3544][Manager] Refactor file source APIs (#3551)
---
.../common/pojo/agent/AgentHeartbeatRequest.java | 36 ---
.../manager/common/pojo/agent/AgentStatus.java | 300 -----------------
.../pojo/agent/AgentStatusReportRequest.java | 36 ---
.../manager/common/pojo/agent/AgentSysConfig.java | 112 -------
.../common/pojo/agent/AgentSysconfRequest.java | 36 ---
.../pojo/agent/CheckAgentTaskConfRequest.java | 34 --
.../common/pojo/agent/ConfirmAgentIpRequest.java | 34 --
.../manager/common/pojo/agent/DataConfig.java | 69 ----
.../common/pojo/agent/FileAgentCMDConfig.java | 39 ---
.../common/pojo/agent/FileAgentCommandInfo.java | 65 ----
.../common/pojo/agent/FileAgentTaskConfig.java | 83 -----
.../common/pojo/agent/FileAgentTaskInfo.java | 36 ---
.../common/pojo/agent/HeartbeatMessage.java | 90 ------
.../manager/dao/entity/AgentHeartbeatEntity.java | 34 --
.../dao/mapper/AgentHeartbeatEntityMapper.java | 40 ---
.../dao/mapper/AgentSysConfigEntityMapper.java | 37 ---
.../dao/mapper/InlongStreamFieldEntityMapper.java | 3 -
.../dao/mapper/SourceFileDetailEntityMapper.java | 10 +-
.../src/main/resources/generatorConfig.xml | 8 +-
.../mappers/AgentHeartbeatEntityMapper.xml | 110 -------
.../mappers/AgentSysConfigEntityMapper.xml | 355 ---------------------
.../resources/mappers/InlongGroupEntityMapper.xml | 5 +-
.../mappers/InlongStreamFieldEntityMapper.xml | 11 -
.../mappers/SourceFileDetailEntityMapper.xml | 83 -----
.../dao/mapper/AgentHeartbeatEntityMapperTest.java | 101 ------
.../dao/mapper/InlongGroupEntityMapperTest.java | 66 ++++
.../service/core/AgentHeartbeatService.java | 29 --
.../inlong/manager/service/core/AgentService.java | 17 -
.../service/core/AgentSysConfigService.java | 27 --
.../core/impl/AgentHeartbeatServiceImpl.java | 55 ----
.../service/core/impl/AgentServiceImpl.java | 285 +----------------
.../core/impl/AgentSysConfigServiceImpl.java | 78 -----
.../main/resources/sql/apache_inlong_manager.sql | 135 +++-----
.../manager-web/sql/apache_inlong_manager.sql | 97 ++----
.../web/controller/openapi/AgentController.java | 52 ---
35 files changed, 142 insertions(+), 2466 deletions(-)
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/AgentHeartbeatRequest.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/AgentHeartbeatRequest.java
deleted file mode 100644
index f502d38e7..000000000
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/AgentHeartbeatRequest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.common.pojo.agent;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("Agent heartbeat request param")
-@Data
-public class AgentHeartbeatRequest {
-
- @ApiModelProperty(value = "Type: TDAgent")
- private String type;
-
- @ApiModelProperty(value = "Agent IP")
- private String agentIp;
-
- @ApiModelProperty(value = "Heartbeat message")
- private HeartbeatMessage heart;
-}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/AgentStatus.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/AgentStatus.java
deleted file mode 100644
index db97e7298..000000000
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/AgentStatus.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.common.pojo.agent;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.List;
-import lombok.Data;
-
-@Data
-@ApiModel("Agent status info")
-public class AgentStatus {
-
- @ApiModelProperty(value = "Current time")
- private String time;
-
- @ApiModelProperty(value = "Agent version")
- private String version;
-
- @ApiModelProperty(value = "Agent register info")
- private List<RegisterInfo> registerInfo;
-
- @ApiModelProperty(value = "Information being read")
- private ReadingInfo readingInfo;
-
- @ApiModelProperty(value = "Retry data list")
- private List<RetryInfo> retryInfo;
-
- @ApiModelProperty(value = "Documents that have not been completed")
- private List<RetryUnfinishedFile> retryUnfinishedFile;
-
- public static class RegisterInfo {
-
- @SerializedName("taskId")
- private long taskId;
-
- @SerializedName("registerMsg")
- private String registerMsg;
-
- public long getTaskId() {
- return taskId;
- }
-
- public void setTaskId(long taskId) {
- this.taskId = taskId;
- }
-
- public String getRegisterMsg() {
- return registerMsg;
- }
-
- public void setRegisterMsg(String registerMsg) {
- this.registerMsg = registerMsg;
- }
- }
-
- public static class RetryInfo {
-
- @SerializedName("taskId")
- private long taskId;
-
- @SerializedName("fileNum")
- private int fileNum;
-
- @SerializedName("dataTime")
- private String dataTime;
-
- @SerializedName("fileList")
- private List<String> fileList;
-
- public long getTaskId() {
- return taskId;
- }
-
- public void setTaskId(long taskId) {
- this.taskId = taskId;
- }
-
- public int getFileNum() {
- return fileNum;
- }
-
- public void setFileNum(int fileNum) {
- this.fileNum = fileNum;
- }
-
- public String getDataTime() {
- return dataTime;
- }
-
- public void setDataTime(String dataTime) {
- this.dataTime = dataTime;
- }
-
- public List<String> getFileList() {
- return fileList;
- }
-
- public void setFileList(List<String> fileList) {
- this.fileList = fileList;
- }
- }
-
- public static class RetryUnfinishedFile {
-
- @SerializedName("taskId")
- private long taskId;
-
- @SerializedName("ufFileNum")
- private int ufFileNum;
-
- @SerializedName("dataTime")
- private String dataTime;
-
- @SerializedName("ufFileList")
- private List<String> ufFileList;
-
- public long getTaskId() {
- return taskId;
- }
-
- public void setTaskId(long taskId) {
- this.taskId = taskId;
- }
-
- public int getUfFileNum() {
- return ufFileNum;
- }
-
- public void setUfFileNum(int ufFileNum) {
- this.ufFileNum = ufFileNum;
- }
-
- public String getDataTime() {
- return dataTime;
- }
-
- public void setDataTime(String dataTime) {
- this.dataTime = dataTime;
- }
-
- public List<String> getUfFileList() {
- return ufFileList;
- }
-
- public void setUfFileList(List<String> ufFileList) {
- this.ufFileList = ufFileList;
- }
- }
-
- public static class ReadingInfo {
-
- @SerializedName("readingCount")
- private int readingCount;
-
- @SerializedName("readingDetails")
- private ReadingDetails readingDetails;
-
- public int getReadingCount() {
- return readingCount;
- }
-
- public void setReadingCount(int readingCount) {
- this.readingCount = readingCount;
- }
-
- public ReadingDetails getReadingDetails() {
- return readingDetails;
- }
-
- public void setReadingDetails(ReadingDetails readingDetails) {
- this.readingDetails = readingDetails;
- }
- }
-
- public static class ReadingDetails {
-
- @SerializedName("normalFile")
- private List<NormalFile> normalFile;
-
- @SerializedName("retryFile")
- private List<RetryFile> retryFile;
-
- public List<NormalFile> getNormalFile() {
- return normalFile;
- }
-
- public void setNormalFile(List<NormalFile> normalFile) {
- this.normalFile = normalFile;
- }
-
- public List<RetryFile> getRetryFile() {
- return retryFile;
- }
-
- public void setRetryFile(List<RetryFile> retryFile) {
- this.retryFile = retryFile;
- }
- }
-
- public static class NormalFile {
-
- @SerializedName("dataTime")
- private String dataTime;
-
- @SerializedName("taskId")
- private long taskId;
-
- @SerializedName("fileName")
- private String fileName;
-
- public String getDataTime() {
- return dataTime;
- }
-
- public void setDataTime(String dataTime) {
- this.dataTime = dataTime;
- }
-
- public long getTaskId() {
- return taskId;
- }
-
- public void setTaskId(long taskId) {
- this.taskId = taskId;
- }
-
- public String getFileName() {
- return fileName;
- }
-
- public void setFileName(String fileName) {
- this.fileName = fileName;
- }
- }
-
- public static class RetryFile {
-
- @SerializedName("dataTime")
- private String dataTime;
-
- @SerializedName("taskId")
- private long taskId;
-
- @SerializedName("fileNum")
- private int fileNum;
-
- @SerializedName("readingFileList")
- private List<String> readingFileList;
-
- public String getDataTime() {
- return dataTime;
- }
-
- public void setDataTime(String dataTime) {
- this.dataTime = dataTime;
- }
-
- public long getTaskId() {
- return taskId;
- }
-
- public void setTaskId(long taskId) {
- this.taskId = taskId;
- }
-
- public int getFileNum() {
- return fileNum;
- }
-
- public void setFileNum(int fileNum) {
- this.fileNum = fileNum;
- }
-
- public List<String> getReadingFileList() {
- return readingFileList;
- }
-
- public void setReadingFileList(List<String> readingFileList) {
- this.readingFileList = readingFileList;
- }
- }
-
-}
\ No newline at end of file
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/AgentStatusReportRequest.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/AgentStatusReportRequest.java
deleted file mode 100644
index ee875f4cb..000000000
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/AgentStatusReportRequest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.common.pojo.agent;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * Agent status report request
- */
-@ApiModel("Agent status report request")
-@Data
-public class AgentStatusReportRequest {
-
- @ApiModelProperty(value = "Agent IP")
- private String agentIp;
-
- @ApiModelProperty(value = "Agent status")
- private AgentStatus agentStatus;
-}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/AgentSysConfig.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/AgentSysConfig.java
deleted file mode 100644
index 35727d75e..000000000
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/AgentSysConfig.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.common.pojo.agent;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@ApiModel("Agent system config")
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Data
-public class AgentSysConfig {
-
- @ApiModelProperty(value = "msgQueueSize")
- private long msgQueueSize;
-
- @ApiModelProperty(value = "clearDayOffset")
- private int clearDayOffset;
-
- @ApiModelProperty(value = "bufferSize")
- private int bufferSize;
-
- @ApiModelProperty(value = "flushEventTimeoutMillSec")
- private int flushEventTimeoutMillSec;
-
- @ApiModelProperty(value = "threadManagerSleepInterval")
- private int threadManagerSleepInterval;
-
- @ApiModelProperty(value = "sendRunnableSize")
- private int sendRunnableSize;
-
- @ApiModelProperty(value = "minRetryThreads")
- private int minRetryThreads;
-
- @ApiModelProperty(value = "clearIntervalSec")
- private long clearIntervalSec;
-
- @ApiModelProperty(value = "maxReaderCnt")
- private int maxReaderCnt;
-
- @ApiModelProperty(value = "sendTimeoutMillSec")
- private int sendTimeoutMillSec;
-
- @ApiModelProperty(value = "bufferSizeInBytes")
- private int bufferSizeInBytes;
-
- @ApiModelProperty(value = "maxRetryThreads")
- private int maxRetryThreads;
-
- @ApiModelProperty(value = "dbPath")
- private String dbPath;
-
- @ApiModelProperty(value = "scanIntervalSec")
- private int scanIntervalSec;
-
- @ApiModelProperty(value = "compress")
- private boolean compress;
-
- @ApiModelProperty(value = "isCalcMd5")
- private boolean isCalcMd5;
-
- @ApiModelProperty(value = "agent ip")
- private String ip;
-
- @ApiModelProperty(value = "flowSize")
- private long flowSize;
-
- @ApiModelProperty(value = "onelineSize")
- private int onelineSize;
-
- @ApiModelProperty(value = "eventCheckInterval")
- private int eventCheckInterval;
-
- @ApiModelProperty(value = "confRefreshIntervalSecs")
- private int confRefreshIntervalSecs;
-
- @ApiModelProperty(value = "statIntervalSec")
- private int statIntervalSec;
-
- @ApiModelProperty(value = "msgSize")
- private int msgSize;
-
- @ApiModelProperty(value = "md5")
- private String md5;
-
- @ApiModelProperty(value = "batchSize")
- private int batchSize;
-
- @ApiModelProperty(value = "agentRpcReconnectTime")
- private int agentRpcReconnectTime;
-
-}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/AgentSysconfRequest.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/AgentSysconfRequest.java
deleted file mode 100644
index f192616bb..000000000
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/AgentSysconfRequest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.common.pojo.agent;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * Request for obtaining agent system configuration information
- */
-@ApiModel("Request for obtaining agent system configuration information")
-@Data
-public class AgentSysconfRequest {
-
- @ApiModelProperty(value = "Agent IP (IP obtained by confirmip)")
- private String agentIp;
-
- @ApiModelProperty(value = "MD5 of the existing configuration")
- private String readerMd5;
-}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/CheckAgentTaskConfRequest.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/CheckAgentTaskConfRequest.java
deleted file mode 100644
index aac02117c..000000000
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/CheckAgentTaskConfRequest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.common.pojo.agent;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.List;
-import lombok.Data;
-
-@ApiModel("Agent source comparison")
-@Data
-public class CheckAgentTaskConfRequest {
-
- @ApiModelProperty(value = "Local ip")
- private String agentIp;
-
- @ApiModelProperty(value = "WorkflowTask ID list")
- private List<Integer> taskInfo;
-}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/ConfirmAgentIpRequest.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/ConfirmAgentIpRequest.java
deleted file mode 100644
index 0adf3a74c..000000000
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/ConfirmAgentIpRequest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.common.pojo.agent;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.List;
-import lombok.Data;
-
-@ApiModel("Confirm current agent IP")
-@Data
-public class ConfirmAgentIpRequest {
-
- @ApiModelProperty(value = "type: agent")
- private String type;
-
- @ApiModelProperty(value = "IP list")
- private List<String> ipList;
-}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/DataConfig.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/DataConfig.java
deleted file mode 100644
index a12cb6067..000000000
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/DataConfig.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.common.pojo.agent;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("Data config")
-@Data
-public class DataConfig {
-
- @ApiModelProperty(value = "Operation type")
- private int opType;
-
- @ApiModelProperty(value = "WorkflowTask id")
- private int id;
-
- @ApiModelProperty(value = "Agent IP")
- private String ip;
-
- @ApiModelProperty(value = "Collection file directory")
- private String dataName;
-
- @ApiModelProperty(value = "Time offset")
- private String timeOffset;
-
- @ApiModelProperty(value = "Message topic")
- private String topic;
-
- @ApiModelProperty(value = "Data interface id")
- private String interfaceId;
-
- @ApiModelProperty(value = "Message queue type")
- private String mqType;
-
- @ApiModelProperty(value = "Cluster id")
- private int clusterId;
-
- @ApiModelProperty(value = "Inlong group id")
- private String inlongGroupId;
-
- @ApiModelProperty(value = "Schedule time")
- private String scheduleTime;
-
- @ApiModelProperty(value = "Additional info that needs to be added to the
message header when writing to DataProxy")
- private String additionalAttr;
-
- @ApiModelProperty(value = "Field splitter")
- private String fieldSplitter;
-
- @ApiModelProperty(value = "WorkflowTask type")
- private int taskType;
-}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/FileAgentCMDConfig.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/FileAgentCMDConfig.java
deleted file mode 100644
index 603b50d0a..000000000
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/FileAgentCMDConfig.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.common.pojo.agent;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("File Agent Special Operation")
-@Data
-public class FileAgentCMDConfig {
-
- @ApiModelProperty(value = "Operation id")
- private int id;
-
- @ApiModelProperty(value = "WorkflowTask id")
- private int taskId;
-
- @ApiModelProperty(value = "Operation")
- private int op;
-
- @ApiModelProperty(value = "Operation time")
- private String dataTime;
-}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/FileAgentCommandInfo.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/FileAgentCommandInfo.java
deleted file mode 100644
index 815e842e4..000000000
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/FileAgentCommandInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.common.pojo.agent;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * File agent operation result
- */
-@ApiModel("File agent operation result")
-@Data
-public class FileAgentCommandInfo {
-
- @ApiModelProperty(value = "agentIp")
- private String agentIp;
-
- @ApiModelProperty(value = "agent result details")
- private List<CommandInfoBean> commandInfo;
-
- @ApiModel("File agent command info")
- @Data
- public static class CommandInfoBean {
-
- @ApiModelProperty(value = "operation result")
- private int commandResult;
-
- @ApiModelProperty(value = "Command issuance time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date deliveryTime;
-
- @ApiModelProperty(value = "task id")
- private int taskId;
-
- @ApiModelProperty(value = "operation type")
- private int op;
-
- @ApiModelProperty(value = "data time")
- private String dataTime;
-
- @ApiModelProperty(value = "operation id")
- private int id;
-
- }
-}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/FileAgentTaskConfig.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/FileAgentTaskConfig.java
deleted file mode 100644
index 44136e4c6..000000000
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/FileAgentTaskConfig.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.common.pojo.agent;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * File agent task config
- */
-@ApiModel("File agent task config")
-@Data
-public class FileAgentTaskConfig {
-
- private String inlongGroupId;
-
- private String inlongStreamId;
-
- @ApiModelProperty(value = "Operation type")
- private String op;
-
- @ApiModelProperty(value = "Command delivery time")
- private Date deliveryTime;
-
- @ApiModelProperty(value = "WorkflowTask id")
- private int taskId;
-
- @ApiModelProperty(value = "Agent IP")
- private String ip;
-
- @ApiModelProperty(value = "Collection file directory")
- private String dataName;
-
- @ApiModelProperty(value = "Time offset")
- private String timeOffset;
-
- @ApiModelProperty(value = "Message topic")
- private String topic;
-
- @ApiModelProperty(value = "Schedule time")
- private String scheduleTime;
-
- @ApiModelProperty(value = "Middleware type")
- private String middlewareType;
-
- @ApiModelProperty(value = "Field splitter")
- private String fieldSplitter;
-
- @ApiModelProperty(value = "Message queue master address")
- private String mqMasterAddress;
-
- @ApiModelProperty(value = "Additional attribute")
- private String additionalAttr;
-
- @JsonIgnore
- @ApiModelProperty(value = "Data generate rule")
- private String dataGenerateRule;
-
- @JsonIgnore
- private String sortType;
-
- @JsonIgnore
- private int status;
-
-}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/FileAgentTaskInfo.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/FileAgentTaskInfo.java
deleted file mode 100644
index ffae522f2..000000000
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/FileAgentTaskInfo.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.common.pojo.agent;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.List;
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@ApiModel("File Agent task info")
-@Builder
-public class FileAgentTaskInfo {
-
- @ApiModelProperty(value = "Command config list")
- private List<FileAgentCMDConfig> cmdConfigs;
-
- @ApiModelProperty(value = "WorkflowTask config list")
- private List<FileAgentTaskConfig> dataConfigs;
-}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/HeartbeatMessage.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/HeartbeatMessage.java
deleted file mode 100644
index 9c1b59933..000000000
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/agent/HeartbeatMessage.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.common.pojo.agent;
-
-import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModel;
-import java.util.List;
-import lombok.Data;
-
-/**
- * Heartbeat message
- */
-@Data
-@ApiModel("Heartbeat message")
-public class HeartbeatMessage {
-
- @SerializedName("ip")
- private String ip;
-
- @SerializedName("version")
- private String version;
-
- @SerializedName("startupTime")
- private String startupTime;
-
- @SerializedName("time")
- private String time;
-
- @SerializedName("firstReport")
- private boolean firstReport;
-
- @SerializedName("bufferUsage")
- private String bufferUsage;
-
- @SerializedName("sendQueueUsage")
- private String sendQueueUsage;
-
- @SerializedName("retryQueueUsage")
- private String retryQueueUsage;
-
- @SerializedName("usedMemoryPercent")
- private String usedMemoryPercent;
-
- @SerializedName("usedDiskPercent")
- private String usedDiskPercent;
-
- @SerializedName("taskInfos")
- private List<TaskInfo> taskInfos;
-
- public static class TaskInfo {
-
- @SerializedName("taskId")
- private int taskId;
-
- @SerializedName("delayTime")
- private String delayTime;
-
- public int getTaskId() {
- return taskId;
- }
-
- public void setTaskId(int taskId) {
- this.taskId = taskId;
- }
-
- public String getDelayTime() {
- return delayTime;
- }
-
- public void setDelayTime(String delayTime) {
- this.delayTime = delayTime;
- }
- }
-
-}
diff --git
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/AgentHeartbeatEntity.java
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/AgentHeartbeatEntity.java
deleted file mode 100644
index 31880a847..000000000
---
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/AgentHeartbeatEntity.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.dao.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class AgentHeartbeatEntity implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private String ip;
- private String version;
- private Date modifyTime;
- private String heartbeatMsg;
-
-}
\ No newline at end of file
diff --git
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/AgentHeartbeatEntityMapper.java
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/AgentHeartbeatEntityMapper.java
deleted file mode 100644
index a2d7c619e..000000000
---
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/AgentHeartbeatEntityMapper.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.dao.mapper;
-
-import org.apache.inlong.manager.dao.entity.AgentHeartbeatEntity;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface AgentHeartbeatEntityMapper {
-
- int deleteByPrimaryKey(String ip);
-
- int insert(AgentHeartbeatEntity record);
-
- int insertSelective(AgentHeartbeatEntity record);
-
- AgentHeartbeatEntity selectByPrimaryKey(String ip);
-
- int updateByPrimaryKeySelective(AgentHeartbeatEntity record);
-
- int updateByPrimaryKey(AgentHeartbeatEntity record);
-
- int replace(AgentHeartbeatEntity record);
-
-}
\ No newline at end of file
diff --git
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/AgentSysConfigEntityMapper.java
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/AgentSysConfigEntityMapper.java
deleted file mode 100644
index b10527beb..000000000
---
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/AgentSysConfigEntityMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.dao.mapper;
-
-import org.apache.inlong.manager.dao.entity.AgentSysConfigEntity;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface AgentSysConfigEntityMapper {
-
- int deleteByPrimaryKey(String ip);
-
- int insert(AgentSysConfigEntity record);
-
- int insertSelective(AgentSysConfigEntity record);
-
- AgentSysConfigEntity selectByPrimaryKey(String ip);
-
- int updateByPrimaryKeySelective(AgentSysConfigEntity record);
-
- int updateByPrimaryKey(AgentSysConfigEntity record);
-}
\ No newline at end of file
diff --git
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongStreamFieldEntityMapper.java
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongStreamFieldEntityMapper.java
index c598c3123..9a5465a06 100644
---
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongStreamFieldEntityMapper.java
+++
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongStreamFieldEntityMapper.java
@@ -35,9 +35,6 @@ public interface InlongStreamFieldEntityMapper {
List<InlongStreamFieldEntity> selectByIdentifier(@Param("groupId") String
groupId,
@Param("streamId") String streamId);
- List<InlongStreamFieldEntity> selectFields(@Param("groupId") String
groupId,
- @Param("streamId") String streamId);
-
int deleteByPrimaryKey(Integer id);
/**
diff --git
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceFileDetailEntityMapper.java
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceFileDetailEntityMapper.java
index 76efff93c..fa618de1a 100644
---
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceFileDetailEntityMapper.java
+++
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceFileDetailEntityMapper.java
@@ -17,13 +17,13 @@
package org.apache.inlong.manager.dao.mapper;
-import java.util.List;
import org.apache.ibatis.annotations.Param;
-import org.apache.inlong.manager.common.pojo.agent.FileAgentTaskConfig;
import
org.apache.inlong.manager.common.pojo.source.SourceFileDetailPageRequest;
import org.apache.inlong.manager.dao.entity.SourceFileDetailEntity;
import org.springframework.stereotype.Repository;
+import java.util.List;
+
@Repository
public interface SourceFileDetailEntityMapper {
@@ -66,10 +66,6 @@ public interface SourceFileDetailEntityMapper {
Integer selectDetailExist(@Param("groupId") String groupId,
@Param("streamId") String streamId,
@Param("ip") String ip, @Param("username") String username);
- List<FileAgentTaskConfig> selectFileAgentTaskByIp(@Param("ip") String
agentIp);
-
- List<FileAgentTaskConfig> selectFileAgentTaskByIpForCheck(@Param("ip")
String agentIp);
-
/**
* According to inlong group id and inlong stream id, query file source
details
*
@@ -95,6 +91,4 @@ public interface SourceFileDetailEntityMapper {
int logicDeleteByIdentifier(@Param("groupId") String groupId,
@Param("streamId") String streamId,
@Param("operator") String operator);
- List<SourceFileDetailEntity> selectByIp(@Param("ip") String ip);
-
}
\ No newline at end of file
diff --git a/inlong-manager/manager-dao/src/main/resources/generatorConfig.xml
b/inlong-manager/manager-dao/src/main/resources/generatorConfig.xml
index 91a53bd05..1aae414bb 100644
--- a/inlong-manager/manager-dao/src/main/resources/generatorConfig.xml
+++ b/inlong-manager/manager-dao/src/main/resources/generatorConfig.xml
@@ -67,13 +67,7 @@
</javaClientGenerator>
<!-- Which entities to generate -->
- <!--<table tableName="agent_heartbeat"
domainObjectName="AgentHeartbeatEntity" enableSelectByPrimaryKey="true"
- enableUpdateByPrimaryKey="true"
- enableDeleteByPrimaryKey="true" enableInsert="true"
- enableCountByExample="false" enableDeleteByExample="false"
- enableSelectByExample="false" enableUpdateByExample="false"/>
-
- <table tableName="user" domainObjectName="UserEntity"
+ <!--<table tableName="user" domainObjectName="UserEntity"
enableSelectByPrimaryKey="true"
enableUpdateByPrimaryKey="true"
enableDeleteByPrimaryKey="true" enableInsert="true"
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/AgentHeartbeatEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/AgentHeartbeatEntityMapper.xml
deleted file mode 100644
index 9c3fd42a7..000000000
---
a/inlong-manager/manager-dao/src/main/resources/mappers/AgentHeartbeatEntityMapper.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd";>
-<mapper
namespace="org.apache.inlong.manager.dao.mapper.AgentHeartbeatEntityMapper">
- <resultMap id="BaseResultMap"
type="org.apache.inlong.manager.dao.entity.AgentHeartbeatEntity">
- <id column="ip" jdbcType="VARCHAR" property="ip"/>
- <result column="version" jdbcType="VARCHAR" property="version"/>
- <result column="modify_time" jdbcType="TIMESTAMP"
property="modifyTime"/>
- <result column="modify_time" jdbcType="TIMESTAMP"
property="modifyTime"/>
- <result column="heartbeat_msg" jdbcType="LONGVARCHAR"
property="heartbeatMsg"/>
- </resultMap>
- <sql id="Base_Column_List">
- ip, version, modify_time, heartbeat_msg
- </sql>
- <select id="selectByPrimaryKey" parameterType="java.lang.String"
resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from agent_heartbeat
- where ip = #{ip,jdbcType=VARCHAR}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
- delete
- from agent_heartbeat
- where ip = #{ip,jdbcType=VARCHAR}
- </delete>
- <insert id="insert"
parameterType="org.apache.inlong.manager.dao.entity.AgentHeartbeatEntity">
- insert into agent_heartbeat (ip, version, modify_time,
- heartbeat_msg)
- values (#{ip,jdbcType=VARCHAR}, #{version,jdbcType=VARCHAR},
#{modifyTime,jdbcType=TIMESTAMP},
- #{heartbeatMsg,jdbcType=LONGVARCHAR})
- </insert>
- <insert id="insertSelective"
parameterType="org.apache.inlong.manager.dao.entity.AgentHeartbeatEntity">
- insert into agent_heartbeat
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="ip != null">
- ip,
- </if>
- <if test="version != null">
- version,
- </if>
- <if test="modifyTime != null">
- modify_time,
- </if>
- <if test="heartbeatMsg != null">
- heartbeat_msg,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="ip != null">
- #{ip,jdbcType=VARCHAR},
- </if>
- <if test="version != null">
- #{version,jdbcType=VARCHAR},
- </if>
- <if test="modifyTime != null">
- #{modifyTime,jdbcType=TIMESTAMP},
- </if>
- <if test="heartbeatMsg != null">
- #{heartbeatMsg,jdbcType=LONGVARCHAR},
- </if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective"
-
parameterType="org.apache.inlong.manager.dao.entity.AgentHeartbeatEntity">
- update agent_heartbeat
- <set>
- <if test="version != null">
- version = #{version,jdbcType=VARCHAR},
- </if>
- <if test="modifyTime != null">
- modify_time = #{modifyTime,jdbcType=TIMESTAMP},
- </if>
- <if test="heartbeatMsg != null">
- heartbeat_msg = #{heartbeatMsg,jdbcType=LONGVARCHAR},
- </if>
- </set>
- where ip = #{ip,jdbcType=VARCHAR}
- </update>
- <update id="updateByPrimaryKey"
parameterType="org.apache.inlong.manager.dao.entity.AgentHeartbeatEntity">
- update agent_heartbeat
- set version = #{version,jdbcType=VARCHAR},
- modify_time = #{modifyTime,jdbcType=TIMESTAMP},
- heartbeat_msg = #{heartbeatMsg,jdbcType=LONGVARCHAR}
- where ip = #{ip,jdbcType=VARCHAR}
- </update>
- <insert id="replace"
parameterType="org.apache.inlong.manager.dao.entity.AgentHeartbeatEntity">
- replace into agent_heartbeat (ip, version, modify_time,
- heartbeat_msg)
- values (#{ip,jdbcType=VARCHAR}, #{version,jdbcType=VARCHAR},
#{modifyTime,jdbcType=TIMESTAMP},
- #{heartbeatMsg,jdbcType=LONGVARCHAR})
- </insert>
-</mapper>
\ No newline at end of file
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/AgentSysConfigEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/AgentSysConfigEntityMapper.xml
deleted file mode 100644
index 53555c9a1..000000000
---
a/inlong-manager/manager-dao/src/main/resources/mappers/AgentSysConfigEntityMapper.xml
+++ /dev/null
@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd";>
-<mapper
namespace="org.apache.inlong.manager.dao.mapper.AgentSysConfigEntityMapper">
- <resultMap id="BaseResultMap"
type="org.apache.inlong.manager.dao.entity.AgentSysConfigEntity">
- <id column="ip" jdbcType="VARCHAR" property="ip"/>
- <result column="max_retry_threads" jdbcType="INTEGER"
property="maxRetryThreads"/>
- <result column="min_retry_threads" jdbcType="INTEGER"
property="minRetryThreads"/>
- <result column="db_path" jdbcType="VARCHAR" property="dbPath"/>
- <result column="scan_interval_sec" jdbcType="INTEGER"
property="scanIntervalSec"/>
- <result column="batch_size" jdbcType="INTEGER" property="batchSize"/>
- <result column="msg_size" jdbcType="INTEGER" property="msgSize"/>
- <result column="send_runnable_size" jdbcType="INTEGER"
property="sendRunnableSize"/>
- <result column="msg_queue_size" jdbcType="INTEGER"
property="msgQueueSize"/>
- <result column="max_reader_cnt" jdbcType="INTEGER"
property="maxReaderCnt"/>
- <result column="thread_manager_sleep_interval" jdbcType="INTEGER"
property="threadManagerSleepInterval"/>
- <result column="oneline_size" jdbcType="INTEGER"
property="onelineSize"/>
- <result column="clear_day_offset" jdbcType="INTEGER"
property="clearDayOffset"/>
- <result column="clear_interval_sec" jdbcType="INTEGER"
property="clearIntervalSec"/>
- <result column="buffer_size_in_bytes" jdbcType="INTEGER"
property="bufferSizeInBytes"/>
- <result column="agent_rpc_reconnect_time" jdbcType="INTEGER"
property="agentRpcReconnectTime"/>
- <result column="send_timeout_mill_sec" jdbcType="INTEGER"
property="sendTimeoutMillSec"/>
- <result column="flush_event_timeout_mill_sec" jdbcType="INTEGER"
property="flushEventTimeoutMillSec"/>
- <result column="stat_interval_sec" jdbcType="INTEGER"
property="statIntervalSec"/>
- <result column="conf_refresh_interval_secs" jdbcType="INTEGER"
property="confRefreshIntervalSecs"/>
- <result column="flow_size" jdbcType="INTEGER" property="flowSize"/>
- <result column="bufferSize" jdbcType="INTEGER" property="buffersize"/>
- <result column="compress" jdbcType="TINYINT" property="compress"/>
- <result column="event_check_interval" jdbcType="INTEGER"
property="eventCheckInterval"/>
- <result column="is_calMD5" jdbcType="TINYINT" property="isCalmd5"/>
- </resultMap>
- <sql id="Base_Column_List">
- ip, max_retry_threads, min_retry_threads, db_path, scan_interval_sec,
batch_size,
- msg_size, send_runnable_size, msg_queue_size, max_reader_cnt,
thread_manager_sleep_interval,
- oneline_size, clear_day_offset, clear_interval_sec,
buffer_size_in_bytes, agent_rpc_reconnect_time,
- send_timeout_mill_sec, flush_event_timeout_mill_sec,
stat_interval_sec, conf_refresh_interval_secs,
- flow_size, bufferSize, compress, event_check_interval, is_calMD5
- </sql>
- <select id="selectByPrimaryKey" parameterType="java.lang.String"
resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from agent_sys_conf
- where ip = #{ip,jdbcType=VARCHAR}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
- delete
- from agent_sys_conf
- where ip = #{ip,jdbcType=VARCHAR}
- </delete>
- <insert id="insert"
parameterType="org.apache.inlong.manager.dao.entity.AgentSysConfigEntity">
- insert into agent_sys_conf (ip, max_retry_threads,
- min_retry_threads, db_path,
scan_interval_sec,
- batch_size, msg_size, send_runnable_size,
- msg_queue_size, max_reader_cnt,
thread_manager_sleep_interval,
- oneline_size, clear_day_offset,
clear_interval_sec,
- buffer_size_in_bytes,
agent_rpc_reconnect_time,
- send_timeout_mill_sec,
flush_event_timeout_mill_sec,
- stat_interval_sec,
conf_refresh_interval_secs,
- flow_size, bufferSize, compress,
- event_check_interval, is_calMD5)
- values (#{ip,jdbcType=VARCHAR}, #{maxRetryThreads,jdbcType=INTEGER},
- #{minRetryThreads,jdbcType=INTEGER},
#{dbPath,jdbcType=VARCHAR}, #{scanIntervalSec,jdbcType=INTEGER},
- #{batchSize,jdbcType=INTEGER}, #{msgSize,jdbcType=INTEGER},
#{sendRunnableSize,jdbcType=INTEGER},
- #{msgQueueSize,jdbcType=INTEGER},
#{maxReaderCnt,jdbcType=INTEGER},
- #{threadManagerSleepInterval,jdbcType=INTEGER},
- #{onelineSize,jdbcType=INTEGER},
#{clearDayOffset,jdbcType=INTEGER},
- #{clearIntervalSec,jdbcType=INTEGER},
- #{bufferSizeInBytes,jdbcType=INTEGER},
#{agentRpcReconnectTime,jdbcType=INTEGER},
- #{sendTimeoutMillSec,jdbcType=INTEGER},
#{flushEventTimeoutMillSec,jdbcType=INTEGER},
- #{statIntervalSec,jdbcType=INTEGER},
#{confRefreshIntervalSecs,jdbcType=INTEGER},
- #{flowSize,jdbcType=INTEGER}, #{buffersize,jdbcType=INTEGER},
#{compress,jdbcType=TINYINT},
- #{eventCheckInterval,jdbcType=INTEGER},
#{isCalmd5,jdbcType=TINYINT})
- </insert>
- <insert id="insertSelective"
parameterType="org.apache.inlong.manager.dao.entity.AgentSysConfigEntity">
- insert into agent_sys_conf
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="ip != null">
- ip,
- </if>
- <if test="maxRetryThreads != null">
- max_retry_threads,
- </if>
- <if test="minRetryThreads != null">
- min_retry_threads,
- </if>
- <if test="dbPath != null">
- db_path,
- </if>
- <if test="scanIntervalSec != null">
- scan_interval_sec,
- </if>
- <if test="batchSize != null">
- batch_size,
- </if>
- <if test="msgSize != null">
- msg_size,
- </if>
- <if test="sendRunnableSize != null">
- send_runnable_size,
- </if>
- <if test="msgQueueSize != null">
- msg_queue_size,
- </if>
- <if test="maxReaderCnt != null">
- max_reader_cnt,
- </if>
- <if test="threadManagerSleepInterval != null">
- thread_manager_sleep_interval,
- </if>
- <if test="onelineSize != null">
- oneline_size,
- </if>
- <if test="clearDayOffset != null">
- clear_day_offset,
- </if>
- <if test="clearIntervalSec != null">
- clear_interval_sec,
- </if>
- <if test="bufferSizeInBytes != null">
- buffer_size_in_bytes,
- </if>
- <if test="agentRpcReconnectTime != null">
- agent_rpc_reconnect_time,
- </if>
- <if test="sendTimeoutMillSec != null">
- send_timeout_mill_sec,
- </if>
- <if test="flushEventTimeoutMillSec != null">
- flush_event_timeout_mill_sec,
- </if>
- <if test="statIntervalSec != null">
- stat_interval_sec,
- </if>
- <if test="confRefreshIntervalSecs != null">
- conf_refresh_interval_secs,
- </if>
- <if test="flowSize != null">
- flow_size,
- </if>
- <if test="buffersize != null">
- bufferSize,
- </if>
- <if test="compress != null">
- compress,
- </if>
- <if test="eventCheckInterval != null">
- event_check_interval,
- </if>
- <if test="isCalmd5 != null">
- is_calMD5,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="ip != null">
- #{ip,jdbcType=VARCHAR},
- </if>
- <if test="maxRetryThreads != null">
- #{maxRetryThreads,jdbcType=INTEGER},
- </if>
- <if test="minRetryThreads != null">
- #{minRetryThreads,jdbcType=INTEGER},
- </if>
- <if test="dbPath != null">
- #{dbPath,jdbcType=VARCHAR},
- </if>
- <if test="scanIntervalSec != null">
- #{scanIntervalSec,jdbcType=INTEGER},
- </if>
- <if test="batchSize != null">
- #{batchSize,jdbcType=INTEGER},
- </if>
- <if test="msgSize != null">
- #{msgSize,jdbcType=INTEGER},
- </if>
- <if test="sendRunnableSize != null">
- #{sendRunnableSize,jdbcType=INTEGER},
- </if>
- <if test="msgQueueSize != null">
- #{msgQueueSize,jdbcType=INTEGER},
- </if>
- <if test="maxReaderCnt != null">
- #{maxReaderCnt,jdbcType=INTEGER},
- </if>
- <if test="threadManagerSleepInterval != null">
- #{threadManagerSleepInterval,jdbcType=INTEGER},
- </if>
- <if test="onelineSize != null">
- #{onelineSize,jdbcType=INTEGER},
- </if>
- <if test="clearDayOffset != null">
- #{clearDayOffset,jdbcType=INTEGER},
- </if>
- <if test="clearIntervalSec != null">
- #{clearIntervalSec,jdbcType=INTEGER},
- </if>
- <if test="bufferSizeInBytes != null">
- #{bufferSizeInBytes,jdbcType=INTEGER},
- </if>
- <if test="agentRpcReconnectTime != null">
- #{agentRpcReconnectTime,jdbcType=INTEGER},
- </if>
- <if test="sendTimeoutMillSec != null">
- #{sendTimeoutMillSec,jdbcType=INTEGER},
- </if>
- <if test="flushEventTimeoutMillSec != null">
- #{flushEventTimeoutMillSec,jdbcType=INTEGER},
- </if>
- <if test="statIntervalSec != null">
- #{statIntervalSec,jdbcType=INTEGER},
- </if>
- <if test="confRefreshIntervalSecs != null">
- #{confRefreshIntervalSecs,jdbcType=INTEGER},
- </if>
- <if test="flowSize != null">
- #{flowSize,jdbcType=INTEGER},
- </if>
- <if test="buffersize != null">
- #{buffersize,jdbcType=INTEGER},
- </if>
- <if test="compress != null">
- #{compress,jdbcType=TINYINT},
- </if>
- <if test="eventCheckInterval != null">
- #{eventCheckInterval,jdbcType=INTEGER},
- </if>
- <if test="isCalmd5 != null">
- #{isCalmd5,jdbcType=TINYINT},
- </if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective"
parameterType="org.apache.inlong.manager.dao.entity.AgentSysConfigEntity">
- update agent_sys_conf
- <set>
- <if test="maxRetryThreads != null">
- max_retry_threads = #{maxRetryThreads,jdbcType=INTEGER},
- </if>
- <if test="minRetryThreads != null">
- min_retry_threads = #{minRetryThreads,jdbcType=INTEGER},
- </if>
- <if test="dbPath != null">
- db_path = #{dbPath,jdbcType=VARCHAR},
- </if>
- <if test="scanIntervalSec != null">
- scan_interval_sec = #{scanIntervalSec,jdbcType=INTEGER},
- </if>
- <if test="batchSize != null">
- batch_size = #{batchSize,jdbcType=INTEGER},
- </if>
- <if test="msgSize != null">
- msg_size = #{msgSize,jdbcType=INTEGER},
- </if>
- <if test="sendRunnableSize != null">
- send_runnable_size = #{sendRunnableSize,jdbcType=INTEGER},
- </if>
- <if test="msgQueueSize != null">
- msg_queue_size = #{msgQueueSize,jdbcType=INTEGER},
- </if>
- <if test="maxReaderCnt != null">
- max_reader_cnt = #{maxReaderCnt,jdbcType=INTEGER},
- </if>
- <if test="threadManagerSleepInterval != null">
- thread_manager_sleep_interval =
#{threadManagerSleepInterval,jdbcType=INTEGER},
- </if>
- <if test="onelineSize != null">
- oneline_size = #{onelineSize,jdbcType=INTEGER},
- </if>
- <if test="clearDayOffset != null">
- clear_day_offset = #{clearDayOffset,jdbcType=INTEGER},
- </if>
- <if test="clearIntervalSec != null">
- clear_interval_sec = #{clearIntervalSec,jdbcType=INTEGER},
- </if>
- <if test="bufferSizeInBytes != null">
- buffer_size_in_bytes = #{bufferSizeInBytes,jdbcType=INTEGER},
- </if>
- <if test="agentRpcReconnectTime != null">
- agent_rpc_reconnect_time =
#{agentRpcReconnectTime,jdbcType=INTEGER},
- </if>
- <if test="sendTimeoutMillSec != null">
- send_timeout_mill_sec = #{sendTimeoutMillSec,jdbcType=INTEGER},
- </if>
- <if test="flushEventTimeoutMillSec != null">
- flush_event_timeout_mill_sec =
#{flushEventTimeoutMillSec,jdbcType=INTEGER},
- </if>
- <if test="statIntervalSec != null">
- stat_interval_sec = #{statIntervalSec,jdbcType=INTEGER},
- </if>
- <if test="confRefreshIntervalSecs != null">
- conf_refresh_interval_secs =
#{confRefreshIntervalSecs,jdbcType=INTEGER},
- </if>
- <if test="flowSize != null">
- flow_size = #{flowSize,jdbcType=INTEGER},
- </if>
- <if test="buffersize != null">
- bufferSize = #{buffersize,jdbcType=INTEGER},
- </if>
- <if test="compress != null">
- compress = #{compress,jdbcType=TINYINT},
- </if>
- <if test="eventCheckInterval != null">
- event_check_interval = #{eventCheckInterval,jdbcType=INTEGER},
- </if>
- <if test="isCalmd5 != null">
- is_calMD5 = #{isCalmd5,jdbcType=TINYINT},
- </if>
- </set>
- where ip = #{ip,jdbcType=VARCHAR}
- </update>
- <update id="updateByPrimaryKey"
parameterType="org.apache.inlong.manager.dao.entity.AgentSysConfigEntity">
- update agent_sys_conf
- set max_retry_threads =
#{maxRetryThreads,jdbcType=INTEGER},
- min_retry_threads =
#{minRetryThreads,jdbcType=INTEGER},
- db_path = #{dbPath,jdbcType=VARCHAR},
- scan_interval_sec =
#{scanIntervalSec,jdbcType=INTEGER},
- batch_size = #{batchSize,jdbcType=INTEGER},
- msg_size = #{msgSize,jdbcType=INTEGER},
- send_runnable_size =
#{sendRunnableSize,jdbcType=INTEGER},
- msg_queue_size = #{msgQueueSize,jdbcType=INTEGER},
- max_reader_cnt = #{maxReaderCnt,jdbcType=INTEGER},
- thread_manager_sleep_interval =
#{threadManagerSleepInterval,jdbcType=INTEGER},
- oneline_size = #{onelineSize,jdbcType=INTEGER},
- clear_day_offset = #{clearDayOffset,jdbcType=INTEGER},
- clear_interval_sec =
#{clearIntervalSec,jdbcType=INTEGER},
- buffer_size_in_bytes =
#{bufferSizeInBytes,jdbcType=INTEGER},
- agent_rpc_reconnect_time =
#{agentRpcReconnectTime,jdbcType=INTEGER},
- send_timeout_mill_sec =
#{sendTimeoutMillSec,jdbcType=INTEGER},
- flush_event_timeout_mill_sec =
#{flushEventTimeoutMillSec,jdbcType=INTEGER},
- stat_interval_sec =
#{statIntervalSec,jdbcType=INTEGER},
- conf_refresh_interval_secs =
#{confRefreshIntervalSecs,jdbcType=INTEGER},
- flow_size = #{flowSize,jdbcType=INTEGER},
- bufferSize = #{buffersize,jdbcType=INTEGER},
- compress = #{compress,jdbcType=TINYINT},
- event_check_interval =
#{eventCheckInterval,jdbcType=INTEGER},
- is_calMD5 = #{isCalmd5,jdbcType=TINYINT}
- where ip = #{ip,jdbcType=VARCHAR}
- </update>
-</mapper>
\ No newline at end of file
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
index 1dec36704..e9535495b 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
@@ -164,7 +164,8 @@
peak_records, max_length, schema_name,
in_charges, followers, status,
is_deleted, creator, modifier,
- create_time, modify_time, temp_view,
zookeeper_enabled, proxy_cluster_id)
+ create_time, modify_time, temp_view,
+ zookeeper_enabled, proxy_cluster_id)
values (#{id,jdbcType=INTEGER}, #{inlongGroupId,jdbcType=VARCHAR},
#{name,jdbcType=VARCHAR},
#{cnName,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR},
#{middlewareType,jdbcType=VARCHAR},
#{queueModule,jdbcType=VARCHAR},
#{topicPartitionNum,jdbcType=INTEGER},
@@ -173,7 +174,7 @@
#{inCharges,jdbcType=VARCHAR}, #{followers,jdbcType=VARCHAR},
#{status,jdbcType=INTEGER},
#{isDeleted,jdbcType=INTEGER}, #{creator,jdbcType=VARCHAR},
#{modifier,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP},
#{modifyTime,jdbcType=TIMESTAMP}, #{tempView,jdbcType=LONGVARCHAR},
- #{zookeeperEnabled,jdbcType=INTEGER}),
#{proxyClusterId,jdbcType=INTEGER})
+ #{zookeeperEnabled,jdbcType=INTEGER},
#{proxyClusterId,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" useGeneratedKeys="true" keyProperty="id"
parameterType="org.apache.inlong.manager.dao.entity.InlongGroupEntity">
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamFieldEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamFieldEntityMapper.xml
index 1a7d58511..2c210c0bc 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamFieldEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamFieldEntityMapper.xml
@@ -98,17 +98,6 @@
and is_deleted = 0
order by id asc
</select>
- <select id="selectFields" resultMap="BaseResultMap">
- select field.*
- from inlong_stream_field field,
- inlong_stream stream
- where field.is_deleted = 0
- and stream.is_deleted = 0
- and stream.id = field.inlong_stream_id
- and stream.inlong_group_id = #{groupId, jdbcType=VARCHAR}
- and stream.inlong_stream_id = #{streamId, jdbcType=VARCHAR}
- and field.is_predefined_field = 0
- </select>
<update id="logicDeleteAllByIdentifier">
update inlong_stream_field
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/SourceFileDetailEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/SourceFileDetailEntityMapper.xml
index ad948ac3d..d63488236 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/SourceFileDetailEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/SourceFileDetailEntityMapper.xml
@@ -43,22 +43,6 @@
<result column="temp_view" jdbcType="LONGVARCHAR" property="tempView"/>
</resultMap>
- <resultMap id="FileAgentTask"
type="org.apache.inlong.manager.common.pojo.agent.FileAgentTaskConfig">
- <result column="inlong_group_id" jdbcType="VARCHAR"
property="inlongGroupId"/>
- <result column="inlong_stream_id" jdbcType="VARCHAR"
property="inlongStreamId"/>
- <result column="ip" jdbcType="VARCHAR" property="ip"/>
- <result column="file_path" jdbcType="VARCHAR" property="dataName"/>
- <result column="op" jdbcType="VARCHAR" property="op"/>
- <result column="status" jdbcType="VARCHAR" property="status"/>
- <result column="modify_time" jdbcType="VARCHAR"
property="deliveryTime"/>
- <result column="id" jdbcType="VARCHAR" property="taskId"/>
- <result column="timeOffset" jdbcType="VARCHAR" property="timeOffset"/>
- <result column="middleware_type" jdbcType="VARCHAR"
property="middlewareType"/>
- <result column="mq_resource_obj" jdbcType="VARCHAR" property="topic"/>
- <result column="data_generate_rule" jdbcType="VARCHAR"
property="dataGenerateRule"/>
- <result column="data_separator" jdbcType="VARCHAR"
property="fieldSplitter"/>
- <result column="sort_type" jdbcType="VARCHAR" property="sortType"/>
- </resultMap>
<sql id="Base_Column_List">
id, inlong_group_id, inlong_stream_id, access_type, server_name, ip,
port, is_inner_ip,
issue_type, username, password, file_path, status, previous_status,
@@ -386,71 +370,4 @@
and is_deleted = 0
</where>
</update>
-
- <select id="selectFileAgentTaskByIp" resultMap="FileAgentTask">
- select detail.inlong_group_id,
- detail.inlong_stream_id,
- detail.ip,
- detail.file_path,
- detail.status,
- detail.status mod 100 as op,
- detail.modify_time,
- detail.id,
- concat(basic.date_offset, basic.date_offset_unit) as timeOffset,
- biz.middleware_type,
- biz.mq_resource_obj,
- ds.data_generate_rule,
- ds.sort_type,
- stream.data_separator
- from source_file_basic basic,
- source_file_detail detail,
- inlong_group biz,
- data_schema ds,
- inlong_stream stream
- where detail.ip = #{ip,jdbcType=VARCHAR}
- and detail.is_deleted = 0
- and (floor(detail.STATUS / 100) = 2)
- and basic.inlong_group_id = detail.inlong_group_id
- and basic.inlong_stream_id = detail.inlong_stream_id
- and biz.inlong_group_id = detail.inlong_group_id
- and biz.schema_name = ds.name
- and stream.inlong_stream_id = detail.inlong_stream_id
- and stream.inlong_group_id = detail.inlong_group_id
- </select>
- <select id="selectFileAgentTaskByIpForCheck" resultMap="FileAgentTask">
- select detail.inlong_group_id,
- detail.inlong_stream_id,
- detail.ip,
- detail.file_path,
- detail.status,
- detail.status mod 100 as op,
- detail.modify_time,
- detail.id,
- concat(basic.date_offset, basic.date_offset_unit) as timeOffset,
- biz.middleware_type,
- biz.mq_resource_obj,
- ds.data_generate_rule,
- ds.sort_type,
- stream.data_separator
- from source_file_basic basic,
- source_file_detail detail,
- inlong_group biz,
- data_schema ds,
- inlong_stream stream
- where detail.ip = #{ip,jdbcType=VARCHAR}
- and detail.is_deleted = 0
- and basic.inlong_group_id = detail.inlong_group_id
- and basic.inlong_stream_id = detail.inlong_stream_id
- and biz.inlong_group_id = basic.inlong_group_id
- and biz.schema_name = ds.name
- and stream.inlong_stream_id = basic.inlong_stream_id
- and stream.inlong_group_id = basic.inlong_group_id
- </select>
-
- <select id="selectByIp" parameterType="java.lang.String"
resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from source_file_detail
- where ip = #{ip,jdbcType=VARCHAR} and is_deleted = 0;
- </select>
</mapper>
\ No newline at end of file
diff --git
a/inlong-manager/manager-dao/src/test/java/org/apache/inlong/manager/dao/mapper/AgentHeartbeatEntityMapperTest.java
b/inlong-manager/manager-dao/src/test/java/org/apache/inlong/manager/dao/mapper/AgentHeartbeatEntityMapperTest.java
deleted file mode 100644
index dbbc3419d..000000000
---
a/inlong-manager/manager-dao/src/test/java/org/apache/inlong/manager/dao/mapper/AgentHeartbeatEntityMapperTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.dao.mapper;
-
-import org.apache.inlong.manager.dao.DaoBaseTest;
-import org.apache.inlong.manager.dao.entity.AgentHeartbeatEntity;
-import org.junit.Assert;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.Date;
-
-public class AgentHeartbeatEntityMapperTest extends DaoBaseTest {
-
- @Autowired
- private AgentHeartbeatEntityMapper heartbeatEntityMapper;
-
- @Test
- public void deleteByPrimaryKey() {
- AgentHeartbeatEntity entity = createHeartbeatEntity();
- heartbeatEntityMapper.insert(entity);
- heartbeatEntityMapper.deleteByPrimaryKey(entity.getIp());
-
Assert.assertNull(heartbeatEntityMapper.selectByPrimaryKey(entity.getIp()));
- }
-
- @Test
- public void insert() {
- AgentHeartbeatEntity entity = createHeartbeatEntity();
- heartbeatEntityMapper.insert(entity);
- Assert.assertEquals(entity,
heartbeatEntityMapper.selectByPrimaryKey(entity.getIp()));
- }
-
- @Test
- public void insertSelective() {
- AgentHeartbeatEntity entity = createHeartbeatEntity();
- entity.setHeartbeatMsg(null);
- heartbeatEntityMapper.insertSelective(entity);
- AgentHeartbeatEntity queryResult =
heartbeatEntityMapper.selectByPrimaryKey(entity.getIp());
- Assert.assertNull(queryResult.getHeartbeatMsg());
- }
-
- @Test
- public void selectByPrimaryKey() {
- AgentHeartbeatEntity entity = createHeartbeatEntity();
- heartbeatEntityMapper.insert(entity);
- Assert.assertEquals(entity,
heartbeatEntityMapper.selectByPrimaryKey(entity.getIp()));
- }
-
- @Test
- public void updateByPrimaryKeySelective() {
- AgentHeartbeatEntity entity = createHeartbeatEntity();
- heartbeatEntityMapper.insert(entity);
- entity.setVersion(null);
- heartbeatEntityMapper.updateByPrimaryKeySelective(entity);
-
Assert.assertNotNull(heartbeatEntityMapper.selectByPrimaryKey(entity.getIp()).getVersion());
- }
-
- @Test
- public void updateByPrimaryKey() {
- AgentHeartbeatEntity entity = createHeartbeatEntity();
- heartbeatEntityMapper.insert(entity);
- entity.setVersion(null);
- heartbeatEntityMapper.updateByPrimaryKey(entity);
- Assert.assertEquals(entity,
heartbeatEntityMapper.selectByPrimaryKey(entity.getIp()));
- }
-
- @Test
- public void replace() {
- AgentHeartbeatEntity entity = createHeartbeatEntity();
- heartbeatEntityMapper.insert(entity);
-
- entity.setVersion(null);
- heartbeatEntityMapper.replace(entity);
- Assert.assertEquals(entity,
heartbeatEntityMapper.selectByPrimaryKey(entity.getIp()));
- }
-
- private AgentHeartbeatEntity createHeartbeatEntity() {
- AgentHeartbeatEntity entity = new AgentHeartbeatEntity();
- entity.setIp("127.0.0.1");
- entity.setVersion("0.0.1");
- entity.setModifyTime(new Date());
- entity.setHeartbeatMsg("test message");
- return entity;
- }
-
-}
\ No newline at end of file
diff --git
a/inlong-manager/manager-dao/src/test/java/org/apache/inlong/manager/dao/mapper/InlongGroupEntityMapperTest.java
b/inlong-manager/manager-dao/src/test/java/org/apache/inlong/manager/dao/mapper/InlongGroupEntityMapperTest.java
new file mode 100644
index 000000000..1de728ade
--- /dev/null
+++
b/inlong-manager/manager-dao/src/test/java/org/apache/inlong/manager/dao/mapper/InlongGroupEntityMapperTest.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.inlong.manager.dao.mapper;
+
+import org.apache.inlong.manager.dao.DaoBaseTest;
+import org.apache.inlong.manager.dao.entity.InlongGroupEntity;
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Date;
+
+public class InlongGroupEntityMapperTest extends DaoBaseTest {
+
+ @Autowired
+ private InlongGroupEntityMapper groupEntityMapper;
+
+ @Test
+ public void deleteByPrimaryKey() {
+ InlongGroupEntity entity = createHeartbeatEntity();
+ groupEntityMapper.insert(entity);
+ groupEntityMapper.deleteByPrimaryKey(entity.getId());
+
Assert.assertNull(groupEntityMapper.selectByGroupId(entity.getInlongGroupId()));
+ }
+
+ @Test
+ public void insertSelective() {
+ InlongGroupEntity entity = createHeartbeatEntity();
+ groupEntityMapper.insertSelective(entity);
+ InlongGroupEntity queryResult =
groupEntityMapper.selectByGroupId(entity.getInlongGroupId());
+ Assert.assertNotNull(queryResult);
+ }
+
+ @Test
+ public void selectByPrimaryKey() {
+ InlongGroupEntity entity = createHeartbeatEntity();
+ groupEntityMapper.insert(entity);
+ Assert.assertEquals(entity,
groupEntityMapper.selectByPrimaryKey(entity.getId()));
+ }
+
+ private InlongGroupEntity createHeartbeatEntity() {
+ InlongGroupEntity entity = new InlongGroupEntity();
+ entity.setInlongGroupId("test_group");
+ entity.setMqResourceObj("test_group");
+ entity.setInCharges("admin");
+ entity.setCreator("admin");
+ entity.setCreateTime(new Date());
+ return entity;
+ }
+
+}
\ No newline at end of file
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/AgentHeartbeatService.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/AgentHeartbeatService.java
deleted file mode 100644
index 17a96b495..000000000
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/AgentHeartbeatService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.service.core;
-
-import org.apache.inlong.manager.common.pojo.agent.AgentHeartbeatRequest;
-
-/**
- * Agent heartbeat service
- */
-public interface AgentHeartbeatService {
-
- String heartbeat(AgentHeartbeatRequest request);
-
-}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/AgentService.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/AgentService.java
index 021fe1ccc..e7db76937 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/AgentService.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/AgentService.java
@@ -20,14 +20,6 @@ package org.apache.inlong.manager.service.core;
import org.apache.inlong.common.pojo.agent.TaskRequest;
import org.apache.inlong.common.pojo.agent.TaskResult;
import org.apache.inlong.common.pojo.agent.TaskSnapshotRequest;
-import org.apache.inlong.manager.common.pojo.agent.AgentStatusReportRequest;
-import org.apache.inlong.manager.common.pojo.agent.CheckAgentTaskConfRequest;
-import org.apache.inlong.manager.common.pojo.agent.ConfirmAgentIpRequest;
-import org.apache.inlong.manager.common.pojo.agent.FileAgentCommandInfo;
-import org.apache.inlong.manager.common.pojo.agent.FileAgentTaskConfig;
-import org.apache.inlong.manager.common.pojo.agent.FileAgentTaskInfo;
-
-import java.util.List;
/**
* The service interface for agent
@@ -57,13 +49,4 @@ public interface AgentService {
*/
TaskResult getTaskResult(TaskRequest request);
- @Deprecated
- FileAgentTaskInfo getFileAgentTask(FileAgentCommandInfo info);
-
- String confirmAgentIp(ConfirmAgentIpRequest request);
-
- List<FileAgentTaskConfig> checkAgentTaskConf(CheckAgentTaskConfRequest
request);
-
- String reportAgentStatus(AgentStatusReportRequest request);
-
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/AgentSysConfigService.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/AgentSysConfigService.java
deleted file mode 100644
index 69adec94f..000000000
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/AgentSysConfigService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.service.core;
-
-import org.apache.inlong.manager.common.pojo.agent.AgentSysConfig;
-import org.apache.inlong.manager.common.pojo.agent.AgentSysconfRequest;
-
-public interface AgentSysConfigService {
-
- public AgentSysConfig getAgentSysConfig(AgentSysconfRequest request);
-
-}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentHeartbeatServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentHeartbeatServiceImpl.java
deleted file mode 100644
index 5a7468f26..000000000
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentHeartbeatServiceImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.service.core.impl;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import org.apache.inlong.manager.common.pojo.agent.AgentHeartbeatRequest;
-import org.apache.inlong.manager.dao.entity.AgentHeartbeatEntity;
-import org.apache.inlong.manager.dao.mapper.AgentHeartbeatEntityMapper;
-import org.apache.inlong.manager.service.core.AgentHeartbeatService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-
-@Service
-public class AgentHeartbeatServiceImpl implements AgentHeartbeatService {
-
- @Autowired
- private AgentHeartbeatEntityMapper heartbeatEntityMapper;
-
- @Override
- public String heartbeat(AgentHeartbeatRequest info) {
- Gson gson = new GsonBuilder().create();
-
- AgentHeartbeatEntity record = new AgentHeartbeatEntity();
- record.setIp(info.getAgentIp());
- record.setVersion(info.getHeart().getVersion());
- record.setModifyTime(new Date());
- record.setHeartbeatMsg(gson.toJson(info.getHeart()));
-
- int success = heartbeatEntityMapper.replace(record);
- if (success > 0) {
- return "success";
- } else {
- throw new IllegalArgumentException("insert heartbeat into database
failed");
- }
- }
-
-}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
index e79e7c9fb..62723bb1a 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
@@ -18,8 +18,6 @@
package org.apache.inlong.manager.service.core.impl;
import com.google.common.collect.Lists;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.inlong.common.constant.Constants;
@@ -31,24 +29,11 @@ import org.apache.inlong.common.pojo.agent.DataConfig;
import org.apache.inlong.common.pojo.agent.TaskRequest;
import org.apache.inlong.common.pojo.agent.TaskResult;
import org.apache.inlong.common.pojo.agent.TaskSnapshotRequest;
-import org.apache.inlong.manager.common.enums.EntityStatus;
-import org.apache.inlong.manager.common.enums.FileAgentDataGenerateRule;
import org.apache.inlong.manager.common.enums.SourceState;
import org.apache.inlong.manager.common.enums.SourceType;
import org.apache.inlong.manager.common.exceptions.BusinessException;
-import org.apache.inlong.manager.common.pojo.agent.AgentStatusReportRequest;
-import org.apache.inlong.manager.common.pojo.agent.CheckAgentTaskConfRequest;
-import org.apache.inlong.manager.common.pojo.agent.ConfirmAgentIpRequest;
-import org.apache.inlong.manager.common.pojo.agent.FileAgentCMDConfig;
-import org.apache.inlong.manager.common.pojo.agent.FileAgentCommandInfo;
-import
org.apache.inlong.manager.common.pojo.agent.FileAgentCommandInfo.CommandInfoBean;
-import org.apache.inlong.manager.common.pojo.agent.FileAgentTaskConfig;
-import org.apache.inlong.manager.common.pojo.agent.FileAgentTaskInfo;
import
org.apache.inlong.manager.common.pojo.stream.InlongStreamConfigLogRequest;
-import org.apache.inlong.manager.dao.entity.DataSourceCmdConfigEntity;
import org.apache.inlong.manager.dao.entity.InlongStreamEntity;
-import org.apache.inlong.manager.dao.entity.InlongStreamFieldEntity;
-import org.apache.inlong.manager.dao.entity.SourceFileDetailEntity;
import org.apache.inlong.manager.dao.entity.StreamSourceEntity;
import org.apache.inlong.manager.dao.mapper.DataSourceCmdConfigEntityMapper;
import org.apache.inlong.manager.dao.mapper.InlongStreamEntityMapper;
@@ -66,13 +51,10 @@ import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -113,17 +95,17 @@ public class AgentServiceImpl implements AgentService {
throw new BusinessException("agent request or agent ip was empty,
just return");
}
+ // Update task status, other tasks with status 20x will change to 30x
in next request
if (CollectionUtils.isEmpty(request.getCommandInfo())) {
LOGGER.warn("task result was empty, just return");
return;
}
for (CommandEntity command : request.getCommandInfo()) {
updateTaskStatus(command);
- // Other tasks with status 20x will change to 30x in next
getTaskResult method
}
}
- public void updateTaskStatus(CommandEntity command) {
+ private void updateTaskStatus(CommandEntity command) {
Integer taskId = command.getTaskId();
StreamSourceEntity current = sourceMapper.selectByIdForUpdate(taskId);
if (current == null) {
@@ -284,267 +266,4 @@ public class AgentServiceImpl implements AgentService {
}).collect(Collectors.toList());
}
- @Deprecated
- @Override
- public FileAgentTaskInfo getFileAgentTask(FileAgentCommandInfo info) {
- LOGGER.debug("begin to get file agent task by info={}", info);
- if (info == null || info.getAgentIp() == null) {
- LOGGER.error("agent command info cannot be empty");
- return null;
- }
-
- // WorkflowProcess the status of the postback task
- this.dealCommandResult(info);
-
- // Query pending tasks
- List<FileAgentTaskConfig> taskConfigs =
this.getFileAgentTaskConfigs(info);
-
- // Query pending special commands
- List<FileAgentCMDConfig> cmdConfigs = getFileAgentCMDConfigs(info);
-
- return
FileAgentTaskInfo.builder().cmdConfigs(cmdConfigs).dataConfigs(taskConfigs).build();
- }
-
- @Deprecated
- private List<FileAgentCMDConfig>
getFileAgentCMDConfigs(FileAgentCommandInfo info) {
- return
sourceCmdConfigMapper.queryCmdByAgentIp(info.getAgentIp()).stream().map(cmd -> {
- FileAgentCMDConfig cmdConfig = new FileAgentCMDConfig();
- cmdConfig.setDataTime(cmd.getSpecifiedDataTime());
- cmdConfig.setOp(cmd.getCmdType());
- cmdConfig.setId(cmd.getId());
- cmdConfig.setTaskId(cmd.getTaskId());
- return cmdConfig;
- }).collect(Collectors.toList());
- }
-
- @Deprecated
- private List<FileAgentTaskConfig>
getFileAgentTaskConfigs(FileAgentCommandInfo info) {
- // Query pending special commands
- List<FileAgentTaskConfig> taskConfigs =
fileDetailMapper.selectFileAgentTaskByIp(info.getAgentIp());
- for (FileAgentTaskConfig config : taskConfigs) {
- FileAgentDataGenerateRule ruleEnu =
FileAgentDataGenerateRule.fromRuleValue(config.getDataGenerateRule());
- if (ruleEnu != null) {
- config.setScheduleTime(ruleEnu.getScheduleRule());
- }
- StringBuilder s = new StringBuilder();
-
- s.append("m=").append(config.getSortType()).append("&");
- s.append("iname=").append(config.getInlongStreamId()).append("&");
- if (config.getDataGenerateRule().equalsIgnoreCase("minute")) {
- s.append("p=t").append("&");
- }
-
- List<InlongStreamFieldEntity> preFields = streamFieldMapper
- .selectFields(config.getInlongGroupId(),
config.getInlongStreamId());
-
- if (!config.getSortType().equalsIgnoreCase("13")) {
- int fIndex = 0;
- for (InlongStreamFieldEntity f : preFields) {
- s.append("__addcol" + fIndex + "__" + f.getFieldName());
- s.append("=");
- s.append(f.getFieldValue());
- s.append("&");
- }
- }
-
- config.setAdditionalAttr(s.substring(0, s.toString().length() -
1));
- }
- return taskConfigs;
- }
-
- @Deprecated
- private void dealCommandResult(FileAgentCommandInfo info) {
- if (CollectionUtils.isEmpty(info.getCommandInfo())) {
- LOGGER.warn("command info is empty, just return");
- return;
- }
-
- for (CommandInfoBean command : info.getCommandInfo()) {
- SourceFileDetailEntity current =
fileDetailMapper.selectByPrimaryKey(command.getTaskId());
- if (current == null) {
- continue;
- }
-
- int op = command.getOp();
- if (op == 2 || op == 6 || op == 8) { // Channel results issued by
special orders
- DataSourceCmdConfigEntity cmd = new
DataSourceCmdConfigEntity();
- if (command.getId() > 0) { // Modify the data result status of
special commands
- cmd.setId(command.getId());
- cmd.setBsend(true);
- cmd.setModifyTime(new Date());
-
cmd.setResultInfo(String.valueOf(command.getCommandResult()));
- sourceCmdConfigMapper.updateByPrimaryKeySelective(cmd);
- }
-
- } else { // Modify the result status of the data collection task
- if (current.getModifyTime().getTime() -
command.getDeliveryTime().getTime() > 1000 * 5) {
- LOGGER.warn(" task id {} receive heartbeat time delay more
than 5's, skip it!",
- command.getTaskId());
- continue;
- }
-
- int result = command.getCommandResult();
- int nextStatus = EntityStatus.AGENT_NORMAL.getCode();
- int previousStatus = current.getStatus();
- if (previousStatus / 100 == 2) { // Modify 30x -> 10x
- if (result == 0) { // Processed successfully
- if (previousStatus ==
EntityStatus.AGENT_ADD.getCode()) {
- nextStatus = EntityStatus.AGENT_NORMAL.getCode();
- } else if (previousStatus ==
EntityStatus.AGENT_DELETE.getCode()) {
- nextStatus = EntityStatus.AGENT_DISABLE.getCode();
- }
- } else if (result == 1) { // Processing failed
- nextStatus = EntityStatus.AGENT_FAILURE.getCode();
- }
-
- SourceFileDetailEntity update = new
SourceFileDetailEntity();
- update.setId(command.getTaskId());
- update.setStatus(nextStatus);
- update.setPreviousStatus(previousStatus);
- fileDetailMapper.updateByPrimaryKeySelective(update);
- }
- }
- }
- }
-
- @Override
- public String confirmAgentIp(ConfirmAgentIpRequest request) {
- for (String ip : request.getIpList()) {
- List<FileAgentTaskConfig> taskConfigs =
fileDetailMapper.selectFileAgentTaskByIp(ip);
- if (!taskConfigs.isEmpty()) {
- return taskConfigs.get(0).getIp();
- }
- }
- throw new IllegalArgumentException("Do not find any agent info with
the ip's in db.");
- }
-
- @Override
- public List<FileAgentTaskConfig>
checkAgentTaskConf(CheckAgentTaskConfRequest request) {
- List<FileAgentTaskConfig> taskConfigs =
fileDetailMapper.selectFileAgentTaskByIpForCheck(request.getAgentIp());
- LOGGER.info(request.getAgentIp() + " taskConfigs = " + taskConfigs);
- List<FileAgentTaskConfig> toAdds = getToBeAdded(request.getTaskInfo(),
taskConfigs);
- List<Integer> toRemoves = getToBeRemoved(request.getTaskInfo(),
taskConfigs);
- List<FileAgentTaskConfig> commons = commons(request.getTaskInfo(),
taskConfigs);
-
- List<FileAgentTaskConfig> result = new ArrayList<>(toAdds.size() +
toRemoves.size());
-
- for (FileAgentTaskConfig fileAgentTaskConfig : toAdds) {
- // ADD(0)
- int currentStatus = fileAgentTaskConfig.getStatus();
- if (currentStatus == 100) {
- fileAgentTaskConfig.setOp("0");
- setFileAgentTaskConfigAttr(fileAgentTaskConfig);
- result.add(fileAgentTaskConfig);
- }
- // 20x, 30x ignore
- // 101, 103, 104 ignore
- }
- // There is no in the database, but the agent reports that it has it,
then delete it
- for (Integer remove : toRemoves) {
- FileAgentTaskConfig config = new FileAgentTaskConfig();
- // DEL(1)
- config.setOp("1");
- config.setTaskId(remove);
- result.add(config);
- }
- for (FileAgentTaskConfig fileAgentTaskConfig : commons) {
- // 20x, 30x ignore
- int currentStatus = fileAgentTaskConfig.getStatus();
- if (currentStatus == 101) {
- fileAgentTaskConfig.setOp("1");
- setFileAgentTaskConfigAttr(fileAgentTaskConfig);
- result.add(fileAgentTaskConfig);
- } else if (currentStatus == 104) {
- fileAgentTaskConfig.setOp("4");
- setFileAgentTaskConfigAttr(fileAgentTaskConfig);
- result.add(fileAgentTaskConfig);
- } else {
- // 100, 103 print log
- LOGGER.warn("Agent {} report task id = {} with status {}, skip
task id fileAgentTaskConfig = {} ",
- request.getAgentIp(),
- fileAgentTaskConfig.getTaskId(),
- currentStatus,
- fileAgentTaskConfig);
- }
- }
- return result;
- }
-
- private void setFileAgentTaskConfigAttr(FileAgentTaskConfig config) {
- FileAgentDataGenerateRule ruleEnu =
FileAgentDataGenerateRule.fromRuleValue(config.getDataGenerateRule());
- if (ruleEnu != null) {
- config.setScheduleTime(ruleEnu.getScheduleRule());
- }
- StringBuilder s = new StringBuilder();
-
- s.append("m=").append(config.getSortType()).append("&");
- s.append("iname=").append(config.getInlongStreamId()).append("&");
- if (config.getDataGenerateRule().equalsIgnoreCase("minute")) {
- s.append("p=t").append("&");
- }
-
- List<InlongStreamFieldEntity> preFields =
streamFieldMapper.selectFields(
- config.getInlongGroupId(),
- config.getInlongStreamId());
-
- if (!config.getSortType().equalsIgnoreCase("13")) {
- int fIndex = 0;
- for (InlongStreamFieldEntity f : preFields) {
- s.append("__addcol" + fIndex + "__" + f.getFieldName());
- s.append("=");
- s.append(f.getFieldValue());
- s.append("&");
- }
- }
-
- config.setAdditionalAttr(s.substring(0, s.toString().length() - 1));
- }
-
- @Override
- public String reportAgentStatus(AgentStatusReportRequest request) {
- Gson gson = new GsonBuilder().create();
- // TODO
- LOGGER.info(gson.toJson(request));
- return "Success";
- }
-
- private List<FileAgentTaskConfig> getToBeAdded(List<Integer> taskInfo,
List<FileAgentTaskConfig> taskConfigs) {
- Map<Integer, FileAgentTaskConfig> all = new HashMap<>();
- for (FileAgentTaskConfig config : taskConfigs) {
- all.put(config.getTaskId(), config);
- }
- for (Integer entry : taskInfo) {
- all.remove(entry);
- }
- return new ArrayList<>(all.values());
- }
-
- private List<Integer> getToBeRemoved(List<Integer> taskInfo,
List<FileAgentTaskConfig> taskConfigs) {
- List<Integer> toRemove = new ArrayList<>();
- Map<Integer, FileAgentTaskConfig> all = new HashMap<>();
- for (FileAgentTaskConfig config : taskConfigs) {
- all.put(config.getTaskId(), config);
- }
- for (Integer entry : taskInfo) {
- if (!all.containsKey(entry)) {
- toRemove.add(entry);
- }
- }
- return toRemove;
- }
-
- private List<FileAgentTaskConfig> commons(List<Integer> taskInfo,
List<FileAgentTaskConfig> taskConfigs) {
- Map<Integer, FileAgentTaskConfig> all = new HashMap<>();
- List<FileAgentTaskConfig> commons = new ArrayList<>();
- for (FileAgentTaskConfig config : taskConfigs) {
- all.put(config.getTaskId(), config);
- }
- for (Integer entry : taskInfo) {
- if (all.containsKey(entry)) {
- commons.add(all.get(entry));
- }
- }
- return commons;
- }
-
}
\ No newline at end of file
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentSysConfigServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentSysConfigServiceImpl.java
deleted file mode 100644
index 345496bcf..000000000
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentSysConfigServiceImpl.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.service.core.impl;
-
-import org.apache.inlong.manager.common.pojo.agent.AgentSysConfig;
-import org.apache.inlong.manager.common.pojo.agent.AgentSysconfRequest;
-import org.apache.inlong.manager.dao.entity.AgentSysConfigEntity;
-import org.apache.inlong.manager.dao.mapper.AgentSysConfigEntityMapper;
-import org.apache.inlong.manager.service.core.AgentSysConfigService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class AgentSysConfigServiceImpl implements AgentSysConfigService {
-
- private static final Logger LOGGER =
LoggerFactory.getLogger(AgentSysConfigServiceImpl.class);
-
- @Autowired
- private AgentSysConfigEntityMapper agentSysConfigEntityMapper;
-
- @Override
- public AgentSysConfig getAgentSysConfig(AgentSysconfRequest request) {
- AgentSysConfigEntity entity =
agentSysConfigEntityMapper.selectByPrimaryKey(request.getAgentIp());
- if (entity != null) {
- AgentSysConfig agentSysConfig = AgentSysConfig.builder()
- .msgQueueSize(entity.getMsgQueueSize())
- .clearDayOffset(entity.getClearDayOffset())
- .bufferSize(entity.getBuffersize())
-
.flushEventTimeoutMillSec(entity.getFlushEventTimeoutMillSec())
-
.threadManagerSleepInterval(entity.getThreadManagerSleepInterval())
- .sendRunnableSize(entity.getSendRunnableSize())
- .minRetryThreads(entity.getMinRetryThreads())
- .clearIntervalSec(entity.getClearIntervalSec())
- .maxReaderCnt(entity.getMaxReaderCnt())
- .sendTimeoutMillSec(entity.getSendTimeoutMillSec())
- .bufferSizeInBytes(entity.getBufferSizeInBytes())
- .maxRetryThreads(entity.getMaxRetryThreads())
- .dbPath(entity.getDbPath())
- .scanIntervalSec(entity.getScanIntervalSec())
- // TODO Need to confirm
- .compress(entity.getCompress() == 1)
- // TODO Need to confirm
- .isCalcMd5(entity.getIsCalmd5() == 1)
- .ip(entity.getIp())
- .flowSize(entity.getFlowSize())
- .onelineSize(entity.getOnelineSize())
- .eventCheckInterval(entity.getEventCheckInterval())
-
.confRefreshIntervalSecs(entity.getConfRefreshIntervalSecs())
- .statIntervalSec(entity.getStatIntervalSec())
- .msgSize(entity.getMsgSize())
- .batchSize(entity.getBatchSize())
- .agentRpcReconnectTime(entity.getAgentRpcReconnectTime())
- .md5(null)
- .build();
- return agentSysConfig;
- } else {
- throw new IllegalArgumentException("do not get config from
database");
- }
- }
-
-}
diff --git
a/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql
b/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql
index 223740c25..220e5f6f6 100644
---
a/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql
+++
b/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql
@@ -18,53 +18,6 @@
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
--- ----------------------------
--- Table structure for agent_heartbeat
--- ----------------------------
-DROP TABLE IF EXISTS `agent_heartbeat`;
-CREATE TABLE `agent_heartbeat`
-(
- `ip` varchar(64) NOT NULL COMMENT 'agent host ip',
- `version` varchar(128) DEFAULT NULL,
- `heartbeat_msg` text DEFAULT NULL COMMENT 'massage in
heartbeat request',
- `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT 'Modify time',
- PRIMARY KEY (`ip`)
-);
-
--- ----------------------------
--- Table structure for agent_sys_conf
--- ----------------------------
-DROP TABLE IF EXISTS `agent_sys_conf`;
-CREATE TABLE `agent_sys_conf`
-(
- `ip` varchar(64) NOT NULL COMMENT 'ip',
- `max_retry_threads` int(11) NOT NULL DEFAULT '6' COMMENT
'Maximum number of retry threads',
- `min_retry_threads` int(11) NOT NULL DEFAULT '3' COMMENT
'Minimum number of retry threads',
- `db_path` varchar(64) DEFAULT '../db'
COMMENT 'The path where bd is located, use a relative path',
- `scan_interval_sec` int(11) NOT NULL DEFAULT '30' COMMENT
'Interval time to scan file directory',
- `batch_size` int(11) NOT NULL DEFAULT '20' COMMENT
'The amount sent to data proxy in batch',
- `msg_size` int(11) NOT NULL DEFAULT '100' COMMENT
'As many packages as possible at one time',
- `send_runnable_size` int(11) NOT NULL DEFAULT '5' COMMENT
'The number of sending threads corresponding to a data source',
- `msg_queue_size` int(11) DEFAULT '500',
- `max_reader_cnt` int(11) NOT NULL DEFAULT '18' COMMENT
'The maximum number of threads of an Agent',
- `thread_manager_sleep_interval` int(11) NOT NULL DEFAULT '30000'
COMMENT 'Interval time between manager thread to taskManager to fetch tasks',
- `oneline_size` int(11) NOT NULL DEFAULT '1048576'
COMMENT 'Maximum length of a row of data',
- `clear_day_offset` int(11) NOT NULL DEFAULT '11' COMMENT
'How many days ago to clear the data of BDB',
- `clear_interval_sec` int(11) NOT NULL DEFAULT '86400'
COMMENT 'Interval time for clearing bdb data',
- `buffer_size_in_bytes` int(16) NOT NULL DEFAULT '268435456'
COMMENT 'Maximum memory occupied by msg buffer',
- `agent_rpc_reconnect_time` int(11) NOT NULL DEFAULT '0' COMMENT
'The interval time to update the link, if it is 0, it will not be updated',
- `send_timeout_mill_sec` int(11) NOT NULL DEFAULT '60000'
COMMENT 'The timeout period for sending a message (if the packet is not full
within one minute, it will be sent out forcibly)',
- `flush_event_timeout_mill_sec` int(11) NOT NULL DEFAULT '16000',
- `stat_interval_sec` int(11) NOT NULL DEFAULT '60' COMMENT
'Statistical message sending frequency',
- `conf_refresh_interval_secs` int(11) NOT NULL DEFAULT '300' COMMENT
'The frequency at which the Agent regularly pulls the configuration from the
InLongManager',
- `flow_size` int(11) DEFAULT '1048576000',
- `bufferSize` int(11) DEFAULT '1048576'
COMMENT 'bufferSize, default 1048576',
- `compress` tinyint(2) DEFAULT NULL COMMENT
'Whether to compress',
- `event_check_interval` int(11) DEFAULT NULL COMMENT
'File scanning period',
- `is_calMD5` tinyint(2) DEFAULT NULL COMMENT
'Do you want to calculate the cumulative md5 of read characters',
- PRIMARY KEY (`ip`)
-);
-
-- ----------------------------
-- Table structure for inlong_group
-- ----------------------------
@@ -73,29 +26,29 @@ CREATE TABLE `inlong_group`
(
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT
'Incremental primary key',
`inlong_group_id` varchar(256) NOT NULL COMMENT 'Inlong group id,
filled in by the user, undeleted ones cannot be repeated',
- `name` varchar(128) DEFAULT '' COMMENT 'Inlong
group name, English, numbers and underscore',
- `cn_name` varchar(256) DEFAULT NULL COMMENT 'Chinese
display name',
- `description` varchar(256) DEFAULT '' COMMENT 'Inlong
group Introduction',
- `middleware_type` varchar(20) DEFAULT 'TUBE' COMMENT 'The
middleware type of message queue, high throughput: TUBE, high consistency:
PULSAR',
- `queue_module` VARCHAR(20) NULL DEFAULT 'parallel' COMMENT
'Queue model of Pulsar, parallel: multiple partitions, high throughput,
out-of-order messages; serial: single partition, low throughput, and orderly
messages',
- `topic_partition_num` INT(4) NULL DEFAULT '3' COMMENT 'The
number of partitions of Pulsar Topic, 1-20',
+ `name` varchar(128) DEFAULT '' COMMENT 'Inlong group
name, English, numbers and underscore',
+ `cn_name` varchar(256) DEFAULT NULL COMMENT 'Chinese
display name',
+ `description` varchar(256) DEFAULT '' COMMENT 'Inlong group
Introduction',
+ `middleware_type` varchar(20) DEFAULT 'TUBE' COMMENT 'The
middleware type of message queue, high throughput: TUBE, high consistency:
PULSAR',
+ `queue_module` VARCHAR(20) NULL DEFAULT 'parallel' COMMENT 'Queue
model of Pulsar, parallel: multiple partitions, high throughput, out-of-order
messages; serial: single partition, low throughput, and orderly messages',
+ `topic_partition_num` INT(4) NULL DEFAULT '3' COMMENT 'The number of
partitions of Pulsar Topic, 1-20',
`mq_resource_obj` varchar(128) NOT NULL COMMENT 'MQ resource object,
for Tube, its Topic, for Pulsar, its Namespace',
- `daily_records` int(11) DEFAULT '10' COMMENT 'Number
of access records per day, unit: 10,000 records per day',
- `daily_storage` int(11) DEFAULT '10' COMMENT 'Access
size by day, unit: GB per day',
- `peak_records` int(11) DEFAULT '1000' COMMENT 'Access
peak per second, unit: records per second',
- `max_length` int(11) DEFAULT '10240' COMMENT 'The
maximum length of a single piece of data, unit: Byte',
- `schema_name` varchar(128) DEFAULT NULL COMMENT 'Data
type, associated data_schema table',
- `in_charges` varchar(512) DEFAULT NULL COMMENT 'Name of
responsible person, separated by commas',
- `followers` varchar(512) DEFAULT NULL COMMENT 'Name of
followers, separated by commas',
- `status` int(4) DEFAULT '21' COMMENT 'Inlong
group status',
- `is_deleted` int(11) DEFAULT '0' COMMENT 'Whether
to delete, 0: not deleted, > 0: deleted',
+ `daily_records` int(11) DEFAULT '10' COMMENT 'Number of
access records per day, unit: 10,000 records per day',
+ `daily_storage` int(11) DEFAULT '10' COMMENT 'Access size
by day, unit: GB per day',
+ `peak_records` int(11) DEFAULT '1000' COMMENT 'Access
peak per second, unit: records per second',
+ `max_length` int(11) DEFAULT '10240' COMMENT 'The
maximum length of a single piece of data, unit: Byte',
+ `schema_name` varchar(128) DEFAULT NULL COMMENT 'Data type,
associated data_schema table',
+ `in_charges` varchar(512) DEFAULT NULL COMMENT 'Name of
responsible person, separated by commas',
+ `followers` varchar(512) DEFAULT NULL COMMENT 'Name of
followers, separated by commas',
+ `status` int(4) DEFAULT '21' COMMENT 'Inlong group
status',
+ `is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to
delete, 0: not deleted, > 0: deleted',
`creator` varchar(64) NOT NULL COMMENT 'Creator name',
- `modifier` varchar(64) DEFAULT NULL COMMENT 'Modifier
name',
- `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT 'Create time',
- `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON
UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
- `temp_view` text DEFAULT NULL COMMENT
'Temporary view, used to save intermediate data that has not been submitted or
approved after modification',
- `zookeeper_enabled` int(4) DEFAULT '1' COMMENT 'Need
zookeeper support, 0 false 1 true',
- `proxy_cluster_id` int(11) DEFAULT NULL COMMENT 'The id
of dataproxy cluster',
+ `modifier` varchar(64) DEFAULT NULL COMMENT 'Modifier
name',
+ `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT
'Create time',
+ `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON
UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ `temp_view` text DEFAULT NULL COMMENT 'Temporary
view, used to save intermediate data that has not been submitted or approved
after modification',
+ `zookeeper_enabled` int(4) DEFAULT '1' COMMENT 'Need
zookeeper support, 0 false 1 true',
+ `proxy_cluster_id` int(11) DEFAULT NULL COMMENT 'The id of
dataproxy cluster',
PRIMARY KEY (`id`),
UNIQUE KEY `unique_inlong_group` (`inlong_group_id`, `is_deleted`)
);
@@ -214,18 +167,18 @@ CREATE TABLE `common_file_server`
`access_type` varchar(20) NOT NULL COMMENT 'Collection type, with
Agent, DataProxy, LoadProxy',
`ip` varchar(64) NOT NULL COMMENT 'Data source IP',
`port` int(11) NOT NULL COMMENT 'Port number',
- `is_inner_ip` tinyint(1) DEFAULT '0' COMMENT 'Whether it is
intranet, 0: No, 1: Yes',
- `issue_type` varchar(128) DEFAULT NULL COMMENT 'Issuance
method, such as SSH, TCS, etc.',
+ `is_inner_ip` tinyint(1) DEFAULT '0' COMMENT 'Whether it is
intranet, 0: No, 1: Yes',
+ `issue_type` varchar(128) DEFAULT NULL COMMENT 'Issuance method,
such as SSH, TCS, etc.',
`username` varchar(64) NOT NULL COMMENT 'User name of the data
source IP host',
`password` varchar(64) NOT NULL COMMENT 'The password corresponding
to the above user name',
- `status` int(4) DEFAULT '0' COMMENT 'status',
- `is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to
delete, 0: not deleted, > 0: deleted',
+ `status` int(4) DEFAULT '0' COMMENT 'status',
+ `is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to delete,
0: not deleted, > 0: deleted',
`creator` varchar(64) NOT NULL COMMENT 'Creator name',
- `modifier` varchar(64) DEFAULT NULL COMMENT 'Modifier name',
- `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT
'Create time',
- `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT 'Modify time',
- `visible_person` varchar(1024) DEFAULT NULL COMMENT 'List of
visible persons, separated by commas',
- `visible_group` varchar(1024) DEFAULT NULL COMMENT 'List of
visible groups, separated by commas',
+ `modifier` varchar(64) DEFAULT NULL COMMENT 'Modifier name',
+ `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT
'Create time',
+ `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT 'Modify time',
+ `visible_person` varchar(1024) DEFAULT NULL COMMENT 'List of visible
persons, separated by commas',
+ `visible_group` varchar(1024) DEFAULT NULL COMMENT 'List of visible
groups, separated by commas',
PRIMARY KEY (`id`)
);
@@ -328,9 +281,9 @@ CREATE TABLE `stream_source_cmd_config`
`task_id` int(11) NOT NULL,
`specified_data_time` varchar(64) NOT NULL,
`bSend` tinyint(1) NOT NULL,
- `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT 'Create time',
- `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON
UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
- `result_info` varchar(64) DEFAULT NULL,
+ `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT
'Create time',
+ `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT 'Modify time',
+ `result_info` varchar(64) DEFAULT NULL,
PRIMARY KEY (`id`)
);
@@ -545,8 +498,8 @@ CREATE TABLE `stream_sink`
`is_deleted` int(11) DEFAULT '0' COMMENT
'Whether to delete, 0: not deleted, > 0: deleted',
`creator` varchar(64) NOT NULL COMMENT 'Creator name',
`modifier` varchar(64) DEFAULT NULL COMMENT
'Modifier name',
- `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT 'Create time',
- `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP
COMMENT 'Create time',
+ `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP
ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
PRIMARY KEY (`id`),
UNIQUE KEY `unique_sink_name` (`inlong_group_id`, `inlong_stream_id`,
`sink_name`, `is_deleted`)
);
@@ -585,7 +538,7 @@ CREATE TABLE `stream_sink_field`
`field_type` varchar(50) NOT NULL COMMENT 'Field type',
`field_comment` varchar(2000) DEFAULT NULL COMMENT 'Field description',
`is_meta_field` smallint(3) DEFAULT '0' COMMENT 'Is this field a
meta field? 0: no, 1: yes',
- `field_format` varchar(50) DEFAULT NULL COMMENT 'Field format,
including: MICROSECONDS, MILLISECONDS, SECONDS, SQL, ISO_8601 and custom such
as yyyy-MM-dd HH:mm:ss',
+ `field_format` varchar(50) DEFAULT NULL COMMENT 'Field format,
including: MICROSECONDS, MILLISECONDS, SECONDS, SQL, ISO_8601 and custom such
as yyyy-MM-dd HH:mm:ss',
`rank_num` smallint(6) DEFAULT '0' COMMENT 'Field order
(front-end display field order)',
`is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to delete,
0: not deleted, > 0: deleted',
PRIMARY KEY (`id`)
@@ -642,14 +595,14 @@ CREATE TABLE `workflow_approver`
`process_name` varchar(256) NOT NULL COMMENT 'Process name',
`task_name` varchar(256) NOT NULL COMMENT 'Approval task name',
`filter_key` varchar(64) NOT NULL COMMENT 'Filter condition KEY',
- `filter_value` varchar(256) DEFAULT NULL COMMENT 'Filter
matching value',
- `filter_value_desc` varchar(256) DEFAULT NULL COMMENT 'Filter
value description',
+ `filter_value` varchar(256) DEFAULT NULL COMMENT 'Filter
matching value',
+ `filter_value_desc` varchar(256) DEFAULT NULL COMMENT 'Filter value
description',
`approvers` varchar(1024) NOT NULL COMMENT 'Approvers, separated
by commas',
`creator` varchar(64) NOT NULL COMMENT 'Creator',
- `modifier` varchar(64) NOT NULL COMMENT 'Modifier',
- `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT 'Create time',
- `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON
UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
- `is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to
delete, 0 is not deleted, if greater than 0, delete',
+ `modifier` varchar(64) NULL COMMENT 'Modifier',
+ `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT
'Create time',
+ `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT 'Modify time',
+ `is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to
delete, 0 is not deleted, if greater than 0, delete',
PRIMARY KEY (`id`),
KEY `process_name_task_name_index` (`process_name`, `task_name`)
);
@@ -965,8 +918,8 @@ CREATE TABLE `db_collector_detail_task`
`group_id` varchar(64) NULL COMMENT 'group id',
`stream_id` varchar(64) NULL COMMENT 'stream id',
`state` int(11) NOT NULL COMMENT 'task state',
- `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT
'create time',
- `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT 'modify time',
+ `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT
'create time',
+ `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT 'modify time',
PRIMARY KEY (`id`)
);
diff --git a/inlong-manager/manager-web/sql/apache_inlong_manager.sql
b/inlong-manager/manager-web/sql/apache_inlong_manager.sql
index 07abf939a..47848a947 100644
--- a/inlong-manager/manager-web/sql/apache_inlong_manager.sql
+++ b/inlong-manager/manager-web/sql/apache_inlong_manager.sql
@@ -24,55 +24,6 @@ SET FOREIGN_KEY_CHECKS = 0;
CREATE DATABASE IF NOT EXISTS apache_inlong_manager;
USE apache_inlong_manager;
--- ----------------------------
--- Table structure for agent_heartbeat
--- ----------------------------
-DROP TABLE IF EXISTS `agent_heartbeat`;
-CREATE TABLE `agent_heartbeat`
-(
- `ip` varchar(64) NOT NULL COMMENT 'agent host ip',
- `version` varchar(128) DEFAULT NULL,
- `heartbeat_msg` text DEFAULT NULL COMMENT 'massage in
heartbeat request',
- `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT 'Modify time',
- PRIMARY KEY (`ip`)
-) ENGINE = InnoDB
- DEFAULT CHARSET = utf8 COMMENT ='Agent heartbeat information table';
-
--- ----------------------------
--- Table structure for agent_sys_conf
--- ----------------------------
-DROP TABLE IF EXISTS `agent_sys_conf`;
-CREATE TABLE `agent_sys_conf`
-(
- `ip` varchar(64) NOT NULL COMMENT 'ip',
- `max_retry_threads` int(11) NOT NULL DEFAULT '6' COMMENT
'Maximum number of retry threads',
- `min_retry_threads` int(11) NOT NULL DEFAULT '3' COMMENT
'Minimum number of retry threads',
- `db_path` varchar(64) DEFAULT '../db'
COMMENT 'The path where bd is located, use a relative path',
- `scan_interval_sec` int(11) NOT NULL DEFAULT '30' COMMENT
'Interval time to scan file directory',
- `batch_size` int(11) NOT NULL DEFAULT '20' COMMENT
'The amount sent to data proxy in batch',
- `msg_size` int(11) NOT NULL DEFAULT '100' COMMENT
'As many packages as possible at one time',
- `send_runnable_size` int(11) NOT NULL DEFAULT '5' COMMENT
'The number of sending threads corresponding to a data source',
- `msg_queue_size` int(11) DEFAULT '500',
- `max_reader_cnt` int(11) NOT NULL DEFAULT '18' COMMENT
'The maximum number of threads of an Agent',
- `thread_manager_sleep_interval` int(11) NOT NULL DEFAULT '30000'
COMMENT 'Interval time between manager thread to taskManager to fetch tasks',
- `oneline_size` int(11) NOT NULL DEFAULT '1048576'
COMMENT 'Maximum length of a row of data',
- `clear_day_offset` int(11) NOT NULL DEFAULT '11' COMMENT
'How many days ago to clear the data of BDB',
- `clear_interval_sec` int(11) NOT NULL DEFAULT '86400'
COMMENT 'Interval time for clearing bdb data',
- `buffer_size_in_bytes` int(16) NOT NULL DEFAULT '268435456'
COMMENT 'Maximum memory occupied by msg buffer',
- `agent_rpc_reconnect_time` int(11) NOT NULL DEFAULT '0' COMMENT
'The interval time to update the link, if it is 0, it will not be updated',
- `send_timeout_mill_sec` int(11) NOT NULL DEFAULT '60000'
COMMENT 'The timeout period for sending a message (if the packet is not full
within one minute, it will be sent out forcibly)',
- `flush_event_timeout_mill_sec` int(11) NOT NULL DEFAULT '16000',
- `stat_interval_sec` int(11) NOT NULL DEFAULT '60' COMMENT
'Statistical message sending frequency',
- `conf_refresh_interval_secs` int(11) NOT NULL DEFAULT '300' COMMENT
'The frequency at which the Agent regularly pulls the configuration from the
InLongManager',
- `flow_size` int(11) DEFAULT '1048576000',
- `bufferSize` int(11) DEFAULT '1048576'
COMMENT 'bufferSize, default 1048576',
- `compress` tinyint(2) DEFAULT NULL COMMENT
'Whether to compress',
- `event_check_interval` int(11) DEFAULT NULL COMMENT
'File scanning period',
- `is_calMD5` tinyint(2) DEFAULT NULL COMMENT
'Do you want to calculate the cumulative md5 of read characters',
- PRIMARY KEY (`ip`)
-) ENGINE = InnoDB
- DEFAULT CHARSET = utf8 COMMENT ='Agent system configuration table';
-
-- ----------------------------
-- Table structure for inlong_group
-- ----------------------------
@@ -227,18 +178,18 @@ CREATE TABLE `common_file_server`
`access_type` varchar(20) NOT NULL COMMENT 'Collection type, with
Agent, DataProxy, LoadProxy',
`ip` varchar(64) NOT NULL COMMENT 'Data source IP',
`port` int(11) NOT NULL COMMENT 'Port number',
- `is_inner_ip` tinyint(1) DEFAULT '0' COMMENT 'Whether it is
intranet, 0: No, 1: Yes',
- `issue_type` varchar(128) DEFAULT NULL COMMENT 'Issuance
method, such as SSH, TCS, etc.',
+ `is_inner_ip` tinyint(1) DEFAULT '0' COMMENT 'Whether it is
intranet, 0: No, 1: Yes',
+ `issue_type` varchar(128) DEFAULT NULL COMMENT 'Issuance method,
such as SSH, TCS, etc.',
`username` varchar(64) NOT NULL COMMENT 'User name of the data
source IP host',
`password` varchar(64) NOT NULL COMMENT 'The password corresponding
to the above user name',
- `status` int(4) DEFAULT '0' COMMENT 'status',
- `is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to
delete, 0: not deleted, > 0: deleted',
+ `status` int(4) DEFAULT '0' COMMENT 'status',
+ `is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to delete,
0: not deleted, > 0: deleted',
`creator` varchar(64) NOT NULL COMMENT 'Creator name',
- `modifier` varchar(64) DEFAULT NULL COMMENT 'Modifier name',
- `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT
'Create time',
- `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT 'Modify time',
- `visible_person` varchar(1024) DEFAULT NULL COMMENT 'List of
visible persons, separated by commas',
- `visible_group` varchar(1024) DEFAULT NULL COMMENT 'List of
visible groups, separated by commas',
+ `modifier` varchar(64) DEFAULT NULL COMMENT 'Modifier name',
+ `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT
'Create time',
+ `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT 'Modify time',
+ `visible_person` varchar(1024) DEFAULT NULL COMMENT 'List of visible
persons, separated by commas',
+ `visible_group` varchar(1024) DEFAULT NULL COMMENT 'List of visible
groups, separated by commas',
PRIMARY KEY (`id`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT ='Common File Server Table';
@@ -346,9 +297,9 @@ CREATE TABLE `stream_source_cmd_config`
`task_id` int(11) NOT NULL,
`specified_data_time` varchar(64) NOT NULL,
`bSend` tinyint(1) NOT NULL,
- `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT 'Create time',
- `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON
UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
- `result_info` varchar(64) DEFAULT NULL,
+ `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT
'Create time',
+ `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT 'Modify time',
+ `result_info` varchar(64) DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `index_1` (`task_id`, `bSend`, `specified_data_time`)
) ENGINE = InnoDB
@@ -565,15 +516,15 @@ CREATE TABLE `stream_sink`
`sink_name` varchar(128) NOT NULL DEFAULT '' COMMENT 'Sink
name',
`storage_period` int(11) DEFAULT '10' COMMENT 'Data
storage period, unit: day',
`enable_create_resource` tinyint(1) DEFAULT '1' COMMENT
'Whether to enable create sink resource? 0: disable, 1: enable. default is 1',
- `ext_params` text COMMENT 'Another fields, will saved as JSON
type',
+ `ext_params` text NULL COMMENT 'Another fields, will
saved as JSON type',
`operate_log` text DEFAULT NULL COMMENT
'Background operate log',
`status` int(11) DEFAULT '0' COMMENT
'Status',
`previous_status` int(11) DEFAULT '0' COMMENT
'Previous status',
`is_deleted` int(11) DEFAULT '0' COMMENT
'Whether to delete, 0: not deleted, > 0: deleted',
`creator` varchar(64) NOT NULL COMMENT 'Creator name',
`modifier` varchar(64) DEFAULT NULL COMMENT
'Modifier name',
- `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT 'Create time',
- `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP
COMMENT 'Create time',
+ `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP
ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
PRIMARY KEY (`id`),
UNIQUE KEY `unique_sink_name` (`inlong_group_id`, `inlong_stream_id`,
`sink_name`, `is_deleted`)
) ENGINE = InnoDB
@@ -614,7 +565,7 @@ CREATE TABLE `stream_sink_field`
`field_type` varchar(50) NOT NULL COMMENT 'Field type',
`field_comment` varchar(2000) DEFAULT NULL COMMENT 'Field description',
`is_meta_field` smallint(3) DEFAULT '0' COMMENT 'Is this field a
meta field? 0: no, 1: yes',
- `field_format` varchar(50) DEFAULT NULL COMMENT 'Field format,
including: MICROSECONDS, MILLISECONDS, SECONDS, SQL, ISO_8601 and custom such
as yyyy-MM-dd HH:mm:ss',
+ `field_format` varchar(50) DEFAULT NULL COMMENT 'Field format,
including: MICROSECONDS, MILLISECONDS, SECONDS, SQL, ISO_8601 and custom such
as yyyy-MM-dd HH:mm:ss',
`rank_num` smallint(6) DEFAULT '0' COMMENT 'Field order
(front-end display field order)',
`is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to delete,
0: not deleted, > 0: deleted',
PRIMARY KEY (`id`)
@@ -674,14 +625,14 @@ CREATE TABLE `workflow_approver`
`process_name` varchar(256) NOT NULL COMMENT 'Process name',
`task_name` varchar(256) NOT NULL COMMENT 'Approval task name',
`filter_key` varchar(64) NOT NULL COMMENT 'Filter condition KEY',
- `filter_value` varchar(256) DEFAULT NULL COMMENT 'Filter
matching value',
- `filter_value_desc` varchar(256) DEFAULT NULL COMMENT 'Filter
value description',
+ `filter_value` varchar(256) DEFAULT NULL COMMENT 'Filter
matching value',
+ `filter_value_desc` varchar(256) DEFAULT NULL COMMENT 'Filter value
description',
`approvers` varchar(1024) NOT NULL COMMENT 'Approvers, separated
by commas',
`creator` varchar(64) NOT NULL COMMENT 'Creator',
- `modifier` varchar(64) NOT NULL COMMENT 'Modifier',
- `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT 'Create time',
- `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON
UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
- `is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to
delete, 0 is not deleted, if greater than 0, delete',
+ `modifier` varchar(64) NULL COMMENT 'Modifier',
+ `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT
'Create time',
+ `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT 'Modify time',
+ `is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to
delete, 0 is not deleted, if greater than 0, delete',
PRIMARY KEY (`id`),
KEY `process_name_task_name_index` (`process_name`, `task_name`)
) ENGINE = InnoDB
@@ -1013,8 +964,8 @@ CREATE TABLE `db_collector_detail_task`
`group_id` varchar(64) NULL COMMENT 'group id',
`stream_id` varchar(64) NULL COMMENT 'stream id',
`state` int(11) NOT NULL COMMENT 'task state',
- `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT
'create time',
- `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT 'modify time',
+ `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT
'create time',
+ `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT 'modify time',
PRIMARY KEY (`id`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT ='db collector detail task table';
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/AgentController.java
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/AgentController.java
index 965117090..e75b52eb5 100644
---
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/AgentController.java
+++
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/AgentController.java
@@ -23,18 +23,7 @@ import org.apache.inlong.common.pojo.agent.TaskRequest;
import org.apache.inlong.common.pojo.agent.TaskResult;
import org.apache.inlong.common.pojo.agent.TaskSnapshotRequest;
import org.apache.inlong.manager.common.beans.Response;
-import org.apache.inlong.manager.common.pojo.agent.AgentHeartbeatRequest;
-import org.apache.inlong.manager.common.pojo.agent.AgentStatusReportRequest;
-import org.apache.inlong.manager.common.pojo.agent.AgentSysConfig;
-import org.apache.inlong.manager.common.pojo.agent.AgentSysconfRequest;
-import org.apache.inlong.manager.common.pojo.agent.CheckAgentTaskConfRequest;
-import org.apache.inlong.manager.common.pojo.agent.ConfirmAgentIpRequest;
-import org.apache.inlong.manager.common.pojo.agent.FileAgentCommandInfo;
-import org.apache.inlong.manager.common.pojo.agent.FileAgentTaskConfig;
-import org.apache.inlong.manager.common.pojo.agent.FileAgentTaskInfo;
-import org.apache.inlong.manager.service.core.AgentHeartbeatService;
import org.apache.inlong.manager.service.core.AgentService;
-import org.apache.inlong.manager.service.core.AgentSysConfigService;
import org.apache.inlong.manager.service.core.ThirdPartyClusterService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -52,10 +41,6 @@ public class AgentController {
@Autowired
private AgentService agentService;
@Autowired
- private AgentSysConfigService agentSysConfigService;
- @Autowired
- private AgentHeartbeatService heartbeatService;
- @Autowired
private ThirdPartyClusterService thirdPartyClusterService;
@PostMapping("/getManagerIpList")
@@ -77,41 +62,4 @@ public class AgentController {
return Response.success(agentService.getTaskResult(request));
}
- @Deprecated
- @PostMapping("/fileAgent/getTaskConf")
- @ApiOperation(value = "Get file task")
- public Response<FileAgentTaskInfo> getFileAgentTask(@RequestBody
FileAgentCommandInfo info) {
- return Response.success(agentService.getFileAgentTask(info));
- }
-
- @PostMapping("/fileAgent/confirmAgentIp")
- @ApiOperation(value = "Confirm current agent ip")
- public Response<String> confirmAgentIp(@RequestBody ConfirmAgentIpRequest
info) {
- return Response.success(agentService.confirmAgentIp(info));
- }
-
- @PostMapping("/fileAgent/getAgentSysConf")
- @ApiOperation(value = "Get agent system config")
- public Response<AgentSysConfig> getAgentSysConf(@RequestBody
AgentSysconfRequest info) {
- return Response.success(agentSysConfigService.getAgentSysConfig(info));
- }
-
- @PostMapping("/fileAgent/heartbeat")
- @ApiOperation(value = "Report agent heartbeat")
- public Response<String> heartbeat(@RequestBody AgentHeartbeatRequest info)
{
- return Response.success(heartbeatService.heartbeat(info));
- }
-
- @PostMapping("/fileAgent/checkAgentTaskConf")
- @ApiOperation(value = "Check agent source config")
- public Response<List<FileAgentTaskConfig>> checkAgentTaskConf(@RequestBody
CheckAgentTaskConfRequest info) {
- return Response.success(agentService.checkAgentTaskConf(info));
- }
-
- @PostMapping("/fileAgent/reportAgentStatus")
- @ApiOperation(value = "Report agent status")
- public Response<String> reportAgentStatus(@RequestBody
AgentStatusReportRequest info) {
- return Response.success(agentService.reportAgentStatus(info));
- }
-
}
