You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2015/11/25 11:21:05 UTC
[01/15] cassandra git commit: Make internal paging logic consistent
between searcher impls
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 f319f0a23 -> f5a09c125
refs/heads/cassandra-2.2 1142183f5 -> a90753392
refs/heads/cassandra-3.0 ae315b5ec -> 602f736e2
refs/heads/cassandra-3.1 8feb66e6f -> 8e1b6ea70
refs/heads/trunk 8bf3002dd -> ea9b36011
Make internal paging logic consistent between searcher impls
Patch by Sam Tunnicliffe; reviewed by Carl Yeksigian for CASSANDRA-10683
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5a09c12
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5a09c12
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5a09c12
Branch: refs/heads/cassandra-2.1
Commit: f5a09c125cce2078832c20f35eba3ab43eb5c36b
Parents: f319f0a
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Nov 10 18:18:45 2015 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Nov 25 09:29:52 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5a09c12/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c4dd54e..91f4577 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
* (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
* Try next replica if not possible to connect to primary replica on
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5a09c12/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
index 634bb0c..4ba636d 100644
--- a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
@@ -98,9 +98,8 @@ public class KeysSearcher extends SecondaryIndexSearcher
protected Row computeNext()
{
- int meanColumns = Math.max(index.getIndexCfs().getMeanColumns(), 1);
// We shouldn't fetch only 1 row as this provides buggy paging in case the first row doesn't satisfy all clauses
- int rowsPerQuery = Math.max(Math.min(filter.maxRows(), filter.maxColumns() / meanColumns), 2);
+ int rowsPerQuery = Math.max(Math.min(filter.maxRows(), filter.maxColumns()), 2);
while (true)
{
if (indexColumns == null || !indexColumns.hasNext())
[05/15] cassandra git commit: Make internal paging logic consistent
between searcher impls
Posted by sa...@apache.org.
Make internal paging logic consistent between searcher impls
Patch by Sam Tunnicliffe; reviewed by Carl Yeksigian for CASSANDRA-10683
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5a09c12
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5a09c12
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5a09c12
Branch: refs/heads/cassandra-3.1
Commit: f5a09c125cce2078832c20f35eba3ab43eb5c36b
Parents: f319f0a
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Nov 10 18:18:45 2015 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Nov 25 09:29:52 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5a09c12/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c4dd54e..91f4577 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
* (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
* Try next replica if not possible to connect to primary replica on
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5a09c12/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
index 634bb0c..4ba636d 100644
--- a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
@@ -98,9 +98,8 @@ public class KeysSearcher extends SecondaryIndexSearcher
protected Row computeNext()
{
- int meanColumns = Math.max(index.getIndexCfs().getMeanColumns(), 1);
// We shouldn't fetch only 1 row as this provides buggy paging in case the first row doesn't satisfy all clauses
- int rowsPerQuery = Math.max(Math.min(filter.maxRows(), filter.maxColumns() / meanColumns), 2);
+ int rowsPerQuery = Math.max(Math.min(filter.maxRows(), filter.maxColumns()), 2);
while (true)
{
if (indexColumns == null || !indexColumns.hasNext())
[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sa...@apache.org.
Merge branch 'cassandra-2.2' 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/602f736e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/602f736e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/602f736e
Branch: refs/heads/cassandra-3.1
Commit: 602f736e2b1585c2bc223ef524fbc7c415b3c6e4
Parents: ae315b5 a907533
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Nov 25 10:05:02 2015 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Nov 25 10:05:02 2015 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[13/15] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.1
Posted by sa...@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/8e1b6ea7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e1b6ea7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e1b6ea7
Branch: refs/heads/cassandra-3.1
Commit: 8e1b6ea70b16a39c729700ecfc2fb7e406545e5a
Parents: 8feb66e 602f736
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Nov 25 10:09:23 2015 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Nov 25 10:09:23 2015 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.1
Posted by sa...@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/8e1b6ea7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e1b6ea7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e1b6ea7
Branch: refs/heads/trunk
Commit: 8e1b6ea70b16a39c729700ecfc2fb7e406545e5a
Parents: 8feb66e 602f736
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Nov 25 10:09:23 2015 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Nov 25 10:09:23 2015 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[02/15] cassandra git commit: Make internal paging logic consistent
between searcher impls
Posted by sa...@apache.org.
Make internal paging logic consistent between searcher impls
Patch by Sam Tunnicliffe; reviewed by Carl Yeksigian for CASSANDRA-10683
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5a09c12
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5a09c12
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5a09c12
Branch: refs/heads/cassandra-2.2
Commit: f5a09c125cce2078832c20f35eba3ab43eb5c36b
Parents: f319f0a
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Nov 10 18:18:45 2015 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Nov 25 09:29:52 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5a09c12/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c4dd54e..91f4577 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
* (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
* Try next replica if not possible to connect to primary replica on
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5a09c12/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
index 634bb0c..4ba636d 100644
--- a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
@@ -98,9 +98,8 @@ public class KeysSearcher extends SecondaryIndexSearcher
protected Row computeNext()
{
- int meanColumns = Math.max(index.getIndexCfs().getMeanColumns(), 1);
// We shouldn't fetch only 1 row as this provides buggy paging in case the first row doesn't satisfy all clauses
- int rowsPerQuery = Math.max(Math.min(filter.maxRows(), filter.maxColumns() / meanColumns), 2);
+ int rowsPerQuery = Math.max(Math.min(filter.maxRows(), filter.maxColumns()), 2);
while (true)
{
if (indexColumns == null || !indexColumns.hasNext())
[09/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sa...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a9075339
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9075339
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9075339
Branch: refs/heads/cassandra-3.1
Commit: a9075339227fc689a04977f0b9fa714cbc958f15
Parents: 1142183 f5a09c1
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Nov 25 10:01:12 2015 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Nov 25 10:01:12 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9075339/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d11be26,91f4577..a274ea9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
-2.1.12
+2.2.4
+ * Don't do anticompaction after subrange repair (CASSANDRA-10422)
+ * Fix SimpleDateType type compatibility (CASSANDRA-10027)
+ * (Hadoop) fix splits calculation (CASSANDRA-10640)
+ * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
+ * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
+ * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
+ * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
+ * Expose phi values from failure detector via JMX and tweak debug
+ and trace logging (CASSANDRA-9526)
+ * Fix RangeNamesQueryPager (CASSANDRA-10509)
+ * Deprecate Pig support (CASSANDRA-10542)
+ * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
+Merged from 2.1:
+ * Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
* (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
* Try next replica if not possible to connect to primary replica on
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9075339/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
----------------------------------------------------------------------
[15/15] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Posted by sa...@apache.org.
Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea9b3601
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea9b3601
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea9b3601
Branch: refs/heads/trunk
Commit: ea9b36011ed4dded3490a2b7b9c669b4e524d55d
Parents: 8bf3002 8e1b6ea
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Nov 25 10:15:34 2015 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Nov 25 10:15:34 2015 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sa...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a9075339
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9075339
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9075339
Branch: refs/heads/trunk
Commit: a9075339227fc689a04977f0b9fa714cbc958f15
Parents: 1142183 f5a09c1
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Nov 25 10:01:12 2015 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Nov 25 10:01:12 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9075339/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d11be26,91f4577..a274ea9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
-2.1.12
+2.2.4
+ * Don't do anticompaction after subrange repair (CASSANDRA-10422)
+ * Fix SimpleDateType type compatibility (CASSANDRA-10027)
+ * (Hadoop) fix splits calculation (CASSANDRA-10640)
+ * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
+ * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
+ * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
+ * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
+ * Expose phi values from failure detector via JMX and tweak debug
+ and trace logging (CASSANDRA-9526)
+ * Fix RangeNamesQueryPager (CASSANDRA-10509)
+ * Deprecate Pig support (CASSANDRA-10542)
+ * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
+Merged from 2.1:
+ * Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
* (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
* Try next replica if not possible to connect to primary replica on
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9075339/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
----------------------------------------------------------------------
[04/15] cassandra git commit: Make internal paging logic consistent
between searcher impls
Posted by sa...@apache.org.
Make internal paging logic consistent between searcher impls
Patch by Sam Tunnicliffe; reviewed by Carl Yeksigian for CASSANDRA-10683
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5a09c12
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5a09c12
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5a09c12
Branch: refs/heads/cassandra-3.0
Commit: f5a09c125cce2078832c20f35eba3ab43eb5c36b
Parents: f319f0a
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Nov 10 18:18:45 2015 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Nov 25 09:29:52 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5a09c12/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c4dd54e..91f4577 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
* (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
* Try next replica if not possible to connect to primary replica on
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5a09c12/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
index 634bb0c..4ba636d 100644
--- a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
@@ -98,9 +98,8 @@ public class KeysSearcher extends SecondaryIndexSearcher
protected Row computeNext()
{
- int meanColumns = Math.max(index.getIndexCfs().getMeanColumns(), 1);
// We shouldn't fetch only 1 row as this provides buggy paging in case the first row doesn't satisfy all clauses
- int rowsPerQuery = Math.max(Math.min(filter.maxRows(), filter.maxColumns() / meanColumns), 2);
+ int rowsPerQuery = Math.max(Math.min(filter.maxRows(), filter.maxColumns()), 2);
while (true)
{
if (indexColumns == null || !indexColumns.hasNext())
[10/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sa...@apache.org.
Merge branch 'cassandra-2.2' 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/602f736e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/602f736e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/602f736e
Branch: refs/heads/trunk
Commit: 602f736e2b1585c2bc223ef524fbc7c415b3c6e4
Parents: ae315b5 a907533
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Nov 25 10:05:02 2015 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Nov 25 10:05:02 2015 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[03/15] cassandra git commit: Make internal paging logic consistent
between searcher impls
Posted by sa...@apache.org.
Make internal paging logic consistent between searcher impls
Patch by Sam Tunnicliffe; reviewed by Carl Yeksigian for CASSANDRA-10683
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5a09c12
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5a09c12
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5a09c12
Branch: refs/heads/trunk
Commit: f5a09c125cce2078832c20f35eba3ab43eb5c36b
Parents: f319f0a
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Nov 10 18:18:45 2015 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Nov 25 09:29:52 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5a09c12/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c4dd54e..91f4577 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
* (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
* Try next replica if not possible to connect to primary replica on
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5a09c12/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
index 634bb0c..4ba636d 100644
--- a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
@@ -98,9 +98,8 @@ public class KeysSearcher extends SecondaryIndexSearcher
protected Row computeNext()
{
- int meanColumns = Math.max(index.getIndexCfs().getMeanColumns(), 1);
// We shouldn't fetch only 1 row as this provides buggy paging in case the first row doesn't satisfy all clauses
- int rowsPerQuery = Math.max(Math.min(filter.maxRows(), filter.maxColumns() / meanColumns), 2);
+ int rowsPerQuery = Math.max(Math.min(filter.maxRows(), filter.maxColumns()), 2);
while (true)
{
if (indexColumns == null || !indexColumns.hasNext())
[07/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sa...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a9075339
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9075339
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9075339
Branch: refs/heads/cassandra-2.2
Commit: a9075339227fc689a04977f0b9fa714cbc958f15
Parents: 1142183 f5a09c1
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Nov 25 10:01:12 2015 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Nov 25 10:01:12 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9075339/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d11be26,91f4577..a274ea9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
-2.1.12
+2.2.4
+ * Don't do anticompaction after subrange repair (CASSANDRA-10422)
+ * Fix SimpleDateType type compatibility (CASSANDRA-10027)
+ * (Hadoop) fix splits calculation (CASSANDRA-10640)
+ * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
+ * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
+ * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
+ * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
+ * Expose phi values from failure detector via JMX and tweak debug
+ and trace logging (CASSANDRA-9526)
+ * Fix RangeNamesQueryPager (CASSANDRA-10509)
+ * Deprecate Pig support (CASSANDRA-10542)
+ * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
+Merged from 2.1:
+ * Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
* (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
* Try next replica if not possible to connect to primary replica on
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9075339/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
----------------------------------------------------------------------
[12/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sa...@apache.org.
Merge branch 'cassandra-2.2' 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/602f736e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/602f736e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/602f736e
Branch: refs/heads/cassandra-3.0
Commit: 602f736e2b1585c2bc223ef524fbc7c415b3c6e4
Parents: ae315b5 a907533
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Nov 25 10:05:02 2015 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Nov 25 10:05:02 2015 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[08/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sa...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a9075339
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9075339
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9075339
Branch: refs/heads/cassandra-3.0
Commit: a9075339227fc689a04977f0b9fa714cbc958f15
Parents: 1142183 f5a09c1
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Nov 25 10:01:12 2015 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Nov 25 10:01:12 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9075339/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d11be26,91f4577..a274ea9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
-2.1.12
+2.2.4
+ * Don't do anticompaction after subrange repair (CASSANDRA-10422)
+ * Fix SimpleDateType type compatibility (CASSANDRA-10027)
+ * (Hadoop) fix splits calculation (CASSANDRA-10640)
+ * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
+ * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
+ * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
+ * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
+ * Expose phi values from failure detector via JMX and tweak debug
+ and trace logging (CASSANDRA-9526)
+ * Fix RangeNamesQueryPager (CASSANDRA-10509)
+ * Deprecate Pig support (CASSANDRA-10542)
+ * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
+Merged from 2.1:
+ * Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
* (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
* Try next replica if not possible to connect to primary replica on
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9075339/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
----------------------------------------------------------------------