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/10/03 02:11:53 UTC
[1/6] git commit: comment
Updated Branches:
refs/heads/cassandra-1.2 6b5874503 -> c8f0e3a9f
refs/heads/cassandra-2.0 e7c90e04c -> 4bd862618
refs/heads/trunk 70dc32023 -> bcbcff3e6
comment
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c8f0e3a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8f0e3a9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8f0e3a9
Branch: refs/heads/cassandra-1.2
Commit: c8f0e3a9f94d81949cd62ec59c552fd0dfa2720c
Parents: 6b58745
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 2 19:11:33 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 2 19:11:33 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c8f0e3a9/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 b23de1f..a81e5b4 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -201,6 +201,9 @@ public class StorageProxy implements StorageProxyMBean
{
if (consistency_level == ConsistencyLevel.ANY)
{
+ // hint all the mutations (except counters, which can't be safely retried). This means
+ // we'll re-hint any successful ones; doesn't seem worth it to track individual success
+ // just for this unusual case.
for (IMutation mutation : mutations)
{
if (mutation instanceof CounterMutation)
[6/6] 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/bcbcff3e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcbcff3e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcbcff3e
Branch: refs/heads/trunk
Commit: bcbcff3e6deafe1f4ab4bf9e1c88407ad70fd9c5
Parents: 70dc320 4bd8626
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 2 19:11:45 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 2 19:11:45 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcbcff3e/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
[2/6] git commit: comment
Posted by jb...@apache.org.
comment
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c8f0e3a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8f0e3a9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8f0e3a9
Branch: refs/heads/cassandra-2.0
Commit: c8f0e3a9f94d81949cd62ec59c552fd0dfa2720c
Parents: 6b58745
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 2 19:11:33 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 2 19:11:33 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c8f0e3a9/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 b23de1f..a81e5b4 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -201,6 +201,9 @@ public class StorageProxy implements StorageProxyMBean
{
if (consistency_level == ConsistencyLevel.ANY)
{
+ // hint all the mutations (except counters, which can't be safely retried). This means
+ // we'll re-hint any successful ones; doesn't seem worth it to track individual success
+ // just for this unusual case.
for (IMutation mutation : mutations)
{
if (mutation instanceof CounterMutation)
[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4bd86261
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bd86261
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bd86261
Branch: refs/heads/cassandra-2.0
Commit: 4bd8626189fe32e46f6ef267fff0e19f54cefc3e
Parents: e7c90e0 c8f0e3a
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 2 19:11:39 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 2 19:11:39 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bd86261/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4bd86261
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bd86261
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bd86261
Branch: refs/heads/trunk
Commit: 4bd8626189fe32e46f6ef267fff0e19f54cefc3e
Parents: e7c90e0 c8f0e3a
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 2 19:11:39 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 2 19:11:39 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bd86261/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
[3/6] git commit: comment
Posted by jb...@apache.org.
comment
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c8f0e3a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8f0e3a9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8f0e3a9
Branch: refs/heads/trunk
Commit: c8f0e3a9f94d81949cd62ec59c552fd0dfa2720c
Parents: 6b58745
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 2 19:11:33 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 2 19:11:33 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c8f0e3a9/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 b23de1f..a81e5b4 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -201,6 +201,9 @@ public class StorageProxy implements StorageProxyMBean
{
if (consistency_level == ConsistencyLevel.ANY)
{
+ // hint all the mutations (except counters, which can't be safely retried). This means
+ // we'll re-hint any successful ones; doesn't seem worth it to track individual success
+ // just for this unusual case.
for (IMutation mutation : mutations)
{
if (mutation instanceof CounterMutation)