You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by xe...@apache.org on 2012/05/15 19:13:16 UTC
git commit: fix SecondaryIndex LelevedManifest save upon snapshot
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-4230
Updated Branches:
refs/heads/cassandra-1.1 96d6aa269 -> 783e5d4c5
fix SecondaryIndex LelevedManifest save upon snapshot
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-4230
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/783e5d4c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/783e5d4c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/783e5d4c
Branch: refs/heads/cassandra-1.1
Commit: 783e5d4c5fab46b1e5964f2743e053351bfe85d1
Parents: 96d6aa2
Author: Pavel Yaskevich <xe...@apache.org>
Authored: Tue May 15 20:12:13 2012 +0300
Committer: Pavel Yaskevich <xe...@apache.org>
Committed: Tue May 15 20:12:13 2012 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/db/ColumnFamilyStore.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/783e5d4c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3e3db3f..7f8f7a0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -43,6 +43,7 @@
* (cql3) Fix drop index (CASSANDRA-4192)
* (cql3) Don't return range ghosts anymore (CASSANDRA-3982)
* fix the problem re-creating Keyspace/ColumnFamily (CASSANDRA-4219)
+ * fix SecondaryIndex LelevedManifest save upon snapshot (CASSANDRA-4230)
Merged from 1.0:
* Fix super columns bug where cache is not updated (CASSANDRA-4190)
* fix maxTimestamp to include row tombstones (CASSANDRA-4116)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/783e5d4c/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 9dcf1ef..4a0739e 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1455,8 +1455,8 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
" created in " + snapshotDirectory);
}
- if (compactionStrategy instanceof LeveledCompactionStrategy)
- directories.snapshotLeveledManifest(snapshotName);
+ if (cfs.compactionStrategy instanceof LeveledCompactionStrategy)
+ cfs.directories.snapshotLeveledManifest(snapshotName);
}
catch (IOException e)
{