svn commit: r956993 - in /cassandra/trunk: src/java/org/apache/cassandra/io/ src/java/org/apache/cassandra/io/sstable/ test/unit/org/apache/cassandra/io/

[jbellis]

Author: jbellis
Date: Tue Jun 22 19:35:53 2010
New Revision: 956993

URL: http://svn.apache.org/viewvc?rev=956993&view=rev
Log:
mv BloomFilterTracker to io.sstable package.  patch by jbellis

Added:
    
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/BloomFilterTracker.java
      - copied, changed from r956979, 
cassandra/trunk/src/java/org/apache/cassandra/io/BloomFilterTracker.java
Removed:
    cassandra/trunk/src/java/org/apache/cassandra/io/BloomFilterTracker.java
Modified:
    cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
    
cassandra/trunk/test/unit/org/apache/cassandra/io/BloomFilterTrackerTest.java

Copied: 
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/BloomFilterTracker.java
 (from r956979, 
cassandra/trunk/src/java/org/apache/cassandra/io/BloomFilterTracker.java)
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/BloomFilterTracker.java?p2=cassandra/trunk/src/java/org/apache/cassandra/io/sstable/BloomFilterTracker.java&p1=cassandra/trunk/src/java/org/apache/cassandra/io/BloomFilterTracker.java&r1=956979&r2=956993&rev=956993&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/io/BloomFilterTracker.java 
(original)
+++ 
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/BloomFilterTracker.java
 Tue Jun 22 19:35:53 2010
@@ -1,4 +1,4 @@
-package org.apache.cassandra.io;
+package org.apache.cassandra.io.sstable;
 
 import java.util.concurrent.atomic.AtomicLong;
 

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=956993&r1=956992&r2=956993&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 
Tue Jun 22 19:35:53 2010
@@ -44,11 +44,8 @@ import org.apache.cassandra.db.filter.Qu
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.dht.AbstractBounds;
 import org.apache.cassandra.dht.Range;
-import org.apache.cassandra.io.BloomFilterTracker;
 import org.apache.cassandra.io.ICompactSerializer2;
 import org.apache.cassandra.io.util.FileDataInput;
-import org.apache.cassandra.utils.BloomFilter;
-import org.apache.cassandra.utils.Pair;
 
 /**
  * SSTableReaders are open()ed by Table.onStart; after that they are created 
by SSTableWriter.renameAndOpen.

Modified: 
cassandra/trunk/test/unit/org/apache/cassandra/io/BloomFilterTrackerTest.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/io/BloomFilterTrackerTest.java?rev=956993&r1=956992&r2=956993&view=diff
==============================================================================
--- 
cassandra/trunk/test/unit/org/apache/cassandra/io/BloomFilterTrackerTest.java 
(original)
+++ 
cassandra/trunk/test/unit/org/apache/cassandra/io/BloomFilterTrackerTest.java 
Tue Jun 22 19:35:53 2010
@@ -3,6 +3,7 @@ package org.apache.cassandra.io;
 import org.junit.Test;
 
 import org.apache.cassandra.CleanupHelper;
+import org.apache.cassandra.io.sstable.BloomFilterTracker;
 
 import static org.junit.Assert.assertEquals;