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/12/20 08:50:06 UTC
[1/2] git commit: Fix potential assertion error in
AbstractQueryPager.discardFirst
Updated Branches:
refs/heads/trunk e6719db85 -> 1f7a5d194
Fix potential assertion error in AbstractQueryPager.discardFirst
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6447
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a462083f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a462083f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a462083f
Branch: refs/heads/trunk
Commit: a462083fc4f74e508ee0e5234c7bc34a6bdb618e
Parents: d8062cd
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Dec 20 08:40:36 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Dec 20 08:40:36 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../service/pager/AbstractQueryPager.java | 56 ++++++++++++++------
2 files changed, 41 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a462083f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8fd794c..60f86c3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,6 +13,7 @@
* Expose a total memtable size metric for a CF (CASSANDRA-6391)
* cqlsh: handle symlinks properly (CASSANDRA-6425)
* Fix potential infinite loop when paging query with IN (CASSANDRA-6464)
+ * Fix assertion error in AbstractQueryPager.discardFirst (CASSANDRA-6447)
Merged from 1.2:
* Improved error message on bad properties in DDL queries (CASSANDRA-6453)
* Randomize batchlog candidates selection (CASSANDRA-6481)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a462083f/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 6f6772c..6047b5b 100644
--- a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
@@ -175,18 +175,37 @@ abstract class AbstractQueryPager implements QueryPager
private List<Row> discardFirst(List<Row> rows)
{
- Row first = rows.get(0);
- ColumnFamily newCf = first.cf.cloneMeShallow();
- int discarded = isReversed()
- ? discardLast(first.cf, 1, newCf)
- : discardFirst(first.cf, 1, newCf);
- assert discarded == 1;
-
- int count = newCf.getColumnCount();
- List<Row> newRows = new ArrayList<Row>(count == 0 ? rows.size() - 1 : rows.size());
+ return discardFirst(rows, 1);
+ }
+
+ private List<Row> discardFirst(List<Row> rows, int toDiscard)
+ {
+ if (toDiscard == 0)
+ return rows;
+
+ int i = 0;
+ DecoratedKey firstKey = null;
+ ColumnFamily firstCf = null;
+ while (toDiscard > 0 && i < rows.size())
+ {
+ Row first = rows.get(i++);
+ firstKey = first.key;
+ firstCf = first.cf.cloneMeShallow();
+ toDiscard -= isReversed()
+ ? discardLast(first.cf, toDiscard, firstCf)
+ : discardFirst(first.cf, toDiscard, firstCf);
+ }
+
+ // If there is less live data than to discard, all is discarded
+ if (i >= rows.size())
+ return Collections.<Row>emptyList();
+
+ int count = firstCf.getColumnCount();
+ int newSize = rows.size() - i;
+ List<Row> newRows = new ArrayList<Row>(count == 0 ? newSize-1 : newSize);
if (count != 0)
- newRows.add(new Row(first.key, newCf));
- newRows.addAll(rows.subList(1, rows.size()));
+ newRows.add(new Row(firstKey, firstCf));
+ newRows.addAll(rows.subList(i, rows.size()));
return newRows;
}
@@ -201,12 +220,12 @@ abstract class AbstractQueryPager implements QueryPager
if (toDiscard == 0)
return rows;
- int size = rows.size();
+ int i = rows.size()-1;
DecoratedKey lastKey = null;
ColumnFamily lastCf = null;
- while (toDiscard > 0)
+ while (toDiscard > 0 && i >= 0)
{
- Row last = rows.get(--size);
+ Row last = rows.get(i--);
lastKey = last.key;
lastCf = last.cf.cloneMeShallow();
toDiscard -= isReversed()
@@ -214,9 +233,14 @@ abstract class AbstractQueryPager implements QueryPager
: discardLast(last.cf, toDiscard, lastCf);
}
+ // If there is less live data than to discard, all is discarded
+ if (i < 0)
+ return Collections.<Row>emptyList();
+
int count = lastCf.getColumnCount();
- List<Row> newRows = new ArrayList<Row>(count == 0 ? size : size+1);
- newRows.addAll(rows.subList(0, size));
+ int newSize = i+1;
+ List<Row> newRows = new ArrayList<Row>(count == 0 ? newSize-1 : newSize);
+ newRows.addAll(rows.subList(0, i));
if (count != 0)
newRows.add(new Row(lastKey, lastCf));
[2/2] 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/1f7a5d19
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1f7a5d19
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1f7a5d19
Branch: refs/heads/trunk
Commit: 1f7a5d194ab0e78bdd761ba525fc74967e0ff3bf
Parents: e6719db a462083
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Dec 20 08:41:45 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Dec 20 08:41:45 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../service/pager/AbstractQueryPager.java | 56 ++++++++++++++------
2 files changed, 41 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f7a5d19/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f7a5d19/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
----------------------------------------------------------------------