Updated Branches: refs/heads/trunk 125a8c9c7 -> 70e9bed7c
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/70e9bed7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70e9bed7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70e9bed7 Branch: refs/heads/trunk Commit: 70e9bed7c28d45119b889a0d97a17826d228fbec Parents: 125a8c9 ac9f478 Author: Vijay Parthasarathy <[email protected]> Authored: Thu Dec 27 18:46:36 2012 -0800 Committer: Vijay Parthasarathy <[email protected]> Committed: Thu Dec 27 18:46:36 2012 -0800 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/Column.java | 5 ++ src/java/org/apache/cassandra/db/ColumnFamily.java | 4 +- .../org/apache/cassandra/db/ColumnFamilyStore.java | 1 + src/java/org/apache/cassandra/db/DeletionInfo.java | 10 ++++ src/java/org/apache/cassandra/db/OnDiskAtom.java | 3 +- .../org/apache/cassandra/db/RangeTombstone.java | 5 ++ src/java/org/apache/cassandra/db/SuperColumn.java | 8 +++ .../db/compaction/CompactionController.java | 4 +- .../cassandra/db/compaction/CompactionManager.java | 2 +- .../db/compaction/LazilyCompactedRow.java | 10 +++- .../cassandra/db/compaction/PrecompactedRow.java | 4 +- .../apache/cassandra/db/compaction/Scrubber.java | 2 +- .../apache/cassandra/io/sstable/ColumnStats.java | 4 +- .../apache/cassandra/io/sstable/Descriptor.java | 5 ++- .../cassandra/io/sstable/SSTableMetadata.java | 21 +++++++- .../apache/cassandra/io/sstable/SSTableReader.java | 5 ++ .../apache/cassandra/io/sstable/SSTableWriter.java | 3 + .../db/compaction/CompactionsPurgeTest.java | 39 ++++++++++++++- .../cassandra/io/sstable/DescriptorTest.java | 1 + .../io/sstable/SSTableMetadataSerializerTest.java | 4 ++ .../apache/cassandra/streaming/BootstrapTest.java | 2 +- 21 files changed, 125 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70e9bed7/src/java/org/apache/cassandra/db/Column.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70e9bed7/src/java/org/apache/cassandra/db/ColumnFamily.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70e9bed7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70e9bed7/src/java/org/apache/cassandra/db/compaction/CompactionController.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70e9bed7/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70e9bed7/src/java/org/apache/cassandra/db/compaction/Scrubber.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70e9bed7/src/java/org/apache/cassandra/io/sstable/SSTableReader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70e9bed7/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java ----------------------------------------------------------------------
