Updated Branches: refs/heads/cassandra-1.1.0 f9454d00b -> 2e7906926
Use current time when filtering tombstones in HH. Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-3972 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e790692 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e790692 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e790692 Branch: refs/heads/cassandra-1.1.0 Commit: 2e79069261fb780dd21c534304abb4ffe1ca422e Parents: f9454d0 Author: Brandon Williams <[email protected]> Authored: Tue Feb 28 10:33:28 2012 -0600 Committer: Brandon Williams <[email protected]> Committed: Tue Feb 28 10:33:28 2012 -0600 ---------------------------------------------------------------------- .../apache/cassandra/db/HintedHandOffManager.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e790692/src/java/org/apache/cassandra/db/HintedHandOffManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java b/src/java/org/apache/cassandra/db/HintedHandOffManager.java index 8e6acb2..d614a8d 100644 --- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java +++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java @@ -311,7 +311,7 @@ public class HintedHandOffManager implements HintedHandOffManagerMBean while (true) { QueryFilter filter = QueryFilter.getSliceFilter(epkey, new QueryPath(HINTS_CF), startColumn, ByteBufferUtil.EMPTY_BYTE_BUFFER, false, pageSize); - ColumnFamily hintsPage = ColumnFamilyStore.removeDeleted(hintStore.getColumnFamily(filter), Integer.MAX_VALUE); + ColumnFamily hintsPage = ColumnFamilyStore.removeDeleted(hintStore.getColumnFamily(filter), (int)(System.currentTimeMillis() / 1000)); if (pagingFinished(hintsPage, startColumn)) break;
