You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/08/27 10:51:06 UTC
[1/3] git commit: Fix QueryPagerTest
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 <sy...@datastax.com>
Authored: Tue Aug 27 10:50:07 2013 +0200
Committer: Sylvain Lebresne <sy...@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)
[2/3] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by sl...@apache.org.
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e49261b4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e49261b4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e49261b4
Branch: refs/heads/trunk
Commit: e49261b46f8db7ccee4205b6dc54741e5d2cc73e
Parents: db381ea c284786
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Aug 27 10:50:45 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Aug 27 10:50:45 2013 +0200
----------------------------------------------------------------------
test/unit/org/apache/cassandra/service/QueryPagerTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9e8391a4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e8391a4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9e8391a4
Branch: refs/heads/trunk
Commit: 9e8391a481844fa277b01d64328cf0d14e779a6d
Parents: 3bba76d e49261b
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Aug 27 10:51:00 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Aug 27 10:51:00 2013 +0200
----------------------------------------------------------------------
test/unit/org/apache/cassandra/service/QueryPagerTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------