Author: jbellis Date: Wed Sep 14 12:53:47 2011 New Revision: 1170581 URL: http://svn.apache.org/viewvc?rev=1170581&view=rev Log: merge from 1.0.0
Modified: cassandra/branches/cassandra-1.0/ (props changed) cassandra/branches/cassandra-1.0/CHANGES.txt cassandra/branches/cassandra-1.0/NEWS.txt cassandra/branches/cassandra-1.0/NOTICE.txt cassandra/branches/cassandra-1.0/build.xml cassandra/branches/cassandra-1.0/contrib/ (props changed) cassandra/branches/cassandra-1.0/debian/changelog cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java (props changed) cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java (props changed) cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java (props changed) cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java (props changed) cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java (props changed) cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/columniterator/ICountableColumnIterator.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/locator/Ec2MultiRegionSnitch.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/INotification.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/INotificationConsumer.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/SSTableAddedNotification.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/IntervalTree/Interval.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/IntervalTree/IntervalNode.java cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/IntervalTree/IntervalTree.java cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/net/MessageSerializer.java cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/utils/IntervalTest.java cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/utils/IntervalTreeTest.java Propchange: cassandra/branches/cassandra-1.0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Sep 14 12:53:47 2011 @@ -5,7 +5,7 @@ /cassandra/branches/cassandra-0.8.0:1125021-1130369 /cassandra/branches/cassandra-0.8.1:1101014-1125018 /cassandra/branches/cassandra-1.0:1167106,1167185 -/cassandra/branches/cassandra-1.0.0:1167104-1170360 +/cassandra/branches/cassandra-1.0.0:1167104-1170580 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689 /cassandra/tags/cassandra-0.8.0-rc1:1102511-1125020 /cassandra/trunk:1167085-1167102,1169870 Modified: cassandra/branches/cassandra-1.0/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/CHANGES.txt (original) +++ cassandra/branches/cassandra-1.0/CHANGES.txt Wed Sep 14 12:53:47 2011 @@ -2,7 +2,7 @@ * describe_ring should include datacenter/topology information (CASSANDRA-2882) -1.0 +1.0.0-beta1 * removed binarymemtable (CASSANDRA-2692) * add commitlog_total_space_in_mb to prevent fragmented logs (CASSANDRA-2427) * removed commitlog_rotation_threshold_in_mb configuration (CASSANDRA-2771) @@ -76,6 +76,8 @@ * Add RowLevel support to secondary index API (CASSANDRA-3147) * Make SerializingCacheProvider the default if JNA is available (CASSANDRA-3183) * Fix backwards compatibilty for CQL memtable properties (CASSANDRA-3190) + * Add five-minute delay before starting compactions on a restarted server + (CASSANDRA-3181) 0.8.6 Modified: cassandra/branches/cassandra-1.0/NEWS.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/NEWS.txt?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/NEWS.txt (original) +++ cassandra/branches/cassandra-1.0/NEWS.txt Wed Sep 14 12:53:47 2011 @@ -60,6 +60,10 @@ Other This does not affect client compatibility -- the old options are still allowed, but have no effect. These options may be removed entirely in a future release. + - Backlogged compactions will begin five minutes after startup. The 0.8 + behavior of never starting compaction until a flush happens is usually + not what is desired, but a short grace period is useful to allow caches + to warm up first. 0.8.5 Modified: cassandra/branches/cassandra-1.0/NOTICE.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/NOTICE.txt?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/NOTICE.txt (original) +++ cassandra/branches/cassandra-1.0/NOTICE.txt Wed Sep 14 12:53:47 2011 @@ -31,3 +31,8 @@ YAML support provided by snakeyaml (http Copyright (c) 2008-2010 Andrey Somov Compression support provided by snappy-java (http://code.google.com/p/snappy-java/) +Written by Taro L. Saito. + +Streaming compression support provided by ning-compress +(https://github.com/ning/compress) +Copyright 2009-2010 Ning, Inc. Modified: cassandra/branches/cassandra-1.0/build.xml URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/build.xml?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/build.xml (original) +++ cassandra/branches/cassandra-1.0/build.xml Wed Sep 14 12:53:47 2011 @@ -25,7 +25,7 @@ <property name="debuglevel" value="source,lines,vars"/> <!-- default version and SCM information (we need the default SCM info as people may checkout with git-svn) --> - <property name="base.version" value="1.0"/> + <property name="base.version" value="1.0.0-beta1"/> <property name="scm.default.path" value="cassandra/branches/cassandra-1.0.0"/> <property name="scm.default.connection" value="scm:svn:http://svn.apache.org/repos/asf/${scm.default.path}"/> <property name="scm.default.developerConnection" value="scm:svn:https://svn.apache.org/repos/asf/${scm.default.path}"/> Propchange: cassandra/branches/cassandra-1.0/contrib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Sep 14 12:53:47 2011 @@ -5,7 +5,7 @@ /cassandra/branches/cassandra-0.8.0/contrib:1125021-1130369 /cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018 /cassandra/branches/cassandra-1.0/contrib:1167106,1167185 -/cassandra/branches/cassandra-1.0.0/contrib:1167104-1170360 +/cassandra/branches/cassandra-1.0.0/contrib:1167104-1170580 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689 /cassandra/tags/cassandra-0.8.0-rc1/contrib:1102511-1125020 /cassandra/trunk/contrib:1167085-1167102,1169870 Modified: cassandra/branches/cassandra-1.0/debian/changelog URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/debian/changelog?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/debian/changelog (original) +++ cassandra/branches/cassandra-1.0/debian/changelog Wed Sep 14 12:53:47 2011 @@ -1,3 +1,9 @@ +cassandra (1.0.0-beta1) unstable; urgency=low + + * New beta release + + -- Sylvain Lebresne <slebre...@apache.org> Wed, 14 Sep 2011 11:07:47 +0200 + cassandra (0.8.1) unstable; urgency=low * New release Propchange: cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Sep 14 12:53:47 2011 @@ -5,7 +5,7 @@ /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1130369 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1101014-1125018 /cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167106,1167185 -/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167104-1170360 +/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167104-1170580 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689 /cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1102511-1125020 /cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167085-1167102,1169870 Propchange: cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Sep 14 12:53:47 2011 @@ -5,7 +5,7 @@ /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1125021-1130369 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1101014-1125018 /cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1167106,1167185 -/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1167104-1170360 +/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1167104-1170580 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1051699-1053689 /cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1102511-1125020 /cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1167085-1167102,1169870 Propchange: cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Sep 14 12:53:47 2011 @@ -5,7 +5,7 @@ /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1125021-1130369 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1101014-1125018 /cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1167106,1167185 -/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1167104-1170360 +/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1167104-1170580 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1051699-1053689 /cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1102511-1125020 /cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1167085-1167102,1169870 Propchange: cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Sep 14 12:53:47 2011 @@ -5,7 +5,7 @@ /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1125021-1130369 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1101014-1125018 /cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1167106,1167185 -/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1167104-1170360 +/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1167104-1170580 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1051699-1053689 /cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1102511-1125020 /cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1167085-1167102,1169870 Propchange: cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Sep 14 12:53:47 2011 @@ -5,7 +5,7 @@ /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1125021-1130369 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1101014-1125018 /cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1167106,1167185 -/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1167104-1170360 +/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1167104-1170580 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1051699-1053689 /cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1102511-1125020 /cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1167085-1167102,1169870 Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java Wed Sep 14 12:53:47 2011 @@ -1,4 +1,25 @@ package org.apache.cassandra.cql.jdbc; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + public class JdbcCounterColumn extends JdbcLong { Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java Wed Sep 14 12:53:47 2011 @@ -1,4 +1,25 @@ package org.apache.cassandra.cql.jdbc; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.util.HashMap; import java.util.Map; Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/columniterator/ICountableColumnIterator.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/columniterator/ICountableColumnIterator.java?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/columniterator/ICountableColumnIterator.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/columniterator/ICountableColumnIterator.java Wed Sep 14 12:53:47 2011 @@ -1,4 +1,25 @@ package org.apache.cassandra.db.columniterator; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + public interface ICountableColumnIterator extends IColumnIterator { Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java Wed Sep 14 12:53:47 2011 @@ -1,4 +1,25 @@ package org.apache.cassandra.db.compaction; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.io.IOException; import java.util.ArrayList; Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java Wed Sep 14 12:53:47 2011 @@ -18,21 +18,14 @@ package org.apache.cassandra.db.compaction; -import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.concurrent.TimeUnit; -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.db.Table; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.io.sstable.SSTableReader; -import org.apache.cassandra.utils.DefaultInteger; -import org.apache.cassandra.utils.Pair; +import org.apache.cassandra.service.StorageService; /** @@ -53,6 +46,19 @@ public abstract class AbstractCompaction assert cfs != null; this.cfs = cfs; this.options = options; + + // start compactions in five minutes (if no flushes have occurred by then to do so) + Runnable runnable = new Runnable() + { + public void run() + { + if (CompactionManager.instance.getActiveCompactions() == 0) + { + CompactionManager.instance.submitBackground(AbstractCompactionStrategy.this.cfs); + } + } + }; + StorageService.tasks.schedule(runnable, 5 * 60, TimeUnit.SECONDS); } /** Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java Wed Sep 14 12:53:47 2011 @@ -1,4 +1,25 @@ package org.apache.cassandra.db.compaction; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.util.Collection; import java.util.Collections; @@ -29,24 +50,6 @@ public class LeveledCompactionStrategy e private final int maxSSTableSize; private final AtomicReference<LeveledCompactionTask> task = new AtomicReference<LeveledCompactionTask>(); - public class ScheduledBackgroundCompaction implements Runnable - { - ColumnFamilyStore cfs; - - public ScheduledBackgroundCompaction(ColumnFamilyStore cfs) - { - this.cfs = cfs; - } - - public void run() - { - if (CompactionManager.instance.getActiveCompactions() == 0) - { - CompactionManager.instance.submitBackground(cfs); - } - } - } - public LeveledCompactionStrategy(ColumnFamilyStore cfs, Map<String, String> options) { super(cfs, options); @@ -76,13 +79,11 @@ public class LeveledCompactionStrategy e // override min/max for this strategy cfs.setMaximumCompactionThreshold(Integer.MAX_VALUE); cfs.setMinimumCompactionThreshold(1); - - DebuggableScheduledThreadPoolExecutor st = StorageService.scheduledTasks; - st.scheduleAtFixedRate(new ScheduledBackgroundCompaction(cfs), 10000, 3000, TimeUnit.MILLISECONDS); } public void shutdown() { + super.shutdown(); cfs.getDataTracker().unsubscribe(this); } @@ -110,7 +111,7 @@ public class LeveledCompactionStrategy e public List<AbstractCompactionTask> getMaximalTasks(int gcBefore) { - return Collections.emptyList(); + return getBackgroundTasks(gcBefore); } public AbstractCompactionTask getUserDefinedTask(Collection<SSTableReader> sstables, int gcBefore) @@ -138,4 +139,4 @@ public class LeveledCompactionStrategy e manifest.logDistribution(); } } -} \ No newline at end of file +} Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java Wed Sep 14 12:53:47 2011 @@ -1,4 +1,25 @@ package org.apache.cassandra.db.compaction; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.io.IOException; import java.util.Collection; Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java Wed Sep 14 12:53:47 2011 @@ -1,4 +1,25 @@ package org.apache.cassandra.db.compaction; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.io.File; import java.io.IOError; Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/locator/Ec2MultiRegionSnitch.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/locator/Ec2MultiRegionSnitch.java?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/locator/Ec2MultiRegionSnitch.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/locator/Ec2MultiRegionSnitch.java Wed Sep 14 12:53:47 2011 @@ -1,4 +1,25 @@ package org.apache.cassandra.locator; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.io.IOException; import java.net.InetAddress; Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/INotification.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/INotification.java?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/INotification.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/INotification.java Wed Sep 14 12:53:47 2011 @@ -1,4 +1,25 @@ package org.apache.cassandra.notifications; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + /** * Created by IntelliJ IDEA. Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/INotificationConsumer.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/INotificationConsumer.java?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/INotificationConsumer.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/INotificationConsumer.java Wed Sep 14 12:53:47 2011 @@ -1,4 +1,25 @@ package org.apache.cassandra.notifications; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + public interface INotificationConsumer { Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/SSTableAddedNotification.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/SSTableAddedNotification.java?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/SSTableAddedNotification.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/SSTableAddedNotification.java Wed Sep 14 12:53:47 2011 @@ -1,4 +1,25 @@ package org.apache.cassandra.notifications; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import org.apache.cassandra.io.sstable.SSTableReader; Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java Wed Sep 14 12:53:47 2011 @@ -1,4 +1,25 @@ package org.apache.cassandra.notifications; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import org.apache.cassandra.io.sstable.SSTableReader; Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/IntervalTree/Interval.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/IntervalTree/Interval.java?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/IntervalTree/Interval.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/IntervalTree/Interval.java Wed Sep 14 12:53:47 2011 @@ -1,4 +1,25 @@ package org.apache.cassandra.utils.IntervalTree; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import com.google.common.collect.Ordering; Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/IntervalTree/IntervalNode.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/IntervalTree/IntervalNode.java?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/IntervalTree/IntervalNode.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/IntervalTree/IntervalNode.java Wed Sep 14 12:53:47 2011 @@ -1,4 +1,25 @@ package org.apache.cassandra.utils.IntervalTree; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.util.ArrayList; import java.util.Collections; Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/IntervalTree/IntervalTree.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/IntervalTree/IntervalTree.java?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/IntervalTree/IntervalTree.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/IntervalTree/IntervalTree.java Wed Sep 14 12:53:47 2011 @@ -1,4 +1,25 @@ package org.apache.cassandra.utils.IntervalTree; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.util.LinkedList; import java.util.List; Modified: cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java (original) +++ cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java Wed Sep 14 12:53:47 2011 @@ -1,4 +1,25 @@ package org.apache.cassandra.db; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.nio.ByteBuffer; import java.util.*; Modified: cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/net/MessageSerializer.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/net/MessageSerializer.java?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/net/MessageSerializer.java (original) +++ cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/net/MessageSerializer.java Wed Sep 14 12:53:47 2011 @@ -1,4 +1,25 @@ package org.apache.cassandra.net; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.io.DataInputStream; import java.io.DataOutputStream; Modified: cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/utils/IntervalTest.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/utils/IntervalTest.java?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/utils/IntervalTest.java (original) +++ cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/utils/IntervalTest.java Wed Sep 14 12:53:47 2011 @@ -1,4 +1,25 @@ package org.apache.cassandra.utils; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import junit.framework.Assert; import junit.framework.TestCase; Modified: cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/utils/IntervalTreeTest.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/utils/IntervalTreeTest.java?rev=1170581&r1=1170580&r2=1170581&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/utils/IntervalTreeTest.java (original) +++ cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/utils/IntervalTreeTest.java Wed Sep 14 12:53:47 2011 @@ -1,4 +1,25 @@ package org.apache.cassandra.utils; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import junit.framework.TestCase; import org.apache.cassandra.utils.IntervalTree.*;