Domovská stránka Prehľadávať Pomoc
Registrovať Prihlásiť sa
apache
/
hadoop
zrkadlo https://github.com/apache/hadoop.git
2
0
Fork 1
Súbory Issues 0 Wiki
Prechádzať zdrojové kódy

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

Haohui Mai 10 rokov pred
rodič
59cb8b9123
commit
84d50003f6
7 zmenil súbory, kde vykonal 20 pridanie a 17 odobranie
Rozdelené zobrazenie Ukázať štatistiku rozdielnych dát
  1. 3 0
      hadoop-common-project/hadoop-common/CHANGES.txt
  2. 2 2
      hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationServlet.java
  3. 2 2
      hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Display.java
  4. 1 1
      hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/TFile.java
  5. 4 4
      hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/TFileDumper.java
  6. 1 1
      hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedIdMapping.java
  7. 7 7
      hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeLibraryChecker.java

+ 3 - 0
hadoop-common-project/hadoop-common/CHANGES.txt
Zobraziť súbor 

@@ -567,6 +567,9 @@ Release 2.7.0 - UNRELEASED
 
     HADOOP-11388. Remove deprecated o.a.h.metrics.file.FileContext.
 
     (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
 
 
   INCOMPATIBLE CHANGES

+ 2 - 2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationServlet.java
Zobraziť súbor 

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

+ 2 - 2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Display.java
Zobraziť súbor 

@@ -195,11 +195,11 @@ class Display extends FsCommand {
 
 
       FileChecksum checksum = item.fs.getFileChecksum(item.path);
 
       if (checksum == null) {
 
-        out.printf("%s\tNONE\t\n", item.toString());
 
+        out.printf("%s\tNONE\t%n", item.toString());
 
       } else {
 
         String checksumString = StringUtils.byteToHexString(
 
             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(),
 
             checksumString);
 
       }

+ 1 - 1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/TFile.java
Zobraziť súbor 

@@ -2341,7 +2341,7 @@ public class TFile {
 
    *          A list of TFile paths.
 
    */
 
   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());
 
     if (args.length == 0) {
 
       System.out

+ 4 - 4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/TFileDumper.java
Zobraziť súbor 

@@ -176,7 +176,7 @@ class TFileDumper {
 
       for (Iterator<Map.Entry<String, String>> it = entrySet.iterator(); it
 
           .hasNext();) {
 
         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());
 
       }
 
       out.println();
 
@@ -200,7 +200,7 @@ class TFileDumper {
 
         String endKey = "End-Key";
 
         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.format(blkLen, blkLenWidth, Align.CENTER), Align.format(
 
                 rawSize, rawSizeWidth, Align.CENTER), Align.format(records,
 
@@ -267,7 +267,7 @@ class TFileDumper {
 
                 * 10);
 
         String compression = "Compression";
 
         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.format(blkLen, blkLenWidth, Align.CENTER), Align.format(
 
                 rawSize, rawSizeWidth, Align.CENTER), Align.format(compression,
 
@@ -280,7 +280,7 @@ class TFileDumper {
 
           BlockRegion region = e.getValue().getRegion();
 
           String blkCompression =
 
               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.getCompressedSize(),
 
               blkLenWidth, Align.LEFT), Align.format(region.getRawSize(),

+ 1 - 1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedIdMapping.java
Zobraziť súbor 

@@ -181,7 +181,7 @@ public class ShellBasedIdMapping implements IdMappingServiceProvider {
 
       final Integer key, final String value,
 
       final Integer ekey, final String evalue) {    
       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,
 
           "The new entry is to be ignored for the following reason.",
 
           DUPLICATE_NAME_ID_DEBUG_INFO));

+ 7 - 7
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeLibraryChecker.java
Zobraziť súbor 

@@ -108,14 +108,14 @@ public class NativeLibraryChecker {
 
     }
 
 
     System.out.println("Native library checking:");
 
-    System.out.printf("hadoop:  %b %s\n", nativeHadoopLoaded, hadoopLibraryName);
 
-    System.out.printf("zlib:    %b %s\n", zlibLoaded, zlibLibraryName);
 
-    System.out.printf("snappy:  %b %s\n", snappyLoaded, snappyLibraryName);
 
-    System.out.printf("lz4:     %b %s\n", lz4Loaded, lz4LibraryName);
 
-    System.out.printf("bzip2:   %b %s\n", bzip2Loaded, bzip2LibraryName);
 
-    System.out.printf("openssl: %b %s\n", openSslLoaded, openSslDetail);
 
+    System.out.printf("hadoop:  %b %s%n", nativeHadoopLoaded, hadoopLibraryName);
 
+    System.out.printf("zlib:    %b %s%n", zlibLoaded, zlibLibraryName);
 
+    System.out.printf("snappy:  %b %s%n", snappyLoaded, snappyLibraryName);
 
+    System.out.printf("lz4:     %b %s%n", lz4Loaded, lz4LibraryName);
 
+    System.out.printf("bzip2:   %b %s%n", bzip2Loaded, bzip2LibraryName);
 
+    System.out.printf("openssl: %b %s%n", openSslLoaded, openSslDetail);
 
     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)) ||