You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/08/20 01:04:38 UTC
[02/10] git commit: Fix getBloomFilterDiskSpaceUsed for
AlwaysPresentFilter patch by jbellis; reviewed by yukim for CASSANDRA-5900
Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter
patch by jbellis; reviewed by yukim for CASSANDRA-5900
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bc98886d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc98886d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc98886d
Branch: refs/heads/cassandra-2.0.0
Commit: bc98886d4bbb15eec28f2e8f059dddbd47999985
Parents: 1d5ecab
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 19 18:01:57 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Aug 19 18:01:57 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc98886d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 60e5cdc..bc3f2c6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.9
+ * Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter (CASSANDRA-5900)
* migrate 1.1 schema_columnfamilies.key_alias column to key_aliases
(CASSANDRA-5800)
* add --migrate option to sstableupgrade and sstablescrub (CASSANDRA-5831)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc98886d/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 8efa4f1..06b1739 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@ -593,6 +593,8 @@ public class SSTableReader extends SSTable
public long getBloomFilterSerializedSize()
{
+ if (bf instanceof AlwaysPresentFilter)
+ return 0;
return FilterFactory.serializedSize(bf, descriptor.version.filterType);
}