Repository: reef Updated Branches: refs/heads/master 684774b9c -> 4f85dd77c
[REEF-1487] Delete deprecated code in reef-io This deletes code deprecated in release 0.14. JIRA: [REEF-1487](https://issues.apache.org/jira/browse/REEF-1487) Pull request: This closes #1072 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/4f85dd77 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/4f85dd77 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/4f85dd77 Branch: refs/heads/master Commit: 4f85dd77c8fb60e1fe9d1e07dbef965f15970294 Parents: 684774b Author: Mariia Mykhailova <[email protected]> Authored: Wed Jul 6 16:03:20 2016 -0700 Committer: Jason (Joo Seong) Jeong <[email protected]> Committed: Thu Jul 7 13:00:41 2016 -0700 ---------------------------------------------------------------------- .../driver/CommunicationGroupDriverFactory.java | 28 --------- .../network/group/impl/driver/FlatTopology.java | 16 +---- .../impl/driver/GroupCommMessageHandler.java | 15 +---- .../network/group/impl/driver/TreeTopology.java | 18 +----- .../impl/task/CommunicationGroupClientImpl.java | 64 +------------------- .../group/impl/task/GroupCommClientImpl.java | 45 +------------- .../org/apache/reef/io/network/util/Utils.java | 13 ---- 7 files changed, 5 insertions(+), 194 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/4f85dd77/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/CommunicationGroupDriverFactory.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/CommunicationGroupDriverFactory.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/CommunicationGroupDriverFactory.java index 99ed305..d3dce3c 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/CommunicationGroupDriverFactory.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/CommunicationGroupDriverFactory.java @@ -65,34 +65,6 @@ public final class CommunicationGroupDriverFactory { } /** - * @deprecated in 0.14. - * Instantiates a new CommunicationGroupDriver instance. - * @param groupName specified name of the communication group - * @param topologyClass topology implementation - * @param commGroupMessageHandler message handler for the communication group - * @param numberOfTasks minimum number of tasks needed in this group before start - * @param customFanOut fanOut for TreeTopology - * @return CommunicationGroupDriver instance - * @throws InjectionException - */ - @Deprecated - public CommunicationGroupDriver getNewInstance( - final Class<? extends Name<String>> groupName, - final Class<? extends Topology> topologyClass, - final BroadcastingEventHandler<GroupCommunicationMessage> commGroupMessageHandler, - final int numberOfTasks, - final int customFanOut) throws InjectionException { - - final Injector newInjector = injector.forkInjector(); - newInjector.bindVolatileParameter(CommGroupNameClass.class, groupName); - newInjector.bindVolatileParameter(TopologyClass.class, topologyClass); - newInjector.bindVolatileParameter(CommGroupMessageHandler.class, commGroupMessageHandler); - newInjector.bindVolatileParameter(CommGroupNumTask.class, numberOfTasks); - newInjector.bindVolatileParameter(TreeTopologyFanOut.class, customFanOut); - return newInjector.getInstance(CommunicationGroupDriver.class); - } - - /** * Instantiates a new CommunicationGroupDriver instance. * @param groupName specified name of the communication group * @param topologyClass topology implementation http://git-wip-us.apache.org/repos/asf/reef/blob/4f85dd77/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/FlatTopology.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/FlatTopology.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/FlatTopology.java index a83134e..4a13940 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/FlatTopology.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/FlatTopology.java @@ -56,7 +56,7 @@ import java.util.logging.Logger; /** * Implements a one level Tree Topology. */ -public class FlatTopology implements Topology { +public final class FlatTopology implements Topology { private static final Logger LOG = Logger.getLogger(FlatTopology.class.getName()); @@ -70,20 +70,6 @@ public class FlatTopology implements Topology { private TaskNode root; private final ConcurrentMap<String, TaskNode> nodes = new ConcurrentSkipListMap<>(); - /** - * @deprecated in 0.14. Use Tang to obtain an instance of this instead. - */ - @Deprecated - public FlatTopology(final EStage<GroupCommunicationMessage> senderStage, - final Class<? extends Name<String>> groupName, - final Class<? extends Name<String>> operatorName, - final String driverId, final int numberOfTasks) { - this.senderStage = senderStage; - this.groupName = groupName; - this.operName = operatorName; - this.driverId = driverId; - } - @Inject private FlatTopology(@Parameter(GroupCommSenderStage.class) final EStage<GroupCommunicationMessage> senderStage, @Parameter(CommGroupNameClass.class) final Class<? extends Name<String>> groupName, http://git-wip-us.apache.org/repos/asf/reef/blob/4f85dd77/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/GroupCommMessageHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/GroupCommMessageHandler.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/GroupCommMessageHandler.java index 2735b52..d7f1030 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/GroupCommMessageHandler.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/GroupCommMessageHandler.java @@ -19,20 +19,18 @@ package org.apache.reef.io.network.group.impl.driver; import org.apache.reef.io.network.group.impl.GroupCommunicationMessage; -import org.apache.reef.io.network.group.impl.utils.BroadcastingEventHandler; import org.apache.reef.io.network.group.impl.utils.Utils; import org.apache.reef.tang.annotations.Name; import org.apache.reef.wake.AbstractEStage; import org.apache.reef.wake.EventHandler; import org.apache.reef.wake.impl.SingleThreadStage; -import org.apache.reef.wake.impl.SyncStage; import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; /** - * The network handler for the group communcation service on the driver side. + * The network handler for the group communication service on the driver side. */ public class GroupCommMessageHandler implements EventHandler<GroupCommunicationMessage> { @@ -41,17 +39,6 @@ public class GroupCommMessageHandler implements EventHandler<GroupCommunicationM private final Map<Class<? extends Name<String>>, AbstractEStage<GroupCommunicationMessage>> commGroupMessageStages = new HashMap<>(); - /** - * @deprecated in 0.14. - */ - @Deprecated - public void addHandler(final Class<? extends Name<String>> groupName, - final BroadcastingEventHandler<GroupCommunicationMessage> handler) { - LOG.entering("GroupCommMessageHandler", "addHandler", new Object[]{Utils.simpleName(groupName), handler}); - commGroupMessageStages.put(groupName, new SyncStage<>(groupName.getName(), handler)); - LOG.exiting("GroupCommMessageHandler", "addHandler", Utils.simpleName(groupName)); - } - public void addHandler(final Class<? extends Name<String>> groupName, final SingleThreadStage<GroupCommunicationMessage> stage) { LOG.entering("GroupCommMessageHandler", "addHandler", new Object[]{Utils.simpleName(groupName), stage}); http://git-wip-us.apache.org/repos/asf/reef/blob/4f85dd77/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TreeTopology.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TreeTopology.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TreeTopology.java index 9d45f0d..f6f9c73 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TreeTopology.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TreeTopology.java @@ -58,7 +58,7 @@ import java.util.logging.Logger; /** * Implements a tree topology with the specified Fan Out. */ -public class TreeTopology implements Topology { +public final class TreeTopology implements Topology { private static final Logger LOG = Logger.getLogger(TreeTopology.class.getName()); @@ -77,22 +77,6 @@ public class TreeTopology implements Topology { private final ConcurrentMap<String, TaskNode> nodes = new ConcurrentSkipListMap<>(); private final ConfigurationSerializer confSer = new AvroConfigurationSerializer(); - /** - * @deprecated in 0.14. Use Tang to obtain an instance of this instead. - */ - @Deprecated - public TreeTopology(final EStage<GroupCommunicationMessage> senderStage, - final Class<? extends Name<String>> groupName, - final Class<? extends Name<String>> operatorName, - final String driverId, final int numberOfTasks, final int fanOut) { - this.senderStage = senderStage; - this.groupName = groupName; - this.operName = operatorName; - this.driverId = driverId; - this.fanOut = fanOut; - LOG.config(getQualifiedName() + "Tree Topology running with a fan-out of " + fanOut); - } - @Inject private TreeTopology(@Parameter(GroupCommSenderStage.class) final EStage<GroupCommunicationMessage> senderStage, @Parameter(CommGroupNameClass.class) final Class<? extends Name<String>> groupName, http://git-wip-us.apache.org/repos/asf/reef/blob/4f85dd77/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/CommunicationGroupClientImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/CommunicationGroupClientImpl.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/CommunicationGroupClientImpl.java index 9bb42bf..9f37e1c 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/CommunicationGroupClientImpl.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/CommunicationGroupClientImpl.java @@ -42,7 +42,6 @@ import org.apache.reef.io.network.util.Pair; import org.apache.reef.io.serialization.Codec; import org.apache.reef.tang.Configuration; import org.apache.reef.tang.Injector; -import org.apache.reef.tang.Tang; import org.apache.reef.tang.annotations.Name; import org.apache.reef.tang.annotations.Parameter; import org.apache.reef.tang.exceptions.InjectionException; @@ -59,7 +58,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Logger; -public class CommunicationGroupClientImpl implements CommunicationGroupServiceClient { +public final class CommunicationGroupClientImpl implements CommunicationGroupServiceClient { private static final Logger LOG = Logger.getLogger(CommunicationGroupClientImpl.class.getName()); private final GroupCommNetworkHandler groupCommNetworkHandler; @@ -79,67 +78,6 @@ public class CommunicationGroupClientImpl implements CommunicationGroupServiceCl private final AtomicBoolean init = new AtomicBoolean(false); - /** - * @deprecated in 0.14. - * Use the private constructor that receives an {@code injector} as a parameter instead. - */ - @Deprecated - @Inject - public CommunicationGroupClientImpl(@Parameter(CommunicationGroupName.class) final String groupName, - @Parameter(TaskConfigurationOptions.Identifier.class) final String taskId, - @Parameter(DriverIdentifierGroupComm.class) final String driverId, - final GroupCommNetworkHandler groupCommNetworkHandler, - @Parameter(SerializedOperConfigs.class) final Set<String> operatorConfigs, - final ConfigurationSerializer configSerializer, - final NetworkService<GroupCommunicationMessage> netService) { - this.taskId = taskId; - this.driverId = driverId; - LOG.finest(groupName + " has GroupCommHandler-" + groupCommNetworkHandler.toString()); - this.identifierFactory = netService.getIdentifierFactory(); - this.groupName = Utils.getClass(groupName); - this.groupCommNetworkHandler = groupCommNetworkHandler; - this.sender = new Sender(netService); - this.operators = new TreeMap<>(new Comparator<Class<? extends Name<String>>>() { - - @Override - public int compare(final Class<? extends Name<String>> o1, final Class<? extends Name<String>> o2) { - final String s1 = o1.getSimpleName(); - final String s2 = o2.getSimpleName(); - return s1.compareTo(s2); - } - }); - try { - this.commGroupNetworkHandler = Tang.Factory.getTang().newInjector().getInstance(CommGroupNetworkHandler.class); - this.groupCommNetworkHandler.register(this.groupName, commGroupNetworkHandler); - - boolean operatorIsScatterSender = false; - for (final String operatorConfigStr : operatorConfigs) { - - final Configuration operatorConfig = configSerializer.fromString(operatorConfigStr); - final Injector injector = Tang.Factory.getTang().newInjector(operatorConfig); - - injector.bindVolatileParameter(TaskConfigurationOptions.Identifier.class, taskId); - injector.bindVolatileParameter(CommunicationGroupName.class, groupName); - injector.bindVolatileInstance(CommGroupNetworkHandler.class, commGroupNetworkHandler); - injector.bindVolatileInstance(NetworkService.class, netService); - injector.bindVolatileInstance(CommunicationGroupServiceClient.class, this); - - final GroupCommOperator operator = injector.getInstance(GroupCommOperator.class); - final String operName = injector.getNamedInstance(OperatorName.class); - this.operators.put(Utils.getClass(operName), operator); - LOG.finest(operName + " has CommGroupHandler-" + commGroupNetworkHandler.toString()); - - if (!operatorIsScatterSender && operator instanceof Scatter.Sender) { - LOG.fine(operName + " is a scatter sender. Will keep track of active slave tasks."); - operatorIsScatterSender = true; - } - } - this.isScatterSender = operatorIsScatterSender; - } catch (final InjectionException | IOException e) { - throw new RuntimeException("Unable to deserialize operator config", e); - } - } - @Inject private CommunicationGroupClientImpl(@Parameter(CommunicationGroupName.class) final String groupName, @Parameter(TaskConfigurationOptions.Identifier.class) final String taskId, http://git-wip-us.apache.org/repos/asf/reef/blob/4f85dd77/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/GroupCommClientImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/GroupCommClientImpl.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/GroupCommClientImpl.java index 34beda1..16a3490 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/GroupCommClientImpl.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/GroupCommClientImpl.java @@ -18,17 +18,13 @@ */ package org.apache.reef.io.network.group.impl.task; -import org.apache.reef.driver.task.TaskConfigurationOptions; -import org.apache.reef.io.network.impl.NetworkService; import org.apache.reef.io.network.group.api.task.CommunicationGroupClient; import org.apache.reef.io.network.group.api.task.CommunicationGroupServiceClient; import org.apache.reef.io.network.group.api.task.GroupCommClient; import org.apache.reef.io.network.group.api.task.GroupCommNetworkHandler; import org.apache.reef.io.network.group.impl.config.parameters.SerializedGroupConfigs; -import org.apache.reef.io.network.proto.ReefNetworkGroupCommProtos; import org.apache.reef.tang.Configuration; import org.apache.reef.tang.Injector; -import org.apache.reef.tang.Tang; import org.apache.reef.tang.annotations.Name; import org.apache.reef.tang.annotations.Parameter; import org.apache.reef.tang.exceptions.InjectionException; @@ -42,54 +38,15 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -public class GroupCommClientImpl implements GroupCommClient { +public final class GroupCommClientImpl implements GroupCommClient { private static final Logger LOG = Logger.getLogger(GroupCommClientImpl.class.getName()); private final Map<Class<? extends Name<String>>, CommunicationGroupServiceClient> communicationGroups = new HashMap<>(); - /** - * @deprecated in 0.14. - * Use the other constructor that receives an {@code injector} as a parameter instead. - * The parameters {@code taskId} and {@code netService} can be removed from the other constructor when - * this constructor gets deleted. - */ - @Deprecated - @Inject - public GroupCommClientImpl( - @Parameter(SerializedGroupConfigs.class) final Set<String> groupConfigs, - @Parameter(TaskConfigurationOptions.Identifier.class) final String taskId, - final GroupCommNetworkHandler groupCommNetworkHandler, - final NetworkService<ReefNetworkGroupCommProtos.GroupCommMessage> netService, - final ConfigurationSerializer configSerializer) { - - LOG.log(Level.FINEST, "GroupCommHandler-{0}", groupCommNetworkHandler); - - for (final String groupConfigStr : groupConfigs) { - try { - final Configuration groupConfig = configSerializer.fromString(groupConfigStr); - - final Injector injector = Tang.Factory.getTang().newInjector(groupConfig); - injector.bindVolatileParameter(TaskConfigurationOptions.Identifier.class, taskId); - injector.bindVolatileInstance(GroupCommNetworkHandler.class, groupCommNetworkHandler); - injector.bindVolatileInstance(NetworkService.class, netService); - - final CommunicationGroupServiceClient commGroupClient = - injector.getInstance(CommunicationGroupServiceClient.class); - - this.communicationGroups.put(commGroupClient.getName(), commGroupClient); - - } catch (final InjectionException | IOException e) { - throw new RuntimeException("Unable to deserialize operator config", e); - } - } - } - @Inject private GroupCommClientImpl(@Parameter(SerializedGroupConfigs.class) final Set<String> groupConfigs, - @Parameter(TaskConfigurationOptions.Identifier.class) final String taskId, final GroupCommNetworkHandler groupCommNetworkHandler, - final NetworkService<ReefNetworkGroupCommProtos.GroupCommMessage> netService, final ConfigurationSerializer configSerializer, final Injector injector) { http://git-wip-us.apache.org/repos/asf/reef/blob/4f85dd77/lang/java/reef-io/src/main/java/org/apache/reef/io/network/util/Utils.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/util/Utils.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/util/Utils.java index a34d92e..31ffb42 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/util/Utils.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/util/Utils.java @@ -54,19 +54,6 @@ public final class Utils { return result; } - /** - * @deprecated in 0.14. Please use parseList instead. - */ - @Deprecated - public static List<ComparableIdentifier> parseListCmp( - final String ids, final IdentifierFactory factory) { - final List<ComparableIdentifier> result = new ArrayList<>(); - for (final String token : ids.split(DELIMITER)) { - result.add((ComparableIdentifier) factory.getNewInstance(token.trim())); - } - return result; - } - public static String listToString(final List<ComparableIdentifier> ids) { return StringUtils.join(ids, DELIMITER); }
