svn commit: r784842 - in /incubator/cassandra/trunk/src/java/org/apache/cassandra/io: ChecksumManager.java ChecksumRandomAccessFile.java SSTable.java SequenceFile.java

[jbellis]

Author: jbellis
Date: Mon Jun 15 16:20:04 2009
New Revision: 784842

URL: http://svn.apache.org/viewvc?rev=784842&view=rev
Log:
r/m CM and CRAF.  patch by jbellis; reviewed by Stu Hood for CASSANDRA-230

Removed:
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/ChecksumManager.java
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/ChecksumRandomAccessFile.java
Modified:
    incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTable.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SequenceFile.java

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTable.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTable.java?rev=784842&r1=784841&r2=784842&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTable.java 
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTable.java Mon 
Jun 15 16:20:04 2009
@@ -89,8 +89,6 @@
     {
         /* remove the cached index table from memory */
         indexMetadataMap_.remove(dataFile);
-        /* Delete the checksum file associated with this data file */
-        ChecksumManager.onFileDelete(dataFile);
 
         deleteWithConfirm(new File(dataFile));
         deleteWithConfirm(new File(indexFilename(dataFile)));

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SequenceFile.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SequenceFile.java?rev=784842&r1=784841&r2=784842&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SequenceFile.java 
(original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SequenceFile.java 
Mon Jun 15 16:20:04 2009
@@ -228,34 +228,6 @@
         }
     }
 
-    public static class ChecksumWriter extends Writer
-    {
-
-        ChecksumWriter(String filename, int size) throws IOException
-        {
-            super(filename, size);
-        }
-
-        @Override
-        protected void init(String filename) throws IOException
-        {
-            init(filename, 0);
-        }
-
-        @Override
-        protected void init(String filename, int size) throws IOException
-        {
-            File file = new File(filename);
-            file_ = new ChecksumRandomAccessFile(file, "rw", size);
-        }
-
-        @Override
-        public void close() throws IOException
-        {
-            super.close();
-            ChecksumManager.close(filename_);
-        }
-    }
 
     public static class ConcurrentWriter extends AbstractWriter
     {
@@ -1113,22 +1085,6 @@
         }
     }
 
-    public static class ChecksumReader extends Reader
-    {
-        private int size_;
-
-        ChecksumReader(String filename, int size) throws IOException
-        {
-            super(filename);
-            size_ = size;
-        }
-
-        protected void init(String filename) throws IOException
-        {
-            file_ = new ChecksumRandomAccessFile(filename, "r", size_);
-        }
-    }
-
     private static Logger logger_ = Logger.getLogger(SequenceFile.class);
     public static final short utfPrefix_ = 2;
     public static final String marker_ = "Bloom-Filter";