From 2597b56f488be1c489af819a3a23d63c49eb13aa Mon Sep 17 00:00:00 2001 From: Lixin Wei Date: Thu, 3 Sep 2020 14:15:33 +0800 Subject: [PATCH] [Streaming] Change ID caption (#10523) --- .../core/common/{AbstractID.java => AbstractId.java} | 10 +++++----- .../core/graph/executiongraph/ExecutionVertex.java | 10 +++++----- .../ray/streaming/runtime/core/resource/Container.java | 8 ++++---- .../streaming/runtime/core/resource/ContainerID.java | 10 ---------- .../streaming/runtime/core/resource/ContainerId.java | 10 ++++++++++ .../master/resourcemanager/ResourceAssignmentView.java | 6 +++--- .../runtime/master/resourcemanager/ViewBuilder.java | 4 ++-- 7 files changed, 29 insertions(+), 29 deletions(-) rename streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/common/{AbstractID.java => AbstractId.java} (71%) delete mode 100644 streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/resource/ContainerID.java create mode 100644 streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/resource/ContainerId.java diff --git a/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/common/AbstractID.java b/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/common/AbstractId.java similarity index 71% rename from streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/common/AbstractID.java rename to streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/common/AbstractId.java index c98b7eba7..f61916bfe 100644 --- a/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/common/AbstractID.java +++ b/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/common/AbstractId.java @@ -1,24 +1,24 @@ package io.ray.streaming.runtime.core.common; import com.google.common.base.MoreObjects; -import io.ray.streaming.runtime.core.resource.ContainerID; +import io.ray.streaming.runtime.core.resource.ContainerId; import java.io.Serializable; import java.util.UUID; /** - * Streaming system unique identity base class. For example, ${@link ContainerID } + * Streaming system unique identity base class. For example, ${@link ContainerId } */ -public class AbstractID implements Serializable { +public class AbstractId implements Serializable { private UUID id; - public AbstractID() { + public AbstractId() { this.id = UUID.randomUUID(); } @Override public boolean equals(Object obj) { - return id.equals(((AbstractID) obj).getId()); + return id.equals(((AbstractId) obj).getId()); } public UUID getId() { diff --git a/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/graph/executiongraph/ExecutionVertex.java b/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/graph/executiongraph/ExecutionVertex.java index 62421463d..0135b35ed 100644 --- a/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/graph/executiongraph/ExecutionVertex.java +++ b/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/graph/executiongraph/ExecutionVertex.java @@ -7,7 +7,7 @@ import io.ray.streaming.api.Language; import io.ray.streaming.jobgraph.VertexType; import io.ray.streaming.operator.StreamOperator; import io.ray.streaming.runtime.config.master.ResourceConfig; -import io.ray.streaming.runtime.core.resource.ContainerID; +import io.ray.streaming.runtime.core.resource.ContainerId; import io.ray.streaming.runtime.core.resource.ResourceType; import java.io.Serializable; import java.util.ArrayList; @@ -58,7 +58,7 @@ public class ExecutionVertex implements Serializable { /** * The id of the container which this vertex's worker actor belongs to. */ - private ContainerID containerId; + private ContainerId containerId; /** * Worker actor handle. @@ -211,15 +211,15 @@ public class ExecutionVertex implements Serializable { return buildTime; } - public ContainerID getContainerId() { + public ContainerId getContainerId() { return containerId; } - public void setContainerId(ContainerID containerId) { + public void setContainerId(ContainerId containerId) { this.containerId = containerId; } - public void setContainerIfNotExist(ContainerID containerId) { + public void setContainerIfNotExist(ContainerId containerId) { if (null == this.containerId) { this.containerId = containerId; } diff --git a/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/resource/Container.java b/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/resource/Container.java index a132064f4..32bdb782e 100644 --- a/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/resource/Container.java +++ b/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/resource/Container.java @@ -24,7 +24,7 @@ public class Container implements Serializable { /** * container id */ - private ContainerID id; + private ContainerId id; /** * Container address @@ -64,7 +64,7 @@ public class Container implements Serializable { UniqueId nodeId, String hostname, Map availableResources) { - this.id = new ContainerID(); + this.id = new ContainerId(); this.address = address; this.hostname = hostname; this.nodeId = nodeId; @@ -80,11 +80,11 @@ public class Container implements Serializable { ); } - public ContainerID getId() { + public ContainerId getId() { return id; } - public void setId(ContainerID id) { + public void setId(ContainerId id) { this.id = id; } diff --git a/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/resource/ContainerID.java b/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/resource/ContainerID.java deleted file mode 100644 index 3f58e8ddd..000000000 --- a/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/resource/ContainerID.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.ray.streaming.runtime.core.resource; - -import io.ray.streaming.runtime.core.common.AbstractID; - -/** - * Container unique identifier. - */ -public class ContainerID extends AbstractID { - -} diff --git a/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/resource/ContainerId.java b/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/resource/ContainerId.java new file mode 100644 index 000000000..81c2a3f84 --- /dev/null +++ b/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/core/resource/ContainerId.java @@ -0,0 +1,10 @@ +package io.ray.streaming.runtime.core.resource; + +import io.ray.streaming.runtime.core.common.AbstractId; + +/** + * Container unique identifier. + */ +public class ContainerId extends AbstractId { + +} diff --git a/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/master/resourcemanager/ResourceAssignmentView.java b/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/master/resourcemanager/ResourceAssignmentView.java index 8bb9a4b9d..9ee228eaf 100644 --- a/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/master/resourcemanager/ResourceAssignmentView.java +++ b/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/master/resourcemanager/ResourceAssignmentView.java @@ -1,6 +1,6 @@ package io.ray.streaming.runtime.master.resourcemanager; -import io.ray.streaming.runtime.core.resource.ContainerID; +import io.ray.streaming.runtime.core.resource.ContainerId; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -8,9 +8,9 @@ import java.util.Map; /** * Cluster resource allocation view, used to statically view cluster resource information. */ -public class ResourceAssignmentView extends HashMap> { +public class ResourceAssignmentView extends HashMap> { - public static ResourceAssignmentView of(Map> assignmentView) { + public static ResourceAssignmentView of(Map> assignmentView) { ResourceAssignmentView view = new ResourceAssignmentView(); view.putAll(assignmentView); return view; diff --git a/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/master/resourcemanager/ViewBuilder.java b/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/master/resourcemanager/ViewBuilder.java index 82d6a8517..8f005fa47 100644 --- a/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/master/resourcemanager/ViewBuilder.java +++ b/streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/master/resourcemanager/ViewBuilder.java @@ -1,7 +1,7 @@ package io.ray.streaming.runtime.master.resourcemanager; import io.ray.streaming.runtime.core.resource.Container; -import io.ray.streaming.runtime.core.resource.ContainerID; +import io.ray.streaming.runtime.core.resource.ContainerId; import java.util.List; import java.util.Map; @@ -15,7 +15,7 @@ public class ViewBuilder { } public static ResourceAssignmentView buildResourceAssignmentView(List containers) { - Map> assignmentView = + Map> assignmentView = containers.stream().collect(java.util.stream.Collectors.toMap(Container::getId, Container::getExecutionVertexIds));