Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-10467 Revert from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1564640 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Zhihong Yu 2014-02-05 05:46:07 +00:00
parent a873e206c9
commit 3db5a52193
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
View File

@ -600,16 +600,15 @@ public class HTableDescriptor implements WritableComparable<HTableDescriptor> {
* Check if async log edits are enabled on the table. * Check if async log edits are enabled on the table.
* *
* @return true if that async log flush is 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()}. * Use {@link #getDurability()}.
*/ */
@Deprecated public synchronized boolean isAsyncLogFlush() {
public synchronized boolean isDeferredLogFlush() {
return getDurability() == Durability.ASYNC_WAL; 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 * 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 * 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 * that the edits are kept in memory until the background async writer-sync-notifier
@ -621,8 +620,7 @@ public class HTableDescriptor implements WritableComparable<HTableDescriptor> {
* *
* @param isAsyncLogFlush * @param isAsyncLogFlush
*/ */
@Deprecated public synchronized void setAsyncLogFlush(final boolean isAsyncLogFlush) {
public synchronized void setDeferredLogFlush(final boolean isAsyncLogFlush) {
this.setDurability(isAsyncLogFlush ? Durability.ASYNC_WAL : DEFAULT_DURABLITY); this.setDurability(isAsyncLogFlush ? Durability.ASYNC_WAL : DEFAULT_DURABLITY);
} }

2
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java
View File

@ -211,7 +211,7 @@ public class TestDurability {
HLog log, boolean isAsyncLogFlush) HLog log, boolean isAsyncLogFlush)
throws IOException { throws IOException {
HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(tableName)); HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(tableName));
htd.setDeferredLogFlush(isAsyncLogFlush); htd.setAsyncLogFlush(isAsyncLogFlush);
HColumnDescriptor hcd = new HColumnDescriptor(FAMILY); HColumnDescriptor hcd = new HColumnDescriptor(FAMILY);
htd.addFamily(hcd); htd.addFamily(hcd);
HRegionInfo info = new HRegionInfo(htd.getTableName(), null, null, false); HRegionInfo info = new HRegionInfo(htd.getTableName(), null, null, false);