This is an automated email from the ASF dual-hosted git repository.
jiafengzheng pushed a commit to branch doris-manager
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/doris-manager by this push:
new 42a5b23 [Manager] Improve agent part code (#6876)
42a5b23 is described below
commit 42a5b237914b9a107c84a06197f6b21acfd9a7a8
Author: weajun <[email protected]>
AuthorDate: Tue Oct 19 15:42:53 2021 +0800
[Manager] Improve agent part code (#6876)
* [fix]:merge code
* Remove the use of javafx
* remove unuse javafx package
Co-authored-by: wudi <[email protected]>
Co-authored-by: jiafeng.zhang <[email protected]>
---
.../main/java/org/apache/doris/manager/agent/task/ITaskLog.java | 4 ++--
.../main/java/org/apache/doris/manager/agent/task/TaskLruLog.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/manager/dm-agent/src/main/java/org/apache/doris/manager/agent/task/ITaskLog.java
b/manager/dm-agent/src/main/java/org/apache/doris/manager/agent/task/ITaskLog.java
index 65cb9de..a196778 100644
---
a/manager/dm-agent/src/main/java/org/apache/doris/manager/agent/task/ITaskLog.java
+++
b/manager/dm-agent/src/main/java/org/apache/doris/manager/agent/task/ITaskLog.java
@@ -17,12 +17,12 @@
package org.apache.doris.manager.agent.task;
-import javafx.util.Pair;
+import org.apache.commons.lang3.tuple.ImmutablePair;
import java.util.List;
public interface ITaskLog {
- Pair<Integer, List<String>> stdLog(int offset, int size);
+ ImmutablePair<Integer, List<String>> stdLog(int offset, int size);
List<String> errLog(int offset, int size);
diff --git
a/manager/dm-agent/src/main/java/org/apache/doris/manager/agent/task/TaskLruLog.java
b/manager/dm-agent/src/main/java/org/apache/doris/manager/agent/task/TaskLruLog.java
index e0b69a4..4329281 100644
---
a/manager/dm-agent/src/main/java/org/apache/doris/manager/agent/task/TaskLruLog.java
+++
b/manager/dm-agent/src/main/java/org/apache/doris/manager/agent/task/TaskLruLog.java
@@ -17,7 +17,7 @@
package org.apache.doris.manager.agent.task;
-import javafx.util.Pair;
+import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.doris.manager.agent.common.AgentConstants;
import java.util.ArrayList;
@@ -40,12 +40,12 @@ public class TaskLruLog implements ITaskLog {
}
@Override
- public Pair<Integer, List<String>> stdLog(int offset, int size) {
+ public ImmutablePair<Integer, List<String>> stdLog(int offset, int size) {
int count = 0;
ArrayList<String> list = new ArrayList<>();
String temp = null;
if (offset > stdlogs.size()) {
- return new Pair(stdlogs.size() - 1 > 0 ? stdlogs.size() - 1 : 0,
list);
+ return new ImmutablePair(stdlogs.size() - 1 > 0 ? stdlogs.size() -
1 : 0, list);
}
while (count < size && offset + count < stdlogs.size()) {
@@ -54,7 +54,7 @@ public class TaskLruLog implements ITaskLog {
}
count++;
}
- Pair<Integer, List<String>> pair = new Pair(offset + count, list);
+ ImmutablePair<Integer, List<String>> pair = new ImmutablePair(offset +
count, list);
return pair;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
