You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/10/01 17:39:09 UTC
git commit: Fix deletes potentially skipped in batches
Updated Branches:
refs/heads/cassandra-2.0 58eebc9a9 -> 8f88670f7
Fix deletes potentially skipped in batches
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6115
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8f88670f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f88670f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f88670f
Branch: refs/heads/cassandra-2.0
Commit: 8f88670f721f4ab4206c9b2d5594eabf1b46cebe
Parents: 58eebc9
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Oct 1 17:38:22 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Oct 1 17:38:22 2013 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/UnsortedColumns.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f88670f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0fa788a..128d7c4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@
* make sequential nodetool repair the default (CASSANDRA-5950)
* Add more hooks for compaction strategy implementations (CASSANDRA-6111)
* Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098)
+ * Delete can potentially be skipped in batch (CASSANDRA-6115)
Merged from 1.2:
* lock access to TM.endpointToHostIdMap (CASSANDRA-6103)
* Allow estimated memtable size to exceed slab allocator size (CASSANDRA-6078)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f88670f/src/java/org/apache/cassandra/db/UnsortedColumns.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/UnsortedColumns.java b/src/java/org/apache/cassandra/db/UnsortedColumns.java
index e8d74b4..2b33cd0 100644
--- a/src/java/org/apache/cassandra/db/UnsortedColumns.java
+++ b/src/java/org/apache/cassandra/db/UnsortedColumns.java
@@ -86,6 +86,7 @@ public class UnsortedColumns extends AbstractThreadUnsafeSortedColumns
public void addAll(ColumnFamily cm, Allocator allocator, Function<Column, Column> transformation)
{
+ delete(cm.deletionInfo());
for (Column column : cm)
addColumn(column);
}