Skip to content

HADOOP-18679. Followup: rename WrappedIO.bulkDelete_PageSize to bulkDelete_PageSize #6854

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

Merged
merged 1 commit into from
May 30, 2024
Merged

HADOOP-18679. Followup: rename WrappedIO.bulkDelete_PageSize to bulkDelete_PageSize #6854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/wrappedio/WrappedIO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ private WrappedIO() {
* @throws IllegalArgumentException path not valid.
* @throws IOException problems resolving paths
*/
public static int bulkDelete_PageSize(FileSystem fs, Path path) throws IOException {
public static int bulkDelete_pageSize(FileSystem fs, Path path) throws IOException {
try (BulkDelete bulk = fs.createBulkDelete(path)) {
return bulk.pageSize();
}
Expand Down
2 changes: 1 addition & 1 deletion ...op-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractBulkDeleteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public abstract class AbstractContractBulkDeleteTest extends AbstractFSContractT
public void setUp() throws Exception {
fs = getFileSystem();
basePath = path(getClass().getName());
pageSize = WrappedIO.bulkDelete_PageSize(getFileSystem(), basePath);
pageSize = WrappedIO.bulkDelete_pageSize(getFileSystem(), basePath);
fs.mkdirs(basePath);
}

Expand Down
4 changes: 2 additions & 2 deletions hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/ITestAssumeRole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ private void executeBulkDeleteOnReadOnlyFiles(Configuration assumedRoleConfig) t

bindReadOnlyRolePolicy(assumedRoleConfig, readOnlyDir);
roleFS = (S3AFileSystem) destDir.getFileSystem(assumedRoleConfig);
int bulkDeletePageSize = WrappedIO.bulkDelete_PageSize(roleFS, destDir);
int bulkDeletePageSize = WrappedIO.bulkDelete_pageSize(roleFS, destDir);
int range = bulkDeletePageSize == 1 ? bulkDeletePageSize : 10;
touchFiles(fs, readOnlyDir, range);
touchFiles(roleFS, destDir, range);
Expand Down Expand Up @@ -769,7 +769,7 @@ private void executeBulkDeleteOnSomeReadOnlyFiles(Configuration assumedRoleConfi
bindReadOnlyRolePolicy(assumedRoleConfig, readOnlyDir);
roleFS = (S3AFileSystem) destDir.getFileSystem(assumedRoleConfig);
S3AFileSystem fs = getFileSystem();
if (WrappedIO.bulkDelete_PageSize(fs, destDir) == 1) {
if (WrappedIO.bulkDelete_pageSize(fs, destDir) == 1) {
String msg = "Skipping as this test requires more than one path to be deleted in bulk";
LOG.debug(msg);
skip(msg);
Expand Down