svn commit: r985292 - in /cassandra/trunk: CHANGES.txt src/java/org/apache/cassandra/io/sstable/SSTableReader.java src/java/org/apache/cassandra/io/util/SegmentedFile.java

[jbellis]

Author: jbellis
Date: Fri Aug 13 17:11:30 2010
New Revision: 985292

URL: http://svn.apache.org/viewvc?rev=985292&view=rev
Log:
restore use of mmap_index_only option.  patch by jbellis; reviewed by Stu Hood 
for CASSANDRA-1241

Modified:
    cassandra/trunk/CHANGES.txt
    cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
    cassandra/trunk/src/java/org/apache/cassandra/io/util/SegmentedFile.java

Modified: cassandra/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=985292&r1=985291&r2=985292&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Fri Aug 13 17:11:30 2010
@@ -3,6 +3,7 @@ dev
  * expose CfDef metadata in describe_keyspaces (CASSANDRA-1633)
  * add back percentage option for cache size configuration, and replace
    SnakeYAML with YamlBeans (CASSANDRA-1313)
+ * restore use of mmap_index_only option (CASSANDRA-1241)
 
 
 0.7-beta1

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java?rev=985292&r1=985291&r2=985292&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java 
Fri Aug 13 17:11:30 2010
@@ -281,8 +281,8 @@ public class SSTableReader extends SSTab
      */
     private void load(boolean recreatebloom) throws IOException
     {
-        SegmentedFile.Builder ibuilder = SegmentedFile.getBuilder();
-        SegmentedFile.Builder dbuilder = SegmentedFile.getBuilder();
+        SegmentedFile.Builder ibuilder = 
SegmentedFile.getBuilder(DatabaseDescriptor.getIndexAccessMode());
+        SegmentedFile.Builder dbuilder = 
SegmentedFile.getBuilder(DatabaseDescriptor.getDiskAccessMode());
 
         // we read the positions in a BRAF so we don't have to worry about an 
entry spanning a mmap boundary.
         indexSummary = new IndexSummary();

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/io/util/SegmentedFile.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/util/SegmentedFile.java?rev=985292&r1=985291&r2=985292&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/io/util/SegmentedFile.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/io/util/SegmentedFile.java 
Fri Aug 13 17:11:30 2010
@@ -53,12 +53,11 @@ public abstract class SegmentedFile
     /**
      * @return A SegmentedFile.Builder.
      */
-    public static Builder getBuilder()
+    public static Builder getBuilder(Config.DiskAccessMode mode)
     {
-        if (DatabaseDescriptor.getDiskAccessMode() == 
Config.DiskAccessMode.mmap)
-            return new MmappedSegmentedFile.Builder();
-        assert DatabaseDescriptor.getDiskAccessMode() == 
Config.DiskAccessMode.standard;
-        return new BufferedSegmentedFile.Builder();
+        return mode == Config.DiskAccessMode.mmap
+               ? new MmappedSegmentedFile.Builder()
+               : new BufferedSegmentedFile.Builder();
     }
 
     public abstract FileDataInput getSegment(long position, int bufferSize);