Skip to content

Commit 05edb95

Browse files
Fix imports
1 parent f8df32f commit 05edb95

File tree

7 files changed

+49
-14
lines changed

7 files changed

+49
-14
lines changed

hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsBackoffMetrics.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818

1919
package org.apache.hadoop.fs.azurebfs;
2020

21-
import java.util.concurrent.ConcurrentHashMap;
22-
import java.util.concurrent.atomic.AtomicLong;
23-
import java.util.Map;
2421
import java.util.ArrayList;
2522
import java.util.Arrays;
23+
import java.util.Map;
24+
import java.util.concurrent.ConcurrentHashMap;
25+
import java.util.concurrent.atomic.AtomicLong;
2626

2727
import static org.apache.hadoop.fs.azurebfs.constants.FileSystemConfigurations.HUNDRED;
2828
import static org.apache.hadoop.fs.azurebfs.constants.FileSystemConfigurations.THOUSAND;

hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsCountersImpl.java

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@
2121
import java.net.URI;
2222
import java.util.Map;
2323
import java.util.UUID;
24-
import org.apache.hadoop.classification.VisibleForTesting;
24+
import java.util.concurrent.atomic.AtomicLong;
2525

26+
import org.apache.hadoop.classification.VisibleForTesting;
2627
import org.apache.hadoop.fs.azurebfs.services.AbfsCounters;
28+
import org.apache.hadoop.fs.azurebfs.services.AbfsReadFooterMetrics;
2729
import org.apache.hadoop.fs.azurebfs.utils.MetricFormat;
2830
import org.apache.hadoop.fs.statistics.DurationTracker;
2931
import org.apache.hadoop.fs.statistics.IOStatistics;
@@ -33,12 +35,43 @@
3335
import org.apache.hadoop.metrics2.lib.MetricsRegistry;
3436
import org.apache.hadoop.metrics2.lib.MutableCounterLong;
3537
import org.apache.hadoop.metrics2.lib.MutableMetric;
36-
import org.apache.hadoop.fs.azurebfs.services.AbfsReadFooterMetrics;
37-
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.*;
38+
39+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.BYTES_RECEIVED;
40+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.BYTES_SENT;
41+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.CALL_APPEND;
42+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.CALL_CREATE;
43+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.CALL_CREATE_NON_RECURSIVE;
44+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.CALL_DELETE;
45+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.CALL_EXIST;
46+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.CALL_GET_DELEGATION_TOKEN;
47+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.CALL_GET_FILE_STATUS;
48+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.CALL_LIST_STATUS;
49+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.CALL_MKDIRS;
50+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.CALL_OPEN;
51+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.CALL_RENAME;
52+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.CONNECTIONS_MADE;
53+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.DIRECTORIES_CREATED;
54+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.DIRECTORIES_DELETED;
55+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.ERROR_IGNORED;
56+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.FILES_CREATED;
57+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.FILES_DELETED;
58+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.GET_RESPONSES;
59+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.HTTP_DELETE_REQUEST;
60+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.HTTP_GET_REQUEST;
61+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.HTTP_HEAD_REQUEST;
62+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.HTTP_PATCH_REQUEST;
63+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.HTTP_POST_REQUEST;
64+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.HTTP_PUT_REQUEST;
65+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.METADATA_INCOMPLETE_RENAME_FAILURES;
66+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.READ_THROTTLES;
67+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.RENAME_PATH_ATTEMPTS;
68+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.RENAME_RECOVERY;
69+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.SEND_REQUESTS;
70+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.SERVER_UNAVAILABLE;
71+
import static org.apache.hadoop.fs.azurebfs.AbfsStatistic.WRITE_THROTTLES;
3872
import static org.apache.hadoop.fs.statistics.impl.IOStatisticsBinding.iostatisticsStore;
3973
import static org.apache.hadoop.util.Time.now;
4074

41-
import java.util.concurrent.atomic.AtomicLong;
4275

