Author: jbellis Date: Thu Aug 26 22:10:34 2010 New Revision: 989952 URL: http://svn.apache.org/viewvc?rev=989952&view=rev Log: handle zero-length (or missing) rows during HH paging. patch by jbellis; reviewed by brandonwilliams for CASSANDRA-1432
Modified: cassandra/branches/cassandra-0.6/CHANGES.txt cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/HintedHandOffManager.java Modified: cassandra/branches/cassandra-0.6/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=989952&r1=989951&r2=989952&view=diff ============================================================================== --- cassandra/branches/cassandra-0.6/CHANGES.txt (original) +++ cassandra/branches/cassandra-0.6/CHANGES.txt Thu Aug 26 22:10:34 2010 @@ -2,6 +2,7 @@ * Allow using DynamicEndpointSnitch with RackAwareStrategy (CASSANDRA-1429) * remove the remaining vestiges of the unfinished DatacenterShardStrategy (replaced by NetworkTopologyStrategy in 0.7) + * handle zero-length (or missing) rows during HH paging (CASSANDRA-1432) 0.6.5 Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/HintedHandOffManager.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/HintedHandOffManager.java?rev=989952&r1=989951&r2=989952&view=diff ============================================================================== --- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/HintedHandOffManager.java (original) +++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/db/HintedHandOffManager.java Thu Aug 26 22:10:34 2010 @@ -120,6 +120,13 @@ public class HintedHandOffManager ColumnFamily cf = cfs.getColumnFamily(filter); if (pagingFinished(cf, startColumn)) break; + if (cf.getColumnNames().isEmpty()) + { + if (logger_.isDebugEnabled()) + logger_.debug("Nothing to hand off for " + key); + break; + } + startColumn = cf.getColumnNames().last(); RowMutation rm = new RowMutation(tableName, key); rm.add(cf);