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 A89F410D2A for ; Wed, 15 Jan 2014 03:13:37 +0000 (UTC) Received: (qmail 50221 invoked by uid 500); 15 Jan 2014 03:13:36 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 49654 invoked by uid 500); 15 Jan 2014 03:13:35 -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 49513 invoked by uid 99); 15 Jan 2014 03:13:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Jan 2014 03:13:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3E8E98BF336; Wed, 15 Jan 2014 03:13:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Wed, 15 Jan 2014 03:13:23 -0000 Message-Id: In-Reply-To: <89f3f2cbfadd435d8aa952c357e40629@git.apache.org> References: <89f3f2cbfadd435d8aa952c357e40629@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/5] git commit: Don't scrub 2i CF if index type is CUSTOM Don't scrub 2i CF if index type is CUSTOM Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0bfe9efd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0bfe9efd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0bfe9efd Branch: refs/heads/trunk Commit: 0bfe9efd859eccd6bb6c6a253ad3912650831ec0 Parents: 3e31143 Author: Yuki Morishita Authored: Thu Jan 9 12:51:04 2014 -0600 Committer: Yuki Morishita Committed: Tue Jan 14 20:23:00 2014 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0bfe9efd/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 6d3e21a..892e881 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -40,11 +40,8 @@ import org.apache.cassandra.cache.IRowCacheEntry; import org.apache.cassandra.cache.RowCacheKey; import org.apache.cassandra.cache.RowCacheSentinel; import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor; -import org.apache.cassandra.config.CFMetaData; +import org.apache.cassandra.config.*; import org.apache.cassandra.config.CFMetaData.SpeculativeRetry; -import org.apache.cassandra.config.ColumnDefinition; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.Schema; import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.db.commitlog.ReplayPosition; @@ -464,8 +461,12 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean { if (def.isIndexed()) { - CFMetaData indexMetadata = CFMetaData.newIndexMetadata(metadata, def, SecondaryIndex.getIndexComparator(metadata, def)); - scrubDataDirectories(indexMetadata); + CellNameType indexComparator = SecondaryIndex.getIndexComparator(metadata, def); + if (indexComparator != null) + { + CFMetaData indexMetadata = CFMetaData.newIndexMetadata(metadata, def, indexComparator); + scrubDataDirectories(indexMetadata); + } } } }