Skip to content

Commit

Permalink
MAPREDUCE-7420. Fix CheckStyle.
Browse files Browse the repository at this point in the history
  • Loading branch information
fanshilun committed Feb 8, 2025
1 parent c16bcc2 commit 2b669d2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ private void testRecoveryInternal(int commitVersion, int recoveryVersion)
assertTrue(jtd2.exists(), "Version 1 recovers to " + jtd2);
validateContent(jobTempDir2);
} else {
assertFalse(jtd2.exists(), "Version 2 commits to output dir " + jtd2);
if (commitVersion == 1) {
assertEquals(0, jtd1.list().length,
assertFalse(jtd2.exists(), "Version 2 commits to output dir " + jtd2);
if (commitVersion == 1) {
assertEquals(0, jtd1.list().length,
"Version 2 recovery moves to output dir from " + jtd1);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public void testAddFileToClassPath() throws Exception {
DistributedCache.addFileToClassPath(new Path("file:///a"), conf, fs, true);
assertEquals("file:/a", conf.get(MRJobConfig.CLASSPATH_FILES),
"The mapreduce.job.classpath.files property was not set correctly");
assertEquals( "file:///a", conf.get(MRJobConfig.CACHE_FILES),
assertEquals("file:///a", conf.get(MRJobConfig.CACHE_FILES),
"The mapreduce.job.cache.files property was not set correctly");

DistributedCache.addFileToClassPath(new Path("file:///b"), conf, fs, true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@ public void testOnDiskMerger() throws IOException {

MapOutputFile mapOutputFile = new MROutputFiles();
FileSystem fs = FileSystem.getLocal(jobConf);
MergeManagerImpl<IntWritable, IntWritable> manager = new MergeManagerImpl<>(null, jobConf, fs, null,
MergeManagerImpl<IntWritable, IntWritable> manager = new MergeManagerImpl<>(
null, jobConf, fs, null,
null, null, null, null, null, null, null, null, null, mapOutputFile);

MergeThread onDiskMerger = manager.getOnDiskMerger();
Expand Down

0 comments on commit 2b669d2

Please sign in to comment.