Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 7b1331fed -> d3258f615 refs/heads/trunk 95d5d8b23 -> c0fc8d823
Buffer bloom filter serialization patch by Gustav Munkby; reviewed by benedict for CASSANDRA-9066 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d3258f61 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d3258f61 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d3258f61 Branch: refs/heads/cassandra-2.1 Commit: d3258f6152eda3be4cba0a021ea34fcb34b7a569 Parents: b0de327 Author: Gustav Munkby <[email protected]> Authored: Sun Mar 29 16:17:56 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Sun Mar 29 16:19:54 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/io/sstable/SSTableWriter.java | 14 +++----------- 2 files changed, 4 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3258f61/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index c02af99..bd5e277 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.4 + * Buffer bloom filter serialization (CASSANDRA-9066) * Fix anti-compaction target bloom filter size (CASSANDRA-9060) * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047) * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3258f61/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java index 440961f..a39c134 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java @@ -17,10 +17,7 @@ */ package org.apache.cassandra.io.sstable; -import java.io.DataInput; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; +import java.io.*; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Collections; @@ -55,12 +52,7 @@ import org.apache.cassandra.io.sstable.metadata.MetadataCollector; import org.apache.cassandra.io.sstable.metadata.MetadataComponent; import org.apache.cassandra.io.sstable.metadata.MetadataType; import org.apache.cassandra.io.sstable.metadata.StatsMetadata; -import org.apache.cassandra.io.util.DataOutputPlus; -import org.apache.cassandra.io.util.DataOutputStreamAndChannel; -import org.apache.cassandra.io.util.FileMark; -import org.apache.cassandra.io.util.FileUtils; -import org.apache.cassandra.io.util.SegmentedFile; -import org.apache.cassandra.io.util.SequentialWriter; +import org.apache.cassandra.io.util.*; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; @@ -647,7 +639,7 @@ public class SSTableWriter extends SSTable { // bloom filter FileOutputStream fos = new FileOutputStream(path); - DataOutputStreamAndChannel stream = new DataOutputStreamAndChannel(fos); + DataOutputStreamPlus stream = new DataOutputStreamPlus(new BufferedOutputStream(fos)); FilterFactory.serialize(bf, stream); stream.flush(); fos.getFD().sync();
