svn commit: r1134925 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/regionserver/Store.java

[apurtell]

Author: apurtell
Date: Sun Jun 12 13:44:30 2011
New Revision: 1134925

URL: http://svn.apache.org/viewvc?rev=1134925&view=rev
Log:
HBASE 3976; 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=1134925&r1=1134924&r2=1134925&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Sun Jun 12 13:44:30 2011
@@ -117,7 +117,6 @@ Release 0.91.0 - Unreleased
                (Alejandro Abdelnur)
    HBASE-3971  Compression.java uses ClassLoader.getSystemClassLoader()
                to load codec (Alejandro Abdelnur)
-   HBASE-3976  Disable block cache on compactions (Karthik Sankarachary)
    HBASE-3979  Trivial fixes in code, document (Ming Ma)
    HBASE-3794  Ability to Discard Bad HTable Puts
    HBASE-3923  HBASE-1502 Broke Shell's status 'simple' and 'detailed'

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=1134925&r1=1134924&r2=1134925&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 
Sun Jun 12 13:44:30 2011
@@ -1169,9 +1169,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();