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 [37/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/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java Thu Oct 27 15:24:51 2011
@@ -60,7 +60,8 @@ public class SetIterCommand extends Comm
     
     if (cl.hasOption(tableOpt.getOpt())) {
       tableName = cl.getOptionValue(tableOpt.getOpt());
-      if (!shellState.getConnector().tableOperations().exists(tableName)) throw new TableNotFoundException(null, tableName, null);
+      if (!shellState.getConnector().tableOperations().exists(tableName))
+        throw new TableNotFoundException(null, tableName, null);
     }
     
     else {
@@ -74,19 +75,25 @@ public class SetIterCommand extends Comm
     String classname = cl.getOptionValue(classnameTypeOpt.getOpt());
     if (cl.hasOption(aggTypeOpt.getOpt())) {
       classname = AggregatingIterator.class.getName();
-    } else if (cl.hasOption(regexTypeOpt.getOpt())) classname = RegExIterator.class.getName();
-    else if (cl.hasOption(ageoffTypeOpt.getOpt())) classname = AgeOffFilter.class.getName();
-    else if (cl.hasOption(versionTypeOpt.getOpt())) classname = VersioningIterator.class.getName();
-    else if (cl.hasOption(nolabelTypeOpt.getOpt())) classname = NoLabelIterator.class.getName();
-    
-    if (!shellState.getConnector().instanceOperations().testClassLoad(classname, SortedKeyValueIterator.class.getName())) throw new ShellCommandException(
-        ErrorCode.INITIALIZATION_FAILURE, "Servers are unable to load " + classname + " as type " + SortedKeyValueIterator.class.getName());
+    } else if (cl.hasOption(regexTypeOpt.getOpt()))
+      classname = RegExIterator.class.getName();
+    else if (cl.hasOption(ageoffTypeOpt.getOpt()))
+      classname = AgeOffFilter.class.getName();
+    else if (cl.hasOption(versionTypeOpt.getOpt()))
+      classname = VersioningIterator.class.getName();
+    else if (cl.hasOption(nolabelTypeOpt.getOpt()))
+      classname = NoLabelIterator.class.getName();
+    
+    if (!shellState.getConnector().instanceOperations().testClassLoad(classname, SortedKeyValueIterator.class.getName()))
+      throw new ShellCommandException(ErrorCode.INITIALIZATION_FAILURE, "Servers are unable to load " + classname + " as type "
+          + SortedKeyValueIterator.class.getName());
     
     String name = cl.getOptionValue(nameOpt.getOpt(), setUpOptions(shellState.getReader(), classname, options));
     
     String aggregatorClass = options.get("aggregatorClass");
-    if (aggregatorClass != null && !shellState.getConnector().instanceOperations().testClassLoad(aggregatorClass, Aggregator.class.getName())) throw new ShellCommandException(
-        ErrorCode.INITIALIZATION_FAILURE, "Servers are unable to load " + aggregatorClass + " as type " + Aggregator.class.getName());
+    if (aggregatorClass != null && !shellState.getConnector().instanceOperations().testClassLoad(aggregatorClass, Aggregator.class.getName()))
+      throw new ShellCommandException(ErrorCode.INITIALIZATION_FAILURE, "Servers are unable to load " + aggregatorClass + " as type "
+          + Aggregator.class.getName());
     
     setTableProperties(cl, shellState, tableName, priority, options, classname, name);
     
@@ -99,12 +106,17 @@ public class SetIterCommand extends Comm
     // remove empty values
     for (Iterator<Entry<String,String>> i = options.entrySet().iterator(); i.hasNext();) {
       Entry<String,String> entry = i.next();
-      if (entry.getValue() == null || entry.getValue().isEmpty()) i.remove();
+      if (entry.getValue() == null || entry.getValue().isEmpty())
+        i.remove();
     }
-    if (cl.hasOption(mincScopeOpt.getOpt())) setting.addOptions(IteratorScope.minc, options);
-    if (cl.hasOption(majcScopeOpt.getOpt())) setting.addOptions(IteratorScope.majc, options);
-    if (cl.hasOption(scanScopeOpt.getOpt())) setting.addOptions(IteratorScope.scan, options);
-    if (setting.getProperties().isEmpty()) throw new IllegalArgumentException("You must select at least one scope to configure");
+    if (cl.hasOption(mincScopeOpt.getOpt()))
+      setting.addOptions(IteratorScope.minc, options);
+    if (cl.hasOption(majcScopeOpt.getOpt()))
+      setting.addOptions(IteratorScope.majc, options);
+    if (cl.hasOption(scanScopeOpt.getOpt()))
+      setting.addOptions(IteratorScope.scan, options);
+    if (setting.getProperties().isEmpty())
+      throw new IllegalArgumentException("You must select at least one scope to configure");
     shellState.getConnector().tableOperations().attachIterator(tableName, setting);
   }
   
@@ -124,7 +136,8 @@ public class SetIterCommand extends Comm
     }
     
     IteratorOptions itopts = skvi.describeOptions();
-    if (itopts.getName() == null) throw new IllegalArgumentException(className + " described its default distinguishing name as null");
+    if (itopts.getName() == null)
+      throw new IllegalArgumentException(className + " described its default distinguishing name as null");
     
     Map<String,String> localOptions = new HashMap<String,String>();
     do {
@@ -166,7 +179,8 @@ public class SetIterCommand extends Comm
               throw new IOException("Input stream closed");
             }
             
-            if (input.length() == 0) break;
+            if (input.length() == 0)
+              break;
             
             String[] sa = input.split(" ", 2);
             localOptions.put(sa[0], sa[1]);
@@ -175,7 +189,8 @@ public class SetIterCommand extends Comm
       }
       
       options.putAll(localOptions);
-      if (!skvi.validateOptions(options)) reader.printString("invalid options for " + clazz.getName() + "\n");
+      if (!skvi.validateOptions(options))
+        reader.printString("invalid options for " + clazz.getName() + "\n");
       
     } while (!skvi.validateOptions(options));
     return itopts.getName();

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetScanIterCommand.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetScanIterCommand.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetScanIterCommand.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetScanIterCommand.java Thu Oct 27 15:24:51 2011
@@ -47,8 +47,9 @@ public class SetScanIterCommand extends 
       throws AccumuloException, AccumuloSecurityException, ShellCommandException {
     // instead of setting table properties, just put the options
     // in a map to use at scan time
-    if (!shellState.getConnector().instanceOperations().testClassLoad(classname, SortedKeyValueIterator.class.getName())) throw new ShellCommandException(
-        ErrorCode.INITIALIZATION_FAILURE, "Servers are unable to load " + classname + " as type " + SortedKeyValueIterator.class.getName());
+    if (!shellState.getConnector().instanceOperations().testClassLoad(classname, SortedKeyValueIterator.class.getName()))
+      throw new ShellCommandException(ErrorCode.INITIALIZATION_FAILURE, "Servers are unable to load " + classname + " as type "
+          + SortedKeyValueIterator.class.getName());
     options.put("iteratorClassName", classname);
     options.put("iteratorPriority", Integer.toString(priority));
     Map<String,Map<String,String>> tableIterators = shellState.scanIteratorOptions.get(tableName);
@@ -76,7 +77,8 @@ public class SetScanIterCommand extends 
       if (!IteratorScope.majc.name().equals(o.getOpt()) && !IteratorScope.minc.name().equals(o.getOpt()) && !IteratorScope.scan.name().equals(o.getOpt())) {
         modifiedOptions.addOption(o);
         OptionGroup group = parentOptions.getOptionGroup(o);
-        if (group != null) groups.add(group);
+        if (group != null)
+          groups.add(group);
       }
     }
     for (OptionGroup group : groups) {

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TableCommand.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TableCommand.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TableCommand.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TableCommand.java Thu Oct 27 15:24:51 2011
@@ -31,7 +31,8 @@ public class TableCommand extends Comman
   @Override
   public int execute(String fullCommand, CommandLine cl, Shell shellState) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
     String tableName = cl.getArgs()[0];
-    if (!shellState.getConnector().tableOperations().exists(tableName)) throw new TableNotFoundException(null, tableName, null);
+    if (!shellState.getConnector().tableOperations().exists(tableName))
+      throw new TableNotFoundException(null, tableName, null);
     
     shellState.setTableName(tableName);
     return 0;

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TraceCommand.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TraceCommand.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TraceCommand.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TraceCommand.java Thu Oct 27 15:24:51 2011
@@ -75,7 +75,8 @@ public class TraceCommand extends DebugC
         } else {
           shellState.getReader().printString("Not tracing\n");
         }
