cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [05/10] git commit: merge from 1.2
Date Mon, 19 Aug 2013 23:04:41 GMT
merge from 1.2


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

Branch: refs/heads/cassandra-2.0
Commit: df9d61c98ff007e26e9a7dcd793e13e056e696c8
Parents: 5bf1fc1 bc98886
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Aug 19 18:03:51 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Aug 19 18:03:51 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                 | 5 +++++
 src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 ++
 2 files changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/df9d61c9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5c2b924,bc3f2c6..83966d7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,8 +1,34 @@@
 -1.2.9
++2.0.0
++Merged from 1.2:
+  * 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)
++
++
 +2.0.0-rc2
 + * enable vnodes by default (CASSANDRA-5869)
 + * fix CAS contention timeout (CASSANDRA-5830)
 + * fix HsHa to respect max frame size (CASSANDRA-4573)
 + * Fix (some) 2i on composite components omissions (CASSANDRA-5851)
 + * cqlsh: add DESCRIBE FULL SCHEMA variant (CASSANDRA-5880)
 +Merged from 1.2:
 + * Correctly validate sparse composite cells in scrub (CASSANDRA-5855)
 + * Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868)
 + * cqlsh: add support for multiline comments (CASSANDRA-5798)
 + * Handle CQL3 SELECT duplicate IN restrictions on clustering columns
 +   (CASSANDRA-5856)
 +
 +
 +2.0.0-rc1
 + * improve DecimalSerializer performance (CASSANDRA-5837)
 + * fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690)
 + * fix schema-related trigger issues (CASSANDRA-5774)
 + * Better validation when accessing CQL3 table from thrift (CASSANDRA-5138)
 + * Fix assertion error during repair (CASSANDRA-5801)
 + * Fix range tombstone bug (CASSANDRA-5805)
 + * DC-local CAS (CASSANDRA-5797)
 + * Add a native_protocol_version column to the system.local table (CASSANRDA-5819)
 + * Use index_interval from cassandra.yaml when upgraded (CASSANDRA-5822)
 + * Fix buffer underflow on socket close (CASSANDRA-5792)
 +Merged from 1.2:
   * fix bulk-loading compressed sstables (CASSANDRA-5820)
   * (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter 
     (CASSANDRA-5824)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/df9d61c9/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/sstable/SSTableReader.java
index 4a62d85,06b1739..814790a
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@@ -590,7 -593,9 +590,9 @@@ public class SSTableReader extends SSTa
  
      public long getBloomFilterSerializedSize()
      {
+         if (bf instanceof AlwaysPresentFilter)
+             return 0;
 -        return FilterFactory.serializedSize(bf, descriptor.version.filterType);
 +        return FilterFactory.serializedSize(bf);
      }
  
      /**


Mime
View raw message