svn commit: r928045 - in /cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter: SSTableNamesIterator.java SSTableSliceIterator.java

[jbellis]

Author: jbellis
Date: Fri Mar 26 20:30:05 2010
New Revision: 928045

URL: http://svn.apache.org/viewvc?rev=928045&view=rev
Log:
improve key mismatch assertion

Modified:
    
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java
    
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java

Modified: 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java?rev=928045&r1=928044&r2=928045&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java
 (original)
+++ 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java
 Fri Mar 26 20:30:05 2010
@@ -53,7 +53,8 @@ public class SSTableNamesIterator extend
         try
         {
             DecoratedKey keyInDisk = 
ssTable.getPartitioner().convertFromDiskFormat(file.readUTF());
-            assert keyInDisk.equals(decoratedKey) : keyInDisk;
+            assert keyInDisk.equals(decoratedKey) 
+                   : String.format("%s != %s in %s", keyInDisk, decoratedKey, 
file.getPath());
             file.readInt(); // data size
 
             /* Read the bloom filter summarizing the columns */

Modified: 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java?rev=928045&r1=928044&r2=928045&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java
 (original)
+++ 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java
 Fri Mar 26 20:30:05 2010
@@ -123,7 +123,8 @@ class SSTableSliceIterator extends Abstr
             this.file = input;
 
             DecoratedKey keyInDisk = 
ssTable.getPartitioner().convertFromDiskFormat(file.readUTF());
-            assert keyInDisk.equals(key);
+            assert keyInDisk.equals(key)
+                   : String.format("%s != %s in %s", keyInDisk, key, 
file.getPath());
 
             file.readInt(); // row size
             IndexHelper.skipBloomFilter(file);