You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/09/26 23:10:28 UTC
[1/3] git commit: fix subList bug
Updated Branches:
refs/heads/cassandra-2.0 20c419b94 -> 7a87fc118
refs/heads/trunk 84f6c26aa -> 2520f2f87
fix subList bug
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a87fc11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a87fc11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a87fc11
Branch: refs/heads/cassandra-2.0
Commit: 7a87fc1186f39678382cf9b3e1dd224d9c71aead
Parents: 20c419b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 26 16:10:15 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 26 16:10:15 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/AbstractReadExecutor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a87fc11/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
index 83368c2..280715a 100644
--- a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
+++ b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
@@ -321,7 +321,7 @@ public abstract class AbstractReadExecutor
@Override
public void executeAsync()
{
- makeDataRequests(targetReplicas.subList(0, 2));
+ makeDataRequests(targetReplicas.subList(0, targetReplicas.size() > 1 ? 2 : 1));
if (targetReplicas.size() > 2)
makeDigestRequests(targetReplicas.subList(2, targetReplicas.size()));
cfs.metric.speculativeRetry.inc();
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@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/2520f2f8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2520f2f8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2520f2f8
Branch: refs/heads/trunk
Commit: 2520f2f87c2fbca97524778e29d0c114adb2cd63
Parents: 84f6c26 7a87fc1
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 26 16:10:22 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 26 16:10:22 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/AbstractReadExecutor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] git commit: fix subList bug
Posted by jb...@apache.org.
fix subList bug
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a87fc11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a87fc11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a87fc11
Branch: refs/heads/trunk
Commit: 7a87fc1186f39678382cf9b3e1dd224d9c71aead
Parents: 20c419b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 26 16:10:15 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 26 16:10:15 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/AbstractReadExecutor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a87fc11/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
index 83368c2..280715a 100644
--- a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
+++ b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
@@ -321,7 +321,7 @@ public abstract class AbstractReadExecutor
@Override
public void executeAsync()
{
- makeDataRequests(targetReplicas.subList(0, 2));
+ makeDataRequests(targetReplicas.subList(0, targetReplicas.size() > 1 ? 2 : 1));
if (targetReplicas.size() > 2)
makeDigestRequests(targetReplicas.subList(2, targetReplicas.size()));
cfs.metric.speculativeRetry.inc();