HADOOP-18269. Misleading method name in DistCpOptions.(#4216)
Contributed by guophilipse
This commit is contained in:
parent
835f39cefc
commit
ba6520f67f
|
@ -684,11 +684,28 @@ public final class DistCpOptions {
|
|||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* whether builder with crc.
|
||||
* @param newSkipCRC whether to skip crc check
|
||||
* @return Builder object whether to skip crc check
|
||||
* @deprecated Use {@link #withSkipCRC(boolean)} instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public Builder withCRC(boolean newSkipCRC) {
|
||||
this.skipCRC = newSkipCRC;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* whether builder with crc.
|
||||
* @param newSkipCRC whether to skip crc check
|
||||
* @return Builder object whether to skip crc check
|
||||
*/
|
||||
public Builder withSkipCRC(boolean newSkipCRC) {
|
||||
this.skipCRC = newSkipCRC;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder withBlocking(boolean newBlocking) {
|
||||
this.blocking = newBlocking;
|
||||
return this;
|
||||
|
|
|
@ -108,7 +108,7 @@ public class OptionsParser {
|
|||
command.hasOption(DistCpOptionSwitch.OVERWRITE.getSwitch()))
|
||||
.withAppend(
|
||||
command.hasOption(DistCpOptionSwitch.APPEND.getSwitch()))
|
||||
.withCRC(
|
||||
.withSkipCRC(
|
||||
command.hasOption(DistCpOptionSwitch.SKIP_CRC.getSwitch()))
|
||||
.withBlocking(
|
||||
!command.hasOption(DistCpOptionSwitch.BLOCKING.getSwitch()))
|
||||
|
|
|
@ -128,7 +128,7 @@ public class TestDistCpOptions {
|
|||
new Path("hdfs://localhost:8020/target/"));
|
||||
Assert.assertFalse(builder.build().shouldSkipCRC());
|
||||
|
||||
final DistCpOptions options = builder.withSyncFolder(true).withCRC(true)
|
||||
final DistCpOptions options = builder.withSyncFolder(true).withSkipCRC(true)
|
||||
.build();
|
||||
Assert.assertTrue(options.shouldSyncFolder());
|
||||
Assert.assertTrue(options.shouldSkipCRC());
|
||||
|
@ -391,7 +391,7 @@ public class TestDistCpOptions {
|
|||
new Path("hdfs://localhost:8020/target/"))
|
||||
.withSyncFolder(true)
|
||||
.withAppend(true)
|
||||
.withCRC(true)
|
||||
.withSkipCRC(true)
|
||||
.build();
|
||||
fail("Append should fail if skipCrc option is specified");
|
||||
} catch (IllegalArgumentException e) {
|
||||
|
|
|
@ -349,7 +349,7 @@ public abstract class AbstractContractDistCpTest
|
|||
Collections.singletonList(srcDir), destDir)
|
||||
.withDeleteMissing(true)
|
||||
.withSyncFolder(true)
|
||||
.withCRC(true)
|
||||
.withSkipCRC(true)
|
||||
.withDirectWrite(shouldUseDirectWrite())
|
||||
.withOverwrite(false)));
|
||||
}
|
||||
|
|
|
@ -536,7 +536,7 @@ public class TestCopyCommitter {
|
|||
Collections.singletonList(new Path(sourceBase)),
|
||||
new Path("/out"))
|
||||
.withBlocksPerChunk(blocksPerChunk)
|
||||
.withCRC(skipCrc)
|
||||
.withSkipCRC(skipCrc)
|
||||
.build();
|
||||
options.appendToConf(conf);
|
||||
conf.setBoolean(
|
||||
|
|
Loading…
Reference in New Issue