accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From medi...@apache.org
Subject svn commit: r1382225 - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/accumulo/core/client/mock/ core/src/main/java/org/apache/accumulo/core/file/ core/src/main/java/org/apache/accumulo/core/...
Date Sat, 08 Sep 2012 02:47:48 GMT
Author: medined
Date: Sat Sep  8 02:47:46 2012
New Revision: 1382225

URL: http://svn.apache.org/viewvc?rev=1382225&view=rev
Log:
ACCUMULO-755: Run findbugs (Changed \n to %n in printf and format calls to resolve the VA_FORMAT_STRING_USES_NEWLINE issue).

Modified:
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/FindMax.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockScanner.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/FileUtil.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFileDumper.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/TableDiskUsage.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DeleterFormatter.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TablesCommand.java
    accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
    accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java
    accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ShowTrace.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/EstimateInMemMapOverhead.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapConcurrencyTest.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NullBatchWriter.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/MaxOpenTest.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/performance/scan/CollectTabletStats.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/scalability/ScaleTest.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/ListInstances.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/FindMax.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/FindMax.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/FindMax.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/FindMax.java Sat Sep  8 02:47:46 2012
@@ -89,7 +89,7 @@ public class FindMax {
   
   private static Text _findMax(Scanner scanner, Text start, boolean inclStart, Text end, boolean inclEnd) {
     
-    // System.out.printf("findMax(%s, %s, %s, %s)\n", Key.toPrintableString(start.getBytes(), 0, start.getLength(), 1000), inclStart,
+    // System.out.printf("findMax(%s, %s, %s, %s)%n", Key.toPrintableString(start.getBytes(), 0, start.getLength(), 1000), inclStart,
     // Key.toPrintableString(end.getBytes(), 0, end.getLength(), 1000), inclEnd);
     
     int cmp = start.compareTo(end);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockScanner.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockScanner.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockScanner.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockScanner.java Sat Sep  8 02:47:46 2012
@@ -31,12 +31,12 @@ import org.apache.accumulo.core.security
 
 public class MockScanner extends MockScannerBase implements Scanner {
   
-  int timeOut = 0;
   int batchSize = 0;
   Range range = new Range();
   
   MockScanner(MockTable table, Authorizations auths) {
     super(table, auths);
+    timeOut = 0;
   }
   
   @Override

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java Sat Sep  8 02:47:46 2012
@@ -440,7 +440,7 @@ public class BloomFilterLayer {
     
     long t2 = System.currentTimeMillis();
     
-    out.printf("write rate %6.2f\n", vals.size() / ((t2 - t1) / 1000.0));
+    out.printf("write rate %6.2f%n", vals.size() / ((t2 - t1) / 1000.0));
     
     bmfw.close();
     
@@ -468,7 +468,7 @@ public class BloomFilterLayer {
     
     t2 = System.currentTimeMillis();
     
-    out.printf("random lookup rate : %6.2f\n", 5000 / ((t2 - t1) / 1000.0));
+    out.printf("random lookup rate : %6.2f%n", 5000 / ((t2 - t1) / 1000.0));
     out.println("hits = " + hits);
     
     int count = 0;
@@ -495,7 +495,7 @@ public class BloomFilterLayer {
     
     t2 = System.currentTimeMillis();
     
-    out.printf("existant lookup rate %6.2f\n", 500 / ((t2 - t1) / 1000.0));
+    out.printf("existant lookup rate %6.2f%n", 500 / ((t2 - t1) / 1000.0));
     out.println("expected hits 500.  Receive hits: " + count);
     bmfr.close();
   }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/FileUtil.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/FileUtil.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/FileUtil.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/FileUtil.java Sat Sep  8 02:47:46 2012
@@ -338,7 +338,7 @@ public class FileUtil {
       
       long t2 = System.currentTimeMillis();
       
-      log.debug(String.format("Found midPoint from indexes in %6.2f secs.\n", ((t2 - t1) / 1000.0)));
+      log.debug(String.format("Found midPoint from indexes in %6.2f secs.%n", ((t2 - t1) / 1000.0)));
       
       ret.put(.5, mmfi.getTopKey());
       

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java Sat Sep  8 02:47:46 2012
@@ -74,7 +74,7 @@ public class RelativeKey implements Writ
     dos.close();
     
     System.out.println("Compressed column map size : " + baos.toByteArray().length);
-    System.out.printf("Bytes written : %,d\n", bytesWritten);
+    System.out.printf("Bytes written : %,d%n", bytesWritten);
     
   }
   
@@ -419,7 +419,7 @@ public class RelativeKey implements Writ
     
     out.writeByte(fieldsSame);
     
-    // System.out.printf("wrote fs %x\n", fieldsSame);
+    // System.out.printf("wrote fs %x%n", fieldsSame);
     
     bytesWritten += 1;
     

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java Sat Sep  8 02:47:46 2012
@@ -2012,7 +2012,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.toString(), BCFile.API_VERSION.toString());
+    System.out.printf("TFile Dumper (TFile %s, BCFile %s)%n", TFile.API_VERSION.toString(), BCFile.API_VERSION.toString());
     if (args.length == 0) {
       System.out.println("Usage: java ... org.apache.hadoop.io.file.tfile.TFile tfile-path [tfile-path ...]");
       System.exit(0);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFileDumper.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFileDumper.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFileDumper.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFileDumper.java Sat Sep  8 02:47:46 2012
@@ -163,7 +163,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, Align.LEFT), e.getValue());
+        out.printf("%s : %s%n", Align.format(e.getKey(), maxKeyLength, Align.LEFT), e.getValue());
       }
       out.println();
       reader.checkTFileDataIndex();
@@ -182,7 +182,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, Align.CENTER), Align.format(offset, offsetWidth, Align.CENTER),
+        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, recordsWidth, Align.CENTER), Align.format(endKey, endKeyWidth, Align.LEFT));
         
