You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2022/05/30 13:03:04 UTC
[hadoop] branch trunk updated: HADOOP-18269. Misleading method name in DistCpOptions.(#4216)
This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new ba6520f67f4 HADOOP-18269. Misleading method name in DistCpOptions.(#4216)
ba6520f67f4 is described below
commit ba6520f67f4aed65f7a8290dd7999322e3fe9c88
Author: GuoPhilipse <46...@users.noreply.github.com>
AuthorDate: Mon May 30 21:02:47 2022 +0800
HADOOP-18269. Misleading method name in DistCpOptions.(#4216)
Contributed by guophilipse
---
.../java/org/apache/hadoop/tools/DistCpOptions.java | 17 +++++++++++++++++
.../java/org/apache/hadoop/tools/OptionsParser.java | 2 +-
.../java/org/apache/hadoop/tools/TestDistCpOptions.java | 4 ++--
.../tools/contract/AbstractContractDistCpTest.java | 2 +-
.../apache/hadoop/tools/mapred/TestCopyCommitter.java | 2 +-
5 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
index e5685c14925..2745d828c36 100644
--- a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
+++ b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java
@@ -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;
diff --git a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/OptionsParser.java b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/OptionsParser.java
index f2875c5f33a..49ee09f4004 100644
--- a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/OptionsParser.java
+++ b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/OptionsParser.java
@@ -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()))
diff --git a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpOptions.java b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpOptions.java
index ac2100ec98a..d126bfdc4f9 100644
--- a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpOptions.java
+++ b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpOptions.java
@@ -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) {
diff --git a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
index 04aeea665c2..8545df30bac 100644
--- a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
+++ b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
@@ -349,7 +349,7 @@ public abstract class AbstractContractDistCpTest
Collections.singletonList(srcDir), destDir)
.withDeleteMissing(true)
.withSyncFolder(true)
- .withCRC(true)
+ .withSkipCRC(true)
.withDirectWrite(shouldUseDirectWrite())
.withOverwrite(false)));
}
diff --git a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
index 62940f64b34..599f3ec2db6 100644
--- a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
+++ b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
@@ -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(
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org