svn commit: r812230 - /incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java

[jb...@apache.org]

Author: jbellis
Date: Mon Sep  7 17:18:41 2009
New Revision: 812230

URL: http://svn.apache.org/viewvc?rev=812230&view=rev
Log:
fix compaction bug -- only one of the SSTR constructors was adding to openedFiles.  (fixes regression from #413).
patch by jbellis; reviewed by Eric Evans for CASSANDRA-425

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

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java?rev=812230&r1=812229&r2=812230&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java Mon Sep  7 17:18:41 2009
@@ -23,6 +23,8 @@
 
 import org.apache.log4j.Logger;
 
+import org.apache.commons.lang.StringUtils;
+
 import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.utils.BloomFilter;
 import org.apache.cassandra.utils.FileUtils;
@@ -108,7 +110,7 @@
     public static SSTableReader get(String dataFileName)
     {
         SSTableReader sstable = openedFiles.get(dataFileName);
-        assert sstable != null;
+        assert sstable != null : "No sstable opened for " + dataFileName + ": " + openedFiles;
         return sstable;
     }
 
@@ -123,6 +125,7 @@
     private SSTableReader(String filename, IPartitioner partitioner)
     {
         super(filename, partitioner);
+        openedFiles.put(filename, this);
     }
 
     public List<KeyPosition> getIndexPositions()
@@ -353,4 +356,10 @@
     {
         map.remove(new File(filename).getCanonicalPath());
     }
+
+    @Override
+    public String toString()
+    {
+        return "FileSSTableMap {" + StringUtils.join(map.keySet(), ", ") + "}";
+    }
 }