Author: stack
Date: Tue Jun 14 23:47:37 2011
New Revision: 1135855
URL: http://svn.apache.org/viewvc?rev=1135855&view=rev
Log:
HBASE-3976 Disable Block Cache On Compactions -- REVERT
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1135855&r1=1135854&r2=1135855&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Jun 14 23:47:37 2011
@@ -263,7 +263,6 @@ Release 0.91.0 - Unreleased
HBASE-3982 Improvements to TestHFileSeek
HBASE-3940 HBase daemons should log version info at startup and possibly
periodically (Li Pi)
- HBASE-3976 Disable Block Cache On Compactions (Karthick Sankarachary)
TASKS
HBASE-3559 Move report of split to master OFF the heartbeat channel
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java?rev=1135855&r1=1135854&r2=1135855&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
Tue Jun 14 23:47:37 2011
@@ -549,18 +549,12 @@ public class Store implements HeapSize {
* @return Writer for a new StoreFile in the tmp dir.
*/
private StoreFile.Writer createWriterInTmp(int maxKeyCount,
- Compression.Algorithm compression) throws IOException {
- return createWriterInTmp(maxKeyCount, compression,
- conf.getBoolean("hbase.rs.cacheblocksonwrite", false));
- }
-
- private StoreFile.Writer createWriterInTmp(int maxKeyCount,
- Compression.Algorithm compression, boolean cacheBlocksOnWrite)
+ Compression.Algorithm compression)
throws IOException {
return StoreFile.createWriter(this.fs, region.getTmpDir(), this.blocksize,
compression, this.comparator, this.conf,
this.family.getBloomFilterType(), maxKeyCount,
- cacheBlocksOnWrite);
+ conf.getBoolean("hbase.rs.cacheblocksonwrite", false));
}
/*
@@ -1103,7 +1097,7 @@ public class Store implements HeapSize {
while (scanner.next(kvs)) {
if (writer == null && !kvs.isEmpty()) {
writer = createWriterInTmp(maxKeyCount,
- this.compactionCompression, false);
+ this.compactionCompression);
}
if (writer != null) {
// output to writer:
