svn commit: r918087 - /incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java

[jbellis]

Author: jbellis
Date: Tue Mar  2 15:57:52 2010
New Revision: 918087

URL: http://svn.apache.org/viewvc?rev=918087&view=rev
Log:
r/m unused closeAndOpenReader overload.  patch by jbellis

Modified:
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java?rev=918087&r1=918086&r2=918087&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java 
(original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java 
Tue Mar  2 15:57:52 2010
@@ -131,15 +131,6 @@
 
     public SSTableReader closeAndOpenReader() throws IOException
     {
-        return closeAndOpenReader(false);
-    }
-
-    /**
-     * Renames temporary SSTable files to valid data, index, and bloom filter 
files.
-     * The SSTableWriter object will no longer be valid.
-     */
-    public SSTableReader closeAndOpenReader(boolean temporary) throws 
IOException
-    {
         // bloom filter
         FileOutputStream fos = new FileOutputStream(filterFilename());
         DataOutputStream stream = new DataOutputStream(fos);
@@ -156,12 +147,9 @@
         dataFile.close(); // calls force
 
         String newpath = getFilename();
-        if (!temporary)
-        {
-            rename(indexFilename());
-            rename(filterFilename());
-            newpath = rename(newpath); // important to do this last since 
index & filter file names are derived from it
-        }
+        rename(indexFilename());
+        rename(filterFilename());
+        newpath = rename(newpath); // important to do this last since index & 
filter file names are derived from it
 
         return new SSTableReader(newpath, partitioner, indexPositions, 
spannedIndexDataPositions, bf);
     }