-      } else throw new BadArgumentException("Argument must be 'on' or 'off'", fullCommand, fullCommand.indexOf(cl.getArgs()[0]));
+      } else
+        throw new BadArgumentException("Argument must be 'on' or 'off'", fullCommand, fullCommand.indexOf(cl.getArgs()[0]));
     } else if (cl.getArgs().length == 0) {
       shellState.getReader().printString(Trace.isTracing() ? "on\n" : "off\n");
     } else {

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java Thu Oct 27 15:24:51 2011
@@ -60,7 +60,8 @@ public class ZooCache {
     @Override
     public void process(WatchedEvent event) {
       
-      if (log.isTraceEnabled()) log.trace(event);
+      if (log.isTraceEnabled())
+        log.trace(event);
       
       switch (event.getType()) {
         case NodeDataChanged:
@@ -72,13 +73,15 @@ public class ZooCache {
         case None:
           switch (event.getState()) {
             case Disconnected:
-              if (log.isTraceEnabled()) log.trace("Zoo keeper connection disconnected, clearing cache");
+              if (log.isTraceEnabled())
+                log.trace("Zoo keeper connection disconnected, clearing cache");
               clear();
               break;
             case SyncConnected:
               break;
             case Expired:
-              if (log.isTraceEnabled()) log.trace("Zoo keeper connection expired, clearing cache");
+              if (log.isTraceEnabled())
+                log.trace("Zoo keeper connection expired, clearing cache");
               clear();
               break;
             default:
@@ -144,7 +147,8 @@ public class ZooCache {
       } catch (InterruptedException e) {
         e.printStackTrace();
       }
-      if (sleepTime < 10000) sleepTime = (int) (sleepTime + sleepTime * Math.random());
+      if (sleepTime < 10000)
+        sleepTime = (int) (sleepTime + sleepTime * Math.random());
       
     }
   }
@@ -156,7 +160,8 @@ public class ZooCache {
       @Override
       public void run(ZooKeeper zooKeeper) throws KeeperException, InterruptedException {
         
-        if (childrenCache.containsKey(zPath)) return;
+        if (childrenCache.containsKey(zPath))
+          return;
         
         try {
           List<String> children = zooKeeper.getChildren(zPath, watcher);
@@ -189,7 +194,8 @@ public class ZooCache {
       @Override
       public void run(ZooKeeper zooKeeper) throws KeeperException, InterruptedException {
         
-        if (cache.containsKey(zPath)) return;
+        if (cache.containsKey(zPath))
+          return;
         
         /*
          * The following call to exists() is important, since we are caching that a node does not exist. Once the node comes into existance, it will be added to
@@ -204,7 +210,8 @@ public class ZooCache {
         byte[] data = null;
         
         if (stat == null) {
-          if (log.isTraceEnabled()) log.trace("zookeeper did not contain " + zPath);
+          if (log.isTraceEnabled())
+            log.trace("zookeeper did not contain " + zPath);
         } else {
           try {
             data = zooKeeper.getData(zPath, watcher, stat);
@@ -213,9 +220,11 @@ public class ZooCache {
           } catch (KeeperException.NoNodeException e2) {
             throw new ConcurrentModificationException();
           }
-          if (log.isTraceEnabled()) log.trace("zookeeper contained " + zPath + " " + (data == null ? null : new String(data)));
+          if (log.isTraceEnabled())
+            log.trace("zookeeper contained " + zPath + " " + (data == null ? null : new String(data)));
         }
-        if (log.isTraceEnabled()) log.trace("putting " + zPath + " " + (data == null ? null : new String(data)) + " in cache");
+        if (log.isTraceEnabled())
+          log.trace("putting " + zPath + " " + (data == null ? null : new String(data)) + " in cache");
         put(zPath, data, stat);
       }
       
@@ -252,7 +261,8 @@ public class ZooCache {
   }
   
   private synchronized void remove(String zPath) {
-    if (log.isTraceEnabled()) log.trace("removing " + zPath + " from cache");
+    if (log.isTraceEnabled())
+      log.trace("removing " + zPath + " from cache");
     cache.remove(zPath);
     childrenCache.remove(zPath);
     statCache.remove(zPath);
@@ -268,17 +278,20 @@ public class ZooCache {
     
     for (Iterator<String> i = cache.keySet().iterator(); i.hasNext();) {
       String path = i.next();
-      if (path.startsWith(zPath)) i.remove();
+      if (path.startsWith(zPath))
+        i.remove();
     }
     
     for (Iterator<String> i = childrenCache.keySet().iterator(); i.hasNext();) {
       String path = i.next();
-      if (path.startsWith(zPath)) i.remove();
+      if (path.startsWith(zPath))
+        i.remove();
     }
     
     for (Iterator<String> i = statCache.keySet().iterator(); i.hasNext();) {
       String path = i.next();
-      if (path.startsWith(zPath)) i.remove();
+      if (path.startsWith(zPath))
+        i.remove();
     }
   }
   

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java Thu Oct 27 15:24:51 2011
@@ -83,9 +83,11 @@ class ZooSession {
         // it may take some time to get connected to zookeeper if some of the servers are down
         for (int i = 0; i < TOTAL_CONNECT_TIME_WAIT_MS / TIME_BETWEEN_CONNECT_CHECKS_MS && tryAgain; i++) {
           if (zooKeeper.getState().equals(States.CONNECTED)) {
-            if (auth != null) zooKeeper.addAuthInfo("digest", auth.getBytes());
+            if (auth != null)
+              zooKeeper.addAuthInfo("digest", auth.getBytes());
             tryAgain = false;
-          } else UtilWaitThread.sleep(TIME_BETWEEN_CONNECT_CHECKS_MS);
+          } else
+            UtilWaitThread.sleep(TIME_BETWEEN_CONNECT_CHECKS_MS);
         }
       } catch (UnknownHostException uhe) {
         // do not expect to recover from this
@@ -94,17 +96,19 @@ class ZooSession {
       } catch (IOException e) {
         log.warn("Connection to zooKeeper failed, will try again in " + String.format("%.2f secs", sleepTime / 1000.0), e);
       } finally {
-        if (tryAgain && zooKeeper != null) try {
-          zooKeeper.close();
-          zooKeeper = null;
-        } catch (InterruptedException e) {
-          log.warn("interrupted", e);
-        }
+        if (tryAgain && zooKeeper != null)
+          try {
+            zooKeeper.close();
+            zooKeeper = null;
+          } catch (InterruptedException e) {
+            log.warn("interrupted", e);
+          }
       }
       
       if (tryAgain) {
         UtilWaitThread.sleep(sleepTime);
-        if (sleepTime < 10000) sleepTime = (int) (sleepTime + sleepTime * Math.random());
+        if (sleepTime < 10000)
+          sleepTime = (int) (sleepTime + sleepTime * Math.random());
       }
     }
     
@@ -124,7 +128,8 @@ class ZooSession {
     
     ZooSessionInfo zsi = sessions.get(sessionKey);
     if (zsi != null && zsi.zooKeeper.getState() == States.CLOSED) {
-      if (auth != null && sessions.get(readOnlySessionKey) == zsi) sessions.remove(readOnlySessionKey);
+      if (auth != null && sessions.get(readOnlySessionKey) == zsi)
+        sessions.remove(readOnlySessionKey);
       zsi = null;
       sessions.remove(sessionKey);
     }
@@ -134,7 +139,8 @@ class ZooSession {
       log.debug("Connecting to " + zooKeepers + " with timeout " + timeout + " with auth");
       zsi = new ZooSessionInfo(connect(zooKeepers, timeout, auth, watcher), watcher);
       sessions.put(sessionKey, zsi);
-      if (auth != null && !sessions.containsKey(readOnlySessionKey)) sessions.put(readOnlySessionKey, zsi);
+      if (auth != null && !sessions.containsKey(readOnlySessionKey))
+        sessions.put(readOnlySessionKey, zsi);
     }
     return zsi.zooKeeper;
   }

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java Thu Oct 27 15:24:51 2011
@@ -55,8 +55,10 @@ public class ZooUtil {
         throw new IllegalArgumentException("Malformed serialized lock id " + serializedLID);
       }
       
-      if (lastSlash == 0) path = root;
-      else path = root + "/" + sa[0].substring(0, lastSlash);
+      if (lastSlash == 0)
+        path = root;
+      else
+        path = root + "/" + sa[0].substring(0, lastSlash);
       node = sa[0].substring(lastSlash + 1);
       eid = Long.parseLong(sa[1], 16);
     }
@@ -95,15 +97,18 @@ public class ZooUtil {
    *          the path to delete
    */
   public static void recursiveDelete(ZooKeeper zk, String zPath, int version, NodeMissingPolicy policy) throws KeeperException, InterruptedException {
-    if (policy.equals(NodeMissingPolicy.CREATE)) throw new IllegalArgumentException(policy.name() + " is invalid for this operation");
+    if (policy.equals(NodeMissingPolicy.CREATE))
+      throw new IllegalArgumentException(policy.name() + " is invalid for this operation");
     try {
       for (String child : zk.getChildren(zPath, false))
         recursiveDelete(zk, zPath + "/" + child, NodeMissingPolicy.SKIP);
       
       Stat stat;
-      if ((stat = zk.exists(zPath, null)) != null) zk.delete(zPath, stat.getVersion());
+      if ((stat = zk.exists(zPath, null)) != null)
+        zk.delete(zPath, stat.getVersion());
     } catch (KeeperException e) {
-      if (policy.equals(NodeMissingPolicy.SKIP) && e.code().equals(KeeperException.Code.NONODE)) return;
+      if (policy.equals(NodeMissingPolicy.SKIP) && e.code().equals(KeeperException.Code.NONODE))
+        return;
       throw e;
     }
   }
@@ -133,7 +138,8 @@ public class ZooUtil {
   
   private static boolean putData(ZooKeeper zk, String zPath, byte[] data, CreateMode mode, int version, NodeExistsPolicy policy, List<ACL> acls)
       throws KeeperException, InterruptedException {
-    if (policy == null) policy = NodeExistsPolicy.FAIL;
+    if (policy == null)
+      policy = NodeExistsPolicy.FAIL;
     
     while (true) {
       try {
@@ -173,7 +179,8 @@ public class ZooUtil {
   public static void recursiveCopyPersistent(ZooKeeper zk, String source, String destination, NodeExistsPolicy policy) throws KeeperException,
       InterruptedException {
     Stat stat = null;
-    if (!exists(zk, source)) throw KeeperException.create(Code.NONODE, source);
+    if (!exists(zk, source))
+      throw KeeperException.create(Code.NONODE, source);
     if (exists(zk, destination)) {
       switch (policy) {
         case OVERWRITE:
@@ -189,10 +196,12 @@ public class ZooUtil {
     stat = new Stat();
     byte[] data = zk.getData(source, false, stat);
     if (stat.getEphemeralOwner() == 0) {
-      if (data == null) throw KeeperException.create(Code.NONODE, source);
+      if (data == null)
+        throw KeeperException.create(Code.NONODE, source);
       putPersistentData(zk, destination, data, policy);
-      if (stat.getNumChildren() > 0) for (String child : zk.getChildren(source, false))
-        recursiveCopyPersistent(zk, source + "/" + child, destination + "/" + child, policy);
+      if (stat.getNumChildren() > 0)
+        for (String child : zk.getChildren(source, false))
+          recursiveCopyPersistent(zk, source + "/" + child, destination + "/" + child, policy);
     }
   }
   
@@ -243,7 +252,8 @@ public class ZooUtil {
     Collections.sort(children);
     
     String lockNode = children.get(0);
-    if (!lid.node.equals(lockNode)) return false;
+    if (!lid.node.equals(lockNode))
+      return false;
     
     Stat stat = zk.exists(lid.path + "/" + lid.node, false);
     return stat != null && stat.getEphemeralOwner() == lid.eid;

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java Thu Oct 27 15:24:51 2011
@@ -120,20 +120,23 @@ public class TableOperationsHelperTest {
     
     @Override
     public void setProperty(String tableName, String property, String value) throws AccumuloException, AccumuloSecurityException {
-      if (!settings.containsKey(tableName)) settings.put(tableName, new TreeMap<String,String>());
+      if (!settings.containsKey(tableName))
+        settings.put(tableName, new TreeMap<String,String>());
       settings.get(tableName).put(property, value);
     }
     
     @Override
     public void removeProperty(String tableName, String property) throws AccumuloException, AccumuloSecurityException {
-      if (!settings.containsKey(tableName)) return;
+      if (!settings.containsKey(tableName))
+        return;
       settings.get(tableName).remove(property);
     }
     
     @Override
     public Iterable<Entry<String,String>> getProperties(String tableName) throws AccumuloException, TableNotFoundException {
       Map<String,String> empty = Collections.emptyMap();
-      if (!settings.containsKey(tableName)) return empty.entrySet();
+      if (!settings.containsKey(tableName))
+        return empty.entrySet();
       return settings.get(tableName).entrySet();
     }
     

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java Thu Oct 27 15:24:51 2011
@@ -120,8 +120,10 @@ public class TabletLocatorImplTest exten
     TreeMap<Text,TabletLocation> mc = new TreeMap<Text,TabletLocation>(TabletLocatorImpl.endRowComparator);
     
     for (Entry<KeyExtent,TabletLocation> entry : mcke.entrySet()) {
-      if (entry.getKey().getEndRow() == null) mc.put(TabletLocatorImpl.MAX_TEXT, entry.getValue());
-      else mc.put(entry.getKey().getEndRow(), entry.getValue());
+      if (entry.getKey().getEndRow() == null)
+        mc.put(TabletLocatorImpl.MAX_TEXT, entry.getValue());
+      else
+        mc.put(entry.getKey().getEndRow(), entry.getValue());
     }
     
     return mc;
@@ -526,8 +528,10 @@ public class TabletLocatorImplTest exten
         List<Range> ranges = entry.getValue();
         for (Range range : ranges) {
           SortedMap<Key,Value> tm;
-          if (range.getStartKey() == null) tm = tabletData;
-          else tm = tabletData.tailMap(range.getStartKey());
+          if (range.getStartKey() == null)
+            tm = tabletData;
+          else
+            tm = tabletData.tailMap(range.getStartKey());
           
           for (Entry<Key,Value> de : tm.entrySet()) {
             if (range.afterEndKey(de.getKey())) {
@@ -541,7 +545,8 @@ public class TabletLocatorImplTest exten
         }
       }
       
-      if (failures.size() > 0) parent.invalidateCache(failures);
+      if (failures.size() > 0)
+        parent.invalidateCache(failures);
       
       SortedMap<KeyExtent,Text> metadata = MetadataTable.getMetadataLocationEntries(results);
       
@@ -590,7 +595,8 @@ public class TabletLocatorImplTest exten
     TabletLocation tl = cache.locateTablet(new Text(row), skipRow, false);
     
     if (expected == null) {
-      if (tl != null) System.out.println("tl = " + tl);
+      if (tl != null)
+        System.out.println("tl = " + tl);
       assertNull(tl);
     } else {
       assertNotNull(tl);
@@ -1086,7 +1092,8 @@ public class TabletLocatorImplTest exten
       
       List<Mutation> ml = nml(nm("a", "cf1:cq1=v1", "cf1:cq2=v2"), nm("m", "cf1:cq1=v3", "cf1:cq2=v4"), nm("z", "cf1:cq1=v5"));
       Map<String,Map<KeyExtent,List<String>>> emb = cemb(nol("a", "l1", ke1), nol("m", "l1", ke1), nol("z", "l1", ke1));
-      if (i == 0 || i == 2) runTest(metaCache, ml, emb);
+      if (i == 0 || i == 2)
+        runTest(metaCache, ml, emb);
       
       List<Range> ranges = nrl(new Range(new Text("a")), new Range(new Text("m")), new Range(new Text("z")));
       
@@ -1094,7 +1101,8 @@ public class TabletLocatorImplTest exten
       
       );
       
-      if (i == 1 || i == 2) runTest(new Text("foo"), ranges, metaCache, expected1);
+      if (i == 1 || i == 2)
+        runTest(new Text("foo"), ranges, metaCache, expected1);
       
       KeyExtent ke11 = nke("foo", "n", null);
       KeyExtent ke12 = nke("foo", null, "n");
@@ -1104,24 +1112,28 @@ public class TabletLocatorImplTest exten
       metaCache.invalidateCache(ke1);
       
       emb = cemb(nol("z", "l2", ke12));
-      if (i == 0 || i == 2) runTest(metaCache, ml, emb, "a", "m");
+      if (i == 0 || i == 2)
+        runTest(metaCache, ml, emb, "a", "m");
       
       Map<String,Map<KeyExtent,List<Range>>> expected2 = createExpectedBinnings("l2", nol(nke("foo", null, "n"), nrl(new Range(new Text("z"))))
       
       );
       
-      if (i == 1 || i == 2) runTest(new Text("foo"), ranges, metaCache, expected2, nrl(new Range(new Text("a")), new Range(new Text("m"))));
+      if (i == 1 || i == 2)
+        runTest(new Text("foo"), ranges, metaCache, expected2, nrl(new Range(new Text("a")), new Range(new Text("m"))));
       
       setLocation(tservers, "tserver2", MTE, ke11, "l3");
       emb = cemb(nol("a", "l3", ke11), nol("m", "l3", ke11), nol("z", "l2", ke12));
-      if (i == 0 || i == 2) runTest(metaCache, ml, emb);
+      if (i == 0 || i == 2)
+        runTest(metaCache, ml, emb);
       
       Map<String,Map<KeyExtent,List<Range>>> expected3 = createExpectedBinnings("l2", nol(nke("foo", null, "n"), nrl(new Range(new Text("z")))), "l3",
           nol(nke("foo", "n", null), nrl(new Range(new Text("a")), new Range(new Text("m"))))
       
       );
       
-      if (i == 1 || i == 2) runTest(new Text("foo"), ranges, metaCache, expected3);
+      if (i == 1 || i == 2)
+        runTest(new Text("foo"), ranges, metaCache, expected3);
     }
   }
   

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java Thu Oct 27 15:24:51 2011
@@ -45,19 +45,17 @@ public class AccumuloFileOutputFormatTes
   @Before
   public void setup() {
     job = new JobContext(new Configuration(), new JobID());
-
-    Path file = new Path(System.getenv("ACCUMULO_HOME")+"/target/");
-    f = new Path(file,"_temporary");
+    
+    Path file = new Path(System.getenv("ACCUMULO_HOME") + "/target/");
+    f = new Path(file, "_temporary");
     job.getConfiguration().set("mapred.output.dir", file.toString());
     
     tac = new TaskAttemptContext(job.getConfiguration(), new TaskAttemptID());
   }
   
   @After
-  public void teardown() throws IOException
-  {
-    if (f!= null && f.getFileSystem(job.getConfiguration()).exists(f))
-    {
+  public void teardown() throws IOException {
+    if (f != null && f.getFileSystem(job.getConfiguration()).exists(f)) {
       f.getFileSystem(job.getConfiguration()).delete(f, true);
     }
   }
@@ -77,7 +75,7 @@ public class AccumuloFileOutputFormatTes
   public void testEmptyWrite() throws IOException, InterruptedException {
     handleWriteTests(false);
   }
-
+  
   @Test
   public void testRealWrite() throws IOException, InterruptedException {
     handleWriteTests(true);
@@ -85,7 +83,7 @@ public class AccumuloFileOutputFormatTes
   
   public void handleWriteTests(boolean content) throws IOException, InterruptedException {
     AccumuloFileOutputFormat afof = new AccumuloFileOutputFormat();
-    RecordWriter<Key, Value> rw = afof.getRecordWriter(tac);
+    RecordWriter<Key,Value> rw = afof.getRecordWriter(tac);
     
     if (content)
       rw.write(new Key("Key"), new Value("".getBytes()));

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java Thu Oct 27 15:24:51 2011
@@ -245,7 +245,8 @@ public class AccumuloInputFormatTest {
     
     @Override
     protected void map(Key k, Value v, Context context) throws IOException, InterruptedException {
-      if (key != null) assertEquals(key.getRow().toString(), new String(v.get()));
+      if (key != null)
+        assertEquals(key.getRow().toString(), new String(v.get()));
       assertEquals(k.getRow(), new Text(String.format("%09x", count + 1)));
       assertEquals(new String(v.get()), String.format("%09x", count));
       key = new Key(k);

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java Thu Oct 27 15:24:51 2011
@@ -66,7 +66,8 @@ public class MockConnectorTest {
     Key key = null;
     int count = 0;
     for (Entry<Key,Value> entry : s) {
-      if (key != null) assertTrue(key.compareTo(entry.getKey()) < 0);
+      if (key != null)
+        assertTrue(key.compareTo(entry.getKey()) < 0);
       assertEquals(entry.getKey().getRow(), new Text(entry.getValue().get()));
       key = entry.getKey();
       count++;
@@ -150,7 +151,8 @@ public class MockConnectorTest {
     Connector c = new MockConnector("root");
     
     // make sure we are using a clean table
-    if (c.tableOperations().exists("test")) c.tableOperations().delete("test");
+    if (c.tableOperations().exists("test"))
+      c.tableOperations().delete("test");
     c.tableOperations().create("test");
     
     BatchDeleter deleter = c.createBatchDeleter("test", Constants.NO_AUTHS, 2, 10000L, 1000L, 4);

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java Thu Oct 27 15:24:51 2011
@@ -33,7 +33,8 @@ public class PropertyTest {
   public void testProperties() {
     HashSet<String> validPrefixes = new HashSet<String>();
     for (Property prop : Property.values())
-      if (prop.getType().equals(PropertyType.PREFIX)) validPrefixes.add(prop.getKey());
+      if (prop.getType().equals(PropertyType.PREFIX))
+        validPrefixes.add(prop.getKey());
     
     HashSet<String> propertyNames = new HashSet<String>();
     for (Property prop : Property.values()) {

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/data/ColumnTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/data/ColumnTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/data/ColumnTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/data/ColumnTest.java Thu Oct 27 15:24:51 2011
@@ -25,8 +25,10 @@ public class ColumnTest extends TestCase
     Column[] col = createColumns();
     for (int i = 0; i < col.length; i++) {
       for (int j = 0; j < col.length; j++) {
-        if (i == j || (i == 0 && j == 1) || (i == 1 && j == 0)) assertTrue(col[i].equals(col[j]));
-        else assertFalse(col[i].equals(col[j]));
+        if (i == j || (i == 0 && j == 1) || (i == 1 && j == 0))
+          assertTrue(col[i].equals(col[j]));
+        else
+          assertFalse(col[i].equals(col[j]));
       }
     }
   }
@@ -35,8 +37,10 @@ public class ColumnTest extends TestCase
     Column[] col = createColumns();
     for (int i = 0; i < col.length; i++) {
       for (int j = 0; j < col.length; j++) {
-        if (i == j || (i == 0 && j == 1) || (i == 1 && j == 0)) assertTrue(col[i].compareTo(col[j]) == 0);
-        else assertFalse(col[i].compareTo(col[j]) == 0);
+        if (i == j || (i == 0 && j == 1) || (i == 1 && j == 0))
+          assertTrue(col[i].compareTo(col[j]) == 0);
+        else
+          assertFalse(col[i].compareTo(col[j]) == 0);
       }
     }
   }

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/data/MapFileTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/data/MapFileTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/data/MapFileTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/data/MapFileTest.java Thu Oct 27 15:24:51 2011
@@ -276,7 +276,8 @@ public class MapFileTest extends TestCas
           boolean moreKeys = false;
           // check for the same number of records
           assertTrue((moreKeys = oldIndexReader.next(oldKey, oldValue)) == newIndexReader.next(newKey, newValue));
-          if (!moreKeys) break;
+          if (!moreKeys)
+            break;
           assertTrue(oldKey.compareTo(newKey) == 0);
           assertTrue(oldValue.compareTo(newValue) == 0);
         }

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java Thu Oct 27 15:24:51 2011
@@ -314,7 +314,8 @@ public class MutationTest extends TestCa
     assertEquals(cq, new String(cu.getColumnQualifier()));
     assertEquals(cv, new String(cu.getColumnVisibility()));
     assertEquals(timeSet, cu.hasTimestamp());
-    if (timeSet) assertEquals(ts, cu.getTimestamp());
+    if (timeSet)
+      assertEquals(ts, cu.getTimestamp());
     assertEquals(deleted, cu.isDeleted());
     assertEquals(val, new String(cu.getValue()));
   }

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java Thu Oct 27 15:24:51 2011
@@ -32,10 +32,12 @@ import org.apache.hadoop.io.Text;
 public class RangeTest extends TestCase {
   private Range nr(String k1, String k2) {
     Key ik1 = null;
-    if (k1 != null) ik1 = new Key(new Text(k1), 0l);
+    if (k1 != null)
+      ik1 = new Key(new Text(k1), 0l);
     
     Key ik2 = null;
-    if (k2 != null) ik2 = new Key(new Text(k2), 0l);
+    if (k2 != null)
+      ik2 = new Key(new Text(k2), 0l);
     
     return new Range(ik1, ik2);
   }
@@ -416,9 +418,11 @@ public class RangeTest extends TestCase 
     Text tr1 = null;
     Text tr2 = null;
     
-    if (r1 != null) tr1 = new Text(r1);
+    if (r1 != null)
+      tr1 = new Text(r1);
     
-    if (r2 != null) tr2 = new Text(r2);
+    if (r2 != null)
+      tr2 = new Text(r2);
     
     return new Range(tr1, r1i, tr2, r2i);
     

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/file/rfile/MultiLevelIndexTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/file/rfile/MultiLevelIndexTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/file/rfile/MultiLevelIndexTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/file/rfile/MultiLevelIndexTest.java Thu Oct 27 15:24:51 2011
@@ -107,8 +107,10 @@ public class MultiLevelIndexTest extends
     for (int i = 0; i < 100; i++) {
       int k = rand.nextInt(num * 1000);
       int expected;
-      if (k % 1000 == 0) expected = k / 1000; // end key is inclusive
-      else expected = k / 1000 + 1;
+      if (k % 1000 == 0)
+        expected = k / 1000; // end key is inclusive
+      else
+        expected = k / 1000 + 1;
       liter = reader.lookup(new Key(String.format("%08d", k)));
       IndexEntry ie = liter.next();
       assertEquals(expected, ie.getNumEntries());

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java Thu Oct 27 15:24:51 2011
@@ -74,12 +74,14 @@ public class RFileTest extends TestCase 
     
     @Override
     public void seek(long pos) throws IOException {
-      if (mark != 0) throw new IllegalStateException();
+      if (mark != 0)
+        throw new IllegalStateException();
       
       reset();
       long skipped = skip(pos);
       
-      if (skipped != pos) throw new IOException();
+      if (skipped != pos)
+        throw new IOException();
     }
     
     @Override
@@ -90,9 +92,12 @@ public class RFileTest extends TestCase 
     @Override
     public int read(long position, byte[] buffer, int offset, int length) throws IOException {
       
-      if (position >= buf.length) throw new IllegalArgumentException();
-      if (position + length > buf.length) throw new IllegalArgumentException();
-      if (length > buffer.length) throw new IllegalArgumentException();
+      if (position >= buf.length)
+        throw new IllegalArgumentException();
+      if (position + length > buf.length)
+        throw new IllegalArgumentException();
+      if (length > buffer.length)
+        throw new IllegalArgumentException();
       
       System.arraycopy(buf, (int) position, buffer, offset, length);
       return length;
@@ -117,12 +122,14 @@ public class RFileTest extends TestCase 
     if (indexIter.hasTop()) {
       Key lastKey = new Key(indexIter.getTopKey());
       
-      if (reader.getFirstKey().compareTo(lastKey) > 0) throw new RuntimeException("First key out of order " + reader.getFirstKey() + " " + lastKey);
+      if (reader.getFirstKey().compareTo(lastKey) > 0)
+        throw new RuntimeException("First key out of order " + reader.getFirstKey() + " " + lastKey);
       
       indexIter.next();
       
       while (indexIter.hasTop()) {
-        if (lastKey.compareTo(indexIter.getTopKey()) > 0) throw new RuntimeException("Indext out of order " + lastKey + " " + indexIter.getTopKey());
+        if (lastKey.compareTo(indexIter.getTopKey()) > 0)
+          throw new RuntimeException("Indext out of order " + lastKey + " " + indexIter.getTopKey());
         
         lastKey = new Key(indexIter.getTopKey());
         indexIter.next();
@@ -151,7 +158,8 @@ public class RFileTest extends TestCase 
       CachableBlockFile.Writer _cbw = new CachableBlockFile.Writer(dos, "gz", conf);
       writer = new RFile.Writer(_cbw, 1000, 1000);
       
-      if (startDLG) writer.startDefaultLocalityGroup();
+      if (startDLG)
+        writer.startDefaultLocalityGroup();
     }
     
     public void openWriter() throws IOException {
@@ -955,7 +963,8 @@ public class RFileTest extends TestCase 
     for (int i = 0; i < 1024; i++) {
       
       int m10 = i % 10;
-      if (m10 == 3 || m10 == 5 || m10 == 7) continue;
+      if (m10 == 3 || m10 == 5 || m10 == 7)
+        continue;
       
       trf.writer.append(nk(nf("i", i), m10 + "mod10", "", "", i + 2), nv("" + i));
       
@@ -988,11 +997,14 @@ public class RFileTest extends TestCase 
       
       // test excluding an individual column family
       trf.reader.seek(new Range(new Key(), true, null, true), ncfs(m + "mod10"), false);
-      if (m == 3) assertEquals(2, trf.reader.getNumLocalityGroupsSeeked());
-      else assertEquals(3, trf.reader.getNumLocalityGroupsSeeked());
+      if (m == 3)
+        assertEquals(2, trf.reader.getNumLocalityGroupsSeeked());
+      else
+        assertEquals(3, trf.reader.getNumLocalityGroupsSeeked());
       for (int i = 0; i < 1024; i++) {
         
-        if (i % 10 == m) continue;
+        if (i % 10 == m)
+          continue;
         
         assertTrue(trf.reader.hasTop());
         assertEquals(nk(nf("i", i), (i % 10) + "mod10", "", "", i + 2), trf.reader.getTopKey());
@@ -1408,8 +1420,10 @@ public class RFileTest extends TestCase 
     
     for (int start : new int[] {0, 10, 100, 998}) {
       for (int cf = 1; cf <= 4; cf++) {
-        if (start == 0) reader.seek(new Range(), ncfs(nf("cf_", cf)), true);
-        else reader.seek(new Range(nf("r_", start), null), ncfs(nf("cf_", cf)), true);
+        if (start == 0)
+          reader.seek(new Range(), ncfs(nf("cf_", cf)), true);
+        else
+          reader.seek(new Range(nf("r_", start), null), ncfs(nf("cf_", cf)), true);
         
         for (int i = start; i < 1000; i++) {
           assertTrue(reader.hasTop());
@@ -1421,8 +1435,10 @@ public class RFileTest extends TestCase 
         assertFalse(reader.hasTop());
       }
       
-      if (start == 0) reader.seek(new Range(), ncfs(), false);
-      else reader.seek(new Range(nf("r_", start), null), ncfs(), false);
+      if (start == 0)
+        reader.seek(new Range(), ncfs(), false);
+      else
+        reader.seek(new Range(nf("r_", start), null), ncfs(), false);
       
       for (int i = start; i < 1000; i++) {
         for (int cf = 1; cf <= 4; cf++) {

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/FamilyIntersectingIteratorTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/FamilyIntersectingIteratorTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/FamilyIntersectingIteratorTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/FamilyIntersectingIteratorTest.java Thu Oct 27 15:24:51 2011
@@ -130,11 +130,13 @@ public class FamilyIntersectingIteratorT
     TreeMap<Key,Value> inMemoryMap = createSortedMap(numRows, numDocsPerRow, columnFamilies, otherColumnFamilies, docs);
     trf.writer.startNewLocalityGroup("docs", RFileTest.ncfs(docColf.toString()));
     for (Entry<Key,Value> entry : inMemoryMap.entrySet()) {
-      if (entry.getKey().getColumnFamily().equals(docColf)) trf.writer.append(entry.getKey(), entry.getValue());
+      if (entry.getKey().getColumnFamily().equals(docColf))
+        trf.writer.append(entry.getKey(), entry.getValue());
     }
     trf.writer.startNewLocalityGroup("terms", RFileTest.ncfs(FamilyIntersectingIterator.DEFAULT_INDEX_COLF.toString()));
     for (Entry<Key,Value> entry : inMemoryMap.entrySet()) {
-      if (entry.getKey().getColumnFamily().equals(FamilyIntersectingIterator.DEFAULT_INDEX_COLF)) trf.writer.append(entry.getKey(), entry.getValue());
+      if (entry.getKey().getColumnFamily().equals(FamilyIntersectingIterator.DEFAULT_INDEX_COLF))
+        trf.writer.append(entry.getKey(), entry.getValue());
     }
     
     trf.closeWriter();

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/FilterTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/FilterTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/FilterTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/FilterTest.java Thu Oct 27 15:24:51 2011
@@ -56,7 +56,8 @@ public class FilterTest extends TestCase
     
     public boolean accept(Key k, Value v) {
       // System.out.println(k.getRow());
-      if (k.getRow().toString().endsWith("0")) return true;
+      if (k.getRow().toString().endsWith("0"))
+        return true;
       return false;
     }
   }
@@ -67,7 +68,8 @@ public class FilterTest extends TestCase
     }
     
     public boolean accept(Key k, Value v) {
-      if (k.getColumnFamily().toString().equals("a")) return false;
+      if (k.getColumnFamily().toString().equals("a"))
+        return false;
       return true;
     }
   }

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/FilteringIteratorTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/FilteringIteratorTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/FilteringIteratorTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/FilteringIteratorTest.java Thu Oct 27 15:24:51 2011
@@ -49,7 +49,8 @@ public class FilteringIteratorTest exten
   
   public class SimpleFilter implements Filter {
     public boolean accept(Key k, Value v) {
-      if (k.getRow().toString().endsWith("0")) return true;
+      if (k.getRow().toString().endsWith("0"))
+        return true;
       return false;
     }
     
@@ -59,7 +60,8 @@ public class FilteringIteratorTest exten
   
   public class SimpleFilter2 implements Filter {
     public boolean accept(Key k, Value v) {
-      if (k.getColumnFamily().toString().equals("a")) return false;
+      if (k.getColumnFamily().toString().equals("a"))
+        return false;
       return true;
     }
     

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/IntersectingIteratorTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/IntersectingIteratorTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/IntersectingIteratorTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/IntersectingIteratorTest.java Thu Oct 27 15:24:51 2011
@@ -71,8 +71,10 @@ public class IntersectingIteratorTest ex
     
     for (int i = 0; i < columnFamilies.length; i++) {
       negateMask[i] = false;
-      if (negatedColumns.length > 0) for (Text ng : negatedColumns)
-        if (columnFamilies[i].equals(ng)) negateMask[i] = true;
+      if (negatedColumns.length > 0)
+        for (Text ng : negatedColumns)
+          if (columnFamilies[i].equals(ng))
+            negateMask[i] = true;
     }
     for (int i = 0; i < numRows; i++) {
       Text row = new Text(String.format("%06d", i));
@@ -83,9 +85,11 @@ public class IntersectingIteratorTest ex
           if (r.nextFloat() < hitRatio) {
             Key k = new Key(row, columnFamilies[j], doc);
             map.put(k, v);
-            if (negateMask[j]) docHits = false;
+            if (negateMask[j])
+              docHits = false;
           } else {
-            if (!negateMask[j]) docHits = false;
+            if (!negateMask[j])
+              docHits = false;
           }
         }
         if (docHits) {

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java Thu Oct 27 15:24:51 2011
@@ -65,29 +65,38 @@ public class MultiIteratorTest extends T
     }
     
     MultiIterator mi;
-    if (endRow == null && prevEndRow == null) mi = new MultiIterator(iters, init);
+    if (endRow == null && prevEndRow == null)
+      mi = new MultiIterator(iters, init);
     else {
       Range range = new Range(prevEndRow, false, endRow, true);
-      if (init) for (SortedKeyValueIterator<Key,Value> iter : iters)
-        iter.seek(range, LocalityGroupUtil.EMPTY_CF_SET, false);
+      if (init)
+        for (SortedKeyValueIterator<Key,Value> iter : iters)
+          iter.seek(range, LocalityGroupUtil.EMPTY_CF_SET, false);
       mi = new MultiIterator(iters, range);
       
-      if (init) mi.seek(range, LocalityGroupUtil.EMPTY_CF_SET, false);
+      if (init)
+        mi.seek(range, LocalityGroupUtil.EMPTY_CF_SET, false);
     }
     
-    if (seekKey != null) mi.seek(new Range(seekKey, null), EMPTY_COL_FAMS, false);
-    else mi.seek(new Range(), EMPTY_COL_FAMS, false);
+    if (seekKey != null)
+      mi.seek(new Range(seekKey, null), EMPTY_COL_FAMS, false);
+    else
+      mi.seek(new Range(), EMPTY_COL_FAMS, false);
     
     int i = start;
     while (mi.hasTop()) {
-      if (incrRow) assertEquals(nk(i, 0), mi.getTopKey());
-      else assertEquals(nk(0, i), mi.getTopKey());
+      if (incrRow)
+        assertEquals(nk(i, 0), mi.getTopKey());
+      else
+        assertEquals(nk(0, i), mi.getTopKey());
       
       assertEquals("v" + i, mi.getTopValue().toString());
       
       mi.next();
-      if (incrRow) i++;
-      else i--;
+      if (incrRow)
+        i++;
+      else
+        i--;
     }
     
     assertEquals("start=" + start + " end=" + end + " seekKey=" + seekKey + " endRow=" + endRow + " prevEndRow=" + prevEndRow + " init=" + init + " incrRow="
@@ -141,8 +150,10 @@ public class MultiIteratorTest extends T
     List<TreeMap<Key,Value>> tmpList = new ArrayList<TreeMap<Key,Value>>(2);
     
     for (int i = 0; i < 8; i++) {
-      if (i % 2 == 0) nkv(tm1, 0, i, false, "v" + i);
-      else nkv(tm2, 0, i, false, "v" + i);
+      if (i % 2 == 0)
+        nkv(tm1, 0, i, false, "v" + i);
+      else
+        nkv(tm2, 0, i, false, "v" + i);
     }
     tmpList.add(tm1);
     tmpList.add(tm2);
@@ -196,8 +207,10 @@ public class MultiIteratorTest extends T
     List<TreeMap<Key,Value>> tmpList = new ArrayList<TreeMap<Key,Value>>(2);
     
     for (int i = 0; i < 8; i++) {
-      if (i % 2 == 0) nkv(tm1, i, 0, false, "v" + i);
-      else nkv(tm2, i, 0, false, "v" + i);
+      if (i % 2 == 0)
+        nkv(tm1, i, 0, false, "v" + i);
+      else
+        nkv(tm2, i, 0, false, "v" + i);
     }
     
     tmpList.add(tm1);
@@ -223,9 +236,11 @@ public class MultiIteratorTest extends T
           
           int start = Math.max(per + 1, seek);
           
-          if (start > er) end = start;
+          if (start > er)
+            end = start;
           
-          if (per >= 8) end = start;
+          if (per >= 8)
+            end = start;
           
           int noSeekStart = Math.max(0, per + 1);
           

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java Thu Oct 27 15:24:51 2011
@@ -51,7 +51,8 @@ public class SourceSwitchingIteratorTest
     assertTrue(rdi.hasTop());
     assertEquals(nk(row, cf, cq, time), rdi.getTopKey());
     assertEquals(val, rdi.getTopValue().toString());
-    if (callNext) rdi.next();
+    if (callNext)
+      rdi.next();
   }
   
   class TestDataSource implements DataSource {
@@ -94,7 +95,8 @@ public class SourceSwitchingIteratorTest
       this.next = next;
       
       for (TestDataSource tds : copies) {
-        if (tds != this) tds.next = new TestDataSource(next.iter.deepCopy(null), next.copies);
+        if (tds != this)
+          tds.next = new TestDataSource(next.iter.deepCopy(null), next.copies);
       }
     }
     

Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java Thu Oct 27 15:24:51 2011
@@ -38,8 +38,10 @@ public class MergeTest {
       Text start = null;
       for (Integer size : sizes) {
         Text end;
-        if (tablets.size() == sizes.length - 1) end = null;
-        else end = new Text(String.format("%05d", tablets.size()));
+        if (tablets.size() == sizes.length - 1)
+          end = null;
+        else
+          end = new Text(String.format("%05d", tablets.size()));
         KeyExtent extent = new KeyExtent(new Text("table"), end, start);
         start = end;
         tablets.add(new Size(extent, size));
@@ -64,10 +66,12 @@ public class MergeTest {
           while (impl.hasNext()) {
             Size candidate = impl.next();
             if (start != null) {
-              if (candidate.extent.getEndRow() != null && candidate.extent.getEndRow().compareTo(start) < 0) continue;
+              if (candidate.extent.getEndRow() != null && candidate.extent.getEndRow().compareTo(start) < 0)
+                continue;
             }
             if (end != null) {
-              if (candidate.extent.getPrevEndRow() != null && candidate.extent.getPrevEndRow().compareTo(end) >= 0) continue;
+              if (candidate.extent.getPrevEndRow() != null && candidate.extent.getPrevEndRow().compareTo(end) >= 0)
+                continue;
             }
             return candidate;
           }

Modified: incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/client/RandomBatchScanner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/client/RandomBatchScanner.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/client/RandomBatchScanner.java (original)
+++ incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/client/RandomBatchScanner.java Thu Oct 27 15:24:51 2011
@@ -89,9 +89,11 @@ public class RandomBatchScanner {
   private static void printRowsNotFound(HashMap<Text,Boolean> expectedRows) {
     int count = 0;
     for (Entry<Text,Boolean> entry : expectedRows.entrySet())
-      if (!entry.getValue()) count++;
+      if (!entry.getValue())
+        count++;
     
-    if (count > 0) log.warn("Did not find " + count + " rows");
+    if (count > 0)
+      log.warn("Did not find " + count + " rows");
   }
   
   static void doRandomQueries(int num, long min, long max, int evs, Random r, BatchScanner tsbr) {
@@ -159,8 +161,10 @@ public class RandomBatchScanner {
     BatchScanner tsbr = connector.createBatchScanner(table, new Authorizations(auths.split(",")), numThreads);
     
     Random r;
-    if (seed == null) r = new Random();
-    else r = new Random(Long.parseLong(seed));
+    if (seed == null)
+      r = new Random();
+    else
+      r = new Random(Long.parseLong(seed));
     
     // do one cold
     doRandomQueries(num, min, max, expectedValueSize, r, tsbr);
@@ -169,8 +173,10 @@ public class RandomBatchScanner {
     System.gc();
     System.gc();
     
-    if (seed == null) r = new Random();
-    else r = new Random(Long.parseLong(seed));
+    if (seed == null)
+      r = new Random();
+    else
+      r = new Random(Long.parseLong(seed));
     
     // do one hot (connections already established, metadata table cached)
     doRandomQueries(num, min, max, expectedValueSize, r, tsbr);

Modified: incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/client/RandomBatchWriter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/client/RandomBatchWriter.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/client/RandomBatchWriter.java (original)
+++ incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/client/RandomBatchWriter.java Thu Oct 27 15:24:51 2011
@@ -101,7 +101,8 @@ public class RandomBatchWriter {
     // logger.setLevel(Level.TRACE);
     
     Random r;
-    if (seed == null) r = new Random();
+    if (seed == null)
+      r = new Random();
     else {
       r = new Random(Long.parseLong(seed));
     }

Modified: incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/client/ReadWriteExample.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/client/ReadWriteExample.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/client/ReadWriteExample.java (original)
+++ incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/client/ReadWriteExample.java Thu Oct 27 15:24:51 2011
@@ -88,10 +88,12 @@ public class ReadWriteExample {
     
     // parse command line
     cl = new BasicParser().parse(opts, args);
-    if (cl.getArgs().length != 0) throw new ParseException("unrecognized options " + cl.getArgList());
+    if (cl.getArgs().length != 0)
+      throw new ParseException("unrecognized options " + cl.getArgList());
     
     // optionally enable debugging
-    if (hasOpt(debugOpt)) Logger.getLogger(Constants.CORE_PACKAGE_NAME).setLevel(Level.TRACE);
+    if (hasOpt(debugOpt))
+      Logger.getLogger(Constants.CORE_PACKAGE_NAME).setLevel(Level.TRACE);
     
     Instance inst = new ZooKeeperInstance(getOpt(instanceOpt, DEFAULT_INSTANCE_NAME), getOpt(zooKeepersOpt, DEFAULT_ZOOKEEPERS));
     conn = inst.getConnector(getRequiredOpt(usernameOpt), getRequiredOpt(passwordOpt).getBytes());
@@ -139,10 +141,12 @@ public class ReadWriteExample {
     }
     
     // create entries
-    if (hasOpt(createEntriesOpt)) createEntries(false);
+    if (hasOpt(createEntriesOpt))
+      createEntries(false);
     
     // delete entries
-    if (hasOpt(deleteEntriesOpt)) createEntries(true);
+    if (hasOpt(deleteEntriesOpt))
+      createEntries(true);
     
     // read entries
     if (hasOpt(readEntriesOpt)) {
@@ -156,7 +160,8 @@ public class ReadWriteExample {
     }
     
     // delete table
-    if (hasOpt(deletetableOpt)) conn.tableOperations().delete(getOpt(tableNameOpt, DEFAULT_TABLE_NAME));
+    if (hasOpt(deletetableOpt))
+      conn.tableOperations().delete(getOpt(tableNameOpt, DEFAULT_TABLE_NAME));
   }
   
   private void createEntries(boolean delete) throws AccumuloException, TableNotFoundException, MutationsRejectedException {

Modified: incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/client/RowOperations.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/client/RowOperations.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/client/RowOperations.java (original)
+++ incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/client/RowOperations.java Thu Oct 27 15:24:51 2011
@@ -180,7 +180,8 @@ public class RowOperations {
     // iterate through the keys
     for (Entry<Key,Value> entry : scanner) {
       // create a mutation for the row
-      if (deleter == null) deleter = new Mutation(entry.getKey().getRow());
+      if (deleter == null)
+        deleter = new Mutation(entry.getKey().getRow());
       // the remove function adds the key with the delete flag set to true
       deleter.putDelete(entry.getKey().getColumnFamily(), entry.getKey().getColumnQualifier());
     }

Modified: incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/constraints/AlphaNumKeyConstraint.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/constraints/AlphaNumKeyConstraint.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/constraints/AlphaNumKeyConstraint.java (original)
+++ incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/constraints/AlphaNumKeyConstraint.java Thu Oct 27 15:24:51 2011
@@ -40,7 +40,8 @@ public class AlphaNumKeyConstraint imple
   private boolean isAlphaNum(byte bytes[]) {
     for (byte b : bytes) {
       boolean ok = ((b >= 'a' && b <= 'z') || (b >= 'A' && b <= 'Z') || (b >= '0' && b <= '9'));
-      if (!ok) return false;
+      if (!ok)
+        return false;
     }
     
     return true;
@@ -60,13 +61,16 @@ public class AlphaNumKeyConstraint imple
   public List<Short> check(Environment env, Mutation mutation) {
     List<Short> violations = null;
     
-    if (!isAlphaNum(mutation.getRow())) violations = addViolation(violations, NON_ALPHA_NUM_ROW);
+    if (!isAlphaNum(mutation.getRow()))
+      violations = addViolation(violations, NON_ALPHA_NUM_ROW);
     
     Collection<ColumnUpdate> updates = mutation.getUpdates();
     for (ColumnUpdate columnUpdate : updates) {
-      if (!isAlphaNum(columnUpdate.getColumnFamily())) violations = addViolation(violations, NON_ALPHA_NUM_COLF);
+      if (!isAlphaNum(columnUpdate.getColumnFamily()))
+        violations = addViolation(violations, NON_ALPHA_NUM_COLF);
       
-      if (!isAlphaNum(columnUpdate.getColumnQualifier())) violations = addViolation(violations, NON_ALPHA_NUM_COLQ);
+      if (!isAlphaNum(columnUpdate.getColumnQualifier()))
+        violations = addViolation(violations, NON_ALPHA_NUM_COLQ);
     }
     
     return violations;

Modified: incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/constraints/MaxMutationSize.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/constraints/MaxMutationSize.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/constraints/MaxMutationSize.java (original)
+++ incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/constraints/MaxMutationSize.java Thu Oct 27 15:24:51 2011
@@ -38,7 +38,8 @@ public class MaxMutationSize implements 
   
   @Override
   public List<Short> check(Environment env, Mutation mutation) {
-    if (mutation.estimatedMemoryUsed() < MAX_SIZE) return empty;
+    if (mutation.estimatedMemoryUsed() < MAX_SIZE)
+      return empty;
     return violations;
   }
 }

Modified: incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/constraints/NumericValueConstraint.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/constraints/NumericValueConstraint.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/constraints/NumericValueConstraint.java (original)
+++ incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/constraints/NumericValueConstraint.java Thu Oct 27 15:24:51 2011
@@ -31,7 +31,8 @@ public class NumericValueConstraint impl
   private boolean isNumeric(byte bytes[]) {
     for (byte b : bytes) {
       boolean ok = (b >= '0' && b <= '9');
-      if (!ok) return false;
+      if (!ok)
+        return false;
     }
     
     return true;
@@ -54,7 +55,8 @@ public class NumericValueConstraint impl
     Collection<ColumnUpdate> updates = mutation.getUpdates();
     
     for (ColumnUpdate columnUpdate : updates) {
-      if (!isNumeric(columnUpdate.getValue())) violations = addViolation(violations, NON_NUMERIC_VALUE);
+      if (!isNumeric(columnUpdate.getValue()))
+        violations = addViolation(violations, NON_NUMERIC_VALUE);
     }
     
     return violations;

Modified: incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/FileCount.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/FileCount.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/FileCount.java (original)
+++ incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/FileCount.java Thu Oct 27 15:24:51 2011
@@ -91,15 +91,18 @@ public class FileCount {
   
   private int findMaxDepth(Scanner scanner, int min, int mid, int max) {
     // check to see if the mid point exist
-    if (max < min) return -1;
+    if (max < min)
+      return -1;
     
     scanner.setRange(new Range(String.format("%03d", mid), true, String.format("%03d", mid + 1), false));
     
     if (scanner.iterator().hasNext()) {
       // this depth exist, check to see if a larger depth exist
       int ret = findMaxDepth(scanner, mid + 1, max);
-      if (ret == -1) return mid; // this must the max
-      else return ret;
+      if (ret == -1)
+        return mid; // this must the max
+      else
+        return ret;
     } else {
       // this depth does not exist, look lower
       return findMaxDepth(scanner, min, mid - 1);
@@ -122,14 +125,16 @@ public class FileCount {
     Key key = entry.getKey();
     Text currentRow = key.getRow();
     
-    if (key.compareColumnQualifier(QueryUtil.COUNTS_COLQ) == 0) cv.set(entry.getValue());
+    if (key.compareColumnQualifier(QueryUtil.COUNTS_COLQ) == 0)
+      cv.set(entry.getValue());
     
     while (iterator.hasNext()) {
       entry = iterator.next();
       entriesScanned++;
       key = entry.getKey();
       
-      if (key.compareRow(currentRow) != 0) return entry;
+      if (key.compareRow(currentRow) != 0)
+        return entry;
       
       if (key.compareColumnFamily(QueryUtil.DIR_COLF) == 0 && key.compareColumnQualifier(QueryUtil.COUNTS_COLQ) == 0) {
         cv.set(entry.getValue());
@@ -149,7 +154,8 @@ public class FileCount {
       entriesScanned++;
       key = entry.getKey();
       
-      if (key.compareRow(currentRow) != 0) return entry;
+      if (key.compareRow(currentRow) != 0)
+        return entry;
     }
     
     return null;
@@ -233,8 +239,10 @@ public class FileCount {
       inst = new ZooKeeperInstance(instance, zookeepers);
     }
     this.conn = inst.getConnector(user, password);
-    if (auths.length() > 0) this.auths = new Authorizations(auths.split(","));
-    else this.auths = new Authorizations();
+    if (auths.length() > 0)
+      this.auths = new Authorizations(auths.split(","));
+    else
+      this.auths = new Authorizations();
     this.colvis = new ColumnVisibility(colvis);
     this.table = table;
   }

Modified: incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/FileCountMR.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/FileCountMR.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/FileCountMR.java (original)
+++ incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/FileCountMR.java Thu Oct 27 15:24:51 2011
@@ -44,8 +44,10 @@ public class FileCountMR extends Configu
     String prefix;
     
     private void incrementCounts(Key k) {
-      if (k.getColumnFamily().equals(QueryUtil.DIR_COLF)) dirCount++;
-      else fileCount++;
+      if (k.getColumnFamily().equals(QueryUtil.DIR_COLF))
+        dirCount++;
+      else
+        fileCount++;
     }
     
     // store last row found and its prefix, reset counts, and increment
@@ -53,7 +55,8 @@ public class FileCountMR extends Configu
       lastRowFound = k.getRow();
       prefix = lastRowFound.toString();
       int slashIndex = prefix.lastIndexOf("/");
-      if (slashIndex >= 0) prefix = prefix.substring(0, slashIndex + 1);
+      if (slashIndex >= 0)
+        prefix = prefix.substring(0, slashIndex + 1);
       dirCount = 0;
       fileCount = 0;
       incrementCounts(k);
@@ -83,7 +86,8 @@ public class FileCountMR extends Configu
     
     @Override
     protected void cleanup(Context context) throws IOException, InterruptedException {
-      if (lastRowFound == null) return;
+      if (lastRowFound == null)
+        return;
       String lrf = lastRowFound.toString().substring(3);
       int slashIndex;
       int parentCount = 0;

Modified: incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/Ingest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/Ingest.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/Ingest.java (original)
+++ incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/Ingest.java Thu Oct 27 15:24:51 2011
@@ -39,16 +39,20 @@ public class Ingest {
   
   public static Mutation buildMutation(ColumnVisibility cv, String path, boolean isDir, boolean isHidden, boolean canExec, long length, long lastmod,
       String hash) {
-    if (path.equals("/")) path = "";
+    if (path.equals("/"))
+      path = "";
     Mutation m = new Mutation(QueryUtil.getRow(path));
     Text colf = null;
-    if (isDir) colf = QueryUtil.DIR_COLF;
-    else colf = new Text(LongSummation.longToBytes(Long.MAX_VALUE - lastmod));
+    if (isDir)
+      colf = QueryUtil.DIR_COLF;
+    else
+      colf = new Text(LongSummation.longToBytes(Long.MAX_VALUE - lastmod));
     m.put(colf, new Text(LENGTH_CQ), cv, new Value(Long.toString(length).getBytes()));
     m.put(colf, new Text(HIDDEN_CQ), cv, new Value(Boolean.toString(isHidden).getBytes()));
     m.put(colf, new Text(EXEC_CQ), cv, new Value(Boolean.toString(canExec).getBytes()));
     m.put(colf, new Text(LASTMOD_CQ), cv, new Value(Long.toString(lastmod).getBytes()));
-    if (hash != null && hash.length() > 0) m.put(colf, new Text(HASH_CQ), cv, new Value(hash.getBytes()));
+    if (hash != null && hash.length() > 0)
+      m.put(colf, new Text(HASH_CQ), cv, new Value(hash.getBytes()));
     return m;
   }
   
@@ -95,7 +99,8 @@ public class Ingest {
     // recurse into subdirectories
     if (src.isDirectory()) {
       File[] files = src.listFiles();
-      if (files == null) return;
+      if (files == null)
+        return;
       for (File child : files) {
         recurse(child, cv, dirBW, indexBW, fdi, data);
       }
@@ -120,9 +125,12 @@ public class Ingest {
     int chunkSize = Integer.parseInt(args[8]);
     
     Connector conn = new ZooKeeperInstance(instance, zooKeepers).getConnector(user, pass.getBytes());
-    if (!conn.tableOperations().exists(nameTable)) conn.tableOperations().create(nameTable);
-    if (!conn.tableOperations().exists(indexTable)) conn.tableOperations().create(indexTable);
-    if (!conn.tableOperations().exists(dataTable)) conn.tableOperations().create(dataTable);
+    if (!conn.tableOperations().exists(nameTable))
+      conn.tableOperations().create(nameTable);
+    if (!conn.tableOperations().exists(indexTable))
+      conn.tableOperations().create(indexTable);
+    if (!conn.tableOperations().exists(dataTable))
+      conn.tableOperations().create(dataTable);
     BatchWriter dirBW = conn.createBatchWriter(nameTable, 50000000, 300000l, 4);
     BatchWriter indexBW = conn.createBatchWriter(indexTable, 50000000, 300000l, 4);
     BatchWriter dataBW = conn.createBatchWriter(dataTable, 50000000, 300000l, 4);

Modified: incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/QueryUtil.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/QueryUtil.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/QueryUtil.java (original)
+++ incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/QueryUtil.java Thu Oct 27 15:24:51 2011
@@ -70,7 +70,8 @@ public class QueryUtil {
   
   public static Text getForwardIndex(String path) {
     String part = path.substring(path.lastIndexOf("/") + 1);
-    if (part.length() == 0) return null;
+    if (part.length() == 0)
+      return null;
     Text row = new Text(FORWARD_PREFIX);
     row.append(part.getBytes(), 0, part.length());
     return row;
@@ -78,7 +79,8 @@ public class QueryUtil {
   
   public static Text getReverseIndex(String path) {
     String part = path.substring(path.lastIndexOf("/") + 1);
-    if (part.length() == 0) return null;
+    if (part.length() == 0)
+      return null;
     byte[] rev = new byte[part.length()];
     int i = part.length() - 1;
     for (byte b : part.getBytes())
@@ -89,7 +91,8 @@ public class QueryUtil {
   }
   
   public static String getType(Text colf) {
-    if (colf.equals(DIR_COLF)) return colf.toString() + ":";
+    if (colf.equals(DIR_COLF))
+      return colf.toString() + ":";
     try {
       return Long.toString(LongSummation.bytesToLong(colf.getBytes())) + ":";
     } catch (IOException e) {
@@ -98,7 +101,8 @@ public class QueryUtil {
   }
   
   public Map<String,String> getData(String path) throws TableNotFoundException {
-    if (path.endsWith("/")) path = path.substring(0, path.length() - 1);
+    if (path.endsWith("/"))
+      path = path.substring(0, path.length() - 1);
     Scanner scanner = conn.createScanner(tableName, auths);
     scanner.setRange(new Range(getRow(path)));
     Map<String,String> data = new TreeMap<String,String>();
@@ -111,7 +115,8 @@ public class QueryUtil {
   }
   
   public Map<String,Map<String,String>> getDirList(String path) throws TableNotFoundException {
-    if (!path.endsWith("/")) path = path + "/";
+    if (!path.endsWith("/"))
+      path = path + "/";
     Map<String,Map<String,String>> fim = new TreeMap<String,Map<String,String>>();
     Scanner scanner = conn.createScanner(tableName, auths);
     scanner.setRange(Range.prefix(getRow(path)));
@@ -136,7 +141,8 @@ public class QueryUtil {
   }
   
   public Iterable<Entry<Key,Value>> singleRestrictedWildCardSearch(String exp) throws Exception {
-    if (exp.indexOf("/") >= 0) throw new Exception("this method only works with unqualified names");
+    if (exp.indexOf("/") >= 0)
+      throw new Exception("this method only works with unqualified names");
     
     Scanner scanner = conn.createScanner(tableName, auths);
     if (exp.startsWith("*")) {
@@ -157,7 +163,8 @@ public class QueryUtil {
   
   public Iterable<Entry<Key,Value>> singleWildCardSearch(String exp) throws Exception {
     int starIndex = exp.indexOf("*");
-    if (exp.indexOf("*", starIndex + 1) >= 0) throw new Exception("only one wild card for search");
+    if (exp.indexOf("*", starIndex + 1) >= 0)
+      throw new Exception("only one wild card for search");
     
     if (starIndex < 0) {
       return exactTermSearch(exp);

Modified: incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/StringArraySummation.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/StringArraySummation.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/StringArraySummation.java (original)
+++ incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/StringArraySummation.java Thu Oct 27 15:24:51 2011
@@ -49,7 +49,8 @@ public class StringArraySummation implem
   }
   
   public static byte[] longArrayToStringBytes(Long[] l) {
-    if (l.length == 0) return new byte[] {};
+    if (l.length == 0)
+      return new byte[] {};
     StringBuilder sb = new StringBuilder(Long.toString(l[0]));
     for (int i = 1; i < l.length; i++) {
       sb.append(",");

Modified: incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/Viewer.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/Viewer.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/Viewer.java (original)
+++ incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/Viewer.java Thu Oct 27 15:24:51 2011
@@ -69,7 +69,8 @@ public class Viewer extends JFrame imple
     
     public String getFullName() {
       String fn = data.get("fullname");
-      if (fn == null) return name;
+      if (fn == null)
+        return name;
       return fn;
     }
     
@@ -180,7 +181,8 @@ public class Viewer extends JFrame imple
   @Override
   public void valueChanged(TreeSelectionEvent e) {
     TreePath selected = e.getNewLeadSelectionPath();
-    if (selected == null) return;
+    if (selected == null)
+      return;
     DefaultMutableTreeNode node = (DefaultMutableTreeNode) selected.getLastPathComponent();
     text.setText(getText(node));
     try {
@@ -201,7 +203,8 @@ public class Viewer extends JFrame imple
       System.exit(1);
     }
     String rootpath = "/";
-    if (args.length == 8) rootpath = args[7];
+    if (args.length == 8)
+      rootpath = args[7];
     Viewer v = new Viewer(args[0], args[1], args[2], args[3], args[4], args[5], new Authorizations(args[6].split(",")), rootpath);
     v.init();
     v.setVisible(true);

Modified: incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/filedata/ChunkCombiner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/filedata/ChunkCombiner.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/filedata/ChunkCombiner.java (original)
+++ incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/filedata/ChunkCombiner.java Thu Oct 27 15:24:51 2011
@@ -97,15 +97,17 @@ public class ChunkCombiner implements So
     topValue = new Value(source.getTopValue());
     source.next();
     
-    if (!topKey.getColumnFamilyData().equals(FileDataIngest.CHUNK_CF_BS)) return topKey.getColumnVisibility().getBytes();
+    if (!topKey.getColumnFamilyData().equals(FileDataIngest.CHUNK_CF_BS))
+      return topKey.getColumnVisibility().getBytes();
     
     maxTS = topKey.getTimestamp();
     
     while (source.hasTop() && source.getTopKey().equals(topKey, PartialKey.ROW_COLFAM_COLQUAL)) {
-      if (source.getTopKey().getTimestamp() > maxTS) maxTS = source.getTopKey().getTimestamp();
+      if (source.getTopKey().getTimestamp() > maxTS)
+        maxTS = source.getTopKey().getTimestamp();
       
-      if (!topValue.equals(source.getTopValue())) throw new RuntimeException("values not equals " + topKey + " " + source.getTopKey() + " : "
-          + diffInfo(topValue, source.getTopValue()));
+      if (!topValue.equals(source.getTopValue()))
+        throw new RuntimeException("values not equals " + topKey + " " + source.getTopKey() + " : " + diffInfo(topValue, source.getTopValue()));
       
       source.next();
     }
@@ -119,12 +121,14 @@ public class ChunkCombiner implements So
   
   private byte[] getVisFromRefs() throws IOException {
     Text row = topKey.getRow();
-    if (lastRowVC.containsKey(row)) return lastRowVC.get(row);
+    if (lastRowVC.containsKey(row))
+      return lastRowVC.get(row);
     Range range = new Range(row);
     refsSource.seek(range, refsColf, true);
     VisibilityCombiner vc = null;
     while (refsSource.hasTop()) {
-      if (vc == null) vc = new VisibilityCombiner();
+      if (vc == null)
+        vc = new VisibilityCombiner();
       vc.add(refsSource.getTopKey().getColumnVisibilityData());
       refsSource.next();
     }



Mime
View raw message