HADOOP-16029. Consecutive StringBuilder.append can be reused. Contributed by Ayush Saxena.

This commit is contained in:
Giovanni Matteo Fumarola 2019-01-11 10:54:49 -08:00
parent a4eefe5765
commit fb8932a727
64 changed files with 683 additions and 688 deletions

View File

@ -65,8 +65,8 @@ public int getAlgorithmBlockSize() {
@Override
public String toString() {
StringBuilder builder = new StringBuilder("{");
builder.append("name: " + name);
builder.append(", algorithmBlockSize: " + algoBlockSize);
builder.append("name: " + name)
.append(", algorithmBlockSize: " + algoBlockSize);
if (unknownValue != null) {
builder.append(", unknownValue: " + unknownValue);
}

View File

@ -330,9 +330,9 @@ public void setStorageTypes(StorageType[] storageTypes) {
@Override
public String toString() {
StringBuilder result = new StringBuilder();
result.append(offset);
result.append(',');
result.append(length);
result.append(offset)
.append(',')
.append(length);
if (corrupt) {
result.append("(corrupt)");
}

View File

@ -105,8 +105,8 @@ public void close() throws IOException {
public String toString() {
final StringBuilder sb = new StringBuilder(
"FSDataOutputStream{");
sb.append("wrappedStream=").append(wrappedStream);
sb.append('}');
sb.append("wrappedStream=").append(wrappedStream)
.append('}');
return sb.toString();
}

View File

@ -115,14 +115,14 @@ public byte[] getIV() {
@Override
public String toString() {
StringBuilder builder = new StringBuilder("{");
builder.append("cipherSuite: " + cipherSuite);
builder.append(", cryptoProtocolVersion: " + version);
builder.append(", edek: " + Hex.encodeHexString(edek));
builder.append(", iv: " + Hex.encodeHexString(iv));
builder.append(", keyName: " + keyName);
builder.append(", ezKeyVersionName: " + ezKeyVersionName);
builder.append("}");
StringBuilder builder = new StringBuilder("{")
.append("cipherSuite: " + cipherSuite)
.append(", cryptoProtocolVersion: " + version)
.append(", edek: " + Hex.encodeHexString(edek))
.append(", iv: " + Hex.encodeHexString(iv))
.append(", keyName: " + keyName)
.append(", ezKeyVersionName: " + ezKeyVersionName)
.append("}");
return builder.toString();
}
@ -136,14 +136,14 @@ public String toString() {
* Currently this method is used by CLI for backward compatibility.
*/
public String toStringStable() {
StringBuilder builder = new StringBuilder("{");
builder.append("cipherSuite: " + cipherSuite);
builder.append(", cryptoProtocolVersion: " + version);
builder.append(", edek: " + Hex.encodeHexString(edek));
builder.append(", iv: " + Hex.encodeHexString(iv));
builder.append(", keyName: " + keyName);
builder.append(", ezKeyVersionName: " + ezKeyVersionName);
builder.append("}");
StringBuilder builder = new StringBuilder("{")
.append("cipherSuite: " + cipherSuite)
.append(", cryptoProtocolVersion: " + version)
.append(", edek: " + Hex.encodeHexString(edek))
.append(", iv: " + Hex.encodeHexString(iv))
.append(", keyName: " + keyName)
.append(", ezKeyVersionName: " + ezKeyVersionName)
.append("}");
return builder.toString();
}
}

View File

@ -442,21 +442,21 @@ public int hashCode() {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append("{");
sb.append("path=" + path);
sb.append("; isDirectory=" + isdir);
sb.append(getClass().getSimpleName())
.append("{")
.append("path=" + path)
.append("; isDirectory=" + isdir);
if(!isDirectory()){
sb.append("; length=" + length);
sb.append("; replication=" + block_replication);
sb.append("; blocksize=" + blocksize);
sb.append("; length=" + length)
.append("; replication=" + block_replication)
.append("; blocksize=" + blocksize);
}
sb.append("; modification_time=" + modification_time);
sb.append("; access_time=" + access_time);
sb.append("; owner=" + owner);
sb.append("; group=" + group);
sb.append("; permission=" + permission);
sb.append("; isSymlink=" + isSymlink());
sb.append("; modification_time=" + modification_time)
.append("; access_time=" + access_time)
.append("; owner=" + owner)
.append("; group=" + group)
.append("; permission=" + permission)
.append("; isSymlink=" + isSymlink());
if(isSymlink()) {
try {
sb.append("; symlink=" + getSymlink());
@ -464,10 +464,10 @@ public String toString() {
throw new RuntimeException("Unexpected exception", e);
}
}
sb.append("; hasAcl=" + hasAcl());
sb.append("; isEncrypted=" + isEncrypted());
sb.append("; isErasureCoded=" + isErasureCoded());
sb.append("}");
sb.append("; hasAcl=" + hasAcl())
.append("; isEncrypted=" + isEncrypted())
.append("; isErasureCoded=" + isErasureCoded())
.append("}");
return sb.toString();
}

View File

@ -367,8 +367,8 @@ public static boolean copy(FileSystem srcFS, Path[] srcs,
returnVal = false;
} catch (IOException e) {
gotException = true;
exceptions.append(e.getMessage());
exceptions.append("\n");
exceptions.append(e.getMessage())
.append("\n");
}
}
if (gotException) {
@ -873,10 +873,10 @@ private static void unTarUsingTar(InputStream inputStream, File untarDir,
if (gzipped) {
untarCommand.append("gzip -dc | (");
}
untarCommand.append("cd '");
untarCommand.append(FileUtil.makeSecureShellPath(untarDir));
untarCommand.append("' && ");
untarCommand.append("tar -x ");
untarCommand.append("cd '")
.append(FileUtil.makeSecureShellPath(untarDir))
.append("' && ")
.append("tar -x ");
if (gzipped) {
untarCommand.append(")");
@ -888,14 +888,14 @@ private static void unTarUsingTar(File inFile, File untarDir,
boolean gzipped) throws IOException {
StringBuffer untarCommand = new StringBuffer();
if (gzipped) {
untarCommand.append(" gzip -dc '");
untarCommand.append(FileUtil.makeSecureShellPath(inFile));
untarCommand.append("' | (");
untarCommand.append(" gzip -dc '")
.append(FileUtil.makeSecureShellPath(inFile))
.append("' | (");
}
untarCommand.append("cd '");
untarCommand.append(FileUtil.makeSecureShellPath(untarDir));
untarCommand.append("' && ");
untarCommand.append("tar -xf ");
untarCommand.append("cd '")
.append(FileUtil.makeSecureShellPath(untarDir))
.append("' && ")
.append("tar -xf ");
if (gzipped) {
untarCommand.append(" -)");
@ -1504,8 +1504,8 @@ public static String[] createJarWithClassPath(String inputClassPath, Path pwd,
classPathEntryList.add(jar.toUri().toURL().toExternalForm());
}
} else {
unexpandedWildcardClasspath.append(File.pathSeparator);
unexpandedWildcardClasspath.append(classPathEntry);
unexpandedWildcardClasspath.append(File.pathSeparator)
.append(classPathEntry);
}
} else {
// Append just this entry

View File

@ -452,12 +452,12 @@ public String toString() {
// illegal characters unescaped in the string, for glob processing, etc.
StringBuilder buffer = new StringBuilder();
if (uri.getScheme() != null) {
buffer.append(uri.getScheme());
buffer.append(":");
buffer.append(uri.getScheme())
.append(":");
}
if (uri.getAuthority() != null) {
buffer.append("//");
buffer.append(uri.getAuthority());
buffer.append("//")
.append(uri.getAuthority());
}
if (uri.getPath() != null) {
String path = uri.getPath();
@ -469,8 +469,8 @@ public String toString() {
buffer.append(path);
}
if (uri.getFragment() != null) {
buffer.append("#");
buffer.append(uri.getFragment());
buffer.append("#")
.append(uri.getFragment());
}
return buffer.toString();
}

View File

@ -330,8 +330,8 @@ public static AclEntry parseAclEntry(String aclStr,
public static String aclSpecToString(List<AclEntry> aclSpec) {
StringBuilder buf = new StringBuilder();
for ( AclEntry e : aclSpec ) {
buf.append(e.toString());
buf.append(",");
buf.append(e.toString())
.append(",");
}
return buf.substring(0, buf.length()-1); // remove last ,
}

View File

@ -202,8 +202,8 @@ protected void processPath(PathData src) throws IOException {
if(!summary.getErasureCodingPolicy().equals("Replicated")){
outputString.append("EC:");
}
outputString.append(summary.getErasureCodingPolicy());
outputString.append(" ");
outputString.append(summary.getErasureCodingPolicy())
.append(" ");
}
outputString.append(src);
out.println(outputString.toString());

View File

@ -334,10 +334,10 @@ private void adjustColumnWidths(PathData items[]) throws IOException {
}
StringBuilder fmt = new StringBuilder();
fmt.append("%s%s"); // permission string
fmt.append("%" + maxRepl + "s ");
fmt.append((maxOwner > 0) ? "%-" + maxOwner + "s " : "%s");
fmt.append((maxGroup > 0) ? "%-" + maxGroup + "s " : "%s");
fmt.append("%s%s") // permission string
.append("%" + maxRepl + "s ")
.append((maxOwner > 0) ? "%-" + maxOwner + "s " : "%s")
.append((maxGroup > 0) ? "%-" + maxGroup + "s " : "%s");
// Do not use '%-0s' as a formatting conversion, since it will throw a
// a MissingFormatWidthException if it is used in String.format().
// http://docs.oracle.com/javase/1.5.0/docs/api/java/util/Formatter.html#intFlags

View File

@ -484,9 +484,9 @@ private static String uriToString(URI uri, boolean inferredSchemeFromPath) {
return decodedRemainder;
} else {
StringBuilder buffer = new StringBuilder();
buffer.append(scheme);
buffer.append(":");
buffer.append(decodedRemainder);
buffer.append(scheme)
.append(":")
.append(decodedRemainder);
return buffer.toString();
}
}

View File

@ -110,8 +110,8 @@ public Configuration getConf() {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append("(");
sb.append(getClass().getSimpleName())
.append("(");
boolean firstArg = true;
for (String arg : getArguments()) {
if (!firstArg) {

View File

@ -134,8 +134,8 @@ public int compare(Expression arg0, Expression arg1) {
for (String line : HELP) {
sb.append(line).append("\n");
}
sb.append("\n");
sb.append("The following primary expressions are recognised:\n");
sb.append("\n")
.append("The following primary expressions are recognised:\n");
for (Expression expr : primaries) {
for (String line : expr.getUsage()) {
sb.append(" ").append(line).append("\n");

View File

@ -220,8 +220,8 @@ public String toString() {
StringBuilder buf = new StringBuilder(MD5_LEN*2);
for (int i = 0; i < MD5_LEN; i++) {
int b = digest[i];
buf.append(HEX_DIGITS[(b >> 4) & 0xf]);
buf.append(HEX_DIGITS[b & 0xf]);
buf.append(HEX_DIGITS[(b >> 4) & 0xf])
.append(HEX_DIGITS[b & 0xf]);
}
return buf.toString();
}

View File

@ -826,8 +826,8 @@ public String toString() {
this.theMetadata.entrySet().iterator();
while (iter.hasNext()) {
Map.Entry<Text, Text> en = iter.next();
sb.append("\t").append(en.getKey().toString()).append("\t").append(en.getValue().toString());
sb.append("\n");
sb.append("\t").append(en.getKey().toString()).append("\t")
.append(en.getValue().toString()).append("\n");
}
return sb.toString();
}

View File

@ -85,15 +85,15 @@ public String toString() {
buf.append("{ ");
if (itr.hasNext()) {
Map.Entry<String, CompressionCodec> entry = itr.next();
buf.append(entry.getKey());
buf.append(": ");
buf.append(entry.getValue().getClass().getName());
buf.append(entry.getKey())
.append(": ")
.append(entry.getValue().getClass().getName());
while (itr.hasNext()) {
entry = itr.next();
buf.append(", ");
buf.append(entry.getKey());
buf.append(": ");
buf.append(entry.getValue().getClass().getName());
buf.append(", ")
.append(entry.getKey())
.append(": ")
.append(entry.getValue().getClass().getName());
}
}
buf.append(" }");
@ -161,8 +161,8 @@ public static void setCodecClasses(Configuration conf,
Class cls = itr.next();
buf.append(cls.getName());
while(itr.hasNext()) {
buf.append(',');
buf.append(itr.next().getName());
buf.append(',')
.append(itr.next().getName());
}
}
conf.set(CommonConfigurationKeys.IO_COMPRESSION_CODECS_KEY, buf.toString());

View File

@ -187,10 +187,10 @@ public int getNumParityUnits() {
public String toString() {
StringBuilder sb = new StringBuilder("ECSchema=[");
sb.append("Codec=" + codecName + ", ");
sb.append(NUM_DATA_UNITS_KEY + "=" + numDataUnits + ", ");
sb.append(NUM_PARITY_UNITS_KEY + "=" + numParityUnits);
sb.append((extraOptions.isEmpty() ? "" : ", "));
sb.append("Codec=" + codecName + ", ")
.append(NUM_DATA_UNITS_KEY + "=" + numDataUnits + ", ")
.append(NUM_PARITY_UNITS_KEY + "=" + numParityUnits)
.append((extraOptions.isEmpty() ? "" : ", "));
int i = 0;
for (Map.Entry<String, String> entry : extraOptions.entrySet()) {

View File

@ -181,17 +181,17 @@ public void write(DataOutput out) throws IOException {
@Override
public String toString() {
StringBuilder buffer = new StringBuilder();
buffer.append(methodName);
buffer.append("(");
buffer.append(methodName)
.append("(");
for (int i = 0; i < parameters.length; i++) {
if (i != 0)
buffer.append(", ");
buffer.append(parameters[i]);
}
buffer.append(")");
buffer.append(", rpc version="+rpcVersion);
buffer.append(", client version="+clientVersion);
buffer.append(", methodsFingerPrint="+clientMethodsHash);
buffer.append(")")
.append(", rpc version="+rpcVersion)
.append(", client version="+clientVersion)
.append(", methodsFingerPrint="+clientMethodsHash);
return buffer.toString();
}

View File

@ -76,10 +76,10 @@ public void putMetrics(MetricsRecord record) {
for (MetricsTag tag : record.tags()) {
if (tag.value() != null) {
metricsPathPrefix.append(".");
metricsPathPrefix.append(tag.name());
metricsPathPrefix.append("=");
metricsPathPrefix.append(tag.value());
metricsPathPrefix.append(".")
.append(tag.name())
.append("=")
.append(tag.value());
}
}

View File

@ -122,9 +122,9 @@ public void putMetrics(MetricsRecord record) {
buf.append(hn.substring(0, idx)).append(PERIOD);
}
}
buf.append(sn).append(PERIOD);
buf.append(ctx).append(PERIOD);
buf.append(record.name().replaceAll("\\.", "-")).append(PERIOD);
buf.append(sn).append(PERIOD)
.append(ctx).append(PERIOD)
.append(record.name().replaceAll("\\.", "-")).append(PERIOD);
// Collect datapoints.
for (AbstractMetric metric : record.metrics()) {

View File

@ -124,8 +124,8 @@ public String dumpTopology() {
.append("\n");
switches.add(entry.getValue());
}
builder.append("Nodes: ").append(rack.size()).append("\n");
builder.append("Switches: ").append(switches.size()).append("\n");
builder.append("Nodes: ").append(rack.size()).append("\n")
.append("Switches: ").append(switches.size()).append("\n");
} else {
builder.append("No topology information");
}

View File

@ -850,8 +850,8 @@ private static String getHostDetailsAsString(final String destHost,
StringBuilder hostDetails = new StringBuilder(27);
hostDetails.append("local host is: ")
.append(quoteHost(localHost))
.append("; ");
hostDetails.append("destination host is: ").append(quoteHost(destHost))
.append("; ")
.append("destination host is: ").append(quoteHost(destHost))
.append(":")
.append(destPort).append("; ");
return hostDetails.toString();

View File

@ -710,18 +710,18 @@ public int countNumOfAvailableNodes(String scope,
public String toString() {
// print the number of racks
StringBuilder tree = new StringBuilder();
tree.append("Number of racks: ");
tree.append(numOfRacks);
tree.append("\n");
tree.append("Number of racks: ")
.append(numOfRacks)
.append("\n");
// print the number of leaves
int numOfLeaves = getNumOfLeaves();
tree.append("Expected number of leaves:");
tree.append(numOfLeaves);
tree.append("\n");
tree.append("Expected number of leaves:")
.append(numOfLeaves)
.append("\n");
// print nodes
for(int i=0; i<numOfLeaves; i++) {
tree.append(NodeBase.getPath(clusterMap.getLeaf(i, null)));
tree.append("\n");
tree.append(NodeBase.getPath(clusterMap.getLeaf(i, null)))
.append("\n");
}
return tree.toString();
}

View File

@ -81,8 +81,8 @@ public static Path unnestUri(URI nestedUri) {
String authority = nestedUri.getAuthority();
if (authority != null) {
String[] parts = nestedUri.getAuthority().split("@", 2);
result.append(parts[0]);
result.append("://");
result.append(parts[0])
.append("://");
if (parts.length == 2) {
result.append(parts[1]);
}

View File

@ -63,9 +63,9 @@ public char[] getCredential() {
public String toString() {
StringBuilder buf = new StringBuilder();
buf.append("alias(");
buf.append(alias);
buf.append(")=");
buf.append("alias(")
.append(alias)
.append(")=");
if (credential == null) {
buf.append("null");
} else {

View File

@ -121,12 +121,12 @@ protected int init(String[] args) throws IOException {
public String getCommandUsage() {
StringBuffer sbuf = new StringBuffer(USAGE_PREFIX + COMMANDS);
String banner = StringUtils.repeat("=", 66);
sbuf.append(banner + "\n");
sbuf.append(CreateCommand.USAGE + ":\n\n" + CreateCommand.DESC + "\n");
sbuf.append(banner + "\n");
sbuf.append(DeleteCommand.USAGE + ":\n\n" + DeleteCommand.DESC + "\n");
sbuf.append(banner + "\n");
sbuf.append(ListCommand.USAGE + ":\n\n" + ListCommand.DESC + "\n");
sbuf.append(banner + "\n")
.append(CreateCommand.USAGE + ":\n\n" + CreateCommand.DESC + "\n")
.append(banner + "\n")
.append(DeleteCommand.USAGE + ":\n\n" + DeleteCommand.DESC + "\n")
.append(banner + "\n")
.append(ListCommand.USAGE + ":\n\n" + ListCommand.DESC + "\n");
return sbuf.toString();
}

View File

@ -295,9 +295,9 @@ public String getAclString() {
sb.append('*');
}
else {
sb.append(getUsersString());
sb.append(" ");
sb.append(getGroupsString());
sb.append(getUsersString())
.append(" ")
.append(getGroupsString());
}
return sb.toString();
}

View File

@ -417,9 +417,9 @@ public void check(final String[] hosts, final String[] cns,
// Don't trim the CN, though!
final String cn = StringUtils.toLowerCase(it.next());
// Store CN in StringBuffer in case we need to report an error.
buf.append(" <");
buf.append(cn);
buf.append('>');
buf.append(" <")
.append(cn)
.append('>');
if (it.hasNext()) {
buf.append(" OR");
}

View File

@ -456,11 +456,11 @@ private void identifierToString(StringBuilder buffer) {
@Override
public String toString() {
StringBuilder buffer = new StringBuilder();
buffer.append("Kind: ");
buffer.append(kind.toString());
buffer.append(", Service: ");
buffer.append(service.toString());
buffer.append(", Ident: ");
buffer.append("Kind: ")
.append(kind.toString())
.append(", Service: ")
.append(service.toString())
.append(", Ident: ");
identifierToString(buffer);
return buffer.toString();
}

View File

@ -94,9 +94,9 @@ public String toString() {
if (owner != null) {
sb.append(", owner= ").append(owner.toString());
}
sb.append(", shutdownTimeMillis=").append(shutdownTimeMillis);
sb.append(", forcedShutdownTimedOut=").append(forcedShutdownTimedOut);
sb.append('}');
sb.append(", shutdownTimeMillis=").append(shutdownTimeMillis)
.append(", forcedShutdownTimedOut=").append(forcedShutdownTimedOut)
.append('}');
return sb.toString();
}

View File

@ -69,8 +69,8 @@ public int run(String[] args) throws Exception {
StringBuilder sb = new StringBuilder();
sb.append(username + " :");
for (String group : getUgmProtocol().getGroupsForUser(username)) {
sb.append(" ");
sb.append(group);
sb.append(" ")
.append(group);
}
out.println(sb);
}

View File

@ -161,9 +161,9 @@ int getActiveCount() {
public String toString() {
final StringBuilder sb = new StringBuilder(
"BlockingThreadPoolExecutorService{");
sb.append(super.toString());
sb.append(", activeCount=").append(getActiveCount());
sb.append('}');
sb.append(super.toString())
.append(", activeCount=").append(getActiveCount())
.append('}');
return sb.toString();
}
}

View File

@ -106,12 +106,12 @@ public void updateElapsedJiffies(BigInteger elapsedJiffies, long newTime) {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("SampleTime " + this.sampleTime);
sb.append(" CummulativeCpuTime " + this.cumulativeCpuTime);
sb.append(" LastSampleTime " + this.lastSampleTime);
sb.append(" LastCummulativeCpuTime " + this.lastCumulativeCpuTime);
sb.append(" CpuUsage " + this.cpuUsage);
sb.append(" JiffyLengthMillisec " + this.jiffyLengthInMillis);
sb.append("SampleTime " + this.sampleTime)
.append(" CummulativeCpuTime " + this.cumulativeCpuTime)
.append(" LastSampleTime " + this.lastSampleTime)
.append(" LastCummulativeCpuTime " + this.lastCumulativeCpuTime)
.append(" CpuUsage " + this.cpuUsage)
.append(" JiffyLengthMillisec " + this.jiffyLengthInMillis);
return sb.toString();
}
}

View File

@ -173,10 +173,10 @@ public int getPermitCount() {
public String toString() {
final StringBuilder sb = new StringBuilder(
"SemaphoredDelegatingExecutor{");
sb.append("permitCount=").append(getPermitCount());
sb.append(", available=").append(getAvailablePermits());
sb.append(", waiting=").append(getWaitingCount());
sb.append('}');
sb.append("permitCount=").append(getPermitCount())
.append(", available=").append(getAvailablePermits())
.append(", waiting=").append(getWaitingCount())
.append('}');
return sb.toString();
}

View File

@ -147,9 +147,9 @@ public static void checkWindowsCommandLineLength(String...commands)
*/
static String bashQuote(String arg) {
StringBuilder buffer = new StringBuilder(arg.length() + 2);
buffer.append('\'');
buffer.append(arg.replace("'", "'\\''"));
buffer.append('\'');
buffer.append('\'')
.append(arg.replace("'", "'\\''"))
.append('\'');
return buffer.toString();
}
@ -964,8 +964,8 @@ public void run() {
try {
String line = errReader.readLine();
while((line != null) && !isInterrupted()) {
errMsg.append(line);
errMsg.append(System.getProperty("line.separator"));
errMsg.append(line)
.append(System.getProperty("line.separator"));
line = errReader.readLine();
}
} catch(IOException ioe) {
@ -1109,8 +1109,8 @@ public String toString() {
final StringBuilder sb =
new StringBuilder("ExitCodeException ");
sb.append("exitCode=").append(exitCode)
.append(": ");
sb.append(super.getMessage());
.append(": ")
.append(super.getMessage());
return sb.toString();
}
}

View File

@ -84,8 +84,8 @@ void register(final LogAdapter LOG) {
for (String signalName : SIGNALS) {
try {
new Handler(signalName, LOG);
bld.append(separator);
bld.append(signalName);
bld.append(separator)
.append(signalName);
separator = ", ";
} catch (Exception e) {
LOG.debug(e);

View File

@ -237,8 +237,8 @@ public String toString() {
StringBuilder res = new StringBuilder();
for (int i = 0; i < matrix.length; i++) {
res.append(matrix[i]);
res.append(Character.LINE_SEPARATOR);
res.append(matrix[i])
.append(Character.LINE_SEPARATOR);
}
return res.toString();
}

View File

@ -972,19 +972,19 @@ private static String getBestNodeDNAddrPairErrorString(
" No live nodes contain current block ");
errMsgr.append("Block locations:");
for (DatanodeInfo datanode : nodes) {
errMsgr.append(" ");
errMsgr.append(datanode.toString());
errMsgr.append(" ")
.append(datanode.toString());
}
errMsgr.append(" Dead nodes: ");
for (DatanodeInfo datanode : deadNodes.keySet()) {
errMsgr.append(" ");
errMsgr.append(datanode.toString());
errMsgr.append(" ")
.append(datanode.toString());
}
if (ignoredNodes != null) {
errMsgr.append(" Ignored nodes: ");
for (DatanodeInfo datanode : ignoredNodes) {
errMsgr.append(" ");
errMsgr.append(datanode.toString());
errMsgr.append(" ")
.append(datanode.toString());
}
}
return errMsgr.toString();

View File

@ -519,10 +519,10 @@ private static String checkRpcAuxiliary(Configuration conf, String suffix,
// localhost), then append port
// TODO : revisit if there is a better way
StringBuilder sb = new StringBuilder();
sb.append(uri.getScheme());
sb.append("://");
sb.append(uri.getHost());
sb.append(":");
sb.append(uri.getScheme())
.append("://")
.append(uri.getHost())
.append(":");
// TODO : currently, only the very first auxiliary port is being used.
// But actually NN supports running multiple auxiliary
sb.append(ports[0]);

View File

@ -374,8 +374,8 @@ public String getDatanodeReport() {
if (lookupName != null) {
buffer.append(" (").append(lookupName).append(")");
}
buffer.append("\n");
buffer.append("Hostname: ").append(getHostName()).append("\n");
buffer.append("\n")
.append("Hostname: ").append(getHostName()).append("\n");
if (!NetworkTopology.DEFAULT_RACK.equals(location)) {
buffer.append("Rack: ").append(location).append("\n");
@ -396,35 +396,34 @@ public String getDatanodeReport() {
buffer.append("Normal\n");
}
buffer.append("Configured Capacity: ").append(c).append(" (")
.append(StringUtils.byteDesc(c)).append(")").append("\n");
buffer.append("DFS Used: ").append(u).append(" (")
.append(StringUtils.byteDesc(u)).append(")").append("\n");
buffer.append("Non DFS Used: ").append(nonDFSUsed).append(" (")
.append(StringUtils.byteDesc(nonDFSUsed)).append(")").append("\n");
buffer.append("DFS Remaining: ").append(r).append(" (")
.append(StringUtils.byteDesc(r)).append(")").append("\n");
buffer.append("DFS Used%: ").append(percent2String(usedPercent))
.append("\n");
buffer.append("DFS Remaining%: ").append(percent2String(remainingPercent))
.append("\n");
buffer.append("Configured Cache Capacity: ").append(cc).append(" (")
.append(StringUtils.byteDesc(cc)).append(")").append("\n");
buffer.append("Cache Used: ").append(cu).append(" (")
.append(StringUtils.byteDesc(cu)).append(")").append("\n");
buffer.append("Cache Remaining: ").append(cr).append(" (")
.append(StringUtils.byteDesc(cr)).append(")").append("\n");
buffer.append("Cache Used%: ").append(percent2String(cacheUsedPercent))
.append("\n");
buffer.append("Cache Remaining%: ")
.append(percent2String(cacheRemainingPercent)).append("\n");
buffer.append("Xceivers: ").append(getXceiverCount()).append("\n");
buffer.append("Last contact: ").append(new Date(lastUpdate)).append("\n");
buffer
.append(StringUtils.byteDesc(c)).append(")").append("\n")
.append("DFS Used: ").append(u).append(" (")
.append(StringUtils.byteDesc(u)).append(")").append("\n")
.append("Non DFS Used: ").append(nonDFSUsed).append(" (")
.append(StringUtils.byteDesc(nonDFSUsed)).append(")").append("\n")
.append("DFS Remaining: ").append(r).append(" (")
.append(StringUtils.byteDesc(r)).append(")").append("\n")
.append("DFS Used%: ").append(percent2String(usedPercent))
.append("\n")
.append("DFS Remaining%: ").append(percent2String(remainingPercent))
.append("\n")
.append("Configured Cache Capacity: ").append(cc).append(" (")
.append(StringUtils.byteDesc(cc)).append(")").append("\n")
.append("Cache Used: ").append(cu).append(" (")
.append(StringUtils.byteDesc(cu)).append(")").append("\n")
.append("Cache Remaining: ").append(cr).append(" (")
.append(StringUtils.byteDesc(cr)).append(")").append("\n")
.append("Cache Used%: ").append(percent2String(cacheUsedPercent))
.append("\n")
.append("Cache Remaining%: ")
.append(percent2String(cacheRemainingPercent)).append("\n")
.append("Xceivers: ").append(getXceiverCount()).append("\n")
.append("Last contact: ").append(new Date(lastUpdate)).append("\n")
.append("Last Block Report: ")
.append(
lastBlockReportTime != 0 ? new Date(lastBlockReportTime) : "Never")
.append("\n");
buffer.append("Num of Blocks: ").append(blockCount).append("\n");
.append("\n")
.append("Num of Blocks: ").append(blockCount).append("\n");
return buffer.toString();
}
@ -458,20 +457,20 @@ public String dumpDatanode() {
buffer.append(" IN");
}
buffer.append(" ").append(c).append("(").append(StringUtils.byteDesc(c))
.append(")");
buffer.append(" ").append(u).append("(").append(StringUtils.byteDesc(u))
.append(")");
buffer.append(" ").append(percent2String(usedPercent));
buffer.append(" ").append(r).append("(").append(StringUtils.byteDesc(r))
.append(")");
buffer.append(" ").append(cc).append("(").append(StringUtils.byteDesc(cc))
.append(")");
buffer.append(" ").append(cu).append("(").append(StringUtils.byteDesc(cu))
.append(")");
buffer.append(" ").append(percent2String(cacheUsedPercent));
buffer.append(" ").append(cr).append("(").append(StringUtils.byteDesc(cr))
.append(")");
buffer.append(" ").append(new Date(lastUpdate));
.append(")")
.append(" ").append(u).append("(").append(StringUtils.byteDesc(u))
.append(")")
.append(" ").append(percent2String(usedPercent))
.append(" ").append(r).append("(").append(StringUtils.byteDesc(r))
.append(")")
.append(" ").append(cc).append("(").append(StringUtils.byteDesc(cc))
.append(")")
.append(" ").append(cu).append("(").append(StringUtils.byteDesc(cu))
.append(")")
.append(" ").append(percent2String(cacheUsedPercent))
.append(" ").append(cr).append("(").append(StringUtils.byteDesc(cr))
.append(")")
.append(" ").append(new Date(lastUpdate));
return buffer.toString();
}

View File

@ -111,8 +111,8 @@ public int hashCode() {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{ ");
sb.append("\"path\" : \"").append(path).append("\"");
sb.append("{ ")
.append("\"path\" : \"").append(path).append("\"");
if (inodeId != null) {
sb.append(",\"inodeId\" : ").append(inodeId);
}

View File

@ -200,12 +200,12 @@ public String toString() {
StringBuilder sb = new StringBuilder();
for (Map.Entry<Long, ZoneReencryptionStatus> entry : zoneStatuses
.entrySet()) {
sb.append("[zone:" + entry.getKey());
sb.append(" state:" + entry.getValue().getState());
sb.append(" lastProcessed:" + entry.getValue().getLastCheckpointFile());
sb.append(" filesReencrypted:" + entry.getValue().getFilesReencrypted());
sb.append(" fileReencryptionFailures:" + entry.getValue()
.getNumReencryptionFailures() + "]");
sb.append("[zone:" + entry.getKey())
.append(" state:" + entry.getValue().getState())
.append(" lastProcessed:" + entry.getValue().getLastCheckpointFile())
.append(" filesReencrypted:" + entry.getValue().getFilesReencrypted())
.append(" fileReencryptionFailures:" + entry.getValue()
.getNumReencryptionFailures() + "]");
}
return sb.toString();
}

View File

@ -109,11 +109,11 @@ public int getNetworkDistance() {
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append("bytesRead=").append(bytesRead);
sb.append(',');
sb.append("isShortCircuit=").append(isShortCircuit);
sb.append(',');
sb.append("networkDistance=").append(networkDistance);
sb.append("bytesRead=").append(bytesRead)
.append(',')
.append("isShortCircuit=").append(isShortCircuit)
.append(',')
.append("networkDistance=").append(networkDistance);
return sb.toString();
}
}

View File

@ -162,9 +162,9 @@ public String toString() {
sb.append(nsId + "->" + path);
}
if (this.destinations.size() > 1) {
sb.append(" [");
sb.append(this.destOrder.toString());
sb.append("]");
sb.append(" [")
.append(this.destOrder.toString())
.append("]");
}
return sb.toString();
}

View File

@ -116,11 +116,11 @@ public String toString() {
Class<?> clazz = proxy.getClass();
StringBuilder sb = new StringBuilder();
sb.append(clazz.getSimpleName());
sb.append("@");
sb.append(addr);
sb.append("x");
sb.append(numThreads);
sb.append(clazz.getSimpleName())
.append("@")
.append(addr)
.append("x")
.append(numThreads);
if (closed) {
sb.append("[CLOSED]");
}

View File

@ -110,8 +110,8 @@ public String toString() {
StringBuilder str = new StringBuilder();
str.append("[NsQuota: ").append(nsQuota).append("/")
.append(nsCount);
str.append(", SsQuota: ").append(ssQuota)
.append(nsCount)
.append(", SsQuota: ").append(ssQuota)
.append("/").append(ssCount)
.append("]");
return str.toString();

View File

@ -1900,8 +1900,7 @@ int computeReconstructionWorkForBlocks(
if (targets != null && targets.length != 0) {
StringBuilder targetList = new StringBuilder("datanode(s)");
for (DatanodeStorageInfo target : targets) {
targetList.append(' ');
targetList.append(target.getDatanodeDescriptor());
targetList.append(' ').append(target.getDatanodeDescriptor());
}
blockLog.debug("BLOCK* ask {} to replicate {} to {}", rw.getSrcNodes(),
rw.getBlock(), targetList);

View File

@ -395,8 +395,7 @@ private void logBlockReplicationInfo(BlockInfo block,
StringBuilder nodeList = new StringBuilder();
for (DatanodeStorageInfo storage : storages) {
final DatanodeDescriptor node = storage.getDatanodeDescriptor();
nodeList.append(node);
nodeList.append(' ');
nodeList.append(node).append(' ');
}
NameNode.blockStateChangeLog.info(
"Block: " + block + ", Expected Replicas: "

View File

@ -2323,8 +2323,7 @@ void transferBlock(ExtendedBlock block, DatanodeInfo[] xferTargets,
if (numTargets > 0) {
StringBuilder xfersBuilder = new StringBuilder();
for (int i = 0; i < numTargets; i++) {
xfersBuilder.append(xferTargets[i]);
xfersBuilder.append(" ");
xfersBuilder.append(xferTargets[i]).append(" ");
}
LOG.info(bpReg + " Starting thread to transfer " +
block + " to " + xfersBuilder);

View File

@ -228,15 +228,15 @@ public void printStats(StringBuilder p) {
" path %s%n", volume.getStorageID(), volume));
synchronized (stats) {
p.append(String.format("Bytes verified in last hour : %57d%n",
stats.bytesScannedInPastHour));
p.append(String.format("Blocks scanned in current period : %57d%n",
stats.blocksScannedInCurrentPeriod));
p.append(String.format("Blocks scanned since restart : %57d%n",
stats.blocksScannedSinceRestart));
p.append(String.format("Block pool scans since restart : %57d%n",
stats.scansSinceRestart));
p.append(String.format("Block scan errors since restart : %57d%n",
stats.scanErrorsSinceRestart));
stats.bytesScannedInPastHour))
.append(String.format("Blocks scanned in current period : %57d%n",
stats.blocksScannedInCurrentPeriod))
.append(String.format("Blocks scanned since restart : %57d%n",
stats.blocksScannedSinceRestart))
.append(String.format("Block pool scans since restart : %57d%n",
stats.scansSinceRestart))
.append(String.format("Block scan errors since restart : %57d%n",
stats.scanErrorsSinceRestart));
if (stats.nextBlockPoolScanStartMs > 0) {
p.append(String.format("Hours until next block pool scan : %57.3f%n",
positiveMsToHours(stats.nextBlockPoolScanStartMs -

View File

@ -176,8 +176,7 @@ public void execute(CommandLine cmd) throws Exception {
final String errMsg =
"Errors while recording the output of plan command.";
LOG.error(errMsg, e);
result.appendln(errMsg);
result.appendln(Throwables.getStackTraceAsString(e));
result.appendln(errMsg).appendln(Throwables.getStackTraceAsString(e));
}
getPrintStream().print(result.toString());

View File

@ -499,11 +499,8 @@ void checkMoveValidity(INodesInPath srcIIP, INodesInPath dstIIP)
final String srcEZPath = getFullPathName(srcParentEZI.getINodeId());
final String dstEZPath = getFullPathName(dstParentEZI.getINodeId());
final StringBuilder sb = new StringBuilder(srcIIP.getPath());
sb.append(" can't be moved from encryption zone ");
sb.append(srcEZPath);
sb.append(" to encryption zone ");
sb.append(dstEZPath);
sb.append(".");
sb.append(" can't be moved from encryption zone ").append(srcEZPath)
.append(" to encryption zone ").append(dstEZPath).append(".");
throw new IOException(sb.toString());
}
checkMoveValidityForReencryption(srcIIP.getPath(),

View File

@ -762,16 +762,16 @@ private void printStatistics(boolean force) {
}
lastPrintTime = now;
StringBuilder buf = new StringBuilder();
buf.append("Number of transactions: ");
buf.append(numTransactions);
buf.append(" Total time for transactions(ms): ");
buf.append(totalTimeTransactions);
buf.append(" Number of transactions batched in Syncs: ");
buf.append(numTransactionsBatchedInSync.get());
buf.append(" Number of syncs: ");
buf.append(editLogStream.getNumSync());
buf.append(" SyncTimes(ms): ");
buf.append(journalSet.getSyncTimes());
buf.append("Number of transactions: ")
.append(numTransactions)
.append(" Total time for transactions(ms): ")
.append(totalTimeTransactions)
.append(" Number of transactions batched in Syncs: ")
.append(numTransactionsBatchedInSync.get())
.append(" Number of syncs: ")
.append(editLogStream.getNumSync())
.append(" SyncTimes(ms): ")
.append(journalSet.getSyncTimes());
LOG.info(buf.toString());
}

View File

@ -1055,8 +1055,8 @@ private long applyEditLogOp(FSEditLogOp op, FSDirectory fsDir,
private static String formatEditLogReplayError(EditLogInputStream in,
long recentOpcodeOffsets[], long txid) {
StringBuilder sb = new StringBuilder();
sb.append("Error replaying edit log at offset " + in.getPosition());
sb.append(". Expected transaction ID was ").append(txid);
sb.append("Error replaying edit log at offset " + in.getPosition())
.append(". Expected transaction ID was ").append(txid);
if (recentOpcodeOffsets[0] != -1) {
Arrays.sort(recentOpcodeOffsets);
sb.append("\nRecent opcode offsets:");

View File

@ -8031,19 +8031,19 @@ public void logAuditEvent(boolean succeeded, String userName,
src = escapeJava(src);
dst = escapeJava(dst);
sb.setLength(0);
sb.append("allowed=").append(succeeded).append("\t");
sb.append("ugi=").append(userName).append("\t");
sb.append("ip=").append(addr).append("\t");
sb.append("cmd=").append(cmd).append("\t");
sb.append("src=").append(src).append("\t");
sb.append("dst=").append(dst).append("\t");
sb.append("allowed=").append(succeeded).append("\t")
.append("ugi=").append(userName).append("\t")
.append("ip=").append(addr).append("\t")
.append("cmd=").append(cmd).append("\t")
.append("src=").append(src).append("\t")
.append("dst=").append(dst).append("\t");
if (null == status) {
sb.append("perm=null");
} else {
sb.append("perm=");
sb.append(status.getOwner()).append(":");
sb.append(status.getGroup()).append(":");
sb.append(status.getPermission());
sb.append("perm=")
.append(status.getOwner()).append(":")
.append(status.getGroup()).append(":")
.append(status.getPermission());
}
if (logTokenTrackingId) {
sb.append("\t").append("trackingId=");
@ -8061,8 +8061,8 @@ public void logAuditEvent(boolean succeeded, String userName,
}
sb.append(trackingId);
}
sb.append("\t").append("proto=");
sb.append(Server.getProtocol());
sb.append("\t").append("proto=")
.append(Server.getProtocol());
if (isCallerContextEnabled &&
callerContext != null &&
callerContext.isContextValid()) {
@ -8076,8 +8076,8 @@ public void logAuditEvent(boolean succeeded, String userName,
if (callerContext.getSignature() != null &&
callerContext.getSignature().length > 0 &&
callerContext.getSignature().length <= callerSignatureMaxLen) {
sb.append(":");
sb.append(new String(callerContext.getSignature(),
sb.append(":")
.append(new String(callerContext.getSignature(),
CallerContext.SIGNATURE_ENCODING));
}
}

View File

@ -697,8 +697,8 @@ String getSyncTimes() {
StringBuilder buf = new StringBuilder();
for (JournalAndStream jas : journals) {
if (jas.isActive()) {
buf.append(jas.getCurrentStream().getTotalSyncTime());
buf.append(" ");
buf.append(jas.getCurrentStream().getTotalSyncTime())
.append(" ");
}
}
return buf.toString();

View File

@ -855,11 +855,11 @@ private void collectBlocksSummary(String parent, HdfsFileStatus file,
block.getLocalBlock());
DatanodeStorageInfo[] storages = storedBlock
.getUnderConstructionFeature().getExpectedStorageLocations();
report.append('\n');
report.append("Under Construction Block:\n");
report.append(blockNumber).append(". ").append(blkName);
report.append(" len=").append(block.getNumBytes());
report.append(" Expected_repl=" + storages.length);
report.append('\n')
.append("Under Construction Block:\n")
.append(blockNumber).append(". ").append(blkName)
.append(" len=").append(block.getNumBytes())
.append(" Expected_repl=" + storages.length);
String info=getReplicaInfo(storedBlock);
if (!info.isEmpty()){
report.append(" ").append(info);

View File

@ -54,9 +54,9 @@ public int hashCode() {
public String toString() {
StringBuilder sb = new StringBuilder();
assert (type != null);
sb.append(StringUtils.toLowerCase(type.toString()));
sb.append(':');
sb.append(quota);
sb.append(StringUtils.toLowerCase(type.toString()))
.append(':')
.append(quota);
return sb.toString();
}

View File

@ -140,8 +140,8 @@ public String getName() {
StringBuilder bld = new StringBuilder();
String prefix = "";
for (EditLogInputStream elis : streams) {
bld.append(prefix);
bld.append(elis.getName());
bld.append(prefix)
.append(elis.getName());
prefix = ", ";
}
return bld.toString();

View File

@ -83,8 +83,10 @@ public int compare(Entry<StorageTypeAllocation, Long> o1,
public String toString() {
StringBuilder compliantBlocksSB = new StringBuilder();
compliantBlocksSB.append("\nBlocks satisfying the specified storage policy:");
compliantBlocksSB.append("\nStorage Policy # of blocks % of blocks\n");
compliantBlocksSB
.append("\nBlocks satisfying the specified storage policy:")
.append("\nStorage Policy"
+ " # of blocks % of blocks\n");
StringBuilder nonCompliantBlocksSB = new StringBuilder();
Formatter compliantFormatter = new Formatter(compliantBlocksSB);
Formatter nonCompliantFormatter = new Formatter(nonCompliantBlocksSB);
@ -103,9 +105,10 @@ public String toString() {
percentFormat.format(percent));
} else {
if (nonCompliantBlocksSB.length() == 0) {
nonCompliantBlocksSB.append("\nBlocks NOT satisfying the specified storage policy:");
nonCompliantBlocksSB.append("\nStorage Policy ");
nonCompliantBlocksSB.append(
nonCompliantBlocksSB
.append("\nBlocks NOT satisfying the specified storage policy:")
.append("\nStorage Policy ")
.append(
"Specified Storage Policy # of blocks % of blocks\n");
}
nonCompliantFormatter.format("%-35s %-20s %10d %20s%n",

View File

@ -55,9 +55,9 @@ public int getAction() {
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append("/");
sb.append(action);
sb.append(getClass().getSimpleName())
.append("/")
.append(action);
return sb.toString();
}
}

View File

@ -241,8 +241,8 @@ private void getLocalNNThreadDump() {
IOUtils.copyBytes(conn.getInputStream(), out, 4096, true);
StringBuilder localNNThreadDumpContent =
new StringBuilder("-- Local NN thread dump -- \n");
localNNThreadDumpContent.append(out);
localNNThreadDumpContent.append("\n -- Local NN thread dump -- ");
localNNThreadDumpContent.append(out)
.append("\n -- Local NN thread dump -- ");
LOG.info("{}", localNNThreadDumpContent.toString());
isThreadDumpCaptured = true;
} catch (IOException e) {

View File

@ -405,14 +405,14 @@ public int hashCode() {
public String toString() {
StringBuilder sb = new StringBuilder(super.toString());
sb.append('{');
sb.append(this.getPath() == null ? "" : this.getPath().toString());
sb.append(" length = ").append(this.getLen());
sb.append(" aclEntries = ").append(aclEntries);
sb.append(", xAttrs = ").append(xAttrs);
sb.append(", modTime = ").append(modificationTime);
sb.append(this.getPath() == null ? "" : this.getPath().toString())
.append(" length = ").append(this.getLen())
.append(" aclEntries = ").append(aclEntries)
.append(", xAttrs = ").append(xAttrs)
.append(", modTime = ").append(modificationTime);
if (isSplit()) {
sb.append(", chunkOffset = ").append(this.getChunkOffset());
sb.append(", chunkLength = ").append(this.getChunkLength());
sb.append(", chunkOffset = ").append(this.getChunkOffset())
.append(", chunkLength = ").append(this.getChunkLength());
}
sb.append('}');
return sb.toString();