HBASE 3976; Revert

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1134925 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andrew Kyle Purtell 2011-06-12 13:44:30 +00:00
parent 3fb6a0a7aa
commit d1c070f707
2 changed files with 2 additions and 4 deletions

View File

@ -117,7 +117,6 @@ Release 0.91.0 - Unreleased
(Alejandro Abdelnur) (Alejandro Abdelnur)
HBASE-3971 Compression.java uses ClassLoader.getSystemClassLoader() HBASE-3971 Compression.java uses ClassLoader.getSystemClassLoader()
to load codec (Alejandro Abdelnur) to load codec (Alejandro Abdelnur)
HBASE-3976 Disable block cache on compactions (Karthik Sankarachary)
HBASE-3979 Trivial fixes in code, document (Ming Ma) HBASE-3979 Trivial fixes in code, document (Ming Ma)
HBASE-3794 Ability to Discard Bad HTable Puts HBASE-3794 Ability to Discard Bad HTable Puts
HBASE-3923 HBASE-1502 Broke Shell's status 'simple' and 'detailed' HBASE-3923 HBASE-1502 Broke Shell's status 'simple' and 'detailed'

View File

@ -1169,9 +1169,8 @@ public class Store implements HeapSize {
LOG.error("Failed move of compacted file " + compactedFile.getPath(), e); LOG.error("Failed move of compacted file " + compactedFile.getPath(), e);
return null; return null;
} }
result = new StoreFile(this.fs, p, result = new StoreFile(this.fs, p, blockcache, this.conf,
false, // never cache during compaction this.family.getBloomFilterType(), this.inMemory);
this.conf, this.family.getBloomFilterType(), this.inMemory);
result.createReader(); result.createReader();
} }
this.lock.writeLock().lock(); this.lock.writeLock().lock();