From a1637b1066309705f166914bd169b0fb4c8c837f Mon Sep 17 00:00:00 2001 From: guophilipse Date: Fri, 22 Apr 2022 09:00:37 +0800 Subject: [PATCH 1/7] fixmethodname --- .../src/main/java/org/apache/hadoop/tools/DistCpOptions.java | 2 +- .../src/main/java/org/apache/hadoop/tools/OptionsParser.java | 2 +- .../test/java/org/apache/hadoop/tools/TestDistCpOptions.java | 4 ++-- .../hadoop/tools/contract/AbstractContractDistCpTest.java | 2 +- .../org/apache/hadoop/tools/mapred/TestCopyCommitter.java | 2 +- 5 files changed, 6 insertions(+), 6 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 e5685c1492507..f765140f32ab0 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,7 +684,7 @@ public Builder withAppend(boolean newAppend) { return this; } - public Builder withCRC(boolean newSkipCRC) { + public Builder withSkipCRC(boolean newSkipCRC) { this.skipCRC = newSkipCRC; 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 f2875c5f33a4f..49ee09f400400 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 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())) 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 ac2100ec98ad0..d126bfdc4f975 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 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()); @@ -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) { 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 04aeea665c244..8545df30bac8e 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 @@ 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))); } 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 62940f64b3488..599f3ec2db61e 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 @@ 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( From 780054b20e18032271e986172cc3c9fc6cbdf53f Mon Sep 17 00:00:00 2001 From: guophilipse Date: Sun, 24 Apr 2022 10:02:26 +0800 Subject: [PATCH 2/7] add deprecated method --- .../java/org/apache/hadoop/tools/DistCpOptions.java | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 f765140f32ab0..09090f1adb3b5 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,6 +684,16 @@ public Builder withAppend(boolean newAppend) { return this; } + /** + * whether builder with crc + * @deprecated Use {@link #withSkipCRC(boolean)} instead. + */ + @Deprecated + public Builder withCRC(boolean newSkipCRC) { + this.skipCRC = newSkipCRC; + return this; + } + public Builder withSkipCRC(boolean newSkipCRC) { this.skipCRC = newSkipCRC; return this; From 5cfc52bf31b7e73ba8250d083ddedd69648f4a75 Mon Sep 17 00:00:00 2001 From: guophilipse Date: Sun, 24 Apr 2022 13:39:58 +0800 Subject: [PATCH 3/7] fixcheckstyle --- .../src/main/java/org/apache/hadoop/tools/DistCpOptions.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 09090f1adb3b5..8f92d3e27aea7 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 @@ -686,6 +686,8 @@ public Builder withAppend(boolean newAppend) { /** * 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 @@ -693,7 +695,7 @@ public Builder withCRC(boolean newSkipCRC) { this.skipCRC = newSkipCRC; return this; } - + public Builder withSkipCRC(boolean newSkipCRC) { this.skipCRC = newSkipCRC; return this; From a539471ab7c67a359eab79625492e1a17a2c47cf Mon Sep 17 00:00:00 2001 From: guophilipse Date: Sun, 24 Apr 2022 16:19:59 +0800 Subject: [PATCH 4/7] fixcheckstyle --- .../main/java/org/apache/hadoop/tools/DistCpOptions.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 8f92d3e27aea7..43479264567c5 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 @@ -685,15 +685,15 @@ public Builder withAppend(boolean newAppend) { } /** - * whether builder with crc + * whether builder with crc. * @param newSkipCRC whether to skip crc check - * @return Builder object 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; + this.skipCRC = newSkipCRC; + return this; } public Builder withSkipCRC(boolean newSkipCRC) { From dab1bbcd0cbb265c40fdebb1b344bece08884e9e Mon Sep 17 00:00:00 2001 From: guophilipse Date: Sun, 24 Apr 2022 16:20:35 +0800 Subject: [PATCH 5/7] fixcheckstyle --- .../src/main/java/org/apache/hadoop/tools/DistCpOptions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 43479264567c5..7544f48a508e4 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 @@ -687,7 +687,7 @@ public Builder withAppend(boolean newAppend) { /** * whether builder with crc. * @param newSkipCRC whether to skip crc check - * @return Builder object whether to skip crc check + * @return Builder object whether to skip crc check * @deprecated Use {@link #withSkipCRC(boolean)} instead. */ @Deprecated From 587aba641dbf194a0d974d0387a30fe500c0a5e7 Mon Sep 17 00:00:00 2001 From: guophilipse Date: Sun, 24 Apr 2022 18:25:06 +0800 Subject: [PATCH 6/7] fixcheckstyle From 68e501c931618a65d46a9eebc2b12ffd0dabadc5 Mon Sep 17 00:00:00 2001 From: gf13871 Date: Wed, 25 May 2022 08:54:40 +0800 Subject: [PATCH 7/7] add comment --- .../src/main/java/org/apache/hadoop/tools/DistCpOptions.java | 5 +++++ 1 file changed, 5 insertions(+) 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 7544f48a508e4..2745d828c361b 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 @@ -696,6 +696,11 @@ public Builder withCRC(boolean 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;