jeongyooneo commented on a change in pull request #24: [NEMO-79] Clean up the legacy Task URL: https://github.com/apache/incubator-nemo/pull/24#discussion_r192000745
########## File path: runtime/executor/src/main/java/edu/snu/nemo/runtime/executor/TaskExecutor.java ########## @@ -41,79 +40,88 @@ * Executes a task. */ public final class TaskExecutor { + // Static variables private static final Logger LOG = LoggerFactory.getLogger(TaskExecutor.class.getName()); + private static final String ITERATORID_PREFIX = "ITERATOR_"; + private static final AtomicInteger ITERATORID_GENERATOR = new AtomicInteger(0); - private final DAG<Task, RuntimeEdge<Task>> taskDag; + // From ExecutableTask + private final DAG<IRVertex, RuntimeEdge<IRVertex>> irVertexDag; private final String taskId; private final int taskIdx; private final TaskStateManager taskStateManager; private final List<PhysicalStageEdge> stageIncomingEdges; private final List<PhysicalStageEdge> stageOutgoingEdges; + private Map<String, Readable> irVertexIdToReadable; + + // Other parameters private final DataTransferFactory channelFactory; private final MetricCollector metricCollector; - private final List<InputReader> inputReaders; - private final Map<InputReader, List<TaskDataHandler>> inputReaderToDataHandlersMap; + // Data structures + private final Map<InputReader, List<IRVertexDataHandler>> inputReaderToDataHandlersMap; private final Map<String, Iterator> idToSrcIteratorMap; - private final Map<String, List<TaskDataHandler>> srcIteratorIdToDataHandlersMap; - private final Map<String, List<TaskDataHandler>> iteratorIdToDataHandlersMap; + private final Map<String, List<IRVertexDataHandler>> srcIteratorIdToDataHandlersMap; + private final Map<String, List<IRVertexDataHandler>> iteratorIdToDataHandlersMap; private final LinkedBlockingQueue<Pair<String, DataUtil.IteratorWithNumBytes>> partitionQueue; - private List<TaskDataHandler> taskDataHandlers; - private Map<OutputCollectorImpl, List<TaskDataHandler>> outputToChildrenDataHandlersMap; - private final Set<String> finishedTaskIds; - private int numPartitions; - private Map<String, Readable> logicalTaskIdToReadable; + private List<IRVertexDataHandler> irVertexDataHandlers; + private Map<OutputCollectorImpl, List<IRVertexDataHandler>> outputToChildrenDataHandlersMap; + private final Set<String> finishedVertexIds; // For metrics private long serBlockSize; private long encodedBlockSize; - private boolean isExecutionRequested; - private String logicalTaskIdPutOnHold; + // Misc + private boolean isExecuted; + private String irVertexIdPutOnHold; + private int numPartitions; - private static final String ITERATORID_PREFIX = "ITERATOR_"; - private static final AtomicInteger ITERATORID_GENERATOR = new AtomicInteger(0); /** * Constructor. - * @param scheduledTask Task with information needed during execution. - * @param taskDag A DAG of Tasks. + * @param executableTask Task with information needed during execution. + * @param irVertexDag A DAG of Tasks. Review comment: A DAG of IRVertices? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services