accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [59/61] [abbrv] accumulo git commit: ACCUMULO-722: merge from trunk
Date Thu, 03 Mar 2016 22:00:24 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/077b18cf/1.5/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java b/1.5/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java
index 675a60f..f86fae4 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java
@@ -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);
       }
       

http://git-wip-us.apache.org/repos/asf/accumulo/blob/077b18cf/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java
b/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java
index 948c67b..e4b54d5 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java
@@ -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)));
     }
     
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/077b18cf/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java
b/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java
index ee08fb9..4e3bed8 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java
@@ -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;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/077b18cf/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java
b/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java
index c8ae6ec..4fab19f 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java
@@ -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);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/077b18cf/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java
b/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java
index 3de6740..bffdf5f 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java
@@ -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);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/077b18cf/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java
b/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java
index 7192a9d..f5f2127 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java
@@ -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;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/077b18cf/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java
b/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java
index 43b4d05..c0ec006 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java
@@ -136,11 +136,11 @@ public class Histogram<T> implements Serializable {
       
       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 {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/077b18cf/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java
b/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java
index fe06a78..aef6a64 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java
@@ -112,7 +112,7 @@ public class BatchScanSplitTest extends FunctionalTest {
       
       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);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/077b18cf/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/MaxOpenTest.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/MaxOpenTest.java
b/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/MaxOpenTest.java
index f0d8022..e9f0835 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/MaxOpenTest.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/MaxOpenTest.java
@@ -80,8 +80,8 @@ public class MaxOpenTest extends FunctionalTest {
     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);
     
   }
   

http://git-wip-us.apache.org/repos/asf/accumulo/blob/077b18cf/1.5/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java
b/1.5/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java
index 60e4aa3..b277864 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java
@@ -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();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/077b18cf/1.5/server/src/main/java/org/apache/accumulo/server/test/performance/scan/CollectTabletStats.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/test/performance/scan/CollectTabletStats.java
b/1.5/server/src/main/java/org/apache/accumulo/server/test/performance/scan/CollectTabletStats.java
index 844e581..e1ffedd 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/test/performance/scan/CollectTabletStats.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/test/performance/scan/CollectTabletStats.java
@@ -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());
     
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/077b18cf/1.5/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/BatchVerify.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/BatchVerify.java
b/1.5/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/BatchVerify.java
index b45f6f3..8a3efa8 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/BatchVerify.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/BatchVerify.java
@@ -52,74 +52,78 @@ public class BatchVerify extends Test {
     Connector conn = state.getConnector();
     BatchScanner scanner = conn.createBatchScanner(state.getString("seqTableName"), new Authorizations(),
2);
     
-    int count = 0;
-    List<Range> ranges = new ArrayList<Range>();
-    while (count < numVerify) {
-      int rangeStart = rand.nextInt(numWrites);
-      int rangeEnd = rangeStart + 99;
-      if (rangeEnd > (numWrites - 1)) {
-        rangeEnd = numWrites - 1;
-      }
-      count += (rangeEnd - rangeStart) + 1;
-      ranges.add(new Range(new Text(String.format("%010d", rangeStart)), new Text(String.format("%010d",
rangeEnd))));
-    }
-    
-    ranges = Range.mergeOverlapping(ranges);
-    Collections.sort(ranges);
-    
-    if (count == 0 || ranges.size() == 0)
-      return;
-    
-    log.debug(String.format("scanning %d rows in the following %d ranges:", count, ranges.size()));
-    for (Range r : ranges) {
-      log.debug(r);
-    }
-    
-    scanner.setRanges(ranges);
-    
-    List<Key> keys = new ArrayList<Key>();
-    for (Entry<Key,Value> entry : scanner) {
-      keys.add(entry.getKey());
-    }
-    
-    log.debug("scan returned " + keys.size() + " rows. now verifying...");
-    
-    Collections.sort(keys);
-    
-    Iterator<Key> iterator = keys.iterator();
-    int curKey = Integer.parseInt(iterator.next().getRow().toString());
-    boolean done = false;
-    for (Range r : ranges) {
-      int start = Integer.parseInt(r.getStartKey().getRow().toString());
-      int end = Integer.parseInt(String.copyValueOf(r.getEndKey().getRow().toString().toCharArray(),
0, 10));
-      for (int i = start; i <= end; i++) {
-        
-        if (done) {
-          log.error("missing key " + i);
-          break;
+    try {
+      int count = 0;
+      List<Range> ranges = new ArrayList<Range>();
+      while (count < numVerify) {
+        int rangeStart = rand.nextInt(numWrites);
+        int rangeEnd = rangeStart + 99;
+        if (rangeEnd > (numWrites - 1)) {
+          rangeEnd = numWrites - 1;
         }
-        
-        while (curKey < i) {
-          log.error("extra key " + curKey);
-          if (iterator.hasNext() == false) {
-            done = true;
+        count += (rangeEnd - rangeStart) + 1;
+        ranges.add(new Range(new Text(String.format("%010d", rangeStart)), new Text(String.format("%010d",
rangeEnd))));
+      }
+      
+      ranges = Range.mergeOverlapping(ranges);
+      Collections.sort(ranges);
+      
+      if (count == 0 || ranges.size() == 0)
+        return;
+      
+      log.debug(String.format("scanning %d rows in the following %d ranges:", count, ranges.size()));
+      for (Range r : ranges) {
+        log.debug(r);
+      }
+      
+      scanner.setRanges(ranges);
+      
+      List<Key> keys = new ArrayList<Key>();
+      for (Entry<Key,Value> entry : scanner) {
+        keys.add(entry.getKey());
+      }
+      
+      log.debug("scan returned " + keys.size() + " rows. now verifying...");
+      
+      Collections.sort(keys);
+      
+      Iterator<Key> iterator = keys.iterator();
+      int curKey = Integer.parseInt(iterator.next().getRow().toString());
+      boolean done = false;
+      for (Range r : ranges) {
+        int start = Integer.parseInt(r.getStartKey().getRow().toString());
+        int end = Integer.parseInt(String.copyValueOf(r.getEndKey().getRow().toString().toCharArray(),
0, 10));
+        for (int i = start; i <= end; i++) {
+          
+          if (done) {
+            log.error("missing key " + i);
             break;
           }
-          curKey = Integer.parseInt(iterator.next().getRow().toString());
-        }
-        
-        if (curKey > i) {
-          log.error("missing key " + i);
-        }
-        
-        if (iterator.hasNext()) {
-          curKey = Integer.parseInt(iterator.next().getRow().toString());
-        } else {
-          done = true;
+          
+          while (curKey < i) {
+            log.error("extra key " + curKey);
+            if (iterator.hasNext() == false) {
+              done = true;
+              break;
+            }
+            curKey = Integer.parseInt(iterator.next().getRow().toString());
+          }
+          
+          if (curKey > i) {
+            log.error("missing key " + i);
+          }
+          
+          if (iterator.hasNext()) {
+            curKey = Integer.parseInt(iterator.next().getRow().toString());
+          } else {
+            done = true;
+          }
         }
       }
+      
+      log.debug("verify is now complete");
+    } finally {
+      scanner.close();
     }
-    
-    log.debug("verify is now complete");
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/077b18cf/1.5/server/src/main/java/org/apache/accumulo/server/test/scalability/ScaleTest.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/test/scalability/ScaleTest.java
b/1.5/server/src/main/java/org/apache/accumulo/server/test/scalability/ScaleTest.java
index cbf381f..0f20bac 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/test/scalability/ScaleTest.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/test/scalability/ScaleTest.java
@@ -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();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/077b18cf/1.5/server/src/main/java/org/apache/accumulo/server/util/ListInstances.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/util/ListInstances.java b/1.5/server/src/main/java/org/apache/accumulo/server/util/ListInstances.java
index 4f7f8d3..19e4246 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/util/ListInstances.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/util/ListInstances.java
@@ -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) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/077b18cf/1.5/server/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
b/1.5/server/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
index e022421..88a5297 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
@@ -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