You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by li...@apache.org on 2020/02/03 02:24:33 UTC
[incubator-dolphinscheduler] branch dev updated: class overrides
equals() and should therefore also override hashCode() (#1882)
This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 5169689 class overrides equals() and should therefore also override hashCode() (#1882)
5169689 is described below
commit 5169689c3566f67438d2224f914197c09c03d52d
Author: Yelli <am...@my.com>
AuthorDate: Mon Feb 3 10:24:24 2020 +0800
class overrides equals() and should therefore also override hashCode() (#1882)
---
.../java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java | 2 +-
.../org/apache/dolphinscheduler/common/model/DateInterval.java | 5 +++++
.../org/apache/dolphinscheduler/common/model/TaskNodeRelation.java | 7 +++++++
.../server/master/runner/MasterTaskExecThread.java | 2 +-
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java
index 968a51a..5aa6be8 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java
@@ -145,7 +145,7 @@ public class ZooKeeperState {
sendThread.setName("FourLetterCmd:" + cmd);
sendThread.start();
try {
- sendThread.join(waitTimeout * 1000);
+ sendThread.join(waitTimeout * 1000L);
return sendThread.ret;
} catch (InterruptedException e) {
logger.error("send " + cmd + " to server " + host + ":" + port + " failed!", e);
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java
index 4ea764c..e936a44 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java
@@ -17,6 +17,7 @@
package org.apache.dolphinscheduler.common.model;
import java.util.Date;
+import java.util.Objects;
/**
* date interval class
@@ -62,4 +63,8 @@ public class DateInterval {
this.endTime = endTime;
}
+ @Override
+ public int hashCode() {
+ return Objects.hash(startTime, endTime);
+ }
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNodeRelation.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNodeRelation.java
index 2fbc0e1..e474157 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNodeRelation.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNodeRelation.java
@@ -16,6 +16,8 @@
*/
package org.apache.dolphinscheduler.common.model;
+import java.util.Objects;
+
public class TaskNodeRelation {
/**
@@ -69,4 +71,9 @@ public class TaskNodeRelation {
", endNode='" + endNode + '\'' +
'}';
}
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(startNode, endNode);
+ }
}
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java
index 1861e8a..f2ee66b 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java
@@ -122,7 +122,7 @@ public class MasterTaskExecThread extends MasterBaseTaskExecThread {
break;
}
if(checkTimeout){
- long remainTime = getRemaintime(taskTimeoutParameter.getInterval()*60);
+ long remainTime = getRemaintime(taskTimeoutParameter.getInterval() * 60L);
if (remainTime < 0) {
logger.warn("task id: {} execution time out",taskInstance.getId());
// process define