@@ -237,7 +237,7 @@ class TFileDumper {
         int rawSizeWidth = Align.calculateWidth(rawSize, metaSizeUncompressed / metaBlkCnt * 10);
         String compression = "Compression";
         int compressionWidth = compression.length();
-        out.printf("%s %s %s %s %s\n", Align.format(name, nameWidth, Align.CENTER), Align.format(offset, offsetWidth, Align.CENTER),
+        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, compressionWidth, Align.LEFT));
         
@@ -246,7 +246,7 @@ class TFileDumper {
           String blkName = e.getValue().getMetaName();
           BlockRegion region = e.getValue().getRegion();
           String blkCompression = e.getValue().getCompressionAlgorithm().getName();
-          out.printf("%s %s %s %s %s\n", Align.format(blkName, nameWidth, Align.LEFT), Align.format(region.getOffset(), offsetWidth, Align.LEFT),
+          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(), rawSizeWidth, Align.LEFT),
               Align.format(blkCompression, compressionWidth, Align.LEFT));
         }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java Sat Sep  8 02:47:46 2012
@@ -81,19 +81,19 @@ public class TraceFormatter implements F
       SimpleDateFormat dateFormatter = new SimpleDateFormat(DATE_FORMAT);
       RemoteSpan span = getRemoteSpan(next);
       result.append("----------------------\n");
-      result.append(String.format(" %12s:%s\n", "name", span.description));
-      result.append(String.format(" %12s:%s\n", "trace", Long.toHexString(span.traceId)));
-      result.append(String.format(" %12s:%s\n", "loc", span.svc + "@" + span.sender));
-      result.append(String.format(" %12s:%s\n", "span", Long.toHexString(span.spanId)));
-      result.append(String.format(" %12s:%s\n", "parent", Long.toHexString(span.parentId)));
-      result.append(String.format(" %12s:%s\n", "start", dateFormatter.format(span.start)));
-      result.append(String.format(" %12s:%s\n", "ms", span.stop - span.start));
+      result.append(String.format(" %12s:%s%n", "name", span.description));
+      result.append(String.format(" %12s:%s%n", "trace", Long.toHexString(span.traceId)));
+      result.append(String.format(" %12s:%s%n", "loc", span.svc + "@" + span.sender));
+      result.append(String.format(" %12s:%s%n", "span", Long.toHexString(span.spanId)));
+      result.append(String.format(" %12s:%s%n", "parent", Long.toHexString(span.parentId)));
+      result.append(String.format(" %12s:%s%n", "start", dateFormatter.format(span.start)));
+      result.append(String.format(" %12s:%s%n", "ms", span.stop - span.start));
       for (Entry<String,String> entry : span.data.entrySet()) {
-        result.append(String.format(" %12s:%s\n", entry.getKey(), entry.getValue()));
+        result.append(String.format(" %12s:%s%n", entry.getKey(), entry.getValue()));
       }
       
       if (printTimeStamps) {
-        result.append(String.format(" %-12s:%d\n", "timestamp", next.getKey().getTimestamp()));
+        result.append(String.format(" %-12s:%d%n", "timestamp", next.getKey().getTimestamp()));
       }
       return result.toString();
     }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java Sat Sep  8 02:47:46 2012
@@ -75,7 +75,7 @@ public class StopWatch<K extends Enum<K>
   
   public synchronized void print() {
     for (K timer : totalTime.keySet()) {
-      System.out.printf("%20s : %,6.4f secs\n", timer.toString(), get(timer) / 1000.0);
+      System.out.printf("%20s : %,6.4f secs%n", timer.toString(), get(timer) / 1000.0);
     }
   }
   

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/TableDiskUsage.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/TableDiskUsage.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/TableDiskUsage.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/TableDiskUsage.java Sat Sep  8 02:47:46 2012
@@ -204,7 +204,7 @@ public class TableDiskUsage {
     }
     
     for (Entry<TreeSet<String>,Long> entry : usage.entrySet())
-      System.out.printf("%,24d %s\n", entry.getValue(), entry.getKey());
+      System.out.printf("%,24d %s%n", entry.getValue(), entry.getKey());
     
   }
   

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DeleterFormatter.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DeleterFormatter.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DeleterFormatter.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/DeleterFormatter.java Sat Sep  8 02:47:46 2012
@@ -88,7 +88,7 @@ public class DeleterFormatter extends De
               log.trace(cvs.toString());
         }
       }
