You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/03/30 18:24:54 UTC
[12/16] git commit: Make loadNewSSTable preserve sstable version
Make loadNewSSTable preserve sstable version
patch by slebresne; reviewed by jbellis for CASSANDRA-4077
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5a324e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5a324e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5a324e3
Branch: refs/heads/trunk
Commit: e5a324e31e0da3e5e57d3bd87e06f20aaf108a3d
Parents: 9ad9c24
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Mar 30 17:31:51 2012 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Mar 30 17:31:51 2012 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/db/ColumnFamilyStore.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5a324e3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 827c0c4..df13658 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,7 @@
* Adds posibility to autoconfigure size of the KeyCache (CASSANDRA-4087)
* fix KEYS index from skipping results (CASSANDRA-3996)
* Remove sliced_buffer_size_in_kb dead option (CASSANDRA-4076)
+ * make loadNewSStable preserve sstable version (CASSANDRA-4077)
1.1-beta2
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5a324e3/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 0fc7604..4ab9eba 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -469,7 +469,8 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
Descriptor.CURRENT_VERSION,
descriptor));
- Descriptor newDescriptor = new Descriptor(descriptor.directory,
+ Descriptor newDescriptor = new Descriptor(descriptor.version,
+ descriptor.directory,
descriptor.ksname,
descriptor.cfname,
fileIndexGenerator.incrementAndGet(),