4376
/**
4477
* Instrumentation of Abfs counters.

hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343

4444
import org.apache.hadoop.classification.VisibleForTesting;
4545
import org.apache.hadoop.fs.azurebfs.constants.FSOperationType;
46-
import org.apache.hadoop.fs.azurebfs.utils.MetricFormat;
4746
import org.apache.hadoop.fs.azurebfs.contracts.exceptions.AbfsInvalidChecksumException;
4847
import org.apache.hadoop.fs.azurebfs.contracts.exceptions.AbfsDriverException;
4948
import org.apache.hadoop.fs.azurebfs.contracts.services.AzureServiceErrorCode;
49+
import org.apache.hadoop.fs.azurebfs.utils.MetricFormat;
5050
import org.apache.hadoop.fs.azurebfs.utils.NamespaceUtil;
5151
import org.apache.hadoop.fs.store.LogExactlyOnce;
5252
import org.apache.hadoop.fs.azurebfs.AzureBlobFileSystemStore.Permissions;

hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsCounters.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,16 @@
2222
import java.util.concurrent.atomic.AtomicLong;
2323

2424
import org.apache.hadoop.classification.VisibleForTesting;
25+
2526
import org.apache.hadoop.classification.InterfaceAudience;
2627
import org.apache.hadoop.classification.InterfaceStability;
28+
import org.apache.hadoop.fs.azurebfs.AbfsBackoffMetrics;
2729
import org.apache.hadoop.fs.azurebfs.AbfsStatistic;
2830
import org.apache.hadoop.fs.azurebfs.utils.MetricFormat;
2931
import org.apache.hadoop.fs.statistics.DurationTracker;
3032
import org.apache.hadoop.fs.statistics.DurationTrackerFactory;
3133
import org.apache.hadoop.fs.statistics.IOStatisticsSource;
32-
import org.apache.hadoop.fs.azurebfs.AbfsBackoffMetrics;
34+
3335
/**
3436
* An interface for Abfs counters.
3537
*/

hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsReadFooterMetrics.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
*/
1818
package org.apache.hadoop.fs.azurebfs.services;
1919

20+
import java.util.ArrayList;
21+
import java.util.List;
2022
import java.util.Map;
2123
import java.util.StringJoiner;
2224
import java.util.concurrent.ConcurrentSkipListMap;
2325
import java.util.concurrent.atomic.AtomicBoolean;
2426
import java.util.concurrent.atomic.AtomicInteger;
2527
import java.util.concurrent.atomic.AtomicLong;
26-
import java.util.List;
27-
import java.util.ArrayList;
2828

2929
import static org.apache.hadoop.fs.azurebfs.constants.FileSystemConfigurations.ONE_KB;
3030

hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsRestOperation.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import java.net.UnknownHostException;
2626
import java.util.List;
2727

28-
import org.apache.hadoop.fs.azurebfs.AbfsConfiguration;
29-
import org.apache.hadoop.fs.azurebfs.contracts.exceptions.InvalidUriException;
3028
import org.slf4j.Logger;
3129
import org.slf4j.LoggerFactory;
3230

@@ -527,7 +525,7 @@ AbfsHttpOperation createHttpOperation() throws IOException {
527525
/**
528526
* Incrementing Abfs counters with a long value.
529527
*
530-
* @param statistic the Abfs statistic that needs to be incremented.f
528+
* @param statistic the Abfs statistic that needs to be incremented.
531529
* @param value the value to be incremented by.
532530
*/
533531
private void incrementCounter(AbfsStatistic statistic, long value) {

hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/utils/TracingContext.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@
1919
package org.apache.hadoop.fs.azurebfs.utils;
2020

2121
import java.util.UUID;
22+
2223
import org.slf4j.Logger;
2324
import org.slf4j.LoggerFactory;
25+
2426
import org.apache.hadoop.fs.azurebfs.constants.FSOperationType;
2527
import org.apache.hadoop.fs.azurebfs.constants.HttpHeaderConfigurations;
2628
import org.apache.hadoop.fs.azurebfs.services.AbfsClient;

0 commit comments

Comments
 (0)