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 branch 'cassandra-2.0' into trunk
Date Mon, 27 Jan 2014 23:00:33 GMT
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 82735e096a49a1871d88353f06620300df55ebf6
Parents: 714c423 20c2adc
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Jan 27 17:00:24 2014 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Jan 27 17:00:24 2014 -0600

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/dht/Murmur3Partitioner.java       |  5 +-
 .../org/apache/cassandra/utils/BloomFilter.java | 79 ++++++++++++++------
 .../org/apache/cassandra/utils/FBUtilities.java |  6 ++
 .../cassandra/utils/Murmur3BloomFilter.java     |  4 +-
 .../org/apache/cassandra/utils/MurmurHash.java  |  6 +-
 .../cassandra/utils/obs/OffHeapBitSet.java      |  2 +-
 7 files changed, 72 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/82735e09/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index cc406c8,68727dc..23bb4f1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,5 +1,35 @@@
 +2.1
 + * add listsnapshots command to nodetool (CASSANDRA-5742)
 + * Introduce AtomicBTreeColumns (CASSANDRA-6271)
 + * Multithreaded commitlog (CASSANDRA-3578)
 + * allocate fixed index summary memory pool and resample cold index summaries 
 +   to use less memory (CASSANDRA-5519)
 + * Removed multithreaded compaction (CASSANDRA-6142)
 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
 + * change logging from log4j to logback (CASSANDRA-5883)
 + * switch to LZ4 compression for internode communication (CASSANDRA-5887)
 + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
 + * Remove 1.2 network compatibility code (CASSANDRA-5960)
 + * Remove leveled json manifest migration code (CASSANDRA-5996)
 + * Remove CFDefinition (CASSANDRA-6253)
 + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
 + * User-defined types for CQL3 (CASSANDRA-5590)
 + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406)
 + * Batch read from OTC's queue and cleanup (CASSANDRA-1632)
 + * Secondary index support for collections (CASSANDRA-4511, 6383)
 + * SSTable metadata(Stats.db) format change (CASSANDRA-6356)
 + * Push composites support in the storage engine
 +   (CASSANDRA-5417, CASSANDRA-6520)
 + * Add snapshot space used to cfstats (CASSANDRA-6231)
 + * Add cardinality estimator for key count estimation (CASSANDRA-5906)
 + * CF id is changed to be non-deterministic. Data dir/key cache are created
 +   uniquely for CF id (CASSANDRA-5202)
 + * Cassandra won't start by default without jna (CASSANDRA-6575)
 + * New counters implementation (CASSANDRA-6504)
 +
 +
  2.0.5
+  * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609)
   * Add ks.cf names to tombstone logging (CASSANDRA-6597)
   * Use LOCAL_QUORUM for LWT operations at LOCAL_SERIAL (CASSANDRA-6495)
   * Wait for gossip to settle before accepting client connections (CASSANDRA-4288)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/82735e09/src/java/org/apache/cassandra/utils/FBUtilities.java
----------------------------------------------------------------------


Mime
View raw message