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 2016/01/22 15:33:39 UTC

[01/10] cassandra git commit: Don't query more results than necessary when paging range queries

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 38dde32ef -> 7bab8240e
  refs/heads/cassandra-3.0 1e25d1983 -> e07c7d0c1
  refs/heads/cassandra-3.3 53339a078 -> 01a10f012
  refs/heads/trunk fd74a0360 -> 5b02fa287


Don't query more results than necessary when paging range queries

patch by slebresne; reviewed by blerer for CASSANDRA-8521


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bab8240
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bab8240
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bab8240

Branch: refs/heads/cassandra-2.2
Commit: 7bab8240e63753ac338890cbd31572e38234c23d
Parents: 38dde32
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 12 16:38:38 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 22 15:32:25 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                       | 1 +
 .../org/apache/cassandra/service/pager/RangeSliceQueryPager.java  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bab8240/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 751267e..54ed851 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.5
+ * Avoid over-fetching during the page of range queries (CASSANDRA-8521)
  * Start L0 STCS-compactions even if there is a L0 -> L1 compaction
    going (CASSANDRA-10979)
  * Make UUID LSB unique per process (CASSANDRA-7925)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bab8240/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java b/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
index fd14c82..10e470b 100644
--- a/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
@@ -72,7 +72,8 @@ public class RangeSliceQueryPager extends AbstractQueryPager
     protected List<Row> queryNextPage(int pageSize, ConsistencyLevel consistencyLevel, boolean localQuery)
     throws RequestExecutionException
     {
-        SliceQueryFilter sf = (SliceQueryFilter)columnFilter;
+        SliceQueryFilter rawFilter = (SliceQueryFilter)columnFilter;
+        SliceQueryFilter sf = rawFilter.withUpdatedCount(Math.min(rawFilter.count, pageSize));
         AbstractBounds<RowPosition> keyRange = lastReturnedKey == null ? command.keyRange : makeIncludingKeyBounds(lastReturnedKey);
         Composite start = lastReturnedName == null ? sf.start() : lastReturnedName;
         PagedRangeCommand pageCmd = new PagedRangeCommand(command.keyspace,

[06/10] cassandra git commit: Merge commit '7bab8240e63753ac338890cbd31572e38234c23d' into cassandra-3.0

Posted by sl...@apache.org.
Merge commit '7bab8240e63753ac338890cbd31572e38234c23d' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e07c7d0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e07c7d0c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e07c7d0c

Branch: refs/heads/cassandra-3.0
Commit: e07c7d0c179ad52dd894157f8d7a02deafe6125e
Parents: 1e25d19 7bab824
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 22 15:32:51 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 22 15:32:51 2016 +0100

----------------------------------------------------------------------

----------------------------------------------------------------------

[10/10] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

Posted by sl...@apache.org.
Merge branch 'cassandra-3.3' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b02fa28
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b02fa28
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b02fa28

Branch: refs/heads/trunk
Commit: 5b02fa287b3d662d1fb1190a0c579d66ac6b65e9
Parents: fd74a03 01a10f0
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 22 15:33:16 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 22 15:33:16 2016 +0100

----------------------------------------------------------------------

----------------------------------------------------------------------

[02/10] cassandra git commit: Don't query more results than necessary when paging range queries

Posted by sl...@apache.org.
Don't query more results than necessary when paging range queries

patch by slebresne; reviewed by blerer for CASSANDRA-8521


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bab8240
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bab8240
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bab8240

Branch: refs/heads/cassandra-3.0
Commit: 7bab8240e63753ac338890cbd31572e38234c23d
Parents: 38dde32
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 12 16:38:38 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 22 15:32:25 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                       | 1 +
 .../org/apache/cassandra/service/pager/RangeSliceQueryPager.java  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bab8240/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 751267e..54ed851 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.5
+ * Avoid over-fetching during the page of range queries (CASSANDRA-8521)
  * Start L0 STCS-compactions even if there is a L0 -> L1 compaction
    going (CASSANDRA-10979)
  * Make UUID LSB unique per process (CASSANDRA-7925)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bab8240/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java b/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
index fd14c82..10e470b 100644
--- a/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
@@ -72,7 +72,8 @@ public class RangeSliceQueryPager extends AbstractQueryPager
     protected List<Row> queryNextPage(int pageSize, ConsistencyLevel consistencyLevel, boolean localQuery)
     throws RequestExecutionException
     {
-        SliceQueryFilter sf = (SliceQueryFilter)columnFilter;
+        SliceQueryFilter rawFilter = (SliceQueryFilter)columnFilter;
+        SliceQueryFilter sf = rawFilter.withUpdatedCount(Math.min(rawFilter.count, pageSize));
         AbstractBounds<RowPosition> keyRange = lastReturnedKey == null ? command.keyRange : makeIncludingKeyBounds(lastReturnedKey);
         Composite start = lastReturnedName == null ? sf.start() : lastReturnedName;
         PagedRangeCommand pageCmd = new PagedRangeCommand(command.keyspace,

[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3

Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/01a10f01
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/01a10f01
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/01a10f01

Branch: refs/heads/trunk
Commit: 01a10f01229fe3559d4c20a014e901eeaa0e1b9d
Parents: 53339a0 e07c7d0
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 22 15:33:03 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 22 15:33:03 2016 +0100

----------------------------------------------------------------------

----------------------------------------------------------------------

[03/10] cassandra git commit: Don't query more results than necessary when paging range queries

Posted by sl...@apache.org.
Don't query more results than necessary when paging range queries

patch by slebresne; reviewed by blerer for CASSANDRA-8521


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bab8240
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bab8240
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bab8240

Branch: refs/heads/cassandra-3.3
Commit: 7bab8240e63753ac338890cbd31572e38234c23d
Parents: 38dde32
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 12 16:38:38 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 22 15:32:25 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                       | 1 +
 .../org/apache/cassandra/service/pager/RangeSliceQueryPager.java  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bab8240/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 751267e..54ed851 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.5
+ * Avoid over-fetching during the page of range queries (CASSANDRA-8521)
  * Start L0 STCS-compactions even if there is a L0 -> L1 compaction
    going (CASSANDRA-10979)
  * Make UUID LSB unique per process (CASSANDRA-7925)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bab8240/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java b/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
index fd14c82..10e470b 100644
--- a/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
@@ -72,7 +72,8 @@ public class RangeSliceQueryPager extends AbstractQueryPager
     protected List<Row> queryNextPage(int pageSize, ConsistencyLevel consistencyLevel, boolean localQuery)
     throws RequestExecutionException
     {
-        SliceQueryFilter sf = (SliceQueryFilter)columnFilter;
+        SliceQueryFilter rawFilter = (SliceQueryFilter)columnFilter;
+        SliceQueryFilter sf = rawFilter.withUpdatedCount(Math.min(rawFilter.count, pageSize));
         AbstractBounds<RowPosition> keyRange = lastReturnedKey == null ? command.keyRange : makeIncludingKeyBounds(lastReturnedKey);
         Composite start = lastReturnedName == null ? sf.start() : lastReturnedName;
         PagedRangeCommand pageCmd = new PagedRangeCommand(command.keyspace,

[07/10] cassandra git commit: Merge commit '7bab8240e63753ac338890cbd31572e38234c23d' into cassandra-3.0

Posted by sl...@apache.org.
Merge commit '7bab8240e63753ac338890cbd31572e38234c23d' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e07c7d0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e07c7d0c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e07c7d0c

Branch: refs/heads/trunk
Commit: e07c7d0c179ad52dd894157f8d7a02deafe6125e
Parents: 1e25d19 7bab824
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 22 15:32:51 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 22 15:32:51 2016 +0100

----------------------------------------------------------------------

----------------------------------------------------------------------

[05/10] cassandra git commit: Merge commit '7bab8240e63753ac338890cbd31572e38234c23d' into cassandra-3.0

Posted by sl...@apache.org.
Merge commit '7bab8240e63753ac338890cbd31572e38234c23d' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e07c7d0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e07c7d0c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e07c7d0c

Branch: refs/heads/cassandra-3.3
Commit: e07c7d0c179ad52dd894157f8d7a02deafe6125e
Parents: 1e25d19 7bab824
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 22 15:32:51 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 22 15:32:51 2016 +0100

----------------------------------------------------------------------

----------------------------------------------------------------------

[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3

Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/01a10f01
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/01a10f01
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/01a10f01

Branch: refs/heads/cassandra-3.3
Commit: 01a10f01229fe3559d4c20a014e901eeaa0e1b9d
Parents: 53339a0 e07c7d0
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 22 15:33:03 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 22 15:33:03 2016 +0100

----------------------------------------------------------------------

----------------------------------------------------------------------

[04/10] cassandra git commit: Don't query more results than necessary when paging range queries

Posted by sl...@apache.org.
Don't query more results than necessary when paging range queries

patch by slebresne; reviewed by blerer for CASSANDRA-8521


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bab8240
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bab8240
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bab8240

Branch: refs/heads/trunk
Commit: 7bab8240e63753ac338890cbd31572e38234c23d
Parents: 38dde32
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 12 16:38:38 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 22 15:32:25 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                       | 1 +
 .../org/apache/cassandra/service/pager/RangeSliceQueryPager.java  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bab8240/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 751267e..54ed851 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.5
+ * Avoid over-fetching during the page of range queries (CASSANDRA-8521)
  * Start L0 STCS-compactions even if there is a L0 -> L1 compaction
    going (CASSANDRA-10979)
  * Make UUID LSB unique per process (CASSANDRA-7925)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bab8240/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java b/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
index fd14c82..10e470b 100644
--- a/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
@@ -72,7 +72,8 @@ public class RangeSliceQueryPager extends AbstractQueryPager
     protected List<Row> queryNextPage(int pageSize, ConsistencyLevel consistencyLevel, boolean localQuery)
     throws RequestExecutionException
     {
-        SliceQueryFilter sf = (SliceQueryFilter)columnFilter;
+        SliceQueryFilter rawFilter = (SliceQueryFilter)columnFilter;
+        SliceQueryFilter sf = rawFilter.withUpdatedCount(Math.min(rawFilter.count, pageSize));
         AbstractBounds<RowPosition> keyRange = lastReturnedKey == null ? command.keyRange : makeIncludingKeyBounds(lastReturnedKey);
         Composite start = lastReturnedName == null ? sf.start() : lastReturnedName;
         PagedRangeCommand pageCmd = new PagedRangeCommand(command.keyspace,