Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3CA1510302 for ; Sat, 27 Jul 2013 00:44:13 +0000 (UTC) Received: (qmail 5330 invoked by uid 500); 27 Jul 2013 00:44:13 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 5290 invoked by uid 500); 27 Jul 2013 00:44:13 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 5282 invoked by uid 99); 27 Jul 2013 00:44:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Jul 2013 00:44:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D2DC29F74; Sat, 27 Jul 2013 00:44:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Message-Id: <75538d91954f419eac4909423f493521@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Fix cas() arguments order in MS.executeWithCondition Date: Sat, 27 Jul 2013 00:44:12 +0000 (UTC) Updated Branches: refs/heads/trunk e22025e09 -> 2548e5aca Fix cas() arguments order in MS.executeWithCondition follow-up to CASSANDRA-5797 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2548e5ac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2548e5ac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2548e5ac Branch: refs/heads/trunk Commit: 2548e5aca3a1ddc0c8b1e9ebe345d4be7d4a54c8 Parents: e22025e Author: Aleksey Yeschenko Authored: Sat Jul 27 03:43:22 2013 +0300 Committer: Aleksey Yeschenko Committed: Sat Jul 27 03:43:22 2013 +0300 ---------------------------------------------------------------------- .../cassandra/cql3/statements/ModificationStatement.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2548e5ac/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java index d08d0ee..88a80e0 100644 --- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java @@ -379,7 +379,14 @@ public abstract class ModificationStatement implements CQLStatement ColumnFamily updates = updateForKey(key, clusteringPrefix, params); ColumnFamily expected = buildConditions(key, clusteringPrefix, params); - ColumnFamily result = StorageProxy.cas(keyspace(), columnFamily(), key, clusteringPrefix, expected, updates, options.getConsistency(), options.getSerialConsistency()); + ColumnFamily result = StorageProxy.cas(keyspace(), + columnFamily(), + key, + clusteringPrefix, + expected, + updates, + options.getSerialConsistency(), + options.getConsistency()); return new ResultMessage.Rows(buildCasResultSet(key, result)); }