Projects >> asakusafw >>7d7115e00094c6d5b5cab013cf62070b22d5405a

Chunk
Conflicting content 
            OutputCommitter committer,
            RawComparator comparator) throws IOException, InterruptedException {
        StatusReporter reporter = new MockStatusReporter();
<<<<<<< HEAD
        ReduceContext context = new ReduceContextImpl(
                configuration, id, reader,
                reporter.getCounter("asakusafw", "inputKey"),
                reporter.getCounter("asakusafw", "inputValue"),
                writer, committer, reporter, comparator, inputKeyClass, inputValueClass);
        return new WrappedReducer().getReducerContext(context);
=======
        return reducer.new Context(
                configuration,
                id,
                reader,
                reporter.getCounter("asakusafw", "inputKey"), //$NON-NLS-1$ //$NON-NLS-2$
                reporter.getCounter("asakusafw", "inputValue"), //$NON-NLS-1$ //$NON-NLS-2$
                writer, committer, reporter, comparator,
                inputKeyClass, inputValueClass);
>>>>>>> e7790cc1e28671e603df554cb389a07eedaf8a58
    }

    /**
Solution content 
            OutputCommitter committer,
            RawComparator comparator) throws IOException, InterruptedException {
        StatusReporter reporter = new MockStatusReporter();
        ReduceContext context = new ReduceContextImpl(
                configuration, id, reader,
                reporter.getCounter("asakusafw", "inputKey"), //$NON-NLS-1$ //$NON-NLS-2$
                reporter.getCounter("asakusafw", "inputValue"), //$NON-NLS-1$ //$NON-NLS-2$
                writer, committer, reporter, comparator, inputKeyClass, inputValueClass);
        return new WrappedReducer().getReducerContext(context);
    }

    /**
File
JobCompatibility.java
Developer's decision
Combination
Kind of conflict
Method invocation
Return statement
Variable
Chunk
Conflicting content 
        if (conf == null) {
            throw new IllegalArgumentException("conf must not be null"); //$NON-NLS-1$
        }
<<<<<<< HEAD
=======
        FileStatus status = new FileStatus(length, false, 0, length, 0, new Path("dummy:///")); //$NON-NLS-1$
        Path path = status.getPath();
>>>>>>> e7790cc1e28671e603df554cb389a07eedaf8a58
        return new SequenceFile.Reader(
                conf,
                SequenceFile.Reader.stream(new FSDataInputStream(new WrappedInputStream(in))),
Solution content 
        if (conf == null) {
            throw new IllegalArgumentException("conf must not be null"); //$NON-NLS-1$
        }
        return new SequenceFile.Reader(
                conf,
                SequenceFile.Reader.stream(new FSDataInputStream(new WrappedInputStream(in))),
File
SequenceFileCompatibility.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Variable