accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [04/18] git commit: ACCUMULO-1957 whitespace
Date Fri, 05 Sep 2014 21:17:20 GMT
ACCUMULO-1957 whitespace


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a25796c4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a25796c4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a25796c4

Branch: refs/heads/master
Commit: a25796c4b18734ad87cb5e5df64a15574647fd13
Parents: e3aa7ea
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Wed Aug 27 15:38:42 2014 -0400
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Fri Sep 5 17:16:58 2014 -0400

----------------------------------------------------------------------
 .../org/apache/accumulo/core/conf/Property.java |  6 +++---
 .../apache/accumulo/core/conf/PropertyType.java |  2 +-
 .../accumulo/tserver/TabletMutations.java       |  6 +++---
 .../apache/accumulo/tserver/log/DfsLogger.java  |  8 ++++----
 .../accumulo/tserver/tablet/Durability.java     |  4 ++--
 .../accumulo/test/functional/DurabilityIT.java  | 20 ++++++++++----------
 6 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a25796c4/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 72d9aa1..018e83f 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -390,9 +390,9 @@ public enum Property {
           + ",org.apache.accumulo.core.file.keyfunctor.ColumnFamilyFunctor, and org.apache.accumulo.core.file.keyfunctor.ColumnQualifierFunctor
are"
           + " allowable values. One can extend any of the above mentioned classes to perform
specialized parsing of the key. "),
   TABLE_BLOOM_HASHTYPE("table.bloom.hash.type", "murmur", PropertyType.STRING, "The bloom
filter hash type"),
-  TABLE_DURABILITY("table.durability", "sync", PropertyType.DURABILITY, "The durability used
to write to the write-ahead log." + 
-      " Legal values are: none, which skips the write-ahead log; " + 
-      "flush, which pushes data to the file system; and " + 
+  TABLE_DURABILITY("table.durability", "sync", PropertyType.DURABILITY, "The durability used
to write to the write-ahead log." +
+      " Legal values are: none, which skips the write-ahead log; " +
+      "flush, which pushes data to the file system; and " +
       "sync, which ensures the data is written to disk."),
   TABLE_FAILURES_IGNORE("table.failures.ignore", "false", PropertyType.BOOLEAN,
       "If you want queries for your table to hang or fail when data is missing from the system,
"

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a25796c4/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
index 5d5dd5f..00202cf 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
@@ -67,7 +67,7 @@ public enum PropertyType {
 
   CLASSNAME("java class", "[\\w$.]*", "A fully qualified java class name representing a class
on the classpath.\n"
       + "An example is 'java.lang.String', rather than 'String'"),
-      
+
   DURABILITY("durability", "(?:none|log|flush|sync)", "One of 'none', 'flush' or 'sync'."),
 
   STRING("string", ".*",

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a25796c4/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletMutations.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletMutations.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletMutations.java
index a30fa02..edd12aa 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletMutations.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletMutations.java
@@ -41,13 +41,13 @@ public class TabletMutations {
   public int getTid() {
     return tid;
   }
-  
+
   public int getSeq() {
     return seq;
   }
-  
+
   public Durability getDurability() {
     return durability;
   }
-  
+
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a25796c4/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index d907ee7..443ba2e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -69,7 +69,7 @@ import com.google.common.base.Joiner;
 
 /**
  * Wrap a connection to a logger.
- * 
+ *
  */
 public class DfsLogger {
   // Package private so that LogSorter can find this
@@ -146,7 +146,7 @@ public class DfsLogger {
           continue;
         }
         workQueue.drainTo(work);
-        
+
         Method durabilityMethod = null;
         loop:
         for (LogWork logWork : work) {
@@ -238,7 +238,7 @@ public class DfsLogger {
     // filename is unique
     return getFileName().hashCode();
   }
-  
+
   private final ServerResources conf;
   private FSDataOutputStream logFile;
   private DataOutputStream encryptingLogFile = null;
@@ -474,7 +474,7 @@ public class DfsLogger {
       log.error("WAL work queue not empty after sync thread exited");
       throw new IllegalStateException("WAL work queue not empty after sync thread exited");
     }
-    
+
     if (encryptingLogFile != null)
       try {
         logFile.close();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a25796c4/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Durability.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Durability.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Durability.java
index 675b196..a88e377 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Durability.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Durability.java
@@ -21,7 +21,7 @@ public enum Durability {
   LOG,
   FLUSH,
   SYNC;
-  
+
   static public Durability fromString(String value) {
     try {
       return Durability.valueOf(value.toUpperCase());
@@ -29,5 +29,5 @@ public enum Durability {
       return Durability.SYNC;
     }
   }
-  
+
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a25796c4/test/src/test/java/org/apache/accumulo/test/functional/DurabilityIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DurabilityIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DurabilityIT.java
index b4d9c83..590c7c4 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/DurabilityIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/DurabilityIT.java
@@ -37,24 +37,24 @@ import org.apache.hadoop.conf.Configuration;
 import org.junit.Test;
 
 public class DurabilityIT extends ConfigurableMacIT {
-  
+
   @Override
   public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
     cfg.useMiniDFS(true);
     cfg.setNumTservers(1);
   }
-  
+
   static final long N = 100000;
-  
+
   String tableNames[] = null;
-  
+
   void init() throws Exception {
     synchronized (this) {
       if (tableNames == null) {
         tableNames = getUniqueNames(4);
         Connector c = getConnector();
         TableOperations tableOps = c.tableOperations();
-        tableOps.create(tableNames[0]); 
+        tableOps.create(tableNames[0]);
         tableOps.create(tableNames[1]);
         tableOps.create(tableNames[2]);
         tableOps.create(tableNames[3]);
@@ -81,7 +81,7 @@ public class DurabilityIT extends ConfigurableMacIT {
     assertTrue(t1 > t2);
     assertTrue(t2 > t3);
   }
-  
+
   @Test(timeout = 4 * 60 * 1000)
   public void testSync() throws Exception {
     init();
@@ -96,7 +96,7 @@ public class DurabilityIT extends ConfigurableMacIT {
   public void testFlush() throws Exception {
     init();
     // flush table won't lose anything since we're not losing power/dfs
-    getConnector().tableOperations().deleteRows(tableNames[1], null, null); 
+    getConnector().tableOperations().deleteRows(tableNames[1], null, null);
     writeSome(tableNames[1], N);
     restartTServer();
     assertEquals(N, readSome(tableNames[1], N));
@@ -106,12 +106,12 @@ public class DurabilityIT extends ConfigurableMacIT {
   public void testLog() throws Exception {
     init();
     // we're probably going to lose something the the log setting
-    getConnector().tableOperations().deleteRows(tableNames[2], null, null); 
+    getConnector().tableOperations().deleteRows(tableNames[2], null, null);
     writeSome(tableNames[2], N);
     restartTServer();
     assertTrue(N > readSome(tableNames[2], N));
   }
-  
+
   @Test(timeout = 4 * 60 * 1000)
   public void testNone() throws Exception {
     init();
@@ -159,5 +159,5 @@ public class DurabilityIT extends ConfigurableMacIT {
     c.tableOperations().flush(table, null, null, true);
     return result;
   }
-  
+
 }


Mime
View raw message