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 [43/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/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java Thu Oct 27 15:24:51 2011
@@ -131,8 +131,9 @@ public class TabletServerResourceManager
     
     Runtime runtime = Runtime.getRuntime();
     if (!usingNativeMap && maxMemory + dCacheSize + iCacheSize > runtime.maxMemory()) {
-      throw new IllegalArgumentException(String.format("Maximum tablet server map memory %,d and block cache sizes %,d is too large for this JVM configuration %,d",
-          maxMemory, dCacheSize + iCacheSize, runtime.maxMemory()));
+      throw new IllegalArgumentException(String.format(
+          "Maximum tablet server map memory %,d and block cache sizes %,d is too large for this JVM configuration %,d", maxMemory, dCacheSize + iCacheSize,
+          runtime.maxMemory()));
     }
     runtime.gc();
     if (!usingNativeMap && maxMemory > runtime.freeMemory()) {
@@ -378,7 +379,8 @@ public class TabletServerResourceManager
       synchronized (commitHold) {
         while (holdCommits) {
           try {
-            if (System.currentTimeMillis() > timeout) throw new HoldTimeoutException("Commits are held");
+            if (System.currentTimeMillis() > timeout)
+              throw new HoldTimeoutException("Commits are held");
             commitHold.wait(1000);
           } catch (InterruptedException e) {}
         }
@@ -387,7 +389,8 @@ public class TabletServerResourceManager
   }
   
   public long holdTime() {
-    if (!holdCommits) return 0;
+    if (!holdCommits)
+      return 0;
     synchronized (commitHold) {
       return System.currentTimeMillis() - holdStartTime;
     }
@@ -401,7 +404,8 @@ public class TabletServerResourceManager
     for (Entry<String,ExecutorService> entry : threadPools.entrySet()) {
       while (true) {
         try {
-          if (entry.getValue().awaitTermination(60, TimeUnit.SECONDS)) break;
+          if (entry.getValue().awaitTermination(60, TimeUnit.SECONDS))
+            break;
           log.info("Waiting for thread pool " + entry.getKey() + " to shutdown");
         } catch (InterruptedException e) {
           log.warn(e);
@@ -464,7 +468,8 @@ public class TabletServerResourceManager
     }
     
     synchronized ScanFileManager newScanFileManager() {
-      if (closed) throw new IllegalStateException("closed");
+      if (closed)
+        throw new IllegalStateException("closed");
       return fileManager.newScanFileManager(tablet.getExtent());
     }
     
@@ -498,11 +503,13 @@ public class TabletServerResourceManager
       
       long currentTime = System.currentTimeMillis();
       if ((delta > 32000 || delta < 0 || (currentTime - lastReportedCommitTime > 1000)) && lastReportedSize.compareAndSet(lrs, totalSize)) {
-        if (delta > 0) lastReportedCommitTime = currentTime;
+        if (delta > 0)
+          lastReportedCommitTime = currentTime;
         report = true;
       }
       
-      if (report) memMgmt.updateMemoryUsageStats(tablet, size, lastReportedCommitTime, mincSize);
+      if (report)
+        memMgmt.updateMemoryUsageStats(tablet, size, lastReportedCommitTime, mincSize);
     }
     
     // END methods that Tablets call to manage memory
@@ -519,13 +526,17 @@ public class TabletServerResourceManager
         return files;
       }
       
-      if (tabletFiles.size() <= 1) return null;
+      if (tabletFiles.size() <= 1)
+        return null;
       TreeSet<MapFileInfo> candidateFiles = new TreeSet<MapFileInfo>(new Comparator<MapFileInfo>() {
         @Override
         public int compare(MapFileInfo o1, MapFileInfo o2) {
-          if (o1 == o2) return 0;
-          if (o1.size < o2.size) return -1;
-          if (o1.size > o2.size) return 1;
+          if (o1 == o2)
+            return 0;
+          if (o1.size < o2.size)
+            return -1;
+          if (o1.size > o2.size)
+            return 1;
           return o1.path.compareTo(o2.path);
         }
       });
@@ -551,7 +562,8 @@ public class TabletServerResourceManager
           files.clear();
           for (MapFileInfo mfi : candidateFiles) {
             files.put(mfi.path, mfi.size);
-            if (files.size() >= maxFilesToCompact) break;
+            if (files.size() >= maxFilesToCompact)
+              break;
           }
           
           break;
@@ -561,7 +573,8 @@ public class TabletServerResourceManager
       }
       
       int totalFilesToCompact = 0;
-      if (tabletFiles.size() > maxFilesPerTablet) totalFilesToCompact = tabletFiles.size() - maxFilesPerTablet + 1;
+      if (tabletFiles.size() > maxFilesPerTablet)
+        totalFilesToCompact = tabletFiles.size() - maxFilesPerTablet + 1;
       
       totalFilesToCompact = Math.min(totalFilesToCompact, maxFilesToCompact);
       
@@ -577,21 +590,25 @@ public class TabletServerResourceManager
         
         for (MapFileInfo mfi : candidateFiles) {
           files.put(mfi.path, mfi.size);
-          if (files.size() >= totalFilesToCompact) break;
+          if (files.size() >= totalFilesToCompact)
+            break;
         }
       }
       
-      if (files.size() == 0) return null;
+      if (files.size() == 0)
+        return null;
       
       return files;
     }
     
     boolean needsMajorCompaction(SortedMap<String,DataFileValue> tabletFiles, MajorCompactionReason reason) {
-      if (closed) return false;// throw new IOException("closed");
-      
+      if (closed)
+        return false;// throw new IOException("closed");
+        
       // int threshold;
       
-      if (reason == MajorCompactionReason.ALL) return true;
+      if (reason == MajorCompactionReason.ALL)
+        return true;
       
       if (reason == MajorCompactionReason.IDLE) {
         // threshold = 1;
@@ -627,8 +644,10 @@ public class TabletServerResourceManager
       // always obtain locks in same order to avoid deadlock
       synchronized (TabletServerResourceManager.this) {
         synchronized (this) {
-          if (closed) throw new IOException("closed");
-          if (openFilesReserved) throw new IOException("tired to close files while open files reserved");
+          if (closed)
+            throw new IOException("closed");
+          if (openFilesReserved)
+            throw new IOException("tired to close files while open files reserved");
           
           TabletServerResourceManager.this.removeTabletResource(this);
           

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletStatsKeeper.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletStatsKeeper.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletStatsKeeper.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletStatsKeeper.java Thu Oct 27 15:24:51 2011
@@ -59,7 +59,8 @@ public class TabletStatsKeeper {
         data.queueTime += t;
         data.sumDev += t * t;
         data.queueSumDev += q * q;
-        if (data.elapsed < 0 || data.sumDev < 0 || data.queueSumDev < 0 || data.queueTime < 0) resetTimes();
+        if (data.elapsed < 0 || data.sumDev < 0 || data.queueSumDev < 0 || data.queueTime < 0)
+          resetTimes();
       }
     } catch (Exception E) {
       resetTimes();
@@ -81,7 +82,8 @@ public class TabletStatsKeeper {
         data.elapsed += t;
         data.sumDev += t * t;
         
-        if (data.elapsed < 0 || data.sumDev < 0 || data.queueSumDev < 0 || data.queueTime < 0) resetTimes();
+        if (data.elapsed < 0 || data.sumDev < 0 || data.queueSumDev < 0 || data.queueTime < 0)
+          resetTimes();
       }
     } catch (Exception E) {
       resetTimes();

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletTime.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletTime.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletTime.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletTime.java Thu Oct 27 15:24:51 2011
@@ -124,7 +124,8 @@ public abstract class TabletTime {
     
     @Override
     void useMaxTimeFromWALog(long time) {
-      if (time > lastTime) lastTime = time;
+      if (time > lastTime)
+        lastTime = time;
     }
     
     @Override
@@ -133,7 +134,8 @@ public abstract class TabletTime {
       long currTime = RelativeTime.currentTimeMillis();
       
       synchronized (this) {
-        if (mutations.size() == 0) return lastTime;
+        if (mutations.size() == 0)
+          return lastTime;
         
         currTime = updateTime(currTime);
       }
@@ -207,7 +209,8 @@ public abstract class TabletTime {
     
     @Override
     long setUpdateTimes(List<Mutation> mutations) {
-      if (mutations.size() == 0) return getTime();
+      if (mutations.size() == 0)
+        return getTime();
       
       long time = nextTime.getAndAdd(mutations.size());
       for (Mutation mutation : mutations)

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/UniqueNameAllocator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/UniqueNameAllocator.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/UniqueNameAllocator.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/UniqueNameAllocator.java Thu Oct 27 15:24:51 2011
@@ -70,7 +70,8 @@ public class UniqueNameAllocator {
   private static UniqueNameAllocator instance = null;
   
   public static synchronized UniqueNameAllocator getInstance() {
-    if (instance == null) instance = new UniqueNameAllocator();
+    if (instance == null)
+      instance = new UniqueNameAllocator();
     
     return instance;
   }

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/MultiReader.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/MultiReader.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/MultiReader.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/MultiReader.java Thu Oct 27 15:24:51 2011
@@ -74,8 +74,10 @@ public class MultiReader {
         cache();
         o.cache();
         // no more data: always goes to the end
-        if (!cached) return 1;
-        if (!o.cached) return -1;
+        if (!cached)
+          return 1;
+        if (!o.cached)
+          return -1;
         return key.compareTo(o.key);
       } catch (IOException ex) {
         throw new RuntimeException(ex);
@@ -88,14 +90,16 @@ public class MultiReader {
   public MultiReader(FileSystem fs, Configuration conf, String directory) throws IOException {
     boolean foundFinish = false;
     for (FileStatus child : fs.listStatus(new Path(directory))) {
-      if (child.getPath().getName().startsWith("_")) continue;
+      if (child.getPath().getName().startsWith("_"))
+        continue;
       if (child.getPath().getName().equals("finished")) {
         foundFinish = true;
         continue;
       }
       heap.add(new Index(new Reader(fs, child.getPath().toString(), conf)));
     }
-    if (!foundFinish) throw new IOException("Sort \"finished\" flag not found in " + directory);
+    if (!foundFinish)
+      throw new IOException("Sort \"finished\" flag not found in " + directory);
   }
   
   private static void copy(Writable src, Writable dest) throws IOException {
@@ -154,7 +158,8 @@ public class MultiReader {
         problem = ex;
       }
     }
-    if (problem != null) throw problem;
+    if (problem != null)
+      throw problem;
     heap = null;
   }
   

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/RemoteLogger.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/RemoteLogger.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/RemoteLogger.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/RemoteLogger.java Thu Oct 27 15:24:51 2011
@@ -47,8 +47,10 @@ public class RemoteLogger {
   @Override
   public boolean equals(Object obj) {
     // filename is unique
-    if (obj == null) return false;
-    if (obj instanceof RemoteLogger) return getFileName().equals(((RemoteLogger) obj).getFileName());
+    if (obj == null)
+      return false;
+    if (obj instanceof RemoteLogger)
+      return getFileName().equals(((RemoteLogger) obj).getFileName());
     return false;
   }
   

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/RoundRobinLoggerStrategy.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/RoundRobinLoggerStrategy.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/RoundRobinLoggerStrategy.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/RoundRobinLoggerStrategy.java Thu Oct 27 15:24:51 2011
@@ -38,7 +38,8 @@ public class RoundRobinLoggerStrategy ex
   
   @Override
   public Set<String> getLoggers(Set<String> allLoggers) {
-    if (allLoggers.size() == 0) return allLoggers;
+    if (allLoggers.size() == 0)
+      return allLoggers;
     int numberOfLoggersToUse = getNumberOfLoggersToUse();
     Set<String> result = new HashSet<String>();
     
@@ -46,7 +47,8 @@ public class RoundRobinLoggerStrategy ex
     if (!preferences.isEmpty()) {
       for (int i = 0; result.size() < numberOfLoggersToUse && i < preferences.size(); i++) {
         String preferred = preferences.get(i);
-        if (allLoggers.contains(preferred)) result.add(preferred);
+        if (allLoggers.contains(preferred))
+          result.add(preferred);
       }
     }
     
@@ -54,7 +56,8 @@ public class RoundRobinLoggerStrategy ex
     List<String> loggers = new ArrayList<String>(allLoggers);
     Collections.sort(loggers);
     int pos = Collections.binarySearch(loggers, myHostName);
-    if (pos < 0) pos = -pos - 1;
+    if (pos < 0)
+      pos = -pos - 1;
     for (int i = 0; result.size() < numberOfLoggersToUse && i < loggers.size(); i++) {
       String selection = loggers.get((pos + i) % loggers.size());
       log.debug("Choosing logger " + selection);

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/SortedLogRecovery.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/SortedLogRecovery.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/SortedLogRecovery.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/SortedLogRecovery.java Thu Oct 27 15:24:51 2011
@@ -60,7 +60,8 @@ public class SortedLogRecovery {
     
     private void update(long newFinish) {
       this.seq = this.lastStart;
-      if (newFinish != -1) lastFinish = newFinish;
+      if (newFinish != -1)
+        lastFinish = newFinish;
     }
     
     private void update(int newStartFile, long newStart) {
@@ -96,8 +97,8 @@ public class SortedLogRecovery {
       
     }
     
-    if (lastStartToFinish.compactionStatus == Status.LOOKING_FOR_FINISH) throw new RuntimeException(
-        "COMPACTION_FINISH (without preceding COMPACTION_START) not followed by successful minor compaction");
+    if (lastStartToFinish.compactionStatus == Status.LOOKING_FOR_FINISH)
+      throw new RuntimeException("COMPACTION_FINISH (without preceding COMPACTION_START) not followed by successful minor compaction");
     
     for (int i = 0; i < recoveryLogs.size(); i++) {
       String logfile = recoveryLogs.get(i);
@@ -120,12 +121,14 @@ public class SortedLogRecovery {
     LogFileKey key = new LogFileKey();
     LogFileValue value = new LogFileValue();
     int tid = -1;
-    if (!reader.next(key, value)) throw new RuntimeException("Unable to read log entries");
-    if (key.event != OPEN) throw new RuntimeException("First log entry value is not OPEN");
+    if (!reader.next(key, value))
+      throw new RuntimeException("Unable to read log entries");
+    if (key.event != OPEN)
+      throw new RuntimeException("First log entry value is not OPEN");
     
     if (key.tserverSession.compareTo(lastStartToFinish.tserverSession) != 0) {
-      if (lastStartToFinish.compactionStatus == Status.LOOKING_FOR_FINISH) throw new RuntimeException(
-          "COMPACTION_FINISH (without preceding COMPACTION_START) is not followed by a successful minor compaction.");
+      if (lastStartToFinish.compactionStatus == Status.LOOKING_FOR_FINISH)
+        throw new RuntimeException("COMPACTION_FINISH (without preceding COMPACTION_START) is not followed by a successful minor compaction.");
       lastStartToFinish.update(key.tserverSession);
     }
     
@@ -135,7 +138,8 @@ public class SortedLogRecovery {
     // for the maximum tablet id, find the minimum sequence #... may be ok to find the max seq, but just want to make the code behave like it used to
     while (reader.next(key, value)) {
       // LogReader.printEntry(entry);
-      if (key.event != DEFINE_TABLET) break;
+      if (key.event != DEFINE_TABLET)
+        break;
       if (key.tablet.equals(extent)) {
         if (tid != key.tid) {
           tid = key.tid;
@@ -156,22 +160,30 @@ public class SortedLogRecovery {
     reader.seek(key);
     while (reader.next(key, value)) {
       // LogFileEntry.printEntry(entry);
-      if (key.tid != tid) break;
+      if (key.tid != tid)
+        break;
       if (key.event == COMPACTION_START) {
-        if (lastStartToFinish.compactionStatus == Status.INITIAL) lastStartToFinish.compactionStatus = Status.COMPLETE;
-        if (key.seq <= lastStartToFinish.lastStart) throw new RuntimeException("Sequence numbers are not increasing for start/stop events.");
+        if (lastStartToFinish.compactionStatus == Status.INITIAL)
+          lastStartToFinish.compactionStatus = Status.COMPLETE;
+        if (key.seq <= lastStartToFinish.lastStart)
+          throw new RuntimeException("Sequence numbers are not increasing for start/stop events.");
         lastStartToFinish.update(fileno, key.seq);
         
         // Tablet server finished the minor compaction, but didn't remove the entry from the METADATA table.
-        if (tabletFiles.contains(key.filename)) lastStartToFinish.update(-1);
+        if (tabletFiles.contains(key.filename))
+          lastStartToFinish.update(-1);
       } else if (key.event == COMPACTION_FINISH) {
-        if (key.seq <= lastStartToFinish.lastStart) throw new RuntimeException("Sequence numbers are not increasing for start/stop events.");
-        if (lastStartToFinish.compactionStatus == Status.INITIAL) lastStartToFinish.compactionStatus = Status.LOOKING_FOR_FINISH;
-        else if (lastStartToFinish.lastFinish > lastStartToFinish.lastStart) throw new RuntimeException(
-            "COMPACTION_FINISH does not have preceding COMPACTION_START event.");
-        else lastStartToFinish.compactionStatus = Status.COMPLETE;
+        if (key.seq <= lastStartToFinish.lastStart)
+          throw new RuntimeException("Sequence numbers are not increasing for start/stop events.");
+        if (lastStartToFinish.compactionStatus == Status.INITIAL)
+          lastStartToFinish.compactionStatus = Status.LOOKING_FOR_FINISH;
+        else if (lastStartToFinish.lastFinish > lastStartToFinish.lastStart)
+          throw new RuntimeException("COMPACTION_FINISH does not have preceding COMPACTION_START event.");
+        else
+          lastStartToFinish.compactionStatus = Status.COMPLETE;
         lastStartToFinish.update(key.seq);
-      } else break;
+      } else
+        break;
     }
     return tid;
   }
@@ -189,8 +201,10 @@ public class SortedLogRecovery {
     key.seq = lastStartToFinish.seq;
     reader.seek(key);
     while (true) {
-      if (!reader.next(key, value)) break;
-      if (key.tid != tid) break;
+      if (!reader.next(key, value))
+        break;
+      if (key.tid != tid)
+        break;
       // log.info("Replaying " + key);
       // log.info(value);
       if (key.event == MUTATION) {

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java (original)
+++ incubator/accumulo/trunk/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);
         }
@@ -197,7 +200,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());
@@ -274,7 +278,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();
               }
@@ -287,7 +292,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);
           }
@@ -340,7 +346,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 {
@@ -350,7 +357,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 {
@@ -365,9 +373,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
@@ -384,7 +394,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());
       }
@@ -394,7 +405,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();
     
@@ -411,7 +423,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 {
@@ -422,7 +435,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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/BulkImportDirectory.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/BulkImportDirectory.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/BulkImportDirectory.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/BulkImportDirectory.java Thu Oct 27 15:24:51 2011
@@ -28,8 +28,8 @@ import org.apache.hadoop.fs.Path;
 
 public class BulkImportDirectory {
   public static void main(String[] args) throws IOException, AccumuloException, AccumuloSecurityException, TableNotFoundException {
-    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>");
     
     final String user = args[0];
     final byte[] pass = args[1].getBytes();

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/FastFormat.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/FastFormat.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/FastFormat.java (original)
+++ incubator/accumulo/trunk/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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/GCLotsOfCandidatesTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/GCLotsOfCandidatesTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/GCLotsOfCandidatesTest.java (original)
+++ incubator/accumulo/trunk/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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/GetMasterStats.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/GetMasterStats.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/GetMasterStats.java (original)
+++ incubator/accumulo/trunk/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.getSystemCredentials());
     } 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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/MMFITest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/MMFITest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/MMFITest.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/MMFITest.java Thu Oct 27 15:24:51 2011
@@ -57,7 +57,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
         }
@@ -104,7 +105,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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java (original)
+++ incubator/accumulo/trunk/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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java Thu Oct 27 15:24:51 2011
@@ -69,7 +69,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) {
@@ -134,7 +135,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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java (original)
+++ incubator/accumulo/trunk/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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java Thu Oct 27 15:24:51 2011
@@ -369,8 +369,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) {
@@ -390,7 +392,8 @@ public class TestIngest {
           }
           
         }
-        if (bw != null) bw.addMutation(m);
+        if (bw != null)
+          bw.addMutation(m);
         
       }
       

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestRandomDeletes.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestRandomDeletes.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestRandomDeletes.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestRandomDeletes.java Thu Oct 27 15:24:51 2011
@@ -62,7 +62,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);
     }
     
@@ -145,7 +146,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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java Thu Oct 27 15:24:51 2011
@@ -223,13 +223,15 @@ public class ContinuousIngest {
   
   private static Value createValue(byte[] ingestInstanceId, long count, byte[] prevRow, Checksum cksum) {
     int dataLen = ingestInstanceId.length + 16 + (prevRow == null ? 0 : prevRow.length) + 3;
-    if (cksum != null) dataLen += 8;
+    if (cksum != null)
+      dataLen += 8;
     byte val[] = new byte[dataLen];
     System.arraycopy(ingestInstanceId, 0, val, 0, ingestInstanceId.length);
     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) {

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousMoru.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousMoru.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousMoru.java (original)
+++ incubator/accumulo/trunk/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;
@@ -171,6 +172,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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousQuery.java (original)
+++ incubator/accumulo/trunk/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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousScanner.java Thu Oct 27 15:24:51 2011
@@ -119,7 +119,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
@@ -132,7 +133,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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousStatsCollector.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousStatsCollector.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousStatsCollector.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousStatsCollector.java Thu Oct 27 15:24:51 2011
@@ -102,8 +102,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";
       
     }
     
@@ -147,7 +149,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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousVerify.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousVerify.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousVerify.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousVerify.java Thu Oct 27 15:24:51 2011
@@ -58,7 +58,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();
       
       try {
         ContinuousWalk.validate(key, data);
@@ -183,6 +184,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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java Thu Oct 27 15:24:51 2011
@@ -144,10 +144,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);
     }
   }
   
@@ -166,7 +168,8 @@ public class ContinuousWalk {
       validate(entry.getKey(), entry.getValue());
       pr = getPrevRow(entry.getValue());
       count++;
-      if (pr != null) break;
+      if (pr != null)
+        break;
     }
     
     long t2 = System.currentTimeMillis();
@@ -177,12 +180,15 @@ public class ContinuousWalk {
   }
   
   static int getPrevRowOffset(byte val[]) {
-    if (val.length == 0) throw new IllegalArgumentException();
-    if (val[53] != ':') throw new IllegalArgumentException(new String(val));
+    if (val.length == 0)
+      throw new IllegalArgumentException();
+    if (val[53] != ':')
+      throw new IllegalArgumentException(new String(val));
     
     // prev row starts at 54
     if (val[54] != ':') {
-      if (val[54 + 16] != ':') throw new IllegalArgumentException(new String(val));
+      if (val[54 + 16] != ':')
+        throw new IllegalArgumentException(new String(val));
       return 54;
     }
     
@@ -202,7 +208,8 @@ public class ContinuousWalk {
   
   static int getChecksumOffset(byte val[]) {
     if (val[val.length - 1] != ':') {
-      if (val[val.length - 9] != ':') throw new IllegalArgumentException(new String(val));
+      if (val[val.length - 9] != ':')
+        throw new IllegalArgumentException(new String(val));
       return val.length - 8;
     }
     
@@ -211,7 +218,8 @@ public class ContinuousWalk {
   
   static void validate(Key key, Value value) throws BadChecksumException {
     int ckOff = getChecksumOffset(value.get());
-    if (ckOff < 0) return;
+    if (ckOff < 0)
+      return;
     
     long storedCksum = Long.parseLong(new String(value.get(), ckOff, 8), 16);
     

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/Histogram.java (original)
+++ incubator/accumulo/trunk/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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/PrintScanTimeHistogram.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/PrintScanTimeHistogram.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/PrintScanTimeHistogram.java (original)
+++ incubator/accumulo/trunk/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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/TimeBinner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/TimeBinner.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/TimeBinner.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/TimeBinner.java Thu Oct 27 15:24:51 2011
@@ -89,10 +89,12 @@ public class TimeBinner {
           }
           case AMM: {
             DoubleWrapper mindw = get(time, aggregation3, Double.POSITIVE_INFINITY);
-            if (data < mindw.d) mindw.d = data_min;
+            if (data < mindw.d)
+              mindw.d = data_min;
             
             DoubleWrapper maxdw = get(time, aggregation4, Double.NEGATIVE_INFINITY);
-            if (data > maxdw.d) maxdw.d = data_max;
+            if (data > maxdw.d)
+              maxdw.d = data_max;
             
             // fall through to AVG
           }

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java (original)
+++ incubator/accumulo/trunk/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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BadIteratorMincTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BadIteratorMincTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BadIteratorMincTest.java (original)
+++ incubator/accumulo/trunk/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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BatchScanSplitTest.java (original)
+++ incubator/accumulo/trunk/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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BatchWriterFlushTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BatchWriterFlushTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BatchWriterFlushTest.java (original)
+++ incubator/accumulo/trunk/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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkFileTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkFileTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkFileTest.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkFileTest.java Thu Oct 27 15:24:51 2011
@@ -93,18 +93,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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestClean.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestClean.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestClean.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestClean.java Thu Oct 27 15:24:51 2011
@@ -41,7 +41,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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestReader.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestReader.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestReader.java (original)
+++ incubator/accumulo/trunk/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 = new ZooCache(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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestWriter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestWriter.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestWriter.java (original)
+++ incubator/accumulo/trunk/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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/ConcurrencyTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/ConcurrencyTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/ConcurrencyTest.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/ConcurrencyTest.java Thu Oct 27 15:24:51 2011
@@ -117,9 +117,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();
@@ -128,10 +130,12 @@ public class ConcurrencyTest extends Fun
     getConnector().tableOperations().flush("cct", null, null, false);
     
     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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/CreateAndUseTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/CreateAndUseTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/CreateAndUseTest.java (original)
+++ incubator/accumulo/trunk/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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/DeleteEverythingTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/DeleteEverythingTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/DeleteEverythingTest.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/DeleteEverythingTest.java Thu Oct 27 15:24:51 2011
@@ -76,7 +76,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", null, null, true);
     
@@ -93,6 +94,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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/DeleteRowsTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/DeleteRowsTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/DeleteRowsTest.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/DeleteRowsTest.java Thu Oct 27 15:24:51 2011
@@ -138,16 +138,19 @@ public class DeleteRowsTest extends Func
   }
   
   private void assertEquals(int expected, int value) {
-    if (expected != value) throw new RuntimeException("Test failed, expected " + expected + " != " + value);
+    if (expected != value)
+      throw new RuntimeException("Test failed, expected " + expected + " != " + value);
     
   }
   
   private void assertTrue(boolean b) {
-    if (!b) throw new RuntimeException("test failed, false value");
+    if (!b)
+      throw new RuntimeException("test failed, false value");
   }
   
   private void assertEquals(String expected, String value) {
-    if (!expected.equals(value)) throw new RuntimeException("expected " + expected + " != " + value);
+    if (!expected.equals(value))
+      throw new RuntimeException("expected " + expected + " != " + value);
   }
   
 }

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/FunctionalTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/FunctionalTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/FunctionalTest.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/FunctionalTest.java Thu Oct 27 15:24:51 2011
@@ -81,8 +81,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;
@@ -234,7 +236,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/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/NativeMapTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/NativeMapTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/NativeMapTest.java (original)
+++ incubator/accumulo/trunk/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());
       



Mime
View raw message