cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [1/2] cassandra git commit: Fix parallelism re-calc in 2ary and range queries
Date Wed, 25 Feb 2015 16:43:03 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 058e97720 -> 4807f1295


Fix parallelism re-calc in 2ary and range queries

Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANRA-8856


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

Branch: refs/heads/trunk
Commit: ca6360704aafd233218c05ca9800cf6b5cd0cfc3
Parents: 990f478
Author: Tyler Hobbs <tylerhobbs@apache.org>
Authored: Wed Feb 25 10:41:40 2015 -0600
Committer: Tyler Hobbs <tylerhobbs@apache.org>
Committed: Wed Feb 25 10:41:40 2015 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca636070/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b1bc26f..70641fd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,7 @@
 2.1.4
+ * Fix parallelism adjustment in range and secondary index
+   queries when the first fetch does not satisfy the
+   limit (CASSANDRA-8856)
  * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
  * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
  * Fix CommitLog.forceRecycleAllSegments() memory access error (CASSANDRA-8812)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca636070/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index 743024f..aa829df 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -1797,7 +1797,7 @@ public class StorageProxy implements StorageProxyMBean
                     }
                     else
                     {
-                        actualRowsPerRange = i / fetchedRows;
+                        actualRowsPerRange = fetchedRows / i;
                         concurrencyFactor = Math.max(1, Math.min(ranges.size() - i, Math.round(remainingRows
/ actualRowsPerRange)));
                     }
                     logger.debug("Didn't get enough response rows; actual rows per range:
{}; remaining rows: {}, new concurrent requests: {}",


Mime
View raw message