cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [1/2] git commit: Restore expiring->deleted (cell) compaction optimization
Date Wed, 12 Mar 2014 16:58:43 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 2e00ba8bf -> cf9ae5f9c


Restore expiring->deleted (cell) compaction optimization

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6844


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/19444ea1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19444ea1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19444ea1

Branch: refs/heads/cassandra-2.1
Commit: 19444ea1655d76db11a8048c4ecde81f305018c9
Parents: ed93ad4
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Mar 12 19:37:40 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Mar 12 19:37:40 2014 +0300

----------------------------------------------------------------------
 CHANGES.txt                                                        | 1 +
 .../org/apache/cassandra/io/sstable/SSTableIdentityIterator.java   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/19444ea1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 906f91f..42dc4ee 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,7 @@
  * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790)
  * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838)
  * Fix static counter columns (CASSANDRA-6827)
+ * Restore expiring->deleted (cell) compaction optimization (CASSANDRA-6844)
 
 
 2.0.6

http://git-wip-us.apache.org/repos/asf/cassandra/blob/19444ea1/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java b/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
index 4e23ac2..52da9bb 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
@@ -102,7 +102,7 @@ public class SSTableIdentityIterator implements Comparable<SSTableIdentityIterat
             columnFamily = EmptyColumns.factory.create(metadata);
             columnFamily.delete(DeletionTime.serializer.deserialize(in));
             columnCount = dataVersion.hasRowSizeAndColumnCount ? in.readInt() : Integer.MAX_VALUE;
-            atomIterator = columnFamily.metadata().getOnDiskIterator(in, columnCount, dataVersion);
+            atomIterator = columnFamily.metadata().getOnDiskIterator(in, columnCount, flag,
expireBefore, dataVersion);
         }
         catch (IOException e)
         {


Mime
View raw message