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 2011/11/25 10:19:01 UTC
svn commit: r1206088 - in /cassandra/branches/cassandra-1.0: CHANGES.txt
src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
Author: slebresne
Date: Fri Nov 25 09:19:00 2011
New Revision: 1206088
URL: http://svn.apache.org/viewvc?rev=1206088&view=rev
Log:
Make sstabloader recognize compressed sstables
patch by yukim; reviewed by slebresne for CASSANDRA-3521
Modified:
cassandra/branches/cassandra-1.0/CHANGES.txt
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
Modified: cassandra/branches/cassandra-1.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1206088&r1=1206087&r2=1206088&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0/CHANGES.txt Fri Nov 25 09:19:00 2011
@@ -11,6 +11,7 @@
* skip --debug requirement to see common exceptions in CLI (CASSANDRA-3508)
* fix incorrect query results due to invalid max timestamp (CASSANDRA-3510)
* fix ConcurrentModificationException in Table.all() (CASSANDRA-3529)
+ * make sstableloader recognize compressed sstables (CASSANDRA-3521)
Merged from 0.8:
* fix concurrence issue in the FailureDetector (CASSANDRA-3519)
* fix array out of bounds error in counter shard removal (CASSANDRA-3514)
Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java?rev=1206088&r1=1206087&r2=1206088&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java (original)
+++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java Fri Nov 25 09:19:00 2011
@@ -79,6 +79,8 @@ public class SSTableLoader
Set<Component> components = new HashSet<Component>();
components.add(Component.DATA);
components.add(Component.PRIMARY_INDEX);
+ if (new File(desc.filenameFor(Component.COMPRESSION_INFO)).exists())
+ components.add(Component.COMPRESSION_INFO);
try
{