Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…cubator-ignite into ignite-futures-cleanup-1

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopNoopProcessor.java
	modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
	modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java
	modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java
  • Loading branch information
Yakov Zhdanov committed Mar 5, 2015
1 parent 17ac360 commit cce63fd
Showing 1 changed file with 2 additions and 13 deletions.
Expand Up @@ -330,7 +330,7 @@ private HadoopProcess startProcess(final HadoopJob job, final HadoopMapReducePla


HadoopJobId jobId = job.id(); HadoopJobId jobId = job.id();


final HadoopProcessFuture fut = new HadoopProcessFuture(childProcId, jobId, ctx.kernalContext()); final HadoopProcessFuture fut = new HadoopProcessFuture(childProcId, jobId);


final HadoopProcess proc = new HadoopProcess(jobId, fut, plan.reducers(ctx.localNodeId())); final HadoopProcess proc = new HadoopProcess(jobId, fut, plan.reducers(ctx.localNodeId()));


Expand Down Expand Up @@ -853,9 +853,6 @@ private Collection<Integer> reducers() {
* *
*/ */
private class HadoopProcessFuture extends GridFutureAdapter<IgniteBiTuple<Process, HadoopProcessDescriptor>> { private class HadoopProcessFuture extends GridFutureAdapter<IgniteBiTuple<Process, HadoopProcessDescriptor>> {
/** */
private static final long serialVersionUID = 0L;

/** Child process ID. */ /** Child process ID. */
private UUID childProcId; private UUID childProcId;


Expand All @@ -878,16 +875,8 @@ private class HadoopProcessFuture extends GridFutureAdapter<IgniteBiTuple<Proces
private final IgniteLogger log = HadoopExternalTaskExecutor.this.log; private final IgniteLogger log = HadoopExternalTaskExecutor.this.log;


/** /**
* Empty constructor.
*/
public HadoopProcessFuture() {
// No-op.
}

/**
* @param ctx Kernal context.
*/ */
private GridHadoopProcessFuture(UUID childProcId, HadoopJobId jobId, GridKernalContext ctx) { private HadoopProcessFuture(UUID childProcId, HadoopJobId jobId) {
this.childProcId = childProcId; this.childProcId = childProcId;
this.jobId = jobId; this.jobId = jobId;
} }
Expand Down

0 comments on commit cce63fd

Please sign in to comment.