svn commit: r1035047 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java

[jbellis]

Author: jbellis
Date: Sun Nov 14 18:46:24 2010
New Revision: 1035047

URL: http://svn.apache.org/viewvc?rev=1035047&view=rev
Log:
revert CASSANDRA-1702

Modified:
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java?rev=1035047&r1=1035046&r2=1035047&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java
 Sun Nov 14 18:46:24 2010
@@ -31,7 +31,6 @@ import java.util.concurrent.Future;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
-import org.apache.cassandra.config.CFMetaData;
 import org.apache.commons.collections.PredicateUtils;
 import org.apache.commons.collections.iterators.CollatingIterator;
 import org.apache.commons.collections.iterators.FilterIterator;
@@ -272,22 +271,8 @@ public class CompactionManager implement
             writer = new SSTableWriter(newFilename, expectedBloomFilterSize, 
cfs.metadata, cfs.partitioner);
             while (nni.hasNext())
             {
-                writer.mark();
-                try
-                {
-                    AbstractCompactedRow row = nni.next();
-                    writer.append(row);
-                }
-                catch (Exception e)
-                {
-                    logger.error("non-fatal error during compaction", e);
-                    writer.reset();
-                }
-                catch (IOError e)
-                {
-                    logger.error("non-fatal error during compaction", e);
-                    writer.reset();
-                }
+                AbstractCompactedRow row = nni.next();
+                writer.append(row);
                 totalkeysWritten++;
             }
         }