Skip to content

Commit acf1447

Browse files
committed
HBASE-27220 Apply the spotless format change in HBASE-27208 to our code base
Signed-off-by: Andrew Purtell <[email protected]>
1 parent 7484a91 commit acf1447

File tree

400 files changed

+1225
-3365
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

400 files changed

+1225
-3365
lines changed

hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSOutput.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ public interface AsyncFSOutput extends Closeable {
8989
@Override
9090
void close() throws IOException;
9191

92-
/**
93-
* @return byteSize success synced to underlying filesystem.
94-
*/
92+
/** Returns byteSize success synced to underlying filesystem. */
9593
long getSyncedLength();
9694
}

hbase-asyncfs/src/main/java/org/apache/hadoop/hbase/util/RecoverLeaseFSUtils.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,7 @@ private static boolean recoverLease(final DistributedFileSystem dfs, final int n
186186
return recovered;
187187
}
188188

189-
/**
190-
* @return Detail to append to any log message around lease recovering.
191-
*/
189+
/** Returns Detail to append to any log message around lease recovering. */
192190
private static String getLogMessageDetail(final int nbAttempt, final Path p,
193191
final long startWaiting) {
194192
return "attempt=" + nbAttempt + " on file=" + p + " after "

hbase-balancer/src/main/java/org/apache/hadoop/hbase/master/balancer/FavoredStochasticBalancer.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,7 @@ protected List<CandidateGenerator> createCandidateGenerators() {
8787
return fnPickers;
8888
}
8989

90-
/**
91-
* @return any candidate generator in random
92-
*/
90+
/** Returns any candidate generator in random */
9391
@Override
9492
protected CandidateGenerator getRandomGenerator() {
9593
return candidateGenerators.get(ThreadLocalRandom.current().nextInt(candidateGenerators.size()));

hbase-client/src/main/java/org/apache/hadoop/hbase/CatalogFamilyFormat.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -398,9 +398,7 @@ public static boolean hasMergeRegions(Cell[] cells) {
398398
return false;
399399
}
400400

401-
/**
402-
* @return True if the column in <code>cell</code> matches the regex 'info:merge.*'.
403-
*/
401+
/** Returns True if the column in <code>cell</code> matches the regex 'info:merge.*'. */
404402
public static boolean isMergeQualifierPrefix(Cell cell) {
405403
// Check to see if has family and that qualifier starts with the merge qualifier 'merge'
406404
return CellUtil.matchingFamily(cell, HConstants.CATALOG_FAMILY)

hbase-client/src/main/java/org/apache/hadoop/hbase/ClientMetaTableAccessor.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -382,9 +382,7 @@ public boolean visit(Result r) throws IOException {
382382

383383
abstract void add(Result r);
384384

385-
/**
386-
* @return Collected results; wait till visits complete to collect all possible results
387-
*/
385+
/** Returns Collected results; wait till visits complete to collect all possible results */
388386
List<T> getResults() {
389387
return this.results;
390388
}

hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterId.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ public ClusterId(final String uuid) {
4545
this.id = uuid;
4646
}
4747

48-
/**
49-
* @return The clusterid serialized using pb w/ pb magic prefix
50-
*/
48+
/** Returns The clusterid serialized using pb w/ pb magic prefix */
5149
public byte[] toByteArray() {
5250
return ProtobufUtil.prependPBMagic(convert().toByteArray());
5351
}
@@ -74,9 +72,7 @@ public static ClusterId parseFrom(final byte[] bytes) throws DeserializationExce
7472
}
7573
}
7674

77-
/**
78-
* @return A pb instance to represent this instance.
79-
*/
75+
/** Returns A pb instance to represent this instance. */
8076
public ClusterIdProtos.ClusterId convert() {
8177
ClusterIdProtos.ClusterId.Builder builder = ClusterIdProtos.ClusterId.newBuilder();
8278
return builder.setClusterId(this.id).build();

hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterMetrics.java

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -69,38 +69,26 @@
6969
@InterfaceAudience.Public
7070
public interface ClusterMetrics {
7171

72-
/**
73-
* @return the HBase version string as reported by the HMaster
74-
*/
72+
/** Returns the HBase version string as reported by the HMaster */
7573
@Nullable
7674
String getHBaseVersion();
7775

78-
/**
79-
* @return the names of region servers on the dead list
80-
*/
76+
/** Returns the names of region servers on the dead list */
8177
List<ServerName> getDeadServerNames();
8278

83-
/**
84-
* @return the names of region servers on the decommissioned list
85-
*/
79+
/** Returns the names of region servers on the decommissioned list */
8680
List<ServerName> getDecommissionedServerNames();
8781

88-
/**
89-
* @return the names of region servers on the live list
90-
*/
82+
/** Returns the names of region servers on the live list */
9183
Map<ServerName, ServerMetrics> getLiveServerMetrics();
9284

93-
/**
94-
* @return the number of regions deployed on the cluster
95-
*/
85+
/** Returns the number of regions deployed on the cluster */
9686
default int getRegionCount() {
9787
return getLiveServerMetrics().entrySet().stream()
9888
.mapToInt(v -> v.getValue().getRegionMetrics().size()).sum();
9989
}
10090

101-
/**
102-
* @return the number of requests since last report
103-
*/
91+
/** Returns the number of requests since last report */
10492
default long getRequestCount() {
10593
return getLiveServerMetrics().entrySet().stream()
10694
.flatMap(v -> v.getValue().getRegionMetrics().values().stream())
@@ -114,9 +102,7 @@ default long getRequestCount() {
114102
@Nullable
115103
ServerName getMasterName();
116104

117-
/**
118-
* @return the names of backup masters
119-
*/
105+
/** Returns the names of backup masters */
120106
List<ServerName> getBackupMasterNames();
121107

122108
@InterfaceAudience.Private
@@ -147,9 +133,7 @@ default long getLastMajorCompactionTimestamp(byte[] regionName) {
147133

148134
List<ServerName> getServersName();
149135

150-
/**
151-
* @return the average cluster load
152-
*/
136+
/** Returns the average cluster load */
153137
default double getAverageLoad() {
154138
int serverSize = getLiveServerMetrics().size();
155139
if (serverSize == 0) {

hbase-client/src/main/java/org/apache/hadoop/hbase/CoprocessorEnvironment.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@
2828
@InterfaceStability.Evolving
2929
public interface CoprocessorEnvironment<C extends Coprocessor> {
3030

31-
/** @return the Coprocessor interface version */
31+
/** Returns the Coprocessor interface version */
3232
int getVersion();
3333

34-
/** @return the HBase version as a string (e.g. "0.21.0") */
34+
/** Returns the HBase version as a string (e.g. "0.21.0") */
3535
String getHBaseVersion();
3636

37-
/** @return the loaded coprocessor instance */
37+
/** Returns the loaded coprocessor instance */
3838
C getInstance();
3939

40-
/** @return the priority assigned to the loaded coprocessor */
40+
/** Returns the priority assigned to the loaded coprocessor */
4141
int getPriority();
4242

43-
/** @return the load sequence number */
43+
/** Returns the load sequence number */
4444
int getLoadSequence();
4545

4646
/**
@@ -49,8 +49,6 @@ public interface CoprocessorEnvironment<C extends Coprocessor> {
4949
*/
5050
Configuration getConfiguration();
5151

52-
/**
53-
* @return the classloader for the loaded coprocessor instance
54-
*/
52+
/** Returns the classloader for the loaded coprocessor instance */
5553
ClassLoader getClassLoader();
5654
}

hbase-client/src/main/java/org/apache/hadoop/hbase/HBaseServerException.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ public void setServerOverloaded(boolean serverOverloaded) {
6363
this.serverOverloaded = serverOverloaded;
6464
}
6565

66-
/**
67-
* @return True if server was considered overloaded when exception was thrown
68-
*/
66+
/** Returns True if server was considered overloaded when exception was thrown */
6967
public boolean isServerOverloaded() {
7068
return serverOverloaded;
7169
}

hbase-client/src/main/java/org/apache/hadoop/hbase/RegionMetrics.java

Lines changed: 23 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -28,44 +28,28 @@
2828
@InterfaceAudience.Public
2929
public interface RegionMetrics {
3030

31-
/**
32-
* @return the region name
33-
*/
31+
/** Returns the region name */
3432
byte[] getRegionName();
3533

36-
/**
37-
* @return the number of stores
38-
*/
34+
/** Returns the number of stores */
3935
int getStoreCount();
4036

41-
/**
42-
* @return the number of storefiles
43-
*/
37+
/** Returns the number of storefiles */
4438
int getStoreFileCount();
4539

46-
/**
47-
* @return the total size of the storefiles
48-
*/
40+
/** Returns the total size of the storefiles */
4941
Size getStoreFileSize();
5042

51-
/**
52-
* @return the memstore size
53-
*/
43+
/** Returns the memstore size */
5444
Size getMemStoreSize();
5545

56-
/**
57-
* @return the number of read requests made to region
58-
*/
46+
/** Returns the number of read requests made to region */
5947
long getReadRequestCount();
6048

61-
/**
62-
* @return the number of write requests made to region
63-
*/
49+
/** Returns the number of write requests made to region */
6450
long getWriteRequestCount();
6551

66-
/**
67-
* @return the number of coprocessor service requests made to region
68-
*/
52+
/** Returns the number of coprocessor service requests made to region */
6953
public long getCpRequestCount();
7054

7155
/**
@@ -76,16 +60,12 @@ default long getRequestCount() {
7660
return getReadRequestCount() + getWriteRequestCount() + getCpRequestCount();
7761
}
7862

79-
/**
80-
* @return the region name as a string
81-
*/
63+
/** Returns the region name as a string */
8264
default String getNameAsString() {
8365
return Bytes.toStringBinary(getRegionName());
8466
}
8567

86-
/**
87-
* @return the number of filtered read requests made to region
88-
*/
68+
/** Returns the number of filtered read requests made to region */
8969
long getFilteredReadRequestCount();
9070

9171
/**
@@ -96,29 +76,19 @@ default String getNameAsString() {
9676
*/
9777
Size getStoreFileIndexSize();
9878

99-
/**
100-
* @return The current total size of root-level indexes for the region
101-
*/
79+
/** Returns The current total size of root-level indexes for the region */
10280
Size getStoreFileRootLevelIndexSize();
10381

104-
/**
105-
* @return The total size of all index blocks, not just the root level
106-
*/
82+
/** Returns The total size of all index blocks, not just the root level */
10783
Size getStoreFileUncompressedDataIndexSize();
10884

109-
/**
110-
* @return The total size of all Bloom filter blocks, not just loaded into the block cache
111-
*/
85+
/** Returns The total size of all Bloom filter blocks, not just loaded into the block cache */
11286
Size getBloomFilterSize();
11387

114-
/**
115-
* @return the total number of cells in current compaction
116-
*/
88+
/** Returns the total number of cells in current compaction */
11789
long getCompactingCellCount();
11890

119-
/**
120-
* @return the number of already compacted kvs in current compaction
121-
*/
91+
/** Returns the number of already compacted kvs in current compaction */
12292
long getCompactedCellCount();
12393

12494
/**
@@ -127,29 +97,19 @@ default String getNameAsString() {
12797
*/
12898
long getCompletedSequenceId();
12999

130-
/**
131-
* @return completed sequence id per store.
132-
*/
100+
/** Returns completed sequence id per store. */
133101
Map<byte[], Long> getStoreSequenceId();
134102

135-
/**
136-
* @return the uncompressed size of the storefiles
137-
*/
103+
/** Returns the uncompressed size of the storefiles */
138104
Size getUncompressedStoreFileSize();
139105

140-
/**
141-
* @return the data locality of region in the regionserver.
142-
*/
106+
/** Returns the data locality of region in the regionserver. */
143107
float getDataLocality();
144108

145-
/**
146-
* @return the timestamp of the oldest hfile for any store of this region.
147-
*/
109+
/** Returns the timestamp of the oldest hfile for any store of this region. */
148110
long getLastMajorCompactionTimestamp();
149111

150-
/**
151-
* @return the reference count for the stores of this region
152-
*/
112+
/** Returns the reference count for the stores of this region */
153113
int getStoreRefCount();
154114

155115
/**
@@ -164,9 +124,7 @@ default String getNameAsString() {
164124
*/
165125
float getDataLocalityForSsd();
166126

167-
/**
168-
* @return the data at local weight of this region in the regionserver
169-
*/
127+
/** Returns the data at local weight of this region in the regionserver */
170128
long getBlocksLocalWeight();
171129

172130
/**
@@ -175,13 +133,9 @@ default String getNameAsString() {
175133
*/
176134
long getBlocksLocalWithSsdWeight();
177135

178-
/**
179-
* @return the block total weight of this region
180-
*/
136+
/** Returns the block total weight of this region */
181137
long getBlocksTotalWeight();
182138

183-
/**
184-
* @return the compaction state of this region
185-
*/
139+
/** Returns the compaction state of this region */
186140
CompactionState getCompactionState();
187141
}

0 commit comments

Comments
 (0)