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 6251B73D3 for ; Fri, 11 Nov 2011 17:56:47 +0000 (UTC) Received: (qmail 5516 invoked by uid 500); 11 Nov 2011 17:56:47 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 5485 invoked by uid 500); 11 Nov 2011 17:56:47 -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 5477 invoked by uid 99); 11 Nov 2011 17:56:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Nov 2011 17:56:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Nov 2011 17:56:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EF00923888FD for ; Fri, 11 Nov 2011 17:56:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1200998 - in /cassandra/branches/cassandra-1.0: CHANGES.txt src/java/org/apache/cassandra/db/CollationController.java Date: Fri, 11 Nov 2011 17:56:25 -0000 To: commits@cassandra.apache.org From: slebresne@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111111175625.EF00923888FD@eris.apache.org> Author: slebresne Date: Fri Nov 11 17:56:25 2011 New Revision: 1200998 URL: http://svn.apache.org/viewvc?rev=1200998&view=rev Log: Fix race introduced by CASSANDRA-2503 patch by jbellis; reviewed by slebresne for CASSANDRA-3482 Modified: cassandra/branches/cassandra-1.0/CHANGES.txt cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/CollationController.java Modified: cassandra/branches/cassandra-1.0/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1200998&r1=1200997&r2=1200998&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/CHANGES.txt (original) +++ cassandra/branches/cassandra-1.0/CHANGES.txt Fri Nov 11 17:56:25 2011 @@ -10,6 +10,7 @@ * report compression ratio in CFSMBean (CASSANDRA-3393) * fix incorrect size exception during streaming of counters (CASSANDRA-3481) * (CQL) fix for counter decrement syntax (CASSANDRA-3418) + * Fix race introduced by CASSANDRA-2503 (CASSANDRA-3482) Merged from 0.8: * Make counter shard merging thread safe (CASSANDRA-3178) * fix updating CF row_cache_provider (CASSANDRA-3414) Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/CollationController.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/CollationController.java?rev=1200998&r1=1200997&r2=1200998&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/CollationController.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/CollationController.java Fri Nov 11 17:56:25 2011 @@ -154,7 +154,7 @@ public class CollationController // "hoist up" the requested data into a more recent sstable if (sstablesIterated >= cfs.getMinimumCompactionThreshold() && cfs.getCompactionStrategy() instanceof SizeTieredCompactionStrategy) { - RowMutation rm = new RowMutation(cfs.table.name, new Row(filter.key, returnCF)); + RowMutation rm = new RowMutation(cfs.table.name, new Row(filter.key, returnCF.cloneMe())); try { rm.applyUnsafe(); // skipping commitlog is fine since we're just de-fragmenting existing data