Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HADOOP-18269. Misleading method name in DistCpOptions. #4216

Merged
merged 21 commits into from
May 30, 2022
Merged

HADOOP-18269. Misleading method name in DistCpOptions. #4216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3c51579
Merge pull request #1 from apache/trunk
GuoPhilipse Nov 29, 2020
a449d04
Merge pull request #2 from apache/trunk
GuoPhilipse Dec 12, 2020
d4f968b
Merge pull request #3 from apache/trunk
GuoPhilipse Apr 7, 2021
d522abf
Merge pull request #4 from apache/trunk
GuoPhilipse Apr 21, 2021
de633b8
Merge pull request #5 from apache/trunk
GuoPhilipse Oct 16, 2021
66ce06b
Merge pull request #6 from apache/trunk
GuoPhilipse Nov 8, 2021
bea061f
Merge pull request #7 from apache/trunk
GuoPhilipse Nov 19, 2021
9375f21
Merge pull request #8 from apache/trunk
GuoPhilipse Dec 7, 2021
56a7aea
Merge pull request #9 from apache/trunk
GuoPhilipse Dec 10, 2021
989f31c
Merge pull request #10 from apache/trunk
GuoPhilipse Dec 30, 2021
60f347a
Merge pull request #11 from apache/trunk
GuoPhilipse Jan 19, 2022
99a3513
Merge pull request #12 from apache/trunk
GuoPhilipse Feb 9, 2022
0797b25
Merge pull request #13 from apache/trunk
GuoPhilipse Mar 21, 2022
6f29c61
Merge pull request #14 from apache/trunk
GuoPhilipse Apr 11, 2022
a1637b1
fixmethodname
GuoPhilipse Apr 22, 2022
780054b
add deprecated method
GuoPhilipse Apr 24, 2022
5cfc52b
fixcheckstyle
GuoPhilipse Apr 24, 2022
a539471
fixcheckstyle
GuoPhilipse Apr 24, 2022
dab1bbc
fixcheckstyle
GuoPhilipse Apr 24, 2022
587aba6
fixcheckstyle
GuoPhilipse Apr 24, 2022
68e501c
add comment
tclxgf13871 May 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,11 +684,28 @@ public Builder withAppend(boolean newAppend) {
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) {
steveloughran marked this conversation as resolved.
Show resolved Hide resolved
this.skipCRC = newSkipCRC;
return this;
}

public Builder withBlocking(boolean newBlocking) {
this.blocking = newBlocking;
return this;
Expand Down
2 changes: 1 addition & 1 deletion hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/OptionsParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public static DistCpOptions parse(String[] args)
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()))
Expand Down
4 changes: 2 additions & 2 deletions hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public void testSetSkipCRC() {
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());
Expand Down Expand Up @@ -391,7 +391,7 @@ public void testAppendOption() {
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) {
Expand Down
2 changes: 1 addition & 1 deletion ...oop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ private Job distCpUpdate(final Path srcDir, final Path destDir)
Collections.singletonList(srcDir), destDir)
.withDeleteMissing(true)
.withSyncFolder(true)
.withCRC(true)
.withSkipCRC(true)
.withDirectWrite(shouldUseDirectWrite())
.withOverwrite(false)));
}
Expand Down
2 changes: 1 addition & 1 deletion ...p-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ private void testCommitWithChecksumMismatch(boolean skipCrc)
Collections.singletonList(new Path(sourceBase)),
new Path("/out"))
.withBlocksPerChunk(blocksPerChunk)
.withCRC(skipCrc)
.withSkipCRC(skipCrc)
.build();
options.appendToConf(conf);
conf.setBoolean(
Expand Down