Return-Path: 
 <commits-return-90480-apmail-cassandra-commits-archive=cassandra.apache.org@cassandra.apache.org>
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 C8A5F10640
	for <apmail-cassandra-commits-archive@www.apache.org>;
 Wed, 29 Jan 2014 20:18:36 +0000 (UTC)
Received: (qmail 20170 invoked by uid 500); 29 Jan 2014 20:18:35 -0000
Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org
Received: (qmail 20099 invoked by uid 500); 29 Jan 2014 20:18:34 -0000
Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cassandra.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cassandra.apache.org>
List-Post: <mailto:commits@cassandra.apache.org>
List-Id: <commits.cassandra.apache.org>
Reply-To: dev@cassandra.apache.org
Delivered-To: mailing list commits@cassandra.apache.org
Received: (qmail 20079 invoked by uid 99); 29 Jan 2014 20:18:33 -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, 29 Jan 2014 20:18:33 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 6B6779107FD; Wed, 29 Jan 2014 20:18:33 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: aleksey@apache.org
To: commits@cassandra.apache.org
Date: Wed, 29 Jan 2014 20:18:35 -0000
Message-Id: <5a20c90b4e9d45d19a69026768009bcd@git.apache.org>
In-Reply-To: <aeb874af3eda43118ec00570fb95bdb2@git.apache.org>
References: <aeb874af3eda43118ec00570fb95bdb2@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [3/3] git commit: Merge branch 'cassandra-2.0' into trunk

Merge branch 'cassandra-2.0' into trunk

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/DataRange.java
	src/java/org/apache/cassandra/db/index/SecondaryIndex.java


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

Branch: refs/heads/trunk
Commit: 82571546efff0a3427fca3a000ffdf3f6c1e176c
Parents: 8f17bbd 287745e
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Jan 29 14:18:20 2014 -0600
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Jan 29 14:18:20 2014 -0600

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/db/index/SecondaryIndex.java      | 22 +++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/82571546/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/82571546/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/index/SecondaryIndex.java
index 81359af,fda28f0..7edfd94
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
@@@ -181,15 -180,21 +181,21 @@@ public abstract class SecondaryInde
                  getIndexName(), StringUtils.join(baseCfs.getSSTables(), ", ")));
  
          Collection<SSTableReader> sstables = baseCfs.markCurrentSSTablesReferenced();
-         SecondaryIndexBuilder builder = new SecondaryIndexBuilder(baseCfs,
-                                                                   Collections.singleton(getIndexName()),
-                                                                   new ReducingKeyIterator(sstables));
-         Future<?> future = CompactionManager.instance.submitIndexBuild(builder);
-         FBUtilities.waitOnFuture(future);
-         forceBlockingFlush();
- 
-         setIndexBuilt();
+         try
+         {
+             SecondaryIndexBuilder builder = new SecondaryIndexBuilder(baseCfs,
+                                                                       Collections.singleton(getIndexName()),
+                                                                       new ReducingKeyIterator(sstables));
+             Future<?> future = CompactionManager.instance.submitIndexBuild(builder);
+             FBUtilities.waitOnFuture(future);
+             forceBlockingFlush();
+             setIndexBuilt();
+         }
+         finally
+         {
+             SSTableReader.releaseReferences(sstables);
+         }
 -        logger.info("Index build of " + getIndexName() + " complete");
 +        logger.info("Index build of {} complete", getIndexName());
      }