You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2011/06/15 01:23:52 UTC
svn commit: r1135849 - in /hbase/trunk: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
Author: stack
Date: Tue Jun 14 23:23:52 2011
New Revision: 1135849
URL: http://svn.apache.org/viewvc?rev=1135849&view=rev
Log:
HBASE-3976 Disable Block Cache On Compactions
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=1135849&r1=1135848&r2=1135849&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Jun 14 23:23:52 2011
@@ -263,6 +263,7 @@ 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=1135849&r1=1135848&r2=1135849&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:23:52 2011
@@ -549,12 +549,18 @@ public class Store implements HeapSize {
* @return Writer for a new StoreFile in the tmp dir.
*/
private StoreFile.Writer createWriterInTmp(int maxKeyCount,
- Compression.Algorithm compression)
+ 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)
throws IOException {
return StoreFile.createWriter(this.fs, region.getTmpDir(), this.blocksize,
compression, this.comparator, this.conf,
this.family.getBloomFilterType(), maxKeyCount,
- conf.getBoolean("hbase.rs.cacheblocksonwrite", false));
+ cacheBlocksOnWrite);
}
/*
@@ -1097,7 +1103,7 @@ public class Store implements HeapSize {
while (scanner.next(kvs)) {
if (writer == null && !kvs.isEmpty()) {
writer = createWriterInTmp(maxKeyCount,
- this.compactionCompression);
+ this.compactionCompression, false);
}
if (writer != null) {
// output to writer: