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
