Updated Branches: refs/heads/cassandra-2.0 917bc05c9 -> 67accea1a refs/heads/trunk d362ba596 -> 48cfe0b10
free off-heap IndexSummary during bulk load patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-6359 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/67accea1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67accea1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67accea1 Branch: refs/heads/cassandra-2.0 Commit: 67accea1a1f44319e0382d6894cac457eb4a372a Parents: 917bc05 Author: Jonathan Ellis <jbel...@apache.org> Authored: Sat Nov 16 10:29:51 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sat Nov 16 10:31:08 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/io/sstable/SSTableLoader.java | 2 +- src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/67accea1/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b21e7a7..a283387 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.3 + * free off-heap IndexSummary during bulk (CASSANDRA-6359) * Recover from IOException in accept() thread (CASSANDRA-6349) * Improve Gossip tolerance of abnormally slow tasks (CASSANDRA-6338) * Fix trying to hint timed out counter writes (CASSANDRA-6322) http://git-wip-us.apache.org/repos/asf/cassandra/blob/67accea1/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java index fd3400e..f867317 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java @@ -106,7 +106,7 @@ public class SSTableLoader implements StreamEventHandler try { - // To conserve heap space, open SSTableReaders without bloom filters and discard + // To conserve memory, open SSTableReaders without bloom filters and discard // the index summary after calculating the file sections to stream and the estimated // number of keys for each endpoint. See CASSANDRA-5555 for details. SSTableReader sstable = SSTableReader.openForBatch(desc, components, metadata, client.getPartitioner()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/67accea1/src/java/org/apache/cassandra/io/sstable/SSTableReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java index c961d44..41cd0ba 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java @@ -574,8 +574,9 @@ public class SSTableReader extends SSTable implements Closeable } } - public void releaseSummary() + public void releaseSummary() throws IOException { + indexSummary.close(); indexSummary = null; }
