Skip to content
Merged
22 changes: 15 additions & 7 deletions hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,12 @@ long startcode = conf.getLong("startcode", System.currentTimeMillis());
String listenPort = conf.get("hbase.regionserver.thrift.port", "9090");
String serverInfo = listenPort + "," + String.valueOf(startcode);
ImplType implType = ImplType.getServerImpl(conf);
String framed = implType.isAlwaysFramed()
? "true" : conf.get("hbase.regionserver.thrift.framed", "false");
String compact = conf.get("hbase.regionserver.thrift.compact", "false");
String framed = (implType.isAlwaysFramed()
? "true" : conf.get("hbase.regionserver.thrift.framed", "false"))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"true" -> "Framed"?

nit: I think the logic has become nested and is unreadable for a ternary operator. Mind switching to an if-else?

.equals("true") ? "Framed": "Standard";
String compact = conf.get("hbase.regionserver.thrift.compact", "false")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: String protocol =...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also switch to conf.getBoolean() and avoid equals..?

.equals("true") ? "Compact" : "Binary";
String qop = conf.get("hbase.thrift.security.qop", "none");
%>
<!DOCTYPE html>
<?xml version="1.0" encoding="UTF-8" ?>
Expand Down Expand Up @@ -112,14 +115,19 @@ String compact = conf.get("hbase.regionserver.thrift.compact", "false");
<td>Thrift RPC engine implementation type chosen by this Thrift server</td>
</tr>
<tr>
<td>Compact Protocol</td>
<td>Protocol</td>
<td><%= compact %></td>
<td>Thrift RPC engine uses compact protocol</td>
<td>Thrift RPC engine protocol type</td>
</tr>
<tr>
<td>Framed Transport</td>
<td>Transport</td>
<td><%= framed %></td>
<td>Thrift RPC engine uses framed transport</td>
<td>Thrift RPC engine transport type</td>
</tr>
<tr>
<td>Quality Of Protection</td>
<td><%= qop %></td>
<td>QOP settings for SASL </td>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: extra space after SASL.

</tr>
</table>
</section>
Expand Down