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

HADOOP-11386. Replace \n by %n in format hadoop-common format strings. Contributed by Li Lu.

This commit is contained in:
Haohui Mai 2014-12-10 14:37:31 -08:00
parent df5af744ad
commit 38afeb5f12
7 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -197,6 +197,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-11388. Remove deprecated o.a.h.metrics.file.FileContext. HADOOP-11388. Remove deprecated o.a.h.metrics.file.FileContext.
(Li Lu via wheat9) (Li Lu via wheat9)
HADOOP-11386. Replace \n by %n in format hadoop-common format strings.
(Li Lu via wheat9)
Release 2.6.0 - 2014-11-18 Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationServlet.java
View File

@ -71,10 +71,10 @@ public class ReconfigurationServlet extends HttpServlet {
private void printHeader(PrintWriter out, String nodeName) { private void printHeader(PrintWriter out, String nodeName) {
out.print("<html><head>"); out.print("<html><head>");
out.printf("<title>%s Reconfiguration Utility</title>\n", out.printf("<title>%s Reconfiguration Utility</title>%n",
StringEscapeUtils.escapeHtml(nodeName)); StringEscapeUtils.escapeHtml(nodeName));
out.print("</head><body>\n"); out.print("</head><body>\n");
out.printf("<h1>%s Reconfiguration Utility</h1>\n", out.printf("<h1>%s Reconfiguration Utility</h1>%n",
StringEscapeUtils.escapeHtml(nodeName)); StringEscapeUtils.escapeHtml(nodeName));
} }

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Display.java
View File

@ -197,11 +197,11 @@ class Display extends FsCommand {
FileChecksum checksum = item.fs.getFileChecksum(item.path); FileChecksum checksum = item.fs.getFileChecksum(item.path);
if (checksum == null) { if (checksum == null) {
out.printf("%s\tNONE\t\n", item.toString()); out.printf("%s\tNONE\t%n", item.toString());
} else { } else {
String checksumString = StringUtils.byteToHexString( String checksumString = StringUtils.byteToHexString(
checksum.getBytes(), 0, checksum.getLength()); checksum.getBytes(), 0, checksum.getLength());
out.printf("%s\t%s\t%s\n", out.printf("%s\t%s\t%s%n",
item.toString(), checksum.getAlgorithmName(), item.toString(), checksum.getAlgorithmName(),
checksumString); checksumString);
} }

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/TFile.java
View File

@ -2341,7 +2341,7 @@ public class TFile {
* A list of TFile paths. * A list of TFile paths.
*/ */
public static void main(String[] args) { public static void main(String[] args) {
System.out.printf("TFile Dumper (TFile %s, BCFile %s)\n", TFile.API_VERSION System.out.printf("TFile Dumper (TFile %s, BCFile %s)%n", TFile.API_VERSION
.toString(), BCFile.API_VERSION.toString()); .toString(), BCFile.API_VERSION.toString());
if (args.length == 0) { if (args.length == 0) {
System.out System.out

8
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/TFileDumper.java
View File

@ -176,7 +176,7 @@ class TFileDumper {
for (Iterator<Map.Entry<String, String>> it = entrySet.iterator(); it for (Iterator<Map.Entry<String, String>> it = entrySet.iterator(); it
.hasNext();) { .hasNext();) {
Map.Entry<String, String> e = it.next(); Map.Entry<String, String> e = it.next();
out.printf("%s : %s\n", Align.format(e.getKey(), maxKeyLength, out.printf("%s : %s%n", Align.format(e.getKey(), maxKeyLength,
Align.LEFT), e.getValue()); Align.LEFT), e.getValue());
} }
out.println(); out.println();
@ -200,7 +200,7 @@ class TFileDumper {
String endKey = "End-Key"; String endKey = "End-Key";
int endKeyWidth = Math.max(endKey.length(), maxKeySampleLen * 2 + 5); int endKeyWidth = Math.max(endKey.length(), maxKeySampleLen * 2 + 5);
out.printf("%s %s %s %s %s %s\n", Align.format(blkID, blkIDWidth, out.printf("%s %s %s %s %s %s%n", Align.format(blkID, blkIDWidth,
Align.CENTER), Align.format(offset, offsetWidth, Align.CENTER), Align.CENTER), Align.format(offset, offsetWidth, Align.CENTER),
Align.format(blkLen, blkLenWidth, Align.CENTER), Align.format( Align.format(blkLen, blkLenWidth, Align.CENTER), Align.format(
rawSize, rawSizeWidth, Align.CENTER), Align.format(records, rawSize, rawSizeWidth, Align.CENTER), Align.format(records,
@ -267,7 +267,7 @@ class TFileDumper {
* 10); * 10);
String compression = "Compression"; String compression = "Compression";
int compressionWidth = compression.length(); int compressionWidth = compression.length();
out.printf("%s %s %s %s %s\n", Align.format(name, nameWidth, out.printf("%s %s %s %s %s%n", Align.format(name, nameWidth,
Align.CENTER), Align.format(offset, offsetWidth, Align.CENTER), Align.CENTER), Align.format(offset, offsetWidth, Align.CENTER),
Align.format(blkLen, blkLenWidth, Align.CENTER), Align.format( Align.format(blkLen, blkLenWidth, Align.CENTER), Align.format(
rawSize, rawSizeWidth, Align.CENTER), Align.format(compression, rawSize, rawSizeWidth, Align.CENTER), Align.format(compression,
@ -280,7 +280,7 @@ class TFileDumper {
BlockRegion region = e.getValue().getRegion(); BlockRegion region = e.getValue().getRegion();
String blkCompression = String blkCompression =
e.getValue().getCompressionAlgorithm().getName(); e.getValue().getCompressionAlgorithm().getName();
out.printf("%s %s %s %s %s\n", Align.format(blkName, nameWidth, out.printf("%s %s %s %s %s%n", Align.format(blkName, nameWidth,
Align.LEFT), Align.format(region.getOffset(), offsetWidth, Align.LEFT), Align.format(region.getOffset(), offsetWidth,
Align.LEFT), Align.format(region.getCompressedSize(), Align.LEFT), Align.format(region.getCompressedSize(),
blkLenWidth, Align.LEFT), Align.format(region.getRawSize(), blkLenWidth, Align.LEFT), Align.format(region.getRawSize(),

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedIdMapping.java
View File

@ -181,7 +181,7 @@ public class ShellBasedIdMapping implements IdMappingServiceProvider {
final Integer key, final String value, final Integer key, final String value,
final Integer ekey, final String evalue) { final Integer ekey, final String evalue) {
LOG.warn("\n" + header + String.format( LOG.warn("\n" + header + String.format(
"new entry (%d, %s), existing entry: (%d, %s).\n%s\n%s", "new entry (%d, %s), existing entry: (%d, %s).%n%s%n%s",
key, value, ekey, evalue, key, value, ekey, evalue,
"The new entry is to be ignored for the following reason.", "The new entry is to be ignored for the following reason.",
DUPLICATE_NAME_ID_DEBUG_INFO)); DUPLICATE_NAME_ID_DEBUG_INFO));

14
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeLibraryChecker.java
View File

@ -108,14 +108,14 @@ public class NativeLibraryChecker {
} }
System.out.println("Native library checking:"); System.out.println("Native library checking:");
System.out.printf("hadoop: %b %s\n", nativeHadoopLoaded, hadoopLibraryName); System.out.printf("hadoop: %b %s%n", nativeHadoopLoaded, hadoopLibraryName);
System.out.printf("zlib: %b %s\n", zlibLoaded, zlibLibraryName); System.out.printf("zlib: %b %s%n", zlibLoaded, zlibLibraryName);
System.out.printf("snappy: %b %s\n", snappyLoaded, snappyLibraryName); System.out.printf("snappy: %b %s%n", snappyLoaded, snappyLibraryName);
System.out.printf("lz4: %b %s\n", lz4Loaded, lz4LibraryName); System.out.printf("lz4: %b %s%n", lz4Loaded, lz4LibraryName);
System.out.printf("bzip2: %b %s\n", bzip2Loaded, bzip2LibraryName); System.out.printf("bzip2: %b %s%n", bzip2Loaded, bzip2LibraryName);
System.out.printf("openssl: %b %s\n", openSslLoaded, openSslDetail); System.out.printf("openssl: %b %s%n", openSslLoaded, openSslDetail);
if (Shell.WINDOWS) { if (Shell.WINDOWS) {
System.out.printf("winutils: %b %s\n", winutilsExists, winutilsPath); System.out.printf("winutils: %b %s%n", winutilsExists, winutilsPath);
} }
if ((!nativeHadoopLoaded) || (Shell.WINDOWS && (!winutilsExists)) || if ((!nativeHadoopLoaded) || (Shell.WINDOWS && (!winutilsExists)) ||