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

HBASE-3976 Disable Block Cache On Compactions -- REVERT 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1135855 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-06-14 23:47:37 +00:00
parent a86a4b9dc7
commit 0c8d19c975
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -263,7 +263,6 @@ Release 0.91.0 - Unreleased
HBASE-3982 Improvements to TestHFileSeek HBASE-3982 Improvements to TestHFileSeek
HBASE-3940 HBase daemons should log version info at startup and possibly HBASE-3940 HBase daemons should log version info at startup and possibly
periodically (Li Pi) periodically (Li Pi)
HBASE-3976 Disable Block Cache On Compactions (Karthick Sankarachary)
TASKS TASKS
HBASE-3559 Move report of split to master OFF the heartbeat channel HBASE-3559 Move report of split to master OFF the heartbeat channel

12
src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
View File

@ -549,18 +549,12 @@ public class Store implements HeapSize {
* @return Writer for a new StoreFile in the tmp dir. * @return Writer for a new StoreFile in the tmp dir.
*/ */
private StoreFile.Writer createWriterInTmp(int maxKeyCount, private StoreFile.Writer createWriterInTmp(int maxKeyCount,
Compression.Algorithm compression) throws IOException { Compression.Algorithm compression)
return createWriterInTmp(maxKeyCount, compression,
conf.getBoolean("hbase.rs.cacheblocksonwrite", false));
}
private StoreFile.Writer createWriterInTmp(int maxKeyCount,
Compression.Algorithm compression, boolean cacheBlocksOnWrite)
throws IOException { throws IOException {
return StoreFile.createWriter(this.fs, region.getTmpDir(), this.blocksize, return StoreFile.createWriter(this.fs, region.getTmpDir(), this.blocksize,
compression, this.comparator, this.conf, compression, this.comparator, this.conf,
this.family.getBloomFilterType(), maxKeyCount, this.family.getBloomFilterType(), maxKeyCount,
cacheBlocksOnWrite); conf.getBoolean("hbase.rs.cacheblocksonwrite", false));
} }
/* /*
@ -1103,7 +1097,7 @@ public class Store implements HeapSize {
while (scanner.next(kvs)) { while (scanner.next(kvs)) {
if (writer == null && !kvs.isEmpty()) { if (writer == null && !kvs.isEmpty()) {
writer = createWriterInTmp(maxKeyCount, writer = createWriterInTmp(maxKeyCount,
this.compactionCompression, false); this.compactionCompression);
} }
if (writer != null) { if (writer != null) {
// output to writer: // output to writer: