Repository: cassandra Updated Branches: refs/heads/trunk bade5cfd9 -> ba71c4707
ninja fix CASSANDRA-9112 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba71c470 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba71c470 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba71c470 Branch: refs/heads/trunk Commit: ba71c4707fb315493deef3e63b49d56776bd8677 Parents: bade5cf Author: Benedict Elliott Smith <[email protected]> Authored: Sat Apr 4 11:55:56 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Sat Apr 4 11:55:56 2015 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/io/util/SegmentedFile.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba71c470/src/java/org/apache/cassandra/io/util/SegmentedFile.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/util/SegmentedFile.java b/src/java/org/apache/cassandra/io/util/SegmentedFile.java index 98548e1..129d914 100644 --- a/src/java/org/apache/cassandra/io/util/SegmentedFile.java +++ b/src/java/org/apache/cassandra/io/util/SegmentedFile.java @@ -133,11 +133,9 @@ public abstract class SegmentedFile extends SharedCloseableImpl */ public static Builder getBuilder(Config.DiskAccessMode mode, boolean compressed) { - assert !compressed || mode != Config.DiskAccessMode.mmap; - return mode == Config.DiskAccessMode.mmap - ? new MmappedSegmentedFile.Builder() - : compressed ? new CompressedSegmentedFile.Builder(null) - : new BufferedPoolingSegmentedFile.Builder(); + return compressed ? new CompressedSegmentedFile.Builder(null) + : mode == Config.DiskAccessMode.mmap ? new MmappedSegmentedFile.Builder() + : new BufferedPoolingSegmentedFile.Builder(); } public static Builder getCompressedBuilder(CompressedSequentialWriter writer)
