Repository: cassandra Updated Branches: refs/heads/cassandra-2.1.0 af646fb75 -> a41d5270f
Correctly remove tmplink files Patch by marcuse; reviewed by benedict for CASSANDRA-7803 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a41d5270 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a41d5270 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a41d5270 Branch: refs/heads/cassandra-2.1.0 Commit: a41d5270fb39a5aaddf72a015aab44eb7e2db4a1 Parents: af646fb Author: Marcus Eriksson <marc...@apache.org> Authored: Thu Aug 21 10:34:58 2014 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Thu Aug 21 10:36:45 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/io/sstable/SSTableDeletingTask.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a41d5270/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 92a177d..d7c3dea 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.0 + * Correctly remove tmplink files (CASSANDRA-7803) * (cqlsh) Fix column name formatting for functions, CAS operations, and UDT field selections (CASSANDRA-7806) * (cqlsh) Fix COPY FROM handling of null/empty primary key http://git-wip-us.apache.org/repos/asf/cassandra/blob/a41d5270/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java b/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java index bdc6c65..e4559d3 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java @@ -51,8 +51,16 @@ public class SSTableDeletingTask implements Runnable public SSTableDeletingTask(SSTableReader referent) { this.referent = referent; - this.desc = referent.descriptor; - this.components = referent.components; + if (referent.isOpenEarly) + { + this.desc = referent.descriptor.asType(Descriptor.Type.TEMPLINK); + this.components = Sets.newHashSet(Component.DATA, Component.PRIMARY_INDEX); + } + else + { + this.desc = referent.descriptor; + this.components = referent.components; + } this.size = referent.bytesOnDisk(); }
