Updated Branches: refs/heads/trunk 3bba76dd1 -> 9e8391a48
Fix QueryPagerTest Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2847864 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2847864 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2847864 Branch: refs/heads/trunk Commit: c2847864c6ec05320f18ba380104742b41ca4023 Parents: f5c9b4a Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Aug 27 10:50:07 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Aug 27 10:50:24 2013 +0200 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/service/QueryPagerTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2847864/test/unit/org/apache/cassandra/service/QueryPagerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/QueryPagerTest.java b/test/unit/org/apache/cassandra/service/QueryPagerTest.java index cf1a083..48893d4 100644 --- a/test/unit/org/apache/cassandra/service/QueryPagerTest.java +++ b/test/unit/org/apache/cassandra/service/QueryPagerTest.java @@ -119,7 +119,8 @@ public class QueryPagerTest extends SchemaLoader private static ReadCommand sliceQuery(String key, String start, String end, int count) { SliceQueryFilter filter = new SliceQueryFilter(bytes(start), bytes(end), false, count); - return new SliceFromReadCommand(KS, bytes(key), CF, System.currentTimeMillis(), filter); + // Note: for MultiQueryTest, we need the same timestamp/expireBefore for all queries, so we just use 0 as it doesn't matter here. + return new SliceFromReadCommand(KS, bytes(key), CF, 0, filter); } private static RangeSliceCommand rangeNamesQuery(AbstractBounds<RowPosition> range, int count, String... names)