Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23c2fa8c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23c2fa8c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23c2fa8c Branch: refs/heads/trunk Commit: 23c2fa8c89ce67ebdb8f211a4c1dd8e2148bc785 Parents: 295fe5d 6858dd3 Author: Aleksey Yeschenko <[email protected]> Authored: Thu Jun 19 11:59:19 2014 -0700 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu Jun 19 11:59:19 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../org/apache/cassandra/db/AbstractCell.java | 69 +++++++++----------- .../cassandra/db/ArrayBackedSortedColumns.java | 2 +- .../apache/cassandra/db/BufferCounterCell.java | 4 +- .../cassandra/db/BufferCounterUpdateCell.java | 15 ++--- .../org/apache/cassandra/db/ColumnFamily.java | 2 +- .../org/apache/cassandra/db/ColumnIndex.java | 2 +- .../org/apache/cassandra/db/DeletionInfo.java | 35 ++++------ .../org/apache/cassandra/db/DeletionTime.java | 10 +++ .../apache/cassandra/db/NativeCounterCell.java | 4 +- .../apache/cassandra/db/RangeTombstoneList.java | 31 ++++++--- .../cassandra/db/filter/ColumnCounter.java | 2 +- test/unit/org/apache/cassandra/Util.java | 5 -- .../apache/cassandra/db/ColumnFamilyTest.java | 39 ++++++++++- .../apache/cassandra/db/CounterCellTest.java | 20 ++---- .../cassandra/utils/EncodedStreamsTest.java | 10 +-- 16 files changed, 139 insertions(+), 113 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/23c2fa8c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a837d28,a2205ff..ec1dc9d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,6 +1,19 @@@ +3.0 + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7208) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + + + 2.1.0 + * Modify reconcile logic to always pick a tombstone over a counter cell + (CASSANDRA-7346) * Avoid incremental compaction on Windows (CASSANDRA-7365) * Fix exception when querying a composite-keyed table with a collection index (CASSANDRA-7372) http://git-wip-us.apache.org/repos/asf/cassandra/blob/23c2fa8c/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/23c2fa8c/src/java/org/apache/cassandra/db/ColumnFamily.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/23c2fa8c/test/unit/org/apache/cassandra/Util.java ----------------------------------------------------------------------
