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 2015/11/24 14:50:57 UTC
[1/2] cassandra git commit: Use constant nowInSec for
SinglePartitionReadCommands in QueryPager test
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.1 383eb46b3 -> c37dbdbe3
Use constant nowInSec for SinglePartitionReadCommands in QueryPager test
patch by jkni; reviewed by slebresne for CASSANDRA-10754
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9dac99f8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9dac99f8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9dac99f8
Branch: refs/heads/cassandra-3.1
Commit: 9dac99f8179f503941038ed7f92b2341bb8f0010
Parents: c7e74f3
Author: Joel Knighton <jo...@datastax.com>
Authored: Mon Nov 23 17:42:06 2015 -0600
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Nov 24 14:48:38 2015 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/service/QueryPagerTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9dac99f8/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 15bc060..bfc66e0 100644
--- a/test/unit/org/apache/cassandra/service/QueryPagerTest.java
+++ b/test/unit/org/apache/cassandra/service/QueryPagerTest.java
@@ -53,6 +53,7 @@ public class QueryPagerTest
public static final String CF_STANDARD = "Standard1";
public static final String KEYSPACE_CQL = "cql_keyspace";
public static final String CF_CQL = "table2";
+ public static final int nowInSec = FBUtilities.nowInSeconds();
@BeforeClass
public static void defineSchema() throws ConfigurationException
@@ -159,7 +160,7 @@ public class QueryPagerTest
Slice slice = Slice.make(cmp.make(start), cmp.make(end));
ClusteringIndexSliceFilter filter = new ClusteringIndexSliceFilter(Slices.with(cmp, slice), reversed);
- return SinglePartitionReadCommand.create(cfs().metadata, FBUtilities.nowInSeconds(), ColumnFilter.all(metadata), RowFilter.NONE, DataLimits.NONE, Util.dk(key), filter);
+ return SinglePartitionReadCommand.create(cfs().metadata, nowInSec, ColumnFilter.all(metadata), RowFilter.NONE, DataLimits.NONE, Util.dk(key), filter);
}
private static ReadCommand rangeNamesQuery(String keyStart, String keyEnd, int count, String... names)
@@ -425,7 +426,7 @@ public class QueryPagerTest
for (int i = 0; i < 5; i++)
executeInternal(String.format("INSERT INTO %s.%s (k, c, v) VALUES ('k%d', 'c%d', null)", keyspace, table, 0, i));
- ReadCommand command = SinglePartitionReadCommand.create(cfs.metadata, FBUtilities.nowInSeconds(), Util.dk("k0"), Slice.ALL);
+ ReadCommand command = SinglePartitionReadCommand.create(cfs.metadata, nowInSec, Util.dk("k0"), Slice.ALL);
QueryPager pager = command.getPager(null, Server.CURRENT_VERSION);
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.1
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c37dbdbe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c37dbdbe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c37dbdbe
Branch: refs/heads/cassandra-3.1
Commit: c37dbdbe35759b0b3df5955d7ec4e84fd422d34d
Parents: 383eb46 9dac99f
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Nov 24 14:50:49 2015 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Nov 24 14:50:49 2015 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/service/QueryPagerTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------