Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5A0B118B82 for ; Mon, 27 Apr 2015 06:57:06 +0000 (UTC) Received: (qmail 63100 invoked by uid 500); 27 Apr 2015 06:57:06 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 63060 invoked by uid 500); 27 Apr 2015 06:57:06 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 63034 invoked by uid 99); 27 Apr 2015 06:57:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Apr 2015 06:57:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0D810E0019; Mon, 27 Apr 2015 06:57:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marcuse@apache.org To: commits@cassandra.apache.org Date: Mon, 27 Apr 2015 06:57:06 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] cassandra git commit: Make sstable blacklisting work with compression Repository: cassandra Updated Branches: refs/heads/trunk 246f07b68 -> d3b53aa42 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/trunk Commit: 917fabe231b6bcbc754f04f92b3449a97344826b Parents: b325316 Author: Marcus Eriksson Authored: Fri Apr 10 10:15:22 2015 +0200 Committer: Marcus Eriksson 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());