-      shellState.getReader().printString(String.format("[%s] %s\n", delete ? "DELETED" : "SKIPPED", entryStr));
+      shellState.getReader().printString(String.format("[%s] %s%n", delete ? "DELETED" : "SKIPPED", entryStr));
     } catch (IOException e) {
       log.error("Cannot write to console", e);
       throw new RuntimeException(e);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Sat Sep  8 02:47:46 2012
@@ -441,7 +441,7 @@ public class Shell extends ShellOptions 
     if (disableAuthTimeout)
       sb.append("- Authorization timeout: disabled\n");
     else
-      sb.append("- Authorization timeout: ").append(String.format("%.2fs\n", authTimeout / 1000.0));
+      sb.append("- Authorization timeout: ").append(String.format("%.2fs%n", authTimeout / 1000.0));
     sb.append("- Debug: ").append(isDebuggingEnabled() ? "on" : "off").append("\n");
     if (!scanIteratorOptions.isEmpty()) {
       for (Entry<String,List<IteratorSetting>> entry : scanIteratorOptions.entrySet()) {
@@ -839,12 +839,12 @@ public class Shell extends ShellOptions 
     printException(cve, "");
     int COL1 = 50, COL2 = 14;
     int col3 = Math.max(1, Math.min(Integer.MAX_VALUE, reader.getTermwidth() - COL1 - COL2 - 6));
-    logError(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%" + col3 + "s\n", repeat("-", COL1), repeat("-", COL2), repeat("-", col3)));
-    logError(String.format("%-" + COL1 + "s | %" + COL2 + "s | %-" + col3 + "s\n", "Constraint class", "Violation code", "Violation Description"));
-    logError(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%" + col3 + "s\n", repeat("-", COL1), repeat("-", COL2), repeat("-", col3)));
+    logError(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%" + col3 + "s%n", repeat("-", COL1), repeat("-", COL2), repeat("-", col3)));
+    logError(String.format("%-" + COL1 + "s | %" + COL2 + "s | %-" + col3 + "s%n", "Constraint class", "Violation code", "Violation Description"));
+    logError(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%" + col3 + "s%n", repeat("-", COL1), repeat("-", COL2), repeat("-", col3)));
     for (TConstraintViolationSummary cvs : cve.violationSummaries)
-      logError(String.format("%-" + COL1 + "s | %" + COL2 + "d | %-" + col3 + "s\n", cvs.constrainClass, cvs.violationCode, cvs.violationDescription));
-    logError(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%" + col3 + "s\n", repeat("-", COL1), repeat("-", COL2), repeat("-", col3)));
+      logError(String.format("%-" + COL1 + "s | %" + COL2 + "d | %-" + col3 + "s%n", cvs.constrainClass, cvs.violationCode, cvs.violationDescription));
+    logError(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%" + col3 + "s%n", repeat("-", COL1), repeat("-", COL2), repeat("-", col3)));
   }
   
   public final void printException(Exception e) {

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TablesCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TablesCommand.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TablesCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TablesCommand.java Sat Sep  8 02:47:46 2012
@@ -35,7 +35,7 @@ public class TablesCommand extends Comma
     if (cl.hasOption(tableIdOption.getOpt())) {
       Map<String,String> tableIds = shellState.getConnector().tableOperations().tableIdMap();
       for (String tableName : shellState.getConnector().tableOperations().list())
-        shellState.getReader().printString(String.format("%-15s => %10s\n", tableName, tableIds.get(tableName)));
+        shellState.getReader().printString(String.format("%-15s => %10s%n", tableName, tableIds.get(tableName)));
     } else {
       for (String table : shellState.getConnector().tableOperations().list())
         shellState.getReader().printString(table + "\n");

Modified: accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java (original)
+++ accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java Sat Sep  8 02:47:46 2012
@@ -159,8 +159,8 @@ public class RandomBatchScanner {
     
     long t2 = System.currentTimeMillis();
     
-    log.info(String.format("%6.2f lookups/sec %6.2f secs\n", num / ((t2 - t1) / 1000.0), ((t2 - t1) / 1000.0)));
-    log.info(String.format("num results : %,d\n", receiver.count));
+    log.info(String.format("%6.2f lookups/sec %6.2f secs%n", num / ((t2 - t1) / 1000.0), ((t2 - t1) / 1000.0)));
+    log.info(String.format("num results : %,d%n", receiver.count));
     
     printRowsNotFound(expectedRows);
   }

Modified: accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java (original)
+++ accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java Sat Sep  8 02:47:46 2012
@@ -274,11 +274,11 @@ public class FileCount {
     
     long t3 = System.currentTimeMillis();
     
-    System.out.printf("Max depth              : %d\n", depth);
-    System.out.printf("Time to find max depth : %,d ms\n", (t2 - t1));
-    System.out.printf("Time to compute counts : %,d ms\n", (t3 - t2));
-    System.out.printf("Entries scanned        : %,d \n", entriesScanned);
-    System.out.printf("Counts inserted        : %,d \n", inserts);
+    System.out.printf("Max depth              : %d%n", depth);
+    System.out.printf("Time to find max depth : %,d ms%n", (t2 - t1));
+    System.out.printf("Time to compute counts : %,d ms%n", (t3 - t2));
+    System.out.printf("Entries scanned        : %,d %n", entriesScanned);
+    System.out.printf("Counts inserted        : %,d %n", inserts);
   }
   
   public static void main(String[] args) throws Exception {

Modified: accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java (original)
+++ accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java Sat Sep  8 02:47:46 2012
@@ -89,7 +89,7 @@ public class ContinuousQuery {
       }
       long t2 = System.currentTimeMillis();
       
-      System.out.printf("  %s %,d %6.3f\n", Arrays.asList(columns), count, (t2 - t1) / 1000.0);
+      System.out.printf("  %s %,d %6.3f%n", Arrays.asList(columns), count, (t2 - t1) / 1000.0);
     }
     
     bs.close();

Modified: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java (original)
+++ accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java Sat Sep  8 02:47:46 2012
@@ -114,7 +114,7 @@ public class AdminUtil<T> {
       
       zs.unreserve(tid, 0);
       
-      System.out.printf("txid: %016x  status: %-18s  op: %-15s  locked: %-15s locking: %-15s top: %s\n", tid, status, debug, hlocks, wlocks, top);
+      System.out.printf("txid: %016x  status: %-18s  op: %-15s  locked: %-15s locking: %-15s top: %s%n", tid, status, debug, hlocks, wlocks, top);
     }
     
     if (heldLocks.size() != 0 || waitingLocks.size() != 0) {
@@ -122,10 +122,10 @@ public class AdminUtil<T> {
       System.out.println("The following locks did not have an associated FATE operation");
       System.out.println();
       for (Entry<Long,List<String>> entry : heldLocks.entrySet())
-        System.out.printf("txid: %016x  locked: %s\n", entry.getKey(), entry.getValue());
+        System.out.printf("txid: %016x  locked: %s%n", entry.getKey(), entry.getValue());
       
       for (Entry<Long,List<String>> entry : waitingLocks.entrySet())
-        System.out.printf("txid: %016x  locking: %s\n", entry.getKey(), entry.getValue());
+        System.out.printf("txid: %016x  locking: %s%n", entry.getKey(), entry.getValue());
     }
   }
   

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java Sat Sep  8 02:47:46 2012
@@ -748,15 +748,15 @@ public class BulkImporter {
         failedTablets.addAll(ft);
       
       sb.append("BULK IMPORT ASSIGNMENT STATISTICS\n");
-      sb.append(String.format("# of map files            : %,10d\n", numUniqueMapFiles));
-      sb.append(String.format("# map files with failures : %,10d %6.2f%s\n", completeFailures.size(), completeFailures.size() * 100.0 / numUniqueMapFiles, "%"));
-      sb.append(String.format("# failed failed map files : %,10d %s\n", failedFailures.size(), failedFailures.size() > 0 ? " <-- THIS IS BAD" : ""));
-      sb.append(String.format("# of tablets              : %,10d\n", counts.size()));
-      sb.append(String.format("# tablets imported to     : %,10d %6.2f%s\n", tabletsImportedTo, tabletsImportedTo * 100.0 / counts.size(), "%"));
-      sb.append(String.format("# tablets with failures   : %,10d %6.2f%s\n", failedTablets.size(), failedTablets.size() * 100.0 / counts.size(), "%"));
-      sb.append(String.format("min map files per tablet  : %,10d\n", min));
-      sb.append(String.format("max map files per tablet  : %,10d\n", max));
-      sb.append(String.format("avg map files per tablet  : %,10.2f (std dev = %.2f)\n", totalAssignments / (double) counts.size(), stddev));
+      sb.append(String.format("# of map files            : %,10d%n", numUniqueMapFiles));
+      sb.append(String.format("# map files with failures : %,10d %6.2f%s%n", completeFailures.size(), completeFailures.size() * 100.0 / numUniqueMapFiles, "%"));
+      sb.append(String.format("# failed failed map files : %,10d %s%n", failedFailures.size(), failedFailures.size() > 0 ? " <-- THIS IS BAD" : ""));
+      sb.append(String.format("# of tablets              : %,10d%n", counts.size()));
+      sb.append(String.format("# tablets imported to     : %,10d %6.2f%s%n", tabletsImportedTo, tabletsImportedTo * 100.0 / counts.size(), "%"));
+      sb.append(String.format("# tablets with failures   : %,10d %6.2f%s%n", failedTablets.size(), failedTablets.size() * 100.0 / counts.size(), "%"));
+      sb.append(String.format("min map files per tablet  : %,10d%n", min));
+      sb.append(String.format("max map files per tablet  : %,10d%n", max));
+      sb.append(String.format("avg map files per tablet  : %,10.2f (std dev = %.2f)%n", totalAssignments / (double) counts.size(), stddev));
       return sb.toString();
     }
   }

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java Sat Sep  8 02:47:46 2012
@@ -254,10 +254,10 @@ public class SimpleGarbageCollector impl
         // STEP 3: delete files
         if (safemode) {
           if (verbose)
-            System.out.println("SAFEMODE: There are " + candidates.size() + " data file candidates marked for deletion.\n"
-                + "          Examine the log files to identify them.\n" + "          They can be removed by executing: bin/accumulo gc --offline\n"
-                + "WARNING:  Do not run the garbage collector in offline mode unless you are positive\n"
-                + "          that the accumulo METADATA table is in a clean state, or that accumulo\n"
+            System.out.println("SAFEMODE: There are " + candidates.size() + " data file candidates marked for deletion.%n"
+                + "          Examine the log files to identify them.%n" + "          They can be removed by executing: bin/accumulo gc --offline%n"
+                + "WARNING:  Do not run the garbage collector in offline mode unless you are positive%n"
+                + "          that the accumulo METADATA table is in a clean state, or that accumulo%n"
                 + "          has not yet been run, in the case of an upgrade.");
           log.info("SAFEMODE: Listing all data file candidates for deletion");
           for (String s : candidates)

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ShowTrace.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ShowTrace.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ShowTrace.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ShowTrace.java Sat Sep  8 02:47:46 2012
@@ -98,8 +98,8 @@ public class ShowTrace extends Basic {
       @Override
       public void visit(int level, RemoteSpan parent, RemoteSpan node, Collection<RemoteSpan> children) {
         sb.append("<tr>\n");
-        sb.append(String.format("<td class='right'>%d+</td><td class='left'>%d</td>\n", node.stop - node.start, node.start - finalStart));
-        sb.append(String.format("<td style='text-indent: %dpx'>%s@%s</td>\n", level * 5, node.svc, node.sender));
+        sb.append(String.format("<td class='right'>%d+</td><td class='left'>%d</td>%n", node.stop - node.start, node.start - finalStart));
+        sb.append(String.format("<td style='text-indent: %dpx'>%s@%s</td>%n", level * 5, node.svc, node.sender));
         sb.append("<td>" + node.description + "</td>");
         boolean hasData = node.data != null && !node.data.isEmpty();
         if (hasData)
@@ -112,7 +112,7 @@ public class ShowTrace extends Basic {
         sb.append("  <table class='indent,noborder'>\n");
         for (Entry<String,String> entry : node.data.entrySet()) {
           sb.append("  <tr><td>" + BasicServlet.sanitize(entry.getKey()) + "</td>");
-          sb.append("<td>" + BasicServlet.sanitize(entry.getValue()) + "</td></tr>\n");
+          sb.append("<td>" + BasicServlet.sanitize(entry.getValue()) + "</td></tr>%n");
         }
         sb.append("  </table>");
         sb.append("</td>\n");

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java Sat Sep  8 02:47:46 2012
@@ -193,7 +193,7 @@ public class LargestFirstMemoryManager i
   
   public static void main(String[] args) {
     for (int i = 0; i < 62; i++) {
-      System.out.printf("%d\t%d\n", i, timeMemoryLoad(1, i * 60000l));
+      System.out.printf("%d\t%d%n", i, timeMemoryLoad(1, i * 60000l));
     }
   }
 }

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java Sat Sep  8 02:47:46 2012
@@ -3055,7 +3055,7 @@ public class Tablet {
           if (candidate.compareRow(lastRow) != 0) {
             // we should use this ratio in split size estimations
             if (log.isTraceEnabled())
-              log.trace(String.format("Splitting at %6.2f instead of .5, row at .5 is same as end row\n", keys.firstKey()));
+              log.trace(String.format("Splitting at %6.2f instead of .5, row at .5 is same as end row%n", keys.firstKey()));
             return new SplitRowSpec(keys.firstKey(), candidate.getRow());
           }
           

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/EstimateInMemMapOverhead.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/EstimateInMemMapOverhead.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/EstimateInMemMapOverhead.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/EstimateInMemMapOverhead.java Sat Sep  8 02:47:46 2012
@@ -63,7 +63,7 @@ abstract class MemoryUsageTest {
     double diff = actualBytesPerEntry - expectedBytesPerEntry;
     double ratio = actualBytesPerEntry / expectedBytesPerEntry * 100;
     
-    System.out.printf("%30s | %,10d | %6.2fGB | %6.2f | %6.2f | %6.2f | %6.2f%s\n", getName(), getNumPasses(), memSize / (1024 * 1024 * 1024.0),
+    System.out.printf("%30s | %,10d | %6.2fGB | %6.2f | %6.2f | %6.2f | %6.2f%s%n", getName(), getNumPasses(), memSize / (1024 * 1024 * 1024.0),
         actualBytesPerEntry, expectedBytesPerEntry, diff, ratio, "%");
     
     clear();

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapConcurrencyTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapConcurrencyTest.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapConcurrencyTest.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapConcurrencyTest.java Sat Sep  8 02:47:46 2012
@@ -63,7 +63,7 @@ public class NativeMapConcurrencyTest {
     }
     long t2 = System.currentTimeMillis();
     
-    System.out.printf("inserted %,d in %,d %,d %,6.2f\n", (numRows * numCols), (t2 - t1), nm.size(), rate((numRows * numCols), (t2 - t1)));
+    System.out.printf("inserted %,d in %,d %,d %,6.2f%n", (numRows * numCols), (t2 - t1), nm.size(), rate((numRows * numCols), (t2 - t1)));
   }
   
   private static double rate(int num, long ms) {
@@ -107,7 +107,7 @@ public class NativeMapConcurrencyTest {
         
         long t2 = System.currentTimeMillis();
         
-        System.out.printf("%d %,d %,d %,d %,d %,6.2f\n", Thread.currentThread().getId(), (t2 - t1), t1, t2, count, rate(count, (t2 - t1)));
+        System.out.printf("%d %,d %,d %,d %,d %,6.2f%n", Thread.currentThread().getId(), (t2 - t1), t1, t2, count, rate(count, (t2 - t1)));
       }
     }
     

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java Sat Sep  8 02:47:46 2012
@@ -169,7 +169,7 @@ public class NativeMapPerformanceTest {
     
     UtilWaitThread.sleep(3000);
     
-    System.out.printf("mapType:%10s   put rate:%,6.2f  scan rate:%,6.2f  get rate:%,6.2f  delete time : %6.2f  mem : %,d\n", "" + mapType, (numRows * numCols)
+    System.out.printf("mapType:%10s   put rate:%,6.2f  scan rate:%,6.2f  get rate:%,6.2f  delete time : %6.2f  mem : %,d%n", "" + mapType, (numRows * numCols)
         / ((tpe - tps) / 1000.0), (size) / ((tie - tis) / 1000.0), numLookups / ((tge - tgs) / 1000.0), (tde - tds) / 1000.0, memUsed);
     
   }

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NullBatchWriter.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NullBatchWriter.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NullBatchWriter.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NullBatchWriter.java Sat Sep  8 02:47:46 2012
@@ -48,7 +48,7 @@ public class NullBatchWriter implements 
   
   @Override
   public void flush() throws MutationsRejectedException {
-    System.out.printf("Mutation add rate : %,6.2f mutations/sec\n", mutationsAdded / ((System.currentTimeMillis() - startTime) / 1000.0));
+    System.out.printf("Mutation add rate : %,6.2f mutations/sec%n", mutationsAdded / ((System.currentTimeMillis() - startTime) / 1000.0));
     mutationsAdded = 0;
   }
   

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java Sat Sep  8 02:47:46 2012
@@ -128,7 +128,7 @@ public class QueryMetadataTable {
     for (Entry<Key,Value> entry : scanner) {
       System.out.print(".");
       if (count % 72 == 0) {
-        System.out.printf(" %,d\n", count);
+        System.out.printf(" %,d%n", count);
       }
       if (entry.getKey().compareRow(mdrow) == 0 && entry.getKey().getColumnFamily().compareTo(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY) == 0) {
         System.out.println(entry.getKey() + " " + entry.getValue());
@@ -141,7 +141,7 @@ public class QueryMetadataTable {
       
     }
     
-    System.out.printf(" %,d\n", count);
+    System.out.printf(" %,d%n", count);
     
     ArrayList<Text> rows = new ArrayList<Text>(rowSet);
     

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java Sat Sep  8 02:47:46 2012
@@ -152,8 +152,8 @@ public class TestBinaryRows {
         
         long t2 = System.currentTimeMillis();
         
-        System.out.printf("time : %9.2f secs\n", ((t2 - t1) / 1000.0));
-        System.out.printf("rate : %9.2f entries/sec\n", num / ((t2 - t1) / 1000.0));
+        System.out.printf("time : %9.2f secs%n", ((t2 - t1) / 1000.0));
+        System.out.printf("rate : %9.2f entries/sec%n", num / ((t2 - t1) / 1000.0));
         
       } else if (mode.equals("randomLookups")) {
         int numLookups = 1000;
@@ -194,9 +194,9 @@ public class TestBinaryRows {
         
         long t2 = System.currentTimeMillis();
         
-        System.out.printf("time    : %9.2f secs\n", ((t2 - t1) / 1000.0));
-        System.out.printf("lookups : %9d keys\n", numLookups);
-        System.out.printf("rate    : %9.2f lookups/sec\n", numLookups / ((t2 - t1) / 1000.0));
+        System.out.printf("time    : %9.2f secs%n", ((t2 - t1) / 1000.0));
+        System.out.printf("lookups : %9d keys%n", numLookups);
+        System.out.printf("rate    : %9.2f lookups/sec%n", numLookups / ((t2 - t1) / 1000.0));
         
       } else if (mode.equals("split")) {
         TreeSet<Text> splits = new TreeSet<Text>();
@@ -207,7 +207,7 @@ public class TestBinaryRows {
           long splitPoint = i << shift;
           
           splits.add(new Text(encodeLong(splitPoint)));
-          System.out.printf("added split point 0x%016x  %,12d\n", splitPoint, splitPoint);
+          System.out.printf("added split point 0x%016x  %,12d%n", splitPoint, splitPoint);
         }
         
         connector.tableOperations().create(table);

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java Sat Sep  8 02:47:46 2012
@@ -406,7 +406,7 @@ public class TestIngest {
       int totalValues = ingestArgs.rows * ingestArgs.cols;
       double elapsed = (stopTime - startTime) / 1000.0;
       
-      System.out.printf("%,12d records written | %,8d records/sec | %,12d bytes written | %,8d bytes/sec | %6.3f secs   \n", totalValues,
+      System.out.printf("%,12d records written | %,8d records/sec | %,12d bytes written | %,8d bytes/sec | %6.3f secs   %n", totalValues,
           (int) (totalValues / elapsed), bytesWritten, (int) (bytesWritten / elapsed), elapsed);
     } catch (Exception e) {
       throw new RuntimeException(e);

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java Sat Sep  8 02:47:46 2012
@@ -228,7 +228,7 @@ public class VerifyIngest {
         log.error("Did not read expected number of rows. Saw " + (expectedRow - ingestArgs.startRow) + " expected " + ingestArgs.rows);
         System.exit(1);
       } else {
-        System.out.printf("%,12d records read | %,8d records/sec | %,12d bytes read | %,8d bytes/sec | %6.3f secs   \n", recsRead,
+        System.out.printf("%,12d records read | %,8d records/sec | %,12d bytes read | %,8d bytes/sec | %6.3f secs   %n", recsRead,
             (int) ((recsRead) / ((t2 - t1) / 1000.0)), bytesRead, (int) (bytesRead / ((t2 - t1) / 1000.0)), (t2 - t1) / 1000.0);
       }
       

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java Sat Sep  8 02:47:46 2012
@@ -148,12 +148,12 @@ public class ContinuousBatchWalker {
       copy1.removeAll(batch);
       copy2.removeAll(rowsSeen);
       
-      System.out.printf("DIF %d %d %d\n", t1, copy1.size(), copy2.size());
-      System.err.printf("DIF %d %d %d\n", t1, copy1.size(), copy2.size());
+      System.out.printf("DIF %d %d %d%n", t1, copy1.size(), copy2.size());
+      System.err.printf("DIF %d %d %d%n", t1, copy1.size(), copy2.size());
       System.err.println("Extra seen : " + copy1);
       System.err.println("Not seen   : " + copy2);
     } else {
-      System.out.printf("BRQ %d %d %d %d %d\n", t1, (t2 - t1), rowsSeen.size(), count, (int) (rowsSeen.size() / ((t2 - t1) / 1000.0)));
+      System.out.printf("BRQ %d %d %d %d %d%n", t1, (t2 - t1), rowsSeen.size(), count, (int) (rowsSeen.size() / ((t2 - t1) / 1000.0)));
     }
     
   }

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java Sat Sep  8 02:47:46 2012
@@ -123,7 +123,7 @@ public class ContinuousIngest {
     
     byte[] ingestInstanceId = UUID.randomUUID().toString().getBytes();
     
-    System.out.printf("UUID %d %s\n", System.currentTimeMillis(), new String(ingestInstanceId));
+    System.out.printf("UUID %d %s%n", System.currentTimeMillis(), new String(ingestInstanceId));
     
     long count = 0;
     final int flushInterval = 1000000;
@@ -197,7 +197,7 @@ public class ContinuousIngest {
     long t1 = System.currentTimeMillis();
     bw.flush();
     long t2 = System.currentTimeMillis();
-    System.out.printf("FLUSH %d %d %d %d %d\n", t2, (t2 - lastFlushTime), (t2 - t1), count, flushInterval);
+    System.out.printf("FLUSH %d %d %d %d %d%n", t2, (t2 - lastFlushTime), (t2 - t1), count, flushInterval);
     lastFlushTime = t2;
     return lastFlushTime;
   }

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java Sat Sep  8 02:47:46 2012
@@ -67,7 +67,7 @@ public class ContinuousQuery {
       }
       long t2 = System.currentTimeMillis();
       
-      System.out.printf("SRQ %d %s %d %d\n", t1, new String(row), (t2 - t1), count);
+      System.out.printf("SRQ %d %s %d %d%n", t1, new String(row), (t2 - t1), count);
       
       if (sleepTime > 0)
         Thread.sleep(sleepTime);

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java Sat Sep  8 02:47:46 2012
@@ -131,7 +131,7 @@ public class ContinuousScanner {
         // System.out.println("P2 "+delta +" "+numToScan+" "+distance+"  "+((double)numToScan/count ));
       }
       
-      System.out.printf("SCN %d %s %d %d\n", t1, new String(scanStart), (t2 - t1), count);
+      System.out.printf("SCN %d %s %d %d%n", t1, new String(scanStart), (t2 - t1), count);
       
       if (sleepTime > 0)
         UtilWaitThread.sleep(sleepTime);

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java Sat Sep  8 02:47:46 2012
@@ -134,13 +134,13 @@ public class ContinuousWalk {
         }
         long t2 = System.currentTimeMillis();
         
-        System.out.printf("SRQ %d %s %d %d\n", t1, row, (t2 - t1), values.size());
+        System.out.printf("SRQ %d %s %d %d%n", t1, row, (t2 - t1), values.size());
         
         if (values.size() > 0) {
           row = getPrevRow(values.get(r.nextInt(values.size())));
         } else {
-          System.out.printf("MIS %d %s\n", t1, row);
-          System.err.printf("MIS %d %s\n", t1, row);
+          System.out.printf("MIS %d %s%n", t1, row);
+          System.err.printf("MIS %d %s%n", t1, row);
           row = null;
         }
         
@@ -174,7 +174,7 @@ public class ContinuousWalk {
     
     long t2 = System.currentTimeMillis();
     
-    System.out.printf("FSR %d %s %d %d\n", t1, new String(scanStart), (t2 - t1), count);
+    System.out.printf("FSR %d %s %d %d%n", t1, new String(scanStart), (t2 - t1), count);
     
     return pr;
   }

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java Sat Sep  8 02:47:46 2012
@@ -136,11 +136,11 @@ public class Histogram<T> implements Ser
       
       psum += getPercentage(hd.bin);
       
-      System.out.printf(" %" + (maxValueLen + 1) + "s %,16d %6.2f%s %6.2f%s\n", hd.bin + "", hd.count, getPercentage(hd.bin), "%", psum, "%");
+      System.out.printf(" %" + (maxValueLen + 1) + "s %,16d %6.2f%s %6.2f%s%n", hd.bin + "", hd.count, getPercentage(hd.bin), "%", psum, "%");
     }
     
     System.out.println();
-    System.out.printf(" %" + (maxValueLen + 1) + "s %,16d \n", "TOTAL", sum);
+    System.out.printf(" %" + (maxValueLen + 1) + "s %,16d %n", "TOTAL", sum);
   }
   
   public void save(String file) throws IOException {

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java Sat Sep  8 02:47:46 2012
@@ -112,7 +112,7 @@ public class BatchScanSplitTest extends 
       
       long t2 = System.currentTimeMillis();
       
-      System.out.printf("rate : %06.2f\n", ranges.size() / ((t2 - t1) / 1000.0));
+      System.out.printf("rate : %06.2f%n", ranges.size() / ((t2 - t1) / 1000.0));
       
       if (!found.equals(expected))
         throw new Exception("Found and expected differ " + found + " " + expected);

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/MaxOpenTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/MaxOpenTest.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/MaxOpenTest.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/MaxOpenTest.java Sat Sep  8 02:47:46 2012
@@ -80,8 +80,8 @@ public class MaxOpenTest extends Functio
     time1 = batchScan(ranges, 1);
     long time2 = batchScan(ranges, NUM_TABLETS);
     
-    System.out.printf("Single thread scan time   %6.2f \n", time1 / 1000.0);
-    System.out.printf("Multiple thread scan time %6.2f \n", time2 / 1000.0);
+    System.out.printf("Single thread scan time   %6.2f %n", time1 / 1000.0);
+    System.out.printf("Multiple thread scan time %6.2f %n", time2 / 1000.0);
     
   }
   

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java Sat Sep  8 02:47:46 2012
@@ -153,7 +153,7 @@ public class MetadataBatchScanTest {
       
       long t2 = System.currentTimeMillis();
       
-      System.out.printf("tt : %6.2f\n", (t2 - t1) / 1000.0);
+      System.out.printf("tt : %6.2f%n", (t2 - t1) / 1000.0);
       
     } else {
       throw new IllegalArgumentException();

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/performance/scan/CollectTabletStats.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/performance/scan/CollectTabletStats.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/performance/scan/CollectTabletStats.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/performance/scan/CollectTabletStats.java Sat Sep  8 02:47:46 2012
@@ -154,7 +154,7 @@ public class CollectTabletStats {
       reportHdfsBlockLocations(tabletFiles.get(ke));
     }
     
-    System.out.println("\n*** RUNNING TEST ***\n");
+    System.out.println("%n*** RUNNING TEST ***%n");
     
     ExecutorService threadPool = Executors.newFixedThreadPool(numThreads);
     
@@ -288,7 +288,7 @@ public class CollectTabletStats {
       double time = (t2 - t1) / 1000.0;
       
       System.out.printf("\t\ttablet: " + ke.getUUID() + "  thread: " + Thread.currentThread().getId()
-          + " count: %,d cells  time: %6.2f  rate: %,6.2f cells/sec\n", count, time, count / time);
+          + " count: %,d cells  time: %6.2f  rate: %,6.2f cells/sec%n", count, time, count / time);
       
       finishCdl.countDown();
     }
@@ -334,7 +334,7 @@ public class CollectTabletStats {
     }
     
     double time = (maxTime - minTime) / 1000.0;
-    System.out.printf("\tAggregate stats  count: %,d cells  time: %6.2f  rate: %,6.2f cells/sec\n", count, time, count / time);
+    System.out.printf("\tAggregate stats  count: %,d cells  time: %6.2f  rate: %,6.2f cells/sec%n", count, time, count / time);
     System.out.println();
     
     // run the gc between test so that object created during previous test are not
@@ -590,7 +590,7 @@ public class CollectTabletStats {
   }
   
   private static void printStat(String desc, Stat s) {
-    System.out.printf("\t\tDescription: [%30s]  average: %,6.2f  std dev: %,6.2f  min: %,d  max: %,d \n", desc, s.getAverage(), s.getStdDev(), s.getMin(),
+    System.out.printf("\t\tDescription: [%30s]  average: %,6.2f  std dev: %,6.2f  min: %,d  max: %,d %n", desc, s.getAverage(), s.getStdDev(), s.getMin(),
         s.getMax());
     
   }

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/scalability/ScaleTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/scalability/ScaleTest.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/scalability/ScaleTest.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/scalability/ScaleTest.java Sat Sep  8 02:47:46 2012
@@ -54,7 +54,7 @@ public abstract class ScaleTest {
   
   protected void stopTimer(long numEntries, long numBytes) {
     long endTime = System.currentTimeMillis();
-    System.out.printf("ELAPSEDMS %d %d %d\n", (endTime - startTime), numEntries, numBytes);
+    System.out.printf("ELAPSEDMS %d %d %d%n", (endTime - startTime), numEntries, numBytes);
   }
   
   public abstract void setup();

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/ListInstances.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/ListInstances.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/ListInstances.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/ListInstances.java Sat Sep  8 02:47:46 2012
@@ -126,8 +126,8 @@ public class ListInstances {
   }
   
   private static void printHeader() {
-    System.out.printf(" %-" + NAME_WIDTH + "s| %-" + UUID_WIDTH + "s| %-" + MASTER_WIDTH + "s\n", "Instance Name", "Instance ID", "Master");
-    System.out.printf("%" + (NAME_WIDTH + 1) + "s+%" + (UUID_WIDTH + 1) + "s+%" + (MASTER_WIDTH + 1) + "s\n", new CharFiller('-'), new CharFiller('-'),
+    System.out.printf(" %-" + NAME_WIDTH + "s| %-" + UUID_WIDTH + "s| %-" + MASTER_WIDTH + "s%n", "Instance Name", "Instance ID", "Master");
+    System.out.printf("%" + (NAME_WIDTH + 1) + "s+%" + (UUID_WIDTH + 1) + "s+%" + (MASTER_WIDTH + 1) + "s%n", new CharFiller('-'), new CharFiller('-'),
         new CharFiller('-'));
     
   }
@@ -142,7 +142,7 @@ public class ListInstances {
       master = "";
     }
     
-    System.out.printf("%" + NAME_WIDTH + "s |%" + UUID_WIDTH + "s |%" + MASTER_WIDTH + "s\n", "\"" + instanceName + "\"", iid, master);
+    System.out.printf("%" + NAME_WIDTH + "s |%" + UUID_WIDTH + "s |%" + MASTER_WIDTH + "s%n", "\"" + instanceName + "\"", iid, master);
   }
   
   private static String getMaster(UUID iid) {

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java?rev=1382225&r1=1382224&r2=1382225&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java Sat Sep  8 02:47:46 2012
@@ -46,7 +46,7 @@ public class TabletServerLocks {
           holder = new String(lockData);
         }
         
-        System.out.printf("%32s %16s\n", tabletServer, holder);
+        System.out.printf("%32s %16s%n", tabletServer, holder);
       }
     } else if (args.length == 2 && args[0].equals("-delete")) {
       ZooLock.deleteLock(tserverPath + "/" + args[1]);



Mime
View raw message