Author: jbellis Date: Mon May 10 16:37:09 2010 New Revision: 942816 URL: http://svn.apache.org/viewvc?rev=942816&view=rev Log: r/m unused code from SSTableReader. patch by jbellis
Modified: cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java 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=942816&r1=942815&r2=942816&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 Mon May 10 16:37:09 2010 @@ -31,19 +31,13 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.cache.InstrumentedCache; import org.apache.cassandra.dht.IPartitioner; -import org.apache.cassandra.utils.BloomFilter; -import org.apache.cassandra.utils.Pair; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.*; import org.apache.cassandra.db.filter.QueryFilter; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.io.ICompactSerializer2; -import org.apache.cassandra.io.util.BufferedRandomAccessFile; import org.apache.cassandra.io.util.FileDataInput; -import org.apache.cassandra.io.util.MappedFileDataInput; - -import org.cliffc.high_scale_lib.NonBlockingHashMap; /** * SSTableReaders are open()ed by Table.onStart; after that they are created by SSTableWriter.renameAndOpen. @@ -64,7 +58,7 @@ public abstract class SSTableReader exte { while (true) { - SSTableDeletingReference r = null; + SSTableDeletingReference r; try { r = (SSTableDeletingReference) finalizerQueue.remove(); @@ -172,8 +166,6 @@ public abstract class SSTableReader exte } } - /*************************************************************************/ - protected SSTableReader(Descriptor desc, IPartitioner partitioner) { super(desc, partitioner); @@ -181,12 +173,6 @@ public abstract class SSTableReader exte private volatile SSTableDeletingReference phantomReference; - void addFinalizingReference(SSTableTracker tracker) - { - phantomReference = new SSTableDeletingReference(tracker, this, finalizerQueue); - finalizers.add(phantomReference); - } - /** * For testing purposes only. */