Modified: accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/NativeMapConcurrencyTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/NativeMapConcurrencyTest.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/NativeMapConcurrencyTest.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/NativeMapConcurrencyTest.java Tue Sep 11 18:00:17 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/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java Tue Sep 11 18:00:17 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/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/NullBatchWriter.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/NullBatchWriter.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/NullBatchWriter.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/NullBatchWriter.java Tue Sep 11 18:00:17 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/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java Tue Sep 11 18:00:17 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/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java Tue Sep 11 18:00:17 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/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java Tue Sep 11 18:00:17 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/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java Tue Sep 11 18:00:17 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/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousBatchWalker.java Tue Sep 11 18:00:17 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/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java Tue Sep 11 18:00:17 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/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java Tue Sep 11 18:00:17 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/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java Tue Sep 11 18:00:17 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/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java Tue Sep 11 18:00:17 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/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java Tue Sep 11 18:00:17 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/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java Tue Sep 11 18:00:17 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/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/MaxOpenTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/MaxOpenTest.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/MaxOpenTest.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/MaxOpenTest.java Tue Sep 11 18:00:17 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/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java Tue Sep 11 18:00:17 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/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/performance/scan/CollectTabletStats.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/performance/scan/CollectTabletStats.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/performance/scan/CollectTabletStats.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/performance/scan/CollectTabletStats.java Tue Sep 11 18:00:17 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/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/BatchVerify.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/BatchVerify.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/BatchVerify.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/BatchVerify.java Tue Sep 11 18:00:17 2012 @@ -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"); } } Modified: accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/scalability/ScaleTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/scalability/ScaleTest.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/scalability/ScaleTest.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/scalability/ScaleTest.java Tue Sep 11 18:00:17 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/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/util/ListInstances.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/util/ListInstances.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/util/ListInstances.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/util/ListInstances.java Tue Sep 11 18:00:17 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/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java?rev=1383499&r1=1383498&r2=1383499&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java (original) +++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java Tue Sep 11 18:00:17 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]); Propchange: accumulo/branches/ACCUMULO-722/1.5/src/ ------------------------------------------------------------------------------ Merged /accumulo/branches/ACCUMULO-672:r1359163 Merged /accumulo/trunk/src:r1382042-1383490 Merged /accumulo/branches/1.4/src:r1356924-1358205,1358207-1382577,1382613 Merged /accumulo/trunk:r1359620,1359721 Merged /accumulo/branches/1.4/src/src:r1382566,1382923
