Updated Branches: refs/heads/trunk 5c7ccb033 -> be7cbc8dd
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be7cbc8d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be7cbc8d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be7cbc8d Branch: refs/heads/trunk Commit: be7cbc8dd21ab9b7c75405a0584e9a6b6655582e Parents: 5c7ccb0 9483e14 Author: Pavel Yaskevich <xe...@apache.org> Authored: Tue Feb 28 23:44:47 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Tue Feb 28 23:44:47 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../db/columniterator/IndexedSliceReader.java | 1 + .../db/columniterator/SSTableNamesIterator.java | 2 + .../db/columniterator/SSTableSliceIterator.java | 1 + .../db/columniterator/SimpleSliceReader.java | 1 + .../db/compaction/AbstractCompactionStrategy.java | 24 +++- .../cassandra/db/compaction/LeveledManifest.java | 28 ++++- .../compaction/SizeTieredCompactionStrategy.java | 5 +- .../io/sstable/SSTableBoundedScanner.java | 1 + .../io/sstable/SSTableIdentityIterator.java | 1 + .../apache/cassandra/io/sstable/SSTableReader.java | 15 ++ .../cassandra/io/sstable/SSTableScanner.java | 5 + .../cassandra/db/compaction/CompactionsTest.java | 113 ++++++++++++++- 13 files changed, 191 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be7cbc8d/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be7cbc8d/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be7cbc8d/src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be7cbc8d/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be7cbc8d/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java index bb84d1d,2e70c46..5e0a911 --- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java @@@ -15,11 -15,10 +15,9 @@@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.cassandra.db.compaction; - import java.util.Collection; - import java.util.Map; - import java.util.Set; + import java.util.*; import java.util.concurrent.TimeUnit; import org.apache.cassandra.db.ColumnFamilyStore; http://git-wip-us.apache.org/repos/asf/cassandra/blob/be7cbc8d/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be7cbc8d/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be7cbc8d/src/java/org/apache/cassandra/io/sstable/SSTableBoundedScanner.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be7cbc8d/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be7cbc8d/src/java/org/apache/cassandra/io/sstable/SSTableReader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be7cbc8d/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java ----------------------------------------------------------------------
