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/06/25 10:33:34 UTC
git commit: Nits
Updated Branches:
refs/heads/trunk e48ff2938 -> 764620368
Nits
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76462036
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76462036
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76462036
Branch: refs/heads/trunk
Commit: 76462036843b51f0e875154b2e150a7a52b0e84f
Parents: e48ff29
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jun 25 10:33:27 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jun 25 10:33:27 2013 +0200
----------------------------------------------------------------------
.../cassandra/service/pager/AbstractQueryPager.java | 1 -
.../org/apache/cassandra/service/pager/QueryPagers.java | 12 ++++++------
2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/76462036/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
index 460bc44..49a2c1e 100644
--- a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
@@ -109,7 +109,6 @@ abstract class AbstractQueryPager implements QueryPager
private List<Row> filterEmpty(List<Row> result)
{
- boolean doCopy = false;
for (Row row : result)
{
if (row.cf == null || row.cf.getColumnCount() == 0)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/76462036/src/java/org/apache/cassandra/service/pager/QueryPagers.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/QueryPagers.java b/src/java/org/apache/cassandra/service/pager/QueryPagers.java
index 9bc3afd..2920317 100644
--- a/src/java/org/apache/cassandra/service/pager/QueryPagers.java
+++ b/src/java/org/apache/cassandra/service/pager/QueryPagers.java
@@ -162,12 +162,12 @@ public class QueryPagers
* Convenience method that count (live) cells/rows for a given slice of a row, but page underneath.
*/
public static int countPaged(String keyspace,
- String columnFamily,
- ByteBuffer key,
- SliceQueryFilter filter,
- ConsistencyLevel consistencyLevel,
- final int pageSize,
- long now) throws RequestValidationException, RequestExecutionException
+ String columnFamily,
+ ByteBuffer key,
+ SliceQueryFilter filter,
+ ConsistencyLevel consistencyLevel,
+ final int pageSize,
+ long now) throws RequestValidationException, RequestExecutionException
{
SliceFromReadCommand command = new SliceFromReadCommand(keyspace, key, columnFamily, now, filter);
final SliceQueryPager pager = new SliceQueryPager(command, consistencyLevel, false);