incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1189806 [29/46] - in /incubator/accumulo: branches/1.3/contrib/ branches/1.3/src/core/src/main/java/org/apache/accumulo/core/client/ branches/1.3/src/core/src/main/java/org/apache/accumulo/core/client/admin/ branches/1.3/src/core/src/main/...
Date Thu, 27 Oct 2011 15:25:17 GMT
Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java Thu Oct 27 15:24:51 2011
@@ -141,7 +141,8 @@ public class TabletServerLogger {
       boolean test() {
         copy.clear();
         copy.addAll(loggers);
-        if (!loggers.isEmpty()) result[0] = logSetId.get();
+        if (!loggers.isEmpty())
+          result[0] = logSetId.get();
         return loggers.isEmpty();
       }
       
@@ -150,8 +151,10 @@ public class TabletServerLogger {
           createLoggers();
           copy.clear();
           copy.addAll(loggers);
-          if (copy.size() > 0) result[0] = logSetId.get();
-          else result[0] = -1;
+          if (copy.size() > 0)
+            result[0] = logSetId.get();
+          else
+            result[0] = -1;
         } catch (IOException e) {
           log.error("Unable to create loggers", e);
         }
@@ -193,7 +196,8 @@ public class TabletServerLogger {
           }
         }
         
-        if (loggers.size() == loggerAddresses.size()) break;
+        if (loggers.size() == loggerAddresses.size())
+          break;
         if (loggers.size() > 0) {
           // something is screwy, loggers.size() should be 0 or loggerAddresses.size()..
           throw new RuntimeException("Unexpected number of loggers " + loggers.size() + " " + loggerAddresses.size());
@@ -268,7 +272,8 @@ public class TabletServerLogger {
               try {
                 // Scribble out a tablet definition and then write to the metadata table
                 defineTablet(commitSession);
-                if (currentLogSet == logSetId.get()) tserver.addLoggersToMetadata(copy, commitSession.getExtent(), commitSession.getLogId());
+                if (currentLogSet == logSetId.get())
+                  tserver.addLoggersToMetadata(copy, commitSession.getExtent(), commitSession.getLogId());
               } finally {
                 commitSession.finishUpdatingLogsUsed();
               }
@@ -281,7 +286,8 @@ public class TabletServerLogger {
           
           // write the mutation to the logs
           seq = seqGen.incrementAndGet();
-          if (seq < 0) throw new RuntimeException("Logger sequence generator wrapped!  Onos!!!11!eleven");
+          if (seq < 0)
+            throw new RuntimeException("Logger sequence generator wrapped!  Onos!!!11!eleven");
           for (RemoteLogger wal : copy) {
             writer.write(wal, seq);
           }
@@ -334,7 +340,8 @@ public class TabletServerLogger {
   
   public int defineTablet(final CommitSession commitSession) throws IOException {
     // scribble this into the metadata tablet, too.
-    if (!enabled(commitSession)) return -1;
+    if (!enabled(commitSession))
+      return -1;
     return write(commitSession, false, new Writer() {
       @Override
       public void write(RemoteLogger logger, int ignored) throws Exception {
@@ -344,7 +351,8 @@ public class TabletServerLogger {
   }
   
   public int log(final CommitSession commitSession, final int tabletSeq, final Mutation m) throws IOException {
-    if (!enabled(commitSession)) return -1;
+    if (!enabled(commitSession))
+      return -1;
     int seq = write(commitSession, false, new Writer() {
       @Override
       public void write(RemoteLogger logger, int ignored) throws Exception {
@@ -359,9 +367,11 @@ public class TabletServerLogger {
     
     final Map<CommitSession,List<Mutation>> loggables = new HashMap<CommitSession,List<Mutation>>(mutations);
     for (CommitSession t : mutations.keySet()) {
-      if (!enabled(t)) loggables.remove(t);
+      if (!enabled(t))
+        loggables.remove(t);
     }
-    if (loggables.size() == 0) return -1;
+    if (loggables.size() == 0)
+      return -1;
     
     int seq = write(loggables.keySet(), false, new Writer() {
       @Override
@@ -378,7 +388,8 @@ public class TabletServerLogger {
       }
     });
     for (List<Mutation> entry : loggables.values()) {
-      if (entry.size() < 1) throw new IllegalArgumentException("logManyTablets: logging empty mutation list");
+      if (entry.size() < 1)
+        throw new IllegalArgumentException("logManyTablets: logging empty mutation list");
       for (Mutation m : entry) {
         logSizeEstimate.addAndGet(m.numBytes());
       }
@@ -388,7 +399,8 @@ public class TabletServerLogger {
   
   public void minorCompactionFinished(final CommitSession commitSession, final String fullyQualifiedFileName, final int walogSeq) throws IOException {
     
-    if (!enabled(commitSession)) return;
+    if (!enabled(commitSession))
+      return;
     
     long t1 = System.currentTimeMillis();
     
@@ -405,7 +417,8 @@ public class TabletServerLogger {
   }
   
   public int minorCompactionStarted(final CommitSession commitSession, final int seq, final String fullyQualifiedFileName) throws IOException {
-    if (!enabled(commitSession)) return -1;
+    if (!enabled(commitSession))
+      return -1;
     write(commitSession, false, new Writer() {
       @Override
       public void write(RemoteLogger logger, int ignored) throws Exception {
@@ -416,7 +429,8 @@ public class TabletServerLogger {
   }
   
   public void recover(Tablet tablet, List<String> logs, Set<String> tabletFiles, MutationReceiver mr) throws IOException {
-    if (!enabled(tablet)) return;
+    if (!enabled(tablet))
+      return;
     try {
       SortedLogRecovery recovery = new SortedLogRecovery();
       KeyExtent extent = tablet.getExtent();

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/BulkImportDirectory.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/BulkImportDirectory.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/BulkImportDirectory.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/BulkImportDirectory.java Thu Oct 27 15:24:51 2011
@@ -24,8 +24,8 @@ import org.apache.accumulo.core.client.i
 
 public class BulkImportDirectory {
   public static void main(String[] args) throws IOException, AccumuloException, AccumuloSecurityException {
-    if (args.length != 5) throw new RuntimeException("Usage: bin/accumulo " + BulkImportDirectory.class.getName()
-        + " <username> <password> <tablename> <sourcedir> <failuredir>");
+    if (args.length != 5)
+      throw new RuntimeException("Usage: bin/accumulo " + BulkImportDirectory.class.getName() + " <username> <password> <tablename> <sourcedir> <failuredir>");
     
     String user = args[0];
     byte[] pass = args[1].getBytes();

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/FastFormat.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/FastFormat.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/FastFormat.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/FastFormat.java Thu Oct 27 15:24:51 2011
@@ -20,13 +20,14 @@ public class FastFormat {
   // this 7 to 8 times faster than String.format("%s%06d",prefix, num)
   public static byte[] toZeroPaddedString(long num, int width, int radix, byte[] prefix) {
     byte ret[] = new byte[width + prefix.length];
-    if (toZeroPaddedString(ret, 0, num, width, radix, prefix) != ret.length) throw new RuntimeException(" Did not format to expected width " + num + " "
-        + width + " " + radix + " " + new String(prefix));
+    if (toZeroPaddedString(ret, 0, num, width, radix, prefix) != ret.length)
+      throw new RuntimeException(" Did not format to expected width " + num + " " + width + " " + radix + " " + new String(prefix));
     return ret;
   }
   
   public static int toZeroPaddedString(byte output[], int outputOffset, long num, int width, int radix, byte[] prefix) {
-    if (num < 0) throw new IllegalArgumentException();
+    if (num < 0)
+      throw new IllegalArgumentException();
     
     String s = Long.toString(num, radix);
     

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/GCLotsOfCandidatesTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/GCLotsOfCandidatesTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/GCLotsOfCandidatesTest.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/GCLotsOfCandidatesTest.java Thu Oct 27 15:24:51 2011
@@ -31,7 +31,8 @@ import org.apache.hadoop.io.Text;
 
 public class GCLotsOfCandidatesTest {
   public static void main(String args[]) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, MutationsRejectedException {
-    if (args.length != 4) throw new IllegalArgumentException("Expected arguments: <instance name> <zookeeper server> <username> <password>");
+    if (args.length != 4)
+      throw new IllegalArgumentException("Expected arguments: <instance name> <zookeeper server> <username> <password>");
     
     Connector conn = new ZooKeeperInstance(args[0], args[1]).getConnector(args[2], args[3].getBytes());
     generateCandidates(conn);

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/GetMasterStats.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/GetMasterStats.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/GetMasterStats.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/GetMasterStats.java Thu Oct 27 15:24:51 2011
@@ -45,7 +45,8 @@ public class GetMasterStats {
       client = MasterClient.getConnection(HdfsZooInstance.getInstance());
       stats = client.getMasterStats(null, SecurityConstants.systemCredentials);
     } finally {
-      if (client != null) MasterClient.close(client);
+      if (client != null)
+        MasterClient.close(client);
     }
     out(0, "State: " + stats.state.name());
     out(0, "Goal State: " + stats.goalState.name());
@@ -92,7 +93,8 @@ public class GetMasterStats {
         out(2, "Loggers %d", server.loggers.size());
         for (String logger : server.loggers)
           out(3, "Logger %s", logger);
-        if (server.holdTime > 0) out(2, "Hold Time %d", server.holdTime);
+        if (server.holdTime > 0)
+          out(2, "Hold Time %d", server.holdTime);
         if (server.tableMap != null && server.tableMap.size() > 0) {
           out(2, "Tables");
           for (Entry<String,TableInfo> status : server.tableMap.entrySet()) {

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/MMFITest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/MMFITest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/MMFITest.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/MMFITest.java Thu Oct 27 15:24:51 2011
@@ -58,7 +58,8 @@ public class MMFITest {
     } catch (IOException e) {
       for (MyMapFile.Reader r : mapfiles)
         try {
-          if (r != null) r.close();
+          if (r != null)
+            r.close();
         } catch (IOException e1) {
           // close the rest anyway
         }
@@ -105,7 +106,8 @@ public class MMFITest {
     } finally {
       for (MyMapFile.Reader r : mapfiles)
         try {
-          if (r != null) r.close();
+          if (r != null)
+            r.close();
         } catch (IOException e) {
           // close the rest anyway
         }

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java Thu Oct 27 15:24:51 2011
@@ -55,10 +55,14 @@ public class NativeMapPerformanceTest {
     SortedMap<Key,Value> tm = null;
     NativeMap nm = null;
     
-    if (mapType.equals("SKIP_LIST")) tm = new ConcurrentSkipListMap<Key,Value>();
-    else if (mapType.equals("TREE_MAP")) tm = Collections.synchronizedSortedMap(new TreeMap<Key,Value>());
-    else if (mapType.equals("NATIVE_MAP")) nm = new NativeMap();
-    else throw new IllegalArgumentException(" map type must be SKIP_LIST, TREE_MAP, or NATIVE_MAP");
+    if (mapType.equals("SKIP_LIST"))
+      tm = new ConcurrentSkipListMap<Key,Value>();
+    else if (mapType.equals("TREE_MAP"))
+      tm = Collections.synchronizedSortedMap(new TreeMap<Key,Value>());
+    else if (mapType.equals("NATIVE_MAP"))
+      nm = new NativeMap();
+    else
+      throw new IllegalArgumentException(" map type must be SKIP_LIST, TREE_MAP, or NATIVE_MAP");
     
     Random rand = new Random(19);
     
@@ -150,11 +154,13 @@ public class NativeMapPerformanceTest {
     // delete
     long tds = System.currentTimeMillis();
     
-    if (nm != null) nm.delete();
+    if (nm != null)
+      nm.delete();
     
     long tde = System.currentTimeMillis();
     
-    if (tm != null) tm.clear();
+    if (tm != null)
+      tm.clear();
     
     System.gc();
     System.gc();

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java Thu Oct 27 15:24:51 2011
@@ -68,7 +68,8 @@ public class QueryMetadataTable {
         mdScanner.setRange(new Range(row));
         
         for (Entry<Key,Value> entry : mdScanner) {
-          if (!entry.getKey().getRow().equals(row)) break;
+          if (!entry.getKey().getRow().equals(row))
+            break;
         }
         
       } catch (TableNotFoundException e) {
@@ -133,7 +134,8 @@ public class QueryMetadataTable {
         location = entry.getValue().toString();
       }
       
-      if (!entry.getKey().getRow().toString().startsWith(Constants.METADATA_TABLE_ID)) rowSet.add(entry.getKey().getRow());
+      if (!entry.getKey().getRow().toString().startsWith(Constants.METADATA_TABLE_ID))
+        rowSet.add(entry.getKey().getRow());
       count++;
       
     }

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java Thu Oct 27 15:24:51 2011
@@ -64,7 +64,8 @@ public class TestBinaryRows {
   
   static long decodeLong(byte ba[]) {
     // validate byte array
-    if (ba.length > Long.SIZE / Byte.SIZE) throw new IllegalArgumentException("Byte array of size " + ba.length + " is too big to hold a long");
+    if (ba.length > Long.SIZE / Byte.SIZE)
+      throw new IllegalArgumentException("Byte array of size " + ba.length + " is too big to hold a long");
     
     // build the long from the bytes
     long l = 0;

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java Thu Oct 27 15:24:51 2011
@@ -340,8 +340,10 @@ public class TestIngest {
             bytesWritten += key.getSize();
             
             if (ingestArgs.delete) {
-              if (ingestArgs.hasTimestamp) m.putDelete(colf, colq, le, ingestArgs.timestamp);
-              else m.putDelete(colf, colq, le);
+              if (ingestArgs.hasTimestamp)
+                m.putDelete(colf, colq, le, ingestArgs.timestamp);
+              else
+                m.putDelete(colf, colq, le);
             } else {
               byte value[];
               if (ingestArgs.random) {
@@ -361,7 +363,8 @@ public class TestIngest {
           }
           
         }
-        if (bw != null) bw.addMutation(m);
+        if (bw != null)
+          bw.addMutation(m);
         
       }
       

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/TestRandomDeletes.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/TestRandomDeletes.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/TestRandomDeletes.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/TestRandomDeletes.java Thu Oct 27 15:24:51 2011
@@ -61,7 +61,8 @@ public class TestRandomDeletes {
     
     public int compareTo(RowColumn other) {
       int result = row.compareTo(other.row);
-      if (result != 0) return result;
+      if (result != 0)
+        return result;
       return column.compareTo(other.column);
     }
     
@@ -144,7 +145,8 @@ public class TestRandomDeletes {
       while (true) {
         long half = scrambleDeleteHalfAndCheck(t, doomed);
         deleted += half;
-        if (half == 0) break;
+        if (half == 0)
+          break;
       }
       long stopTime = System.currentTimeMillis();
       

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/TestScanCache2.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/TestScanCache2.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/TestScanCache2.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/TestScanCache2.java Thu Oct 27 15:24:51 2011
@@ -86,7 +86,8 @@ public class TestScanCache2 {
           System.out.println("end of cache reached with key=" + startKey + " and j=" + j);
           break;
         }
-        if (j == 0) System.out.println("first key: " + sc.getTopKey() + "  value: " + sc.getTopValue());
+        if (j == 0)
+          System.out.println("first key: " + sc.getTopKey() + "  value: " + sc.getTopValue());
         try {
           sc.next();
         } catch (IOException e) {

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java Thu Oct 27 15:24:51 2011
@@ -211,10 +211,12 @@ public class ContinuousIngest {
     int index = ingestInstanceId.length;
     val[index++] = ':';
     int added = FastFormat.toZeroPaddedString(val, index, count, 16, 16, EMPTY_BYTES);
-    if (added != 16) throw new RuntimeException(" " + added);
+    if (added != 16)
+      throw new RuntimeException(" " + added);
     index += 16;
     val[index++] = ':';
-    if (prevRow != null) System.arraycopy(prevRow, 0, val, index, prevRow.length);
+    if (prevRow != null)
+      System.arraycopy(prevRow, 0, val, index, prevRow.length);
     
     return new Value(val);
   }

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousMoru.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousMoru.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousMoru.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousMoru.java Thu Oct 27 15:24:51 2011
@@ -68,7 +68,8 @@ public class ContinuousMoru extends Conf
       int max_cf = context.getConfiguration().getInt(MAX_CF, -1);
       int max_cq = context.getConfiguration().getInt(MAX_CQ, -1);
       
-      if (max_cf > Short.MAX_VALUE || max_cq > Short.MAX_VALUE) throw new IllegalArgumentException();
+      if (max_cf > Short.MAX_VALUE || max_cq > Short.MAX_VALUE)
+        throw new IllegalArgumentException();
       
       this.max_cf = (short) max_cf;
       this.max_cq = (short) max_cq;
@@ -168,6 +169,7 @@ public class ContinuousMoru extends Conf
    */
   public static void main(String[] args) throws Exception {
     int res = ToolRunner.run(CachedConfiguration.getInstance(), new ContinuousMoru(), args);
-    if (res != 0) System.exit(res);
+    if (res != 0)
+      System.exit(res);
   }
 }
\ No newline at end of file

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java Thu Oct 27 15:24:51 2011
@@ -69,7 +69,8 @@ public class ContinuousQuery {
       
       System.out.printf("SRQ %d %s %d %d\n", t1, new String(row), (t2 - t1), count);
       
-      if (sleepTime > 0) Thread.sleep(sleepTime);
+      if (sleepTime > 0)
+        Thread.sleep(sleepTime);
       
     }
     

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java Thu Oct 27 15:24:51 2011
@@ -118,7 +118,8 @@ public class ContinuousScanner {
       if (count < (1 - delta) * numToScan || count > (1 + delta) * numToScan) {
         if (count == 0) {
           distance = distance * 10;
-          if (distance < 0) distance = 1000000000000l;
+          if (distance < 0)
+            distance = 1000000000000l;
         } else {
           double ratio = (double) numToScan / count;
           // move ratio closer to 1 to make change slower
@@ -131,7 +132,8 @@ public class ContinuousScanner {
       
       System.out.printf("SCN %d %s %d %d\n", t1, new String(scanStart), (t2 - t1), count);
       
-      if (sleepTime > 0) UtilWaitThread.sleep(sleepTime);
+      if (sleepTime > 0)
+        UtilWaitThread.sleep(sleepTime);
     }
     
   }

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousStatsCollector.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousStatsCollector.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousStatsCollector.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousStatsCollector.java Thu Oct 27 15:24:51 2011
@@ -100,8 +100,10 @@ public class ContinuousStatsCollector {
         s.addStat(Long.parseLong(entry.getValue().toString()));
       }
       
-      if (count > 0) return String.format("%d %d %.3f %.3f", s.getMin(), s.getMax(), s.getAverage(), s.getStdDev());
-      else return "0 0 0 0";
+      if (count > 0)
+        return String.format("%d %d %.3f %.3f", s.getMin(), s.getMax(), s.getAverage(), s.getStdDev());
+      else
+        return "0 0 0 0";
       
     }
     
@@ -145,7 +147,8 @@ public class ContinuousStatsCollector {
             + ti.recsInMemory + " " + (long) ti.ingestRate + " " + (long) ti.queryRate + " " + ti.tablets + " " + ti.onlineTablets;
         
       } finally {
-        if (client != null) MasterClient.close(client);
+        if (client != null)
+          MasterClient.close(client);
       }
       
     }

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousVerify.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousVerify.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousVerify.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousVerify.java Thu Oct 27 15:24:51 2011
@@ -55,7 +55,8 @@ public class ContinuousVerify extends Co
     
     public void map(Key key, Value data, Context context) throws IOException, InterruptedException {
       long r = Long.parseLong(key.getRow().toString(), 16);
-      if (r < 0) throw new IllegalArgumentException();
+      if (r < 0)
+        throw new IllegalArgumentException();
       
       row.set(r);
       
@@ -167,6 +168,7 @@ public class ContinuousVerify extends Co
    */
   public static void main(String[] args) throws Exception {
     int res = ToolRunner.run(CachedConfiguration.getInstance(), new ContinuousVerify(), args);
-    if (res != 0) System.exit(res);
+    if (res != 0)
+      System.exit(res);
   }
 }
\ No newline at end of file

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java Thu Oct 27 15:24:51 2011
@@ -131,10 +131,12 @@ public class ContinuousWalk {
           row = null;
         }
         
-        if (sleepTime > 0) Thread.sleep(sleepTime);
+        if (sleepTime > 0)
+          Thread.sleep(sleepTime);
       }
       
-      if (sleepTime > 0) Thread.sleep(sleepTime);
+      if (sleepTime > 0)
+        Thread.sleep(sleepTime);
     }
   }
   
@@ -152,7 +154,8 @@ public class ContinuousWalk {
     for (Entry<Key,Value> entry : scanner) {
       pr = getPrevRow(entry.getValue());
       count++;
-      if (pr != null) break;
+      if (pr != null)
+        break;
     }
     
     long t2 = System.currentTimeMillis();
@@ -163,7 +166,8 @@ public class ContinuousWalk {
   }
   
   static int getPrevRowOffset(byte val[]) {
-    if (val.length == 0) throw new IllegalArgumentException();
+    if (val.length == 0)
+      throw new IllegalArgumentException();
     
     if (val[val.length - 1] != ':' && val[val.length - 17] == ':') {
       return val.length - 16;

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java Thu Oct 27 15:24:51 2011
@@ -77,7 +77,8 @@ public class Histogram<T> implements Ser
   
   public long getCount(T x) {
     HistData<T> hd = counts.get(x);
-    if (hd == null) return 0;
+    if (hd == null)
+      return 0;
     return hd.count;
   }
   
@@ -98,8 +99,10 @@ public class Histogram<T> implements Ser
     
     Collections.sort(sortedCounts, new Comparator<HistData<T>>() {
       public int compare(HistData<T> o1, HistData<T> o2) {
-        if (o1.count < o2.count) return -1;
-        if (o1.count > o2.count) return 1;
+        if (o1.count < o2.count)
+          return -1;
+        if (o1.count > o2.count)
+          return 1;
         return 0;
       }
     });

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/PrintScanTimeHistogram.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/PrintScanTimeHistogram.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/PrintScanTimeHistogram.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/PrintScanTimeHistogram.java Thu Oct 27 15:24:51 2011
@@ -74,10 +74,12 @@ public class PrintScanTimeHistogram {
     
     if (delta / 1000.0 < .1) {
       point = String.format("%07.2f", delta / 1000.0);
-      if (point.equals("0000.10")) point = "0000.1x";
+      if (point.equals("0000.10"))
+        point = "0000.1x";
     } else if (delta / 1000.0 < 1.0) {
       point = String.format("%06.1fx", delta / 1000.0);
-      if (point.equals("0001.0x")) point = "0001.xx";
+      if (point.equals("0001.0x"))
+        point = "0001.xx";
     } else {
       point = String.format("%04.0f.xx", delta / 1000.0);
     }

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java Thu Oct 27 15:24:51 2011
@@ -85,7 +85,8 @@ public class UndefinedAnalyzer {
       TreeMap<Long,Long> tm = null;
       
       while ((line = reader.readLine()) != null) {
-        if (!line.startsWith("UUID")) continue;
+        if (!line.startsWith("UUID"))
+          continue;
         String[] tokens = line.split("\\s");
         String time = tokens[1];
         String uuid = tokens[2];
@@ -110,7 +111,8 @@ public class UndefinedAnalyzer {
       while ((line = reader.readLine()) != null) {
         String[] tokens = line.split("\\s");
         
-        if (!tokens[0].equals("FLUSH")) continue;
+        if (!tokens[0].equals("FLUSH"))
+          continue;
         
         String time = tokens[1];
         String count = tokens[4];
@@ -123,7 +125,8 @@ public class UndefinedAnalyzer {
     Iterator<Long> getTimes(String uuid, long count) {
       TreeMap<Long,Long> tm = flushes.get(uuid);
       
-      if (tm == null) return null;
+      if (tm == null)
+        return null;
       
       return tm.tailMap(count).values().iterator();
     }
@@ -316,8 +319,10 @@ public class UndefinedAnalyzer {
             }
           }
           
-          if (ta == null) System.out.println(undefinedNode.undef + " " + undefinedNode.ref + " " + uuid + " " + t1 + " " + t2);
-          else System.out.println(undefinedNode.undef + " " + undefinedNode.ref + " " + ta.tablet + " " + ta.server + " " + uuid + " " + t1 + " " + t2);
+          if (ta == null)
+            System.out.println(undefinedNode.undef + " " + undefinedNode.ref + " " + uuid + " " + t1 + " " + t2);
+          else
+            System.out.println(undefinedNode.undef + " " + undefinedNode.ref + " " + ta.tablet + " " + ta.server + " " + uuid + " " + t1 + " " + t2);
           
         }
       } else {

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/BadIteratorMincTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/BadIteratorMincTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/BadIteratorMincTest.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/BadIteratorMincTest.java Thu Oct 27 15:24:51 2011
@@ -76,7 +76,8 @@ public class BadIteratorMincTest extends
       count++;
     }
     
-    if (count != 1) throw new Exception("Did not see expected # entries " + count);
+    if (count != 1)
+      throw new Exception("Did not see expected # entries " + count);
     
     // remove the bad iterator
     getConnector().tableOperations().removeProperty("foo", Property.TABLE_ITERATOR_PREFIX.getKey() + "minc.badi");
@@ -92,7 +93,8 @@ public class BadIteratorMincTest extends
       count++;
     }
     
-    if (count != 1) throw new Exception("Did not see expected # entries " + count);
+    if (count != 1)
+      throw new Exception("Did not see expected # entries " + count);
   }
   
 }

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java Thu Oct 27 15:24:51 2011
@@ -114,7 +114,8 @@ public class BatchScanSplitTest extends 
       
       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);
+      if (!found.equals(expected))
+        throw new Exception("Found and expected differ " + found + " " + expected);
     }
     
     splits = getConnector().tableOperations().getSplits("bss");

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/BatchWriterFlushTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/BatchWriterFlushTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/BatchWriterFlushTest.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/BatchWriterFlushTest.java Thu Oct 27 15:24:51 2011
@@ -128,11 +128,13 @@ public class BatchWriterFlushTest extend
         
         Iterator<Entry<Key,Value>> iter = scanner.iterator();
         
-        if (!iter.hasNext()) throw new Exception(" row " + rowToLookup + " not found after flush");
+        if (!iter.hasNext())
+          throw new Exception(" row " + rowToLookup + " not found after flush");
         
         Entry<Key,Value> entry = iter.next();
         
-        if (iter.hasNext()) throw new Exception("Scanner returned too much");
+        if (iter.hasNext())
+          throw new Exception("Scanner returned too much");
         
         verifyEntry(rowToLookup, entry);
       }
@@ -144,14 +146,16 @@ public class BatchWriterFlushTest extend
       for (int j = 0; j < NUM_TO_FLUSH; j++) {
         int row = i * NUM_TO_FLUSH + j;
         
-        if (!iter.hasNext()) throw new Exception("Scan stopped permaturely at " + row);
+        if (!iter.hasNext())
+          throw new Exception("Scan stopped permaturely at " + row);
         
         Entry<Key,Value> entry = iter.next();
         
         verifyEntry(row, entry);
       }
       
-      if (iter.hasNext()) throw new Exception("Scanner returned too much");
+      if (iter.hasNext())
+        throw new Exception("Scanner returned too much");
       
     }
     

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkFileTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkFileTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkFileTest.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkFileTest.java Thu Oct 27 15:24:51 2011
@@ -94,18 +94,22 @@ public class BulkFileTest extends Functi
     Iterator<Entry<Key,Value>> iter = scanner.iterator();
     
     for (int i = s; i <= e; i++) {
-      if (!iter.hasNext()) throw new Exception("row " + i + " not found");
+      if (!iter.hasNext())
+        throw new Exception("row " + i + " not found");
       
       Entry<Key,Value> entry = iter.next();
       
       String row = String.format("%04d", i);
       
-      if (!entry.getKey().getRow().equals(new Text(row))) throw new Exception("unexpected row " + entry.getKey() + " " + i);
+      if (!entry.getKey().getRow().equals(new Text(row)))
+        throw new Exception("unexpected row " + entry.getKey() + " " + i);
       
-      if (Integer.parseInt(entry.getValue().toString()) != i) throw new Exception("unexpected value " + entry + " " + i);
+      if (Integer.parseInt(entry.getValue().toString()) != i)
+        throw new Exception("unexpected value " + entry + " " + i);
     }
     
-    if (iter.hasNext()) throw new Exception("found more than expected " + iter.next());
+    if (iter.hasNext())
+      throw new Exception("found more than expected " + iter.next());
   }
   
   private void writeData(FileSKVWriter w, int s, int e) throws Exception {

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestClean.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestClean.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestClean.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestClean.java Thu Oct 27 15:24:51 2011
@@ -42,7 +42,8 @@ public class CacheTestClean {
       reportDir.mkdir();
     } else {
       File[] files = reportDir.listFiles();
-      if (files.length != 0) throw new Exception("dir " + reportDir + " is not empty");
+      if (files.length != 0)
+        throw new Exception("dir " + reportDir + " is not empty");
     }
     
   }

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestReader.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestReader.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestReader.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestReader.java Thu Oct 27 15:24:51 2011
@@ -40,7 +40,8 @@ public class CacheTestReader {
     ZooCache zc = ZooCache.getInstance(keepers, 30000);
     
     while (true) {
-      if (myfile.exists()) myfile.delete();
+      if (myfile.exists())
+        myfile.delete();
       
       if (zc.get(rootDir + "/die") != null) {
         return;
@@ -50,16 +51,19 @@ public class CacheTestReader {
       
       for (int i = 0; i < numData; i++) {
         byte[] v = zc.get(rootDir + "/data" + i);
-        if (v != null) readData.put(rootDir + "/data" + i, new String(v));
+        if (v != null)
+          readData.put(rootDir + "/data" + i, new String(v));
       }
       
       byte[] v = zc.get(rootDir + "/dataS");
-      if (v != null) readData.put(rootDir + "/dataS", new String(v));
+      if (v != null)
+        readData.put(rootDir + "/dataS", new String(v));
       
       List<String> children = zc.getChildren(rootDir + "/dir");
-      if (children != null) for (String child : children) {
-        readData.put(rootDir + "/dir/" + child, "");
-      }
+      if (children != null)
+        for (String child : children) {
+          readData.put(rootDir + "/dir/" + child, "");
+        }
       
       FileOutputStream fos = new FileOutputStream(myfile);
       ObjectOutputStream oos = new ObjectOutputStream(fos);

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestWriter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestWriter.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestWriter.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestWriter.java Thu Oct 27 15:24:51 2011
@@ -146,7 +146,8 @@ public class CacheTestWriter {
             }
           }
           
-          if (ok) break;
+          if (ok)
+            break;
         }
         
         UtilWaitThread.sleep(5);

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/ConcurrencyTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/ConcurrencyTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/ConcurrencyTest.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/ConcurrencyTest.java Thu Oct 27 15:24:51 2011
@@ -116,9 +116,11 @@ public class ConcurrencyTest extends Fun
     
     st1.join();
     st2.join();
-    if (st1.count != 50) throw new Exception("Thread 1 did not see 50, saw " + st1.count);
+    if (st1.count != 50)
+      throw new Exception("Thread 1 did not see 50, saw " + st1.count);
     
-    if (st2.count != 50) throw new Exception("Thread 2 did not see 50, saw " + st2.count);
+    if (st2.count != 50)
+      throw new Exception("Thread 2 did not see 50, saw " + st2.count);
     
     ScanTask st3 = new ScanTask(getConnector(), 150);
     st3.start();
@@ -127,10 +129,12 @@ public class ConcurrencyTest extends Fun
     getConnector().tableOperations().flush("cct");
     
     st3.join();
-    if (st3.count != 50) throw new Exception("Thread 3 did not see 50, saw " + st3.count);
+    if (st3.count != 50)
+      throw new Exception("Thread 3 did not see 50, saw " + st3.count);
     
     st0.join();
-    if (st0.count != 50) throw new Exception("Thread 0 did not see 50, saw " + st0.count);
+    if (st0.count != 50)
+      throw new Exception("Thread 0 did not see 50, saw " + st0.count);
     
     bw.close();
   }

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/CreateAndUseTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/CreateAndUseTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/CreateAndUseTest.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/CreateAndUseTest.java Thu Oct 27 15:24:51 2011
@@ -104,7 +104,8 @@ public class CreateAndUseTest extends Fu
     Scanner scanner2 = getConnector().createScanner("t2", Constants.NO_AUTHS);
     int count = 0;
     for (Entry<Key,Value> entry : scanner2) {
-      if (entry != null) count++;
+      if (entry != null)
+        count++;
     }
     
     if (count != 0) {
@@ -124,7 +125,8 @@ public class CreateAndUseTest extends Fu
     bs.setRanges(ranges);
     count = 0;
     for (Entry<Key,Value> entry : bs) {
-      if (entry != null) count++;
+      if (entry != null)
+        count++;
     }
     
     if (count != 0) {

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/DeleteEverythingTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/DeleteEverythingTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/DeleteEverythingTest.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/DeleteEverythingTest.java Thu Oct 27 15:24:51 2011
@@ -77,7 +77,8 @@ public class DeleteEverythingTest extend
       count++;
     }
     
-    if (count != 0) throw new Exception("count == " + count);
+    if (count != 0)
+      throw new Exception("count == " + count);
     
     getConnector().tableOperations().flush("de");
     UtilWaitThread.sleep(3000);
@@ -95,6 +96,7 @@ public class DeleteEverythingTest extend
       count++;
     }
     
-    if (count != 0) throw new Exception("count == " + count);
+    if (count != 0)
+      throw new Exception("count == " + count);
   }
 }

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/FunctionalTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/FunctionalTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/FunctionalTest.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/FunctionalTest.java Thu Oct 27 15:24:51 2011
@@ -80,8 +80,10 @@ public abstract class FunctionalTest {
     
     for (String line : perTableConfigs) {
       String[] splitLine = line.split("=");
-      if (splitLine.length == 1 && line.endsWith("=")) config.put(splitLine[0], "");
-      else config.put(splitLine[0], splitLine[1]);
+      if (splitLine.length == 1 && line.endsWith("="))
+        config.put(splitLine[0], "");
+      else
+        config.put(splitLine[0], splitLine[1]);
     }
     
     return config;
@@ -188,7 +190,8 @@ public abstract class FunctionalTest {
     
     for (TableSetup tableSetup : ttcl) {
       conn.tableOperations().create(tableSetup.tableName);
-      if (tableSetup.splitPoints != null) conn.tableOperations().addSplits(tableSetup.tableName, tableSetup.splitPoints);
+      if (tableSetup.splitPoints != null)
+        conn.tableOperations().addSplits(tableSetup.tableName, tableSetup.splitPoints);
       
       if (tableSetup.perTableConfigs != null) {
         for (Entry<String,String> entry : tableSetup.perTableConfigs.entrySet()) {
@@ -229,7 +232,8 @@ public abstract class FunctionalTest {
       Text row = entry.getKey().getRow();
       
       Integer count = tabletFileCounts.get(row);
-      if (count == null) count = 0;
+      if (count == null)
+        count = 0;
       if (entry.getKey().getColumnFamily().equals(Constants.METADATA_DATAFILE_COLUMN_FAMILY)) {
         count = count + 1;
       }

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/NativeMapTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/NativeMapTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/NativeMapTest.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/NativeMapTest.java Thu Oct 27 15:24:51 2011
@@ -56,15 +56,18 @@ public class NativeMapTest {
   }
   
   private void assertFalse(boolean b) {
-    if (b) throw new RuntimeException();
+    if (b)
+      throw new RuntimeException();
   }
   
   private void assertNotNull(Object o) {
-    if (o == null) throw new RuntimeException();
+    if (o == null)
+      throw new RuntimeException();
   }
   
   private void assertNull(Object o) {
-    if (o != null) throw new RuntimeException();
+    if (o != null)
+      throw new RuntimeException();
   }
   
   public static void main(String[] args) throws Exception {
@@ -525,14 +528,18 @@ public class NativeMapTest {
         Entry<Key,Value> e = iter1.next();
         Pair<Key,Value> p = iter2.next();
         
-        if (!e.getKey().equals(p.getFirst())) throw new RuntimeException("Keys not equal");
+        if (!e.getKey().equals(p.getFirst()))
+          throw new RuntimeException("Keys not equal");
         
-        if (!e.getValue().equals(p.getSecond())) throw new RuntimeException("Values not equal");
+        if (!e.getValue().equals(p.getSecond()))
+          throw new RuntimeException("Values not equal");
       }
       
-      if (iter1.hasNext()) throw new RuntimeException("Not all of native map consumed");
+      if (iter1.hasNext())
+        throw new RuntimeException("Not all of native map consumed");
       
-      if (iter2.hasNext()) throw new RuntimeException("Not all of test data consumed");
+      if (iter2.hasNext())
+        throw new RuntimeException("Not all of test data consumed");
       
       System.out.println("test 11 nm mem " + nm.getMemoryUsed());
       

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/PermissionsTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/PermissionsTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/PermissionsTest.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/PermissionsTest.java Thu Oct 27 15:24:51 2011
@@ -116,7 +116,8 @@ public class PermissionsTest {
             test_user_conn.tableOperations().create(tableName);
             throw new IllegalStateException("Should NOT be able to create a table");
           } catch (AccumuloSecurityException e) {
-            if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED || root_conn.tableOperations().list().contains(tableName)) throw e;
+            if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED || root_conn.tableOperations().list().contains(tableName))
+              throw e;
           }
           break;
         case DROP_TABLE:
@@ -126,7 +127,8 @@ public class PermissionsTest {
             test_user_conn.tableOperations().delete(tableName);
             throw new IllegalStateException("Should NOT be able to delete a table");
           } catch (AccumuloSecurityException e) {
-            if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED || !root_conn.tableOperations().list().contains(tableName)) throw e;
+            if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED || !root_conn.tableOperations().list().contains(tableName))
+              throw e;
           }
           break;
         case ALTER_TABLE:
@@ -139,7 +141,8 @@ public class PermissionsTest {
           } catch (AccumuloSecurityException e) {
             if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED
                 || AccumuloConfiguration.getTableConfiguration(HdfsZooInstance.getInstance().getInstanceID(), tableId).get(Property.TABLE_BLOOM_ERRORRATE)
-                    .equals("003.14159%")) throw e;
+                    .equals("003.14159%"))
+              throw e;
           }
           root_conn.tableOperations().setProperty(tableName, Property.TABLE_BLOOM_ERRORRATE.getKey(), "003.14159%");
           try {
@@ -148,7 +151,8 @@ public class PermissionsTest {
           } catch (AccumuloSecurityException e) {
             if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED
                 || !AccumuloConfiguration.getTableConfiguration(HdfsZooInstance.getInstance().getInstanceID(), tableId).get(Property.TABLE_BLOOM_ERRORRATE)
-                    .equals("003.14159%")) throw e;
+                    .equals("003.14159%"))
+              throw e;
           }
           String table2 = tableName + "2";
           try {
@@ -156,7 +160,8 @@ public class PermissionsTest {
             throw new IllegalStateException("Should NOT be able to rename a table");
           } catch (AccumuloSecurityException e) {
             if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED || !root_conn.tableOperations().list().contains(tableName)
-                || root_conn.tableOperations().list().contains(table2)) throw e;
+                || root_conn.tableOperations().list().contains(table2))
+              throw e;
           }
           break;
         case CREATE_USER:
@@ -165,7 +170,8 @@ public class PermissionsTest {
             test_user_conn.securityOperations().createUser(user, password.getBytes(), Constants.NO_AUTHS);
             throw new IllegalStateException("Should NOT be able to create a user");
           } catch (AccumuloSecurityException e) {
-            if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED || root_conn.securityOperations().authenticateUser(user, password.getBytes())) throw e;
+            if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED || root_conn.securityOperations().authenticateUser(user, password.getBytes()))
+              throw e;
           }
           break;
         case DROP_USER:
@@ -175,7 +181,8 @@ public class PermissionsTest {
             test_user_conn.securityOperations().dropUser(user);
             throw new IllegalStateException("Should NOT be able to delete a user");
           } catch (AccumuloSecurityException e) {
-            if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED || !root_conn.securityOperations().authenticateUser(user, password.getBytes())) throw e;
+            if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED || !root_conn.securityOperations().authenticateUser(user, password.getBytes()))
+              throw e;
           }
           break;
         case ALTER_USER:
@@ -185,7 +192,8 @@ public class PermissionsTest {
             test_user_conn.securityOperations().changeUserAuthorizations(user, new Authorizations("A", "B"));
             throw new IllegalStateException("Should NOT be able to alter a user");
           } catch (AccumuloSecurityException e) {
-            if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED || !root_conn.securityOperations().getUserAuthorizations(user).isEmpty()) throw e;
+            if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED || !root_conn.securityOperations().getUserAuthorizations(user).isEmpty())
+              throw e;
           }
           break;
         case SYSTEM:
@@ -206,13 +214,15 @@ public class PermissionsTest {
         case CREATE_TABLE:
           tableName = "__CREATE_TABLE_WITH_PERM_TEST__";
           test_user_conn.tableOperations().create(tableName);
-          if (!root_conn.tableOperations().list().contains(tableName)) throw new IllegalStateException("Should be able to create a table");
+          if (!root_conn.tableOperations().list().contains(tableName))
+            throw new IllegalStateException("Should be able to create a table");
           break;
         case DROP_TABLE:
           tableName = "__DROP_TABLE_WITH_PERM_TEST__";
           root_conn.tableOperations().create(tableName);
           test_user_conn.tableOperations().delete(tableName);
-          if (root_conn.tableOperations().list().contains(tableName)) throw new IllegalStateException("Should be able to delete a table");
+          if (root_conn.tableOperations().list().contains(tableName))
+            throw new IllegalStateException("Should be able to delete a table");
           break;
         case ALTER_TABLE:
           tableName = "__ALTER_TABLE_WITH_PERM_TEST__";
@@ -221,30 +231,35 @@ public class PermissionsTest {
           tableId = Tables.getNameToIdMap(root_conn.getInstance()).get(tableName);
           test_user_conn.tableOperations().setProperty(tableName, Property.TABLE_BLOOM_ERRORRATE.getKey(), "003.14159%");
           if (!AccumuloConfiguration.getTableConfiguration(HdfsZooInstance.getInstance().getInstanceID(), tableId).get(Property.TABLE_BLOOM_ERRORRATE)
-              .equals("003.14159%")) throw new IllegalStateException("Should be able to set a table property");
+              .equals("003.14159%"))
+            throw new IllegalStateException("Should be able to set a table property");
           test_user_conn.tableOperations().removeProperty(tableName, Property.TABLE_BLOOM_ERRORRATE.getKey());
           if (AccumuloConfiguration.getTableConfiguration(HdfsZooInstance.getInstance().getInstanceID(), tableId).get(Property.TABLE_BLOOM_ERRORRATE)
-              .equals("003.14159%")) throw new IllegalStateException("Should be able to remove a table property");
+              .equals("003.14159%"))
+            throw new IllegalStateException("Should be able to remove a table property");
           test_user_conn.tableOperations().rename(tableName, table2);
-          if (root_conn.tableOperations().list().contains(tableName) || !root_conn.tableOperations().list().contains(table2)) throw new IllegalStateException(
-              "Should be able to rename a table");
+          if (root_conn.tableOperations().list().contains(tableName) || !root_conn.tableOperations().list().contains(table2))
+            throw new IllegalStateException("Should be able to rename a table");
           break;
         case CREATE_USER:
           user = "__CREATE_USER_WITH_PERM_TEST__";
           test_user_conn.securityOperations().createUser(user, password.getBytes(), Constants.NO_AUTHS);
-          if (!root_conn.securityOperations().authenticateUser(user, password.getBytes())) throw new IllegalStateException("Should be able to create a user");
+          if (!root_conn.securityOperations().authenticateUser(user, password.getBytes()))
+            throw new IllegalStateException("Should be able to create a user");
           break;
         case DROP_USER:
           user = "__DROP_USER_WITH_PERM_TEST__";
           root_conn.securityOperations().createUser(user, password.getBytes(), Constants.NO_AUTHS);
           test_user_conn.securityOperations().dropUser(user);
-          if (root_conn.securityOperations().authenticateUser(user, password.getBytes())) throw new IllegalStateException("Should be able to delete a user");
+          if (root_conn.securityOperations().authenticateUser(user, password.getBytes()))
+            throw new IllegalStateException("Should be able to delete a user");
           break;
         case ALTER_USER:
           user = "__ALTER_USER_WITH_PERM_TEST__";
           root_conn.securityOperations().createUser(user, password.getBytes(), Constants.NO_AUTHS);
           test_user_conn.securityOperations().changeUserAuthorizations(user, new Authorizations("A", "B"));
-          if (root_conn.securityOperations().getUserAuthorizations(user).isEmpty()) throw new IllegalStateException("Should be able to alter a user");
+          if (root_conn.securityOperations().getUserAuthorizations(user).isEmpty())
+            throw new IllegalStateException("Should be able to alter a user");
           break;
         case SYSTEM:
           // test for system permission would go here
@@ -260,10 +275,12 @@ public class PermissionsTest {
       for (SystemPermission p : SystemPermission.values()) {
         if (permList.contains(p)) {
           // should have these
-          if (!root_conn.securityOperations().hasSystemPermission(user, p)) throw new IllegalStateException(user + " SHOULD have system permission " + p);
+          if (!root_conn.securityOperations().hasSystemPermission(user, p))
+            throw new IllegalStateException(user + " SHOULD have system permission " + p);
         } else {
           // should not have these
-          if (root_conn.securityOperations().hasSystemPermission(user, p)) throw new IllegalStateException(user + " SHOULD NOT have system permission " + p);
+          if (root_conn.securityOperations().hasSystemPermission(user, p))
+            throw new IllegalStateException(user + " SHOULD NOT have system permission " + p);
         }
       }
     }
@@ -271,7 +288,8 @@ public class PermissionsTest {
     private static void verifyHasNoSystemPermissions(Connector root_conn, String user, SystemPermission... perms) throws AccumuloException,
         AccumuloSecurityException {
       for (SystemPermission p : perms)
-        if (root_conn.securityOperations().hasSystemPermission(user, p)) throw new IllegalStateException(user + " SHOULD NOT have system permission " + p);
+        if (root_conn.securityOperations().hasSystemPermission(user, p))
+          throw new IllegalStateException(user + " SHOULD NOT have system permission " + p);
     }
   }
   
@@ -354,10 +372,12 @@ public class PermissionsTest {
             int i = 0;
             for (Entry<Key,Value> entry : scanner)
               i += 1 + entry.getKey().getRowData().length();
-            if (i != 0) throw new IllegalStateException("Should NOT be able to read from the table");
+            if (i != 0)
+              throw new IllegalStateException("Should NOT be able to read from the table");
           } catch (RuntimeException e) {
             AccumuloSecurityException se = (AccumuloSecurityException) e.getCause();
-            if (se.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED) throw se;
+            if (se.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED)
+              throw se;
           }
           break;
         case WRITE:
@@ -369,12 +389,13 @@ public class PermissionsTest {
             try {
               writer.close();
             } catch (MutationsRejectedException e1) {
-              if (e1.getAuthorizationFailures().size() > 0) throw new AccumuloSecurityException(test_user_conn.whoami(), SecurityErrorCode.PERMISSION_DENIED,
-                  e1);
+              if (e1.getAuthorizationFailures().size() > 0)
+                throw new AccumuloSecurityException(test_user_conn.whoami(), SecurityErrorCode.PERMISSION_DENIED, e1);
             }
             throw new IllegalStateException("Should NOT be able to write to a table");
           } catch (AccumuloSecurityException e) {
-            if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED) throw e;
+            if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED)
+              throw e;
           }
           break;
         case BULK_IMPORT:
@@ -387,7 +408,8 @@ public class PermissionsTest {
             test_user_conn.tableOperations().setLocalityGroups(TEST_TABLE, groups);
             throw new IllegalStateException("User should not be able to set locality groups");
           } catch (AccumuloSecurityException e) {
-            if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED) throw e;
+            if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED)
+              throw e;
           }
           break;
         case DROP_TABLE:
@@ -395,7 +417,8 @@ public class PermissionsTest {
             test_user_conn.tableOperations().delete(TEST_TABLE);
             throw new IllegalStateException("User should not be able delete the table");
           } catch (AccumuloSecurityException e) {
-            if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED) throw e;
+            if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED)
+              throw e;
           }
           break;
         case GRANT:
@@ -403,7 +426,8 @@ public class PermissionsTest {
             test_user_conn.securityOperations().grantTablePermission("root", TEST_TABLE, TablePermission.GRANT);
             throw new IllegalStateException("User should not be able grant permissions");
           } catch (AccumuloSecurityException e) {
-            if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED) throw e;
+            if (e.getErrorCode() != SecurityErrorCode.PERMISSION_DENIED)
+              throw e;
           }
           break;
         default:
@@ -457,12 +481,12 @@ public class PermissionsTest {
       for (TablePermission p : TablePermission.values()) {
         if (permList.contains(p)) {
           // should have these
-          if (!root_conn.securityOperations().hasTablePermission(user, table, p)) throw new IllegalStateException(user + " SHOULD have table permission " + p
-              + " for table " + table);
+          if (!root_conn.securityOperations().hasTablePermission(user, table, p))
+            throw new IllegalStateException(user + " SHOULD have table permission " + p + " for table " + table);
         } else {
           // should not have these
-          if (root_conn.securityOperations().hasTablePermission(user, table, p)) throw new IllegalStateException(user + " SHOULD NOT have table permission "
-              + p + " for table " + table);
+          if (root_conn.securityOperations().hasTablePermission(user, table, p))
+            throw new IllegalStateException(user + " SHOULD NOT have table permission " + p + " for table " + table);
         }
       }
     }
@@ -470,8 +494,8 @@ public class PermissionsTest {
     private static void verifyHasNoTablePermissions(Connector root_conn, String user, String table, TablePermission... perms) throws AccumuloException,
         AccumuloSecurityException {
       for (TablePermission p : perms)
-        if (root_conn.securityOperations().hasTablePermission(user, table, p)) throw new IllegalStateException(user + " SHOULD NOT have table permission " + p
-            + " for table " + table);
+        if (root_conn.securityOperations().hasTablePermission(user, table, p))
+          throw new IllegalStateException(user + " SHOULD NOT have table permission " + p + " for table " + table);
     }
   }
 }

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/RegExTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/RegExTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/RegExTest.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/RegExTest.java Thu Oct 27 15:24:51 2011
@@ -68,7 +68,8 @@ public class RegExTest extends Functiona
   }
   
   private void check(String regex, String val) throws Exception {
-    if (regex != null && !val.matches(regex)) throw new Exception(" " + val + " does not match " + regex);
+    if (regex != null && !val.matches(regex))
+      throw new Exception(" " + val + " does not match " + regex);
   }
   
   private void check(String regex, Text val) throws Exception {
@@ -124,10 +125,14 @@ public class RegExTest extends Functiona
   }
   
   private void setRegexs(ScannerBase scanner, String rowRegEx, String cfRegEx, String cqRegEx, String valRegEx) {
-    if (rowRegEx != null) scanner.setRowRegex(rowRegEx);
-    if (cfRegEx != null) scanner.setColumnFamilyRegex(cfRegEx);
-    if (cqRegEx != null) scanner.setColumnQualifierRegex(cqRegEx);
-    if (valRegEx != null) scanner.setValueRegex(valRegEx);
+    if (rowRegEx != null)
+      scanner.setRowRegex(rowRegEx);
+    if (cfRegEx != null)
+      scanner.setColumnFamilyRegex(cfRegEx);
+    if (cqRegEx != null)
+      scanner.setColumnQualifierRegex(cqRegEx);
+    if (valRegEx != null)
+      scanner.setValueRegex(valRegEx);
   }
   
   private void runTest(Iterable<Entry<Key,Value>> scanner, String rowRegEx, String cfRegEx, String cqRegEx, String valRegEx, int expected) throws Exception {

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/RowDeleteTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/RowDeleteTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/RowDeleteTest.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/RowDeleteTest.java Thu Oct 27 15:24:51 2011
@@ -73,7 +73,8 @@ public class RowDeleteTest extends Funct
     Entry<Key,Value> entry : scanner) {
       count++;
     }
-    if (count != 2) throw new Exception("1 count=" + count);
+    if (count != 2)
+      throw new Exception("1 count=" + count);
     
     bw.addMutation(nm("r1", "", "", RowDeletingIterator.DELETE_ROW_VALUE));
     
@@ -89,7 +90,8 @@ public class RowDeleteTest extends Funct
     Entry<Key,Value> entry : scanner) {
       count++;
     }
-    if (count != 3) throw new Exception("2 count=" + count);
+    if (count != 3)
+      throw new Exception("2 count=" + count);
     
     SimpleDateFormat dateParser = new SimpleDateFormat("yyyyMMddHHmmssz");
     String nowStr = dateParser.format(new Date());
@@ -105,7 +107,8 @@ public class RowDeleteTest extends Funct
     Entry<Key,Value> entry : scanner) {
       count++;
     }
-    if (count != 0) throw new Exception("3 count=" + count);
+    if (count != 0)
+      throw new Exception("3 count=" + count);
     
     bw.close();
     

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/RunTests.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/RunTests.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/RunTests.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/RunTests.java Thu Oct 27 15:24:51 2011
@@ -150,7 +150,8 @@ public class RunTests extends Configured
     RunTests tests = new RunTests();
     ToolRunner.run(new Configuration(), tests, args);
     tests.job.waitForCompletion(true);
-    if (!tests.job.isSuccessful()) System.exit(1);
+    if (!tests.job.isSuccessful())
+      System.exit(1);
   }
   
 }

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/ServerSideErrorTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/ServerSideErrorTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/ServerSideErrorTest.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/ServerSideErrorTest.java Thu Oct 27 15:24:51 2011
@@ -81,7 +81,8 @@ public class ServerSideErrorTest extends
       caught = true;
     }
     
-    if (!caught) throw new Exception("Scan did not fail");
+    if (!caught)
+      throw new Exception("Scan did not fail");
     
     // try to batch scan the table
     BatchScanner bs = getConnector().createBatchScanner("tt", Constants.NO_AUTHS, 2);
@@ -95,7 +96,8 @@ public class ServerSideErrorTest extends
     } catch (Exception e) {
       caught = true;
     }
-    if (!caught) throw new Exception("batch scan did not fail");
+    if (!caught)
+      throw new Exception("batch scan did not fail");
     
     List<AggregatorConfiguration> aggConfig = new ArrayList<AggregatorConfiguration>();
     aggConfig.add(new AggregatorConfiguration(new Text("acf"), BadAggregator.class.getName()));
@@ -127,6 +129,7 @@ public class ServerSideErrorTest extends
       caught = true;
     }
     
-    if (!caught) throw new Exception("Scan did not fail");
+    if (!caught)
+      throw new Exception("Scan did not fail");
   }
 }

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/SplitRecoveryTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/SplitRecoveryTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/SplitRecoveryTest.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/SplitRecoveryTest.java Thu Oct 27 15:24:51 2011
@@ -163,9 +163,10 @@ public class SplitRecoveryTest extends F
     m.put(Constants.METADATA_FUTURE_LOCATION_COLUMN_FAMILY, assignment.server.asColumnQualifier(), assignment.server.asMutationValue());
     writer.update(m);
     
-    if (steps >= 1) MetadataTable.addNewTablet(low, "/lowDir", instance, lowDatafileSizes, SecurityConstants.systemCredentials, TabletTime.LOGICAL_TIME_ID
-        + "0", zl);
-    if (steps >= 2) MetadataTable.finishSplit(high, highDatafileSizes, highDatafilesToRemove, SecurityConstants.systemCredentials, zl);
+    if (steps >= 1)
+      MetadataTable.addNewTablet(low, "/lowDir", instance, lowDatafileSizes, SecurityConstants.systemCredentials, TabletTime.LOGICAL_TIME_ID + "0", zl);
+    if (steps >= 2)
+      MetadataTable.finishSplit(high, highDatafileSizes, highDatafilesToRemove, SecurityConstants.systemCredentials, zl);
     
     SortedMap<KeyExtent,Text> vtiRet = TabletServer.verifyTabletInformation(extent, instance, null, "127.0.0.1:0", zl);
     

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/VisibilityTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/VisibilityTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/VisibilityTest.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/VisibilityTest.java Thu Oct 27 15:24:51 2011
@@ -248,7 +248,8 @@ public class VisibilityTest extends Func
     for (@SuppressWarnings("unused")
     Entry<Key,Value> entry : scanner)
       --expectedCount;
-    if (expectedCount != 0) throw new Exception(" expected count !=0 " + expectedCount);
+    if (expectedCount != 0)
+      throw new Exception(" expected count !=0 " + expectedCount);
   }
   
   private void verify(Set<String> auths, Set<String> expectedValues) throws Exception {

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MBinner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MBinner.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MBinner.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MBinner.java Thu Oct 27 15:24:51 2011
@@ -262,7 +262,8 @@ public class MBinner {
         List<TabletLocation> locs = slo.lookupTablet(null, null, null, null);
         
         for (TabletLocation loc : locs) {
-          if (loc.tablet_extent.getEndRow() != null) trie.add(loc.tablet_extent.getEndRow(), loc);
+          if (loc.tablet_extent.getEndRow() != null)
+            trie.add(loc.tablet_extent.getEndRow(), loc);
         }
         
       } catch (Exception e) {
@@ -285,7 +286,8 @@ public class MBinner {
         /*
          * if(!tl.tablet_extent.contains(row)){ throw new RuntimeException(tl.tablet_extent+" does not contain "+row); }
          */
-        if (tl != null) notNull++;
+        if (tl != null)
+          notNull++;
       }
       
       System.out.println("notNull " + notNull);
@@ -336,7 +338,8 @@ public class MBinner {
         List<TabletLocation> locs = slo.lookupTablet(null, null, null, null);
         
         for (TabletLocation loc : locs) {
-          if (loc.tablet_extent.getEndRow() != null) mc.put(loc.tablet_extent.getEndRow(), loc);
+          if (loc.tablet_extent.getEndRow() != null)
+            mc.put(loc.tablet_extent.getEndRow(), loc);
         }
         
       } catch (Exception e) {
@@ -402,18 +405,24 @@ public class MBinner {
     
     DataGenerator generator;
     
-    if (args[4].equals("binary")) generator = new BinaryGenerator();
-    else if (args[4].equals("hex")) generator = new HexGenerator();
-    else throw new IllegalArgumentException(args[4]);
+    if (args[4].equals("binary"))
+      generator = new BinaryGenerator();
+    else if (args[4].equals("hex"))
+      generator = new HexGenerator();
+    else
+      throw new IllegalArgumentException(args[4]);
     
     TabletLocator tli;
     
-    if (args[5].equals("trie")) tli = new TrieLocator(trieDepth, new SimpleLocationObtainer(numTablets, rowLen, generator));
-    else if (args[5].equals("tree")) tli = new TreeLocator(new SimpleLocationObtainer(numTablets, rowLen, generator));
+    if (args[5].equals("trie"))
+      tli = new TrieLocator(trieDepth, new SimpleLocationObtainer(numTablets, rowLen, generator));
+    else if (args[5].equals("tree"))
+      tli = new TreeLocator(new SimpleLocationObtainer(numTablets, rowLen, generator));
     else if (args[5].equals("system")) {
       TabletLocator parent = new SimpleParent();
       tli = new TabletLocatorImpl(new Text("0"), parent, new SimpleLocationObtainer(numTablets, rowLen, generator));
-    } else throw new IllegalArgumentException(args[5]);
+    } else
+      throw new IllegalArgumentException(args[5]);
     
     for (int i = 0; i < numThreads; i++) {
       new Thread(new BinTask(tli, rowLen, generator)).start();

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/performance/scan/CollectTabletStats.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/performance/scan/CollectTabletStats.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/performance/scan/CollectTabletStats.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/performance/scan/CollectTabletStats.java Thu Oct 27 15:24:51 2011
@@ -84,12 +84,18 @@ public class CollectTabletStats {
     int index = 0;
     String processedArgs[] = new String[8];
     for (int i = 0; i < args.length; i++) {
-      if (args[i].equals("-i")) iterations = Integer.parseInt(args[++i]);
-      else if (args[i].equals("-t")) numThreads = Integer.parseInt(args[++i]);
-      else if (args[i].equals("-l")) selectLocalTablets = true;
-      else if (args[i].equals("-f")) selectLocalTablets = false;
-      else if (args[i].equals("-c")) columnsTmp = args[++i].split(",");
-      else processedArgs[index++] = args[i];
+      if (args[i].equals("-i"))
+        iterations = Integer.parseInt(args[++i]);
+      else if (args[i].equals("-t"))
+        numThreads = Integer.parseInt(args[++i]);
+      else if (args[i].equals("-l"))
+        selectLocalTablets = true;
+      else if (args[i].equals("-f"))
+        selectLocalTablets = false;
+      else if (args[i].equals("-c"))
+        columnsTmp = args[++i].split(",");
+      else
+        processedArgs[index++] = args[i];
     }
     
     final String columns[] = columnsTmp;
@@ -433,8 +439,9 @@ public class CollectTabletStats {
     
     systemIter = new SystemScanIterator(delIter, authorizations, defaultLabels, columnSet);
     
-    if (useTableIterators) return IteratorUtil.loadIterators(IteratorScope.scan, systemIter, ke,
-        AccumuloConfiguration.getTableConfiguration(HdfsZooInstance.getInstance().getInstanceID(), ke.getTableId().toString()), ssiList, ssio, null);
+    if (useTableIterators)
+      return IteratorUtil.loadIterators(IteratorScope.scan, systemIter, ke,
+          AccumuloConfiguration.getTableConfiguration(HdfsZooInstance.getInstance().getInstanceID(), ke.getTableId().toString()), ssiList, ssio, null);
     return systemIter;
   }
   
@@ -515,7 +522,8 @@ public class CollectTabletStats {
     int count = 0;
     
     for (Entry<Key,Value> entry : scanner) {
-      if (entry != null) count++;
+      if (entry != null)
+        count++;
     }
     
     return count;

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/CopyTable.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/CopyTable.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/CopyTable.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/CopyTable.java Thu Oct 27 15:24:51 2011
@@ -33,7 +33,8 @@ public class CopyTable extends Test {
     
     @SuppressWarnings("unchecked")
     ArrayList<String> tables = (ArrayList<String>) state.get("tableList");
-    if (tables.isEmpty()) return;
+    if (tables.isEmpty())
+      return;
     
     Random rand = new Random();
     String srcTableName = tables.remove(rand.nextInt(tables.size()));



Mime
View raw message