Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-26928 Fix several indentation problems (#4323) 

Signed-off-by: Xiaolin Ha <haxiaolin@apache.org>
(cherry picked from commit e68c61dd54)
This commit is contained in:
Duo Zhang 2022-04-06 15:09:00 +08:00
parent beed73be39
commit 5288220f2c
4 changed files with 67 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Encryption.java
View File

@ -497,16 +497,17 @@ public final class Encryption {
* @return a key for the given subject * @return a key for the given subject
* @throws IOException if the key is not found * @throws IOException if the key is not found
*/ */
public static Key getSecretKeyForSubject(String subject, Configuration conf) public static Key getSecretKeyForSubject(String subject, Configuration conf) throws IOException {
throws IOException {
KeyProvider provider = getKeyProvider(conf); KeyProvider provider = getKeyProvider(conf);
if (provider != null) try { if (provider != null) {
Key[] keys = provider.getKeys(new String[] { subject }); try {
if (keys != null && keys.length > 0) { Key[] keys = provider.getKeys(new String[] { subject });
return keys[0]; if (keys != null && keys.length > 0) {
return keys[0];
}
} catch (Exception e) {
throw new IOException(e);
} }
} catch (Exception e) {
throw new IOException(e);
} }
throw new IOException("No key found for subject '" + subject + "'"); throw new IOException("No key found for subject '" + subject + "'");
} }

12
hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpointTracing.java
View File

@ -290,14 +290,10 @@ public class TestCoprocessorEndpointTracing {
final ConcurrentMap<byte[], EchoResponseProto> results = new ConcurrentHashMap<>(); final ConcurrentMap<byte[], EchoResponseProto> results = new ConcurrentHashMap<>();
TraceUtil.trace(() -> { TraceUtil.trace(() -> {
try { try {
table.coprocessorService(TestProtobufRpcProto.class, null, null, table.coprocessorService(TestProtobufRpcProto.class, null, null, t -> {
t -> { t.echo(controller, request, callback);
t.echo(controller, request, callback); return callback.get();
return callback.get(); }, (region, row, result) -> results.put(region, result));
},
(region, row, result) -> {
results.put(region, result);
});
} catch (Throwable t) { } catch (Throwable t) {
throw new RuntimeException(t); throw new RuntimeException(t);
} }

85
hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java
View File

@ -223,10 +223,12 @@ public class RowResource extends ResourceBase {
int i = 0; int i = 0;
for (CellModel cell: row.getCells()) { for (CellModel cell: row.getCells()) {
byte[] col = cell.getColumn(); byte[] col = cell.getColumn();
if (col == null) try { if (col == null) {
col = rowspec.getColumns()[i++]; try {
} catch (ArrayIndexOutOfBoundsException e) { col = rowspec.getColumns()[i++];
col = null; } catch (ArrayIndexOutOfBoundsException e) {
col = null;
}
} }
if (col == null) { if (col == null) {
servlet.getMetrics().incrementFailedPutRequests(1); servlet.getMetrics().incrementFailedPutRequests(1);
@ -263,10 +265,12 @@ public class RowResource extends ResourceBase {
servlet.getMetrics().incrementFailedPutRequests(1); servlet.getMetrics().incrementFailedPutRequests(1);
return processException(e); return processException(e);
} finally { } finally {
if (table != null) try { if (table != null) {
table.close(); try {
} catch (IOException ioe) { table.close();
LOG.debug("Exception received while closing the table", ioe); } catch (IOException ioe) {
LOG.debug("Exception received while closing the table", ioe);
}
} }
} }
} }
@ -334,10 +338,12 @@ public class RowResource extends ResourceBase {
servlet.getMetrics().incrementFailedPutRequests(1); servlet.getMetrics().incrementFailedPutRequests(1);
return processException(e); return processException(e);
} finally { } finally {
if (table != null) try { if (table != null) {
table.close(); try {
} catch (IOException ioe) { table.close();
LOG.debug("Exception received while closing the table", ioe); } catch (IOException ioe) {
LOG.debug("Exception received while closing the table", ioe);
}
} }
} }
} }
@ -399,10 +405,11 @@ public class RowResource extends ResourceBase {
.build(); .build();
} }
Delete delete = null; Delete delete = null;
if (rowspec.hasTimestamp()) if (rowspec.hasTimestamp()) {
delete = new Delete(rowspec.getRow(), rowspec.getTimestamp()); delete = new Delete(rowspec.getRow(), rowspec.getTimestamp());
else } else {
delete = new Delete(rowspec.getRow()); delete = new Delete(rowspec.getRow());
}
for (byte[] column: rowspec.getColumns()) { for (byte[] column: rowspec.getColumns()) {
byte[][] split = CellUtil.parseColumn(column); byte[][] split = CellUtil.parseColumn(column);
@ -440,10 +447,12 @@ public class RowResource extends ResourceBase {
servlet.getMetrics().incrementFailedDeleteRequests(1); servlet.getMetrics().incrementFailedDeleteRequests(1);
return processException(e); return processException(e);
} finally { } finally {
if (table != null) try { if (table != null) {
table.close(); try {
} catch (IOException ioe) { table.close();
LOG.debug("Exception received while closing the table", ioe); } catch (IOException ioe) {
LOG.debug("Exception received while closing the table", ioe);
}
} }
} }
return Response.ok().build(); return Response.ok().build();
@ -557,10 +566,12 @@ public class RowResource extends ResourceBase {
servlet.getMetrics().incrementFailedPutRequests(1); servlet.getMetrics().incrementFailedPutRequests(1);
return processException(e); return processException(e);
} finally { } finally {
if (table != null) try { if (table != null) {
table.close(); try {
} catch (IOException ioe) { table.close();
LOG.debug("Exception received while closing the table", ioe); } catch (IOException ioe) {
LOG.debug("Exception received while closing the table", ioe);
}
} }
} }
} }
@ -687,10 +698,12 @@ public class RowResource extends ResourceBase {
servlet.getMetrics().incrementFailedDeleteRequests(1); servlet.getMetrics().incrementFailedDeleteRequests(1);
return processException(e); return processException(e);
} finally { } finally {
if (table != null) try { if (table != null) {
table.close(); try {
} catch (IOException ioe) { table.close();
LOG.debug("Exception received while closing the table", ioe); } catch (IOException ioe) {
LOG.debug("Exception received while closing the table", ioe);
}
} }
} }
} }
@ -781,10 +794,12 @@ public class RowResource extends ResourceBase {
servlet.getMetrics().incrementFailedAppendRequests(1); servlet.getMetrics().incrementFailedAppendRequests(1);
return processException(e); return processException(e);
} finally { } finally {
if (table != null) try { if (table != null) {
table.close(); try {
} catch (IOException ioe) { table.close();
LOG.debug("Exception received while closing the table" + table.getName(), ioe); } catch (IOException ioe) {
LOG.debug("Exception received while closing the table" + table.getName(), ioe);
}
} }
} }
} }
@ -878,10 +893,12 @@ public class RowResource extends ResourceBase {
servlet.getMetrics().incrementFailedIncrementRequests(1); servlet.getMetrics().incrementFailedIncrementRequests(1);
return processException(e); return processException(e);
} finally { } finally {
if (table != null) try { if (table != null) {
table.close(); try {
} catch (IOException ioe) { table.close();
LOG.debug("Exception received while closing the table " + table.getName(), ioe); } catch (IOException ioe) {
LOG.debug("Exception received while closing the table " + table.getName(), ioe);
}
} }
} }
} }

6
hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRefreshRecoveredReplication.java
View File

@ -141,9 +141,9 @@ public class TestRefreshRecoveredReplication extends TestReplicationBase {
Replication replication = (Replication)otherServer.getReplicationSourceService(); Replication replication = (Replication)otherServer.getReplicationSourceService();
UTIL1.waitFor(60000, () -> !replication.getReplicationManager().getOldSources().isEmpty()); UTIL1.waitFor(60000, () -> !replication.getReplicationManager().getOldSources().isEmpty());
// Wait on only one server being up. // Wait on only one server being up.
UTIL1.waitFor(60000, () -> // Have to go back to source here because getLiveRegionServerThreads makes new array each time
// Have to go back to source here because getLiveRegionServerThreads makes new array each time UTIL1.waitFor(60000,
UTIL1.getMiniHBaseCluster().getLiveRegionServerThreads().size() == NUM_SLAVES1 - 1); () -> UTIL1.getMiniHBaseCluster().getLiveRegionServerThreads().size() == NUM_SLAVES1 - 1);
UTIL1.waitTableAvailable(tablename); UTIL1.waitTableAvailable(tablename);
LOG.info("Available {}", tablename); LOG.info("Available {}", tablename);