svn commit: r1134926 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/regionserver/Store.java

[apurtell]

Author: apurtell
Date: Sun Jun 12 13:46:28 2011
New Revision: 1134926

URL: http://svn.apache.org/viewvc?rev=1134926&view=rev
Log:
HBASE 3976; Revert

Modified:
    hbase/branches/0.90/CHANGES.txt
    
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java

Modified: hbase/branches/0.90/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1134926&r1=1134925&r2=1134926&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Sun Jun 12 13:46:28 2011
@@ -26,7 +26,6 @@ Release 0.90.4 - Unreleased
                hmaster becomes the active one (Jieshan Bean)
    HBASE-3723  Major compact should be done when there is only one storefile
                and some keyvalue is outdated (Zhou Shuaifeng)
-   HBASE-3976  Disable block cache on compactions (Karthik Sankarachary)
    HBASE-3892  Table can't disable (Gao Jinchao)
    HBASE-3894  Thread contention over row locks set monitor (Dave Latham)
    HBASE-3794  Ability to Discard Bad HTable Puts

Modified: 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java?rev=1134926&r1=1134925&r2=1134926&view=diff
==============================================================================
--- 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
 (original)
+++ 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
 Sun Jun 12 13:46:28 2011
@@ -1010,9 +1010,8 @@ public class Store implements HeapSize {
         LOG.error("Failed move of compacted file " + compactedFile.getPath(), 
e);
         return null;
       }
-      result = new StoreFile(this.fs, p, 
-          false, // never cache during compaction
-          this.conf, this.family.getBloomFilterType(), this.inMemory);
+      result = new StoreFile(this.fs, p, blockcache, this.conf,
+          this.family.getBloomFilterType(), this.inMemory);
       result.createReader();
     }
     this.lock.writeLock().lock();