svn commit: r1564640 - in /hbase/trunk: hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java

[te...@apache.org]

Author: tedyu
Date: Wed Feb  5 05:46:07 2014
New Revision: 1564640

URL: http://svn.apache.org/r1564640
Log:
HBASE-10467 Revert from trunk


Modified:
    hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java

Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java?rev=1564640&r1=1564639&r2=1564640&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java Wed Feb  5 05:46:07 2014
@@ -600,16 +600,15 @@ public class HTableDescriptor implements
    * Check if async log edits are enabled on the table.
    *
    * @return true if that async log flush is enabled on the table
-   * @deprecated Since 0.96 we no longer have an explicitly deferred log flush/sync functionality.
+   * @deprecated Since 0.96 we no longer have an explicity deferred log flush/sync functionality.
    * Use {@link #getDurability()}.
    */
-  @Deprecated
-  public synchronized boolean isDeferredLogFlush() {
+  public synchronized boolean isAsyncLogFlush() {
     return getDurability() == Durability.ASYNC_WAL;
   }
 
   /**
-   * This is used to allow the log edits syncing to the file system. Everytime
+   * This is used to allowing the log edits syncing to the file system. Everytime
    * an edit is sent to the server it is first sync'd to the file system by the
    * log writer. This sync is an expensive operation and thus can be deferred so
    * that the edits are kept in memory until the background async writer-sync-notifier
@@ -621,8 +620,7 @@ public class HTableDescriptor implements
    *
    * @param isAsyncLogFlush
    */
-  @Deprecated
-  public synchronized void setDeferredLogFlush(final boolean isAsyncLogFlush) {
+  public synchronized void setAsyncLogFlush(final boolean isAsyncLogFlush) {
     this.setDurability(isAsyncLogFlush ? Durability.ASYNC_WAL : DEFAULT_DURABLITY);
   }
 

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java?rev=1564640&r1=1564639&r2=1564640&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java Wed Feb  5 05:46:07 2014
@@ -211,7 +211,7 @@ public class TestDurability {
       HLog log, boolean isAsyncLogFlush)
     throws IOException {
       HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(tableName));
-      htd.setDeferredLogFlush(isAsyncLogFlush);
+      htd.setAsyncLogFlush(isAsyncLogFlush);
       HColumnDescriptor hcd = new HColumnDescriptor(FAMILY);
       htd.addFamily(hcd);
       HRegionInfo info = new HRegionInfo(htd.getTableName(), null, null, false);