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/09 23:55:44 UTC
[1/3] git commit: fix assert for counters (CASSANDRA-6175)
Updated Branches:
refs/heads/cassandra-2.0 9644f0989 -> 95ac0de7a
refs/heads/trunk 8530d7358 -> 8b8c07a87
fix assert for counters (CASSANDRA-6175)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95ac0de7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95ac0de7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95ac0de7
Branch: refs/heads/cassandra-2.0
Commit: 95ac0de7a7aafb9e9661ce87f04b4302e6c5e3be
Parents: 9644f09
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 9 16:55:25 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 9 16:55:33 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/net/MessagingService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/95ac0de7/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java
index bda7038..b66c8a4 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -548,7 +548,7 @@ public final class MessagingService implements MessagingServiceMBean
public int addCallback(IAsyncCallback cb, MessageOut<? extends IMutation> message, InetAddress to, long timeout, ConsistencyLevel consistencyLevel)
{
- assert message.verb == Verb.MUTATION;
+ assert message.verb == Verb.MUTATION || message.verb == Verb.COUNTER_MUTATION;
int messageId = nextId();
CallbackInfo previous = callbacks.put(messageId, new WriteCallbackInfo(to, cb, message, callbackDeserializers.get(message.verb), consistencyLevel), timeout);
assert previous == null;
[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/8b8c07a8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b8c07a8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b8c07a8
Branch: refs/heads/trunk
Commit: 8b8c07a876924f7aa6a360be101c784524ce397b
Parents: 8530d73 95ac0de
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 9 16:55:40 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 9 16:55:40 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/net/MessagingService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b8c07a8/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
[2/3] git commit: fix assert for counters (CASSANDRA-6175)
Posted by jb...@apache.org.
fix assert for counters (CASSANDRA-6175)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95ac0de7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95ac0de7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95ac0de7
Branch: refs/heads/trunk
Commit: 95ac0de7a7aafb9e9661ce87f04b4302e6c5e3be
Parents: 9644f09
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 9 16:55:25 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 9 16:55:33 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/net/MessagingService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/95ac0de7/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java
index bda7038..b66c8a4 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -548,7 +548,7 @@ public final class MessagingService implements MessagingServiceMBean
public int addCallback(IAsyncCallback cb, MessageOut<? extends IMutation> message, InetAddress to, long timeout, ConsistencyLevel consistencyLevel)
{
- assert message.verb == Verb.MUTATION;
+ assert message.verb == Verb.MUTATION || message.verb == Verb.COUNTER_MUTATION;
int messageId = nextId();
CallbackInfo previous = callbacks.put(messageId, new WriteCallbackInfo(to, cb, message, callbackDeserializers.get(message.verb), consistencyLevel), timeout);
assert previous == null;