You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2019/01/09 08:08:47 UTC
[flink] branch release-1.6 updated: [FLINK-11232][rest] Fix subtask
start-time field name
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch release-1.6
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.6 by this push:
new df8301b [FLINK-11232][rest] Fix subtask start-time field name
df8301b is described below
commit df8301b2487b47633fd1f94d0e1f983ee19d237a
Author: Bo WANG <42...@users.noreply.github.com>
AuthorDate: Wed Jan 9 16:05:13 2019 +0800
[FLINK-11232][rest] Fix subtask start-time field name
---
.../flink/runtime/rest/messages/JobVertexDetailsInfo.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/JobVertexDetailsInfo.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/JobVertexDetailsInfo.java
index df007f4..3ad1e41 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/JobVertexDetailsInfo.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/JobVertexDetailsInfo.java
@@ -110,7 +110,8 @@ public class JobVertexDetailsInfo implements ResponseBody {
public static final String FIELD_NAME_STATUS = "status";
public static final String FIELD_NAME_ATTEMPT = "attempt";
public static final String FIELD_NAME_HOST = "host";
- public static final String FIELD_NAME_START_TIME = "start_time";
+ public static final String FIELD_NAME_START_TIME = "start-time";
+ public static final String FIELD_NAME_COMPATIBLE_START_TIME = "start_time";
public static final String FIELD_NAME_END_TIME = "end-time";
public static final String FIELD_NAME_DURATION = "duration";
public static final String FIELD_NAME_METRICS = "metrics";
@@ -130,6 +131,9 @@ public class JobVertexDetailsInfo implements ResponseBody {
@JsonProperty(FIELD_NAME_START_TIME)
private final long startTime;
+ @JsonProperty(FIELD_NAME_COMPATIBLE_START_TIME)
+ private final long startTimeCompatible;
+
@JsonProperty(FIELD_NAME_END_TIME)
private final long endTime;
@@ -154,6 +158,7 @@ public class JobVertexDetailsInfo implements ResponseBody {
this.attempt = attempt;
this.host = checkNotNull(host);
this.startTime = startTime;
+ this.startTimeCompatible = startTime;
this.endTime = endTime;
this.duration = duration;
this.metrics = checkNotNull(metrics);
@@ -175,6 +180,7 @@ public class JobVertexDetailsInfo implements ResponseBody {
attempt == that.attempt &&
Objects.equals(host, that.host) &&
startTime == that.startTime &&
+ startTimeCompatible == that.startTimeCompatible &&
endTime == that.endTime &&
duration == that.duration &&
Objects.equals(metrics, that.metrics);
@@ -182,7 +188,7 @@ public class JobVertexDetailsInfo implements ResponseBody {
@Override
public int hashCode() {
- return Objects.hash(subtask, status, attempt, host, startTime, endTime, duration, metrics);
+ return Objects.hash(subtask, status, attempt, host, startTime, startTimeCompatible, endTime, duration, metrics);
}
}
}