Author: jbellis
Date: Wed Apr 20 15:53:55 2011
New Revision: 1095440
URL: http://svn.apache.org/viewvc?rev=1095440&view=rev
Log:
merge from 0.7
Modified:
cassandra/branches/cassandra-0.8/CHANGES.txt
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Memtable.java
Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1095440&r1=1095439&r2=1095440&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Wed Apr 20 15:53:55 2011
@@ -57,6 +57,8 @@
* use 64KB flush buffer instead of in_memory_compaction_limit (CASSANDRA-2463)
* fix duplicate results from CFS.scan (CASSANDRA-2406)
* avoid caching token-only decoratedkeys (CASSANDRA-2416)
+ * count a row deletion as one operation towards memtable threshold
+ (CASSANDRA-2519)
0.7.4
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Memtable.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Memtable.java?rev=1095440&r1=1095439&r2=1095440&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Memtable.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Memtable.java
Wed Apr 20 15:53:55 2011
@@ -208,7 +208,9 @@ public class Memtable implements Compara
private void resolve(DecoratedKey key, ColumnFamily cf)
{
currentThroughput.addAndGet(cf.size());
- currentOperations.addAndGet(cf.getColumnCount());
+ currentOperations.addAndGet((cf.getColumnCount() == 0)
+ ? cf.isMarkedForDelete() ? 1 : 0
+ : cf.getColumnCount());
ColumnFamily oldCf = columnFamilies.putIfAbsent(key, cf);
if (oldCf == null)
