cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/3] git commit: merge from 1.2
Date Mon, 07 Jan 2013 15:40:32 GMT
Updated Branches:
  refs/heads/cassandra-1.2 3d787b78c -> dac6048c5
  refs/heads/trunk 94d76aa6c -> af404f211


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/af404f21
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af404f21
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af404f21

Branch: refs/heads/trunk
Commit: af404f2116ae15dc0aba5676a337321e15d47dfb
Parents: 94d76aa dac6048
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Jan 7 09:40:17 2013 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Jan 7 09:40:17 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../org/apache/cassandra/config/CFMetaData.java    |    6 +++++-
 .../apache/cassandra/io/sstable/SSTableWriter.java |   10 +---------
 3 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/af404f21/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f290829,78643d5..c0e403f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 +1.3
 + * make index_interval configurable per columnfamily (CASSANDRA-3961)
 + * add default_tim_to_live (CASSANDRA-3974)
 + * add memtable_flush_period_in_ms (CASSANDRA-4237)
 + * replace supercolumns internally by composites (CASSANDRA-3237)
 +
 +
  1.2.1
+  * disallow bloom filter false positive chance of 0 (CASSANDRA-5013)
   * add threadpool size adjustment methods to JMXEnabledThreadPoolExecutor and 
     CompactionManagerMBean (CASSANDRA-5044)
   * Improve handling a changing target throttle rate mid-compaction (CASSANDRA-5087)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/af404f21/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index 359bbb3,5f6c1fe..c1fd8e9
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -555,9 -529,15 +555,10 @@@ public final class CFMetaDat
          return Collections.unmodifiableMap(column_metadata);
      }
  
 -    public AbstractType<?> getComparatorFor(ByteBuffer superColumnName)
 -    {
 -        return superColumnName == null ? comparator : subcolumnComparator;
 -    }
 -
      public double getBloomFilterFpChance()
      {
-         return bloomFilterFpChance == null
+         // we disallow bFFPC==null starting in 1.2.1 but tolerated it before that
+         return (bloomFilterFpChance == null || bloomFilterFpChance == 0)
                 ? compactionStrategyClass == LeveledCompactionStrategy.class ? 0.1 : 0.01
                 : bloomFilterFpChance;
      }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/af404f21/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
index 10af96d,f578064..279599e
--- a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
@@@ -426,16 -441,8 +426,8 @@@ public class SSTableWriter extends SSTa
              indexFile = SequentialWriter.open(new File(descriptor.filenameFor(SSTable.COMPONENT_INDEX)),
                                                !DatabaseDescriptor.populateIOCacheOnFlush());
              builder = SegmentedFile.getBuilder(DatabaseDescriptor.getIndexAccessMode());
 -            summary = new IndexSummary(keyCount);
 +            summary = new IndexSummary(keyCount, metadata.getIndexInterval());
- 
-             double fpChance = metadata.getBloomFilterFpChance();
-             if (fpChance == 0)
-             {
-                 // paranoia -- we've had bugs in the thrift <-> avro <-> CfDef
dance before, let's not let that break things
-                 logger.error("Bloom filter FP chance of zero isn't supposed to happen");
-                 fpChance = 0.01;
-             }
-             bf = FilterFactory.getFilter(keyCount, fpChance, true);
+             bf = FilterFactory.getFilter(keyCount, metadata.getBloomFilterFpChance(), true);
          }
  
          public void append(DecoratedKey key, RowIndexEntry indexEntry)


Mime
View raw message