cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [1/2] cassandra git commit: Make sstable blacklisting work with compression
Date Mon, 27 Apr 2015 06:56:52 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 93b36d4b8 -> 12628893c


Make sstable blacklisting work with compression

Patch by marcuse; reviewed by Aleksey Yeschenko for CASSANDRA-9138


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

Branch: refs/heads/cassandra-2.1
Commit: 917fabe231b6bcbc754f04f92b3449a97344826b
Parents: b325316
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Fri Apr 10 10:15:22 2015 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Mon Apr 27 08:47:54 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/917fabe2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5e1e62c..5f6a547 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.15:
+ * Make sstable blacklisting work with compression (CASSANDRA-9138)
  * Do not attempt to rebuild indexes if no index accepts any column (CASSANDRA-9196)
  * Don't initiate snitch reconnection for dead states (CASSANDRA-7292)
  * Fix ArrayIndexOutOfBoundsException in CQLSSTableWriter (CASSANDRA-8978)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/917fabe2/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java b/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
index 7a87879..caec9b6 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
@@ -276,7 +276,7 @@ public class SSTableScanner implements ICompactionScanner
                 });
 
             }
-            catch (IOException e)
+            catch (CorruptSSTableException | IOException e)
             {
                 sstable.markSuspect();
                 throw new CorruptSSTableException(e, sstable.getFilename());


Mime
View raw message