Author: jbellis
Date: Tue Jul 12 23:37:01 2011
New Revision: 1145819
URL: http://svn.apache.org/viewvc?rev=1145819&view=rev
Log:
fix supercolumn maxtimestamp bug
patch by Daniel Doubleday; reviewed by jbellis for CASSANDRA-2753
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java?rev=1145819&r1=1145818&r2=1145819&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java Tue Jul
12 23:37:01 2011
@@ -138,7 +138,8 @@ public class SuperColumn extends Abstrac
long maxTimestamp = Long.MIN_VALUE;
for (IColumn subColumn : getSubColumns())
maxTimestamp = Math.max(maxTimestamp, subColumn.maxTimestamp());
- return maxTimestamp;
+
+ return Math.max(maxTimestamp, getMarkedForDeleteAt());
}
public long mostRecentLiveChangeAt()
