You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2009/09/15 23:30:26 UTC
svn commit: r815498 - in /incubator/cassandra/trunk:
src/java/org/apache/cassandra/db/ src/java/org/apache/cassandra/tools/
test/unit/org/apache/cassandra/db/
Author: jbellis
Date: Tue Sep 15 21:30:26 2009
New Revision: 815498
URL: http://svn.apache.org/viewvc?rev=815498&view=rev
Log:
rename MinorCompactionManager -> CompactionManager. patch by jbellis for CASSANDRA-447
Added:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java
- copied, changed from r815497, incubator/cassandra/trunk/src/java/org/apache/cassandra/db/MinorCompactionManager.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManagerMBean.java
Removed:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/MinorCompactionManager.java
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/OneCompactionTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=815498&r1=815497&r2=815498&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Tue Sep 15 21:30:26 2009
@@ -188,7 +188,7 @@
ssTables_.onStart(sstables);
// submit initial check-for-compaction request
- MinorCompactionManager.instance().submit(ColumnFamilyStore.this);
+ CompactionManager.instance().submit(ColumnFamilyStore.this);
// schedule hinted handoff
if (table_.equals(Table.SYSTEM_TABLE) && columnFamily_.equals(HintedHandOffManager.HINTS_CF))
@@ -248,7 +248,7 @@
List<SSTableReader> forceAntiCompaction(List<Range> ranges, EndPoint target, long skip)
{
assert ranges != null;
- Future<List<SSTableReader>> futurePtr = MinorCompactionManager.instance().submit(ColumnFamilyStore.this, ranges, target);
+ Future<List<SSTableReader>> futurePtr = CompactionManager.instance().submit(ColumnFamilyStore.this, ranges, target);
List<SSTableReader> result;
try
@@ -556,7 +556,7 @@
void addSSTable(SSTableReader sstable)
{
ssTables_.add(sstable);
- MinorCompactionManager.instance().submit(this);
+ CompactionManager.instance().submit(this);
}
private PriorityQueue<FileStruct> initializePriorityQueue(Collection<SSTableReader> sstables, List<Range> ranges) throws IOException
@@ -714,7 +714,7 @@
void forceCleanup()
{
- MinorCompactionManager.instance().submitCleanup(ColumnFamilyStore.this);
+ CompactionManager.instance().submitCleanup(ColumnFamilyStore.this);
}
/**
@@ -1034,7 +1034,7 @@
ssTable = writer.closeAndOpenReader();
ssTables_.add(ssTable);
ssTables_.markCompacted(sstables);
- MinorCompactionManager.instance().submit(ColumnFamilyStore.this);
+ CompactionManager.instance().submit(ColumnFamilyStore.this);
String format = "Compacted to %s. %d/%d bytes for %d/%d keys read/written. Time: %dms.";
long dTime = System.currentTimeMillis() - startTime;
Copied: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java (from r815497, incubator/cassandra/trunk/src/java/org/apache/cassandra/db/MinorCompactionManager.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java?p2=incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java&p1=incubator/cassandra/trunk/src/java/org/apache/cassandra/db/MinorCompactionManager.java&r1=815497&r2=815498&rev=815498&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/MinorCompactionManager.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java Tue Sep 15 21:30:26 2009
@@ -37,16 +37,16 @@
import org.apache.log4j.Logger;
-public class MinorCompactionManager implements MinorCompactionManagerMBean
+public class CompactionManager implements CompactionManagerMBean
{
- public static String MBEAN_OBJECT_NAME = "org.apache.cassandra.db:type=MinorCompactionManager";
- private static MinorCompactionManager instance_;
+ public static String MBEAN_OBJECT_NAME = "org.apache.cassandra.db:type=CompactionManager";
+ private static CompactionManager instance_;
private static Lock lock_ = new ReentrantLock();
- private static Logger logger_ = Logger.getLogger(MinorCompactionManager.class);
+ private static Logger logger_ = Logger.getLogger(CompactionManager.class);
private int minimumCompactionThreshold_ = 4; // compact this many sstables min at a time
private int maximumCompactionThreshold = 32; // compact this many sstables max at a time
- public static MinorCompactionManager instance()
+ public static CompactionManager instance()
{
if ( instance_ == null )
{
@@ -55,7 +55,7 @@
{
if ( instance_ == null )
{
- instance_ = new MinorCompactionManager();
+ instance_ = new CompactionManager();
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
mbs.registerMBean(instance_, new ObjectName(MBEAN_OBJECT_NAME));
}
Added: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManagerMBean.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManagerMBean.java?rev=815498&view=auto
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManagerMBean.java (added)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManagerMBean.java Tue Sep 15 21:30:26 2009
@@ -0,0 +1,42 @@
+/**
+ * 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.
+ */
+
+package org.apache.cassandra.db;
+
+public interface CompactionManagerMBean
+{
+ /**
+ * Gets the minimum number of sstables in queue before compaction kicks off
+ */
+ public int getMinimumCompactionThreshold();
+
+ /**
+ * Sets the minimum number of sstables in queue before compaction kicks off
+ */
+ public void setMinimumCompactionThreshold(int threshold);
+
+ /**
+ * Gets the maximum number of sstables in queue before compaction kicks off
+ */
+ public int getMaximumCompactionThreshold();
+
+ /**
+ * Sets the maximum number of sstables in queue before compaction kicks off
+ */
+ public void setMaximumCompactionThreshold(int threshold);
+}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java?rev=815498&r1=815497&r2=815498&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java Tue Sep 15 21:30:26 2009
@@ -485,7 +485,7 @@
{
ColumnFamilyStore cfStore = columnFamilyStores_.get( columnFamily );
if ( cfStore != null )
- MinorCompactionManager.instance().submitMajor(cfStore, 0);
+ CompactionManager.instance().submitMajor(cfStore, 0);
}
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java?rev=815498&r1=815497&r2=815498&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java Tue Sep 15 21:30:26 2009
@@ -42,8 +42,8 @@
import org.apache.cassandra.concurrent.IExecutorMBean;
import org.apache.cassandra.db.ColumnFamilyStoreMBean;
-import org.apache.cassandra.db.MinorCompactionManager;
-import org.apache.cassandra.db.MinorCompactionManagerMBean;
+import org.apache.cassandra.db.CompactionManager;
+import org.apache.cassandra.db.CompactionManagerMBean;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.net.EndPoint;
import org.apache.cassandra.service.StorageServiceMBean;
@@ -74,7 +74,7 @@
private StorageServiceMBean ssProxy;
private MemoryMXBean memProxy;
private RuntimeMXBean runtimeProxy;
- private MinorCompactionManagerMBean mcmProxy;
+ private CompactionManagerMBean mcmProxy;
static
{
@@ -159,8 +159,8 @@
{
ObjectName name = new ObjectName(ssObjName);
ssProxy = JMX.newMBeanProxy(mbeanServerConn, name, StorageServiceMBean.class);
- name = new ObjectName(MinorCompactionManager.MBEAN_OBJECT_NAME);
- mcmProxy = JMX.newMBeanProxy(mbeanServerConn, name, MinorCompactionManagerMBean.class);
+ name = new ObjectName(CompactionManager.MBEAN_OBJECT_NAME);
+ mcmProxy = JMX.newMBeanProxy(mbeanServerConn, name, CompactionManagerMBean.class);
} catch (MalformedObjectNameException e)
{
throw new RuntimeException(
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java?rev=815498&r1=815497&r2=815498&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java Tue Sep 15 21:30:26 2009
@@ -55,7 +55,7 @@
}
while (true)
{
- Future<Integer> ft = MinorCompactionManager.instance().submit(store);
+ Future<Integer> ft = CompactionManager.instance().submit(store);
if (ft.get() == 0)
break;
}
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/OneCompactionTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/OneCompactionTest.java?rev=815498&r1=815497&r2=815498&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/OneCompactionTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/OneCompactionTest.java Tue Sep 15 21:30:26 2009
@@ -46,7 +46,7 @@
store.forceBlockingFlush();
assertEquals(inserted.size(), table.getColumnFamilyStore(columnFamilyName).getKeyRange("", "", 10000).keys.size());
}
- Future<Integer> ft = MinorCompactionManager.instance().submit(store, 2, 32);
+ Future<Integer> ft = CompactionManager.instance().submit(store, 2, 32);
ft.get();
assertEquals(1, store.getSSTables().size());
assertEquals(table.getColumnFamilyStore(columnFamilyName).getKeyRange("", "", 10000).keys.size(), inserted.size());
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java?rev=815498&r1=815497&r2=815498&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java Tue Sep 15 21:30:26 2009
@@ -57,7 +57,7 @@
store.forceBlockingFlush();
validateRemoveTwoSources();
- Future<Integer> ft = MinorCompactionManager.instance().submit(store, 2, 32);
+ Future<Integer> ft = CompactionManager.instance().submit(store, 2, 32);
ft.get();
assertEquals(1, store.getSSTables().size());
validateRemoveCompacted();
@@ -109,7 +109,7 @@
store.forceBlockingFlush();
validateRemoveWithNewData();
- Future<Integer> ft = MinorCompactionManager.instance().submit(store, 2, 32);
+ Future<Integer> ft = CompactionManager.instance().submit(store, 2, 32);
ft.get();
assertEquals(1, store.getSSTables().size());
validateRemoveWithNewData();