natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor CFS constructor to not depend on DatabaseDescriptor. 

patch by jbellis; reviewed by Sandeep Tata for #85

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@765829 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-04-17 01:48:39 +00:00
parent 1228ec0c67
commit 1e15ccf5c9
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/org/apache/cassandra/db/ColumnFamilyStore.java
View File

@ -23,6 +23,10 @@ import java.io.IOException;
import java.lang.management.ManagementFactory;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.InstanceAlreadyExistsException;
import javax.management.MBeanRegistrationException;
import javax.management.NotCompliantMBeanException;
import javax.management.MalformedObjectNameException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@ -87,10 +91,17 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
/* Flag indicates if a compaction is in process */
private AtomicBoolean isCompacting_ = new AtomicBoolean(false);
ColumnFamilyStore(String table, String columnFamily) throws IOException
ColumnFamilyStore(String table, String columnFamily, int indexValue) throws IOException
{
table_ = table;
columnFamily_ = columnFamily;
fileIndexGenerator_.set(indexValue);
memtable_ = new AtomicReference<Memtable>(new Memtable(table_, columnFamily_));
binaryMemtable_ = new AtomicReference<BinaryMemtable>(new BinaryMemtable(table_, columnFamily_));
}
public static ColumnFamilyStore getColumnFamilyStore(String table, String columnFamily) throws IOException
{
/*
* Get all data files associated with old Memtables for this table.
* These files are named as follows <Table>-1.db, ..., <Table>-n.db. Get
@ -107,8 +118,8 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
{
String filename = file.getName();
String[] tblCfName = getTableAndColumnFamilyName(filename);
if (tblCfName[0].equals(table_)
if (tblCfName[0].equals(table)
&& tblCfName[1].equals(columnFamily))
{
int index = getIndexFromFileName(filename);
@ -118,20 +129,21 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
}
Collections.sort(indices);
int value = (indices.size() > 0) ? (indices.get(indices.size() - 1)) : 0;
fileIndexGenerator_.set(value);
memtable_ = new AtomicReference<Memtable>( new Memtable(table_, columnFamily_) );
binaryMemtable_ = new AtomicReference<BinaryMemtable>( new BinaryMemtable(table_, columnFamily_) );
ColumnFamilyStore cfs = new ColumnFamilyStore(table, columnFamily, value);
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
try
{
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
mbs.registerMBean(this, new ObjectName(
"org.apache.cassandra.db:type=ColumnFamilyStore-" + columnFamily_));
mbs.registerMBean(cfs, new ObjectName(
"org.apache.cassandra.db:type=ColumnFamilyStore-" + table + "." + columnFamily));
}
catch (Exception e)
{
logger_.error(LogUtil.throwableToString(e));
throw new RuntimeException(e);
}
return cfs;
}
void onStart() throws IOException
@ -303,7 +315,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
return columnFamily_;
}
private String[] getTableAndColumnFamilyName(String filename)
private static String[] getTableAndColumnFamilyName(String filename)
{
StringTokenizer st = new StringTokenizer(filename, "-");
String[] values = new String[2];

2
src/org/apache/cassandra/db/Table.java
View File

@ -588,7 +588,7 @@ public class Table
Set<String> columnFamilies = tableMetadata_.getColumnFamilies();
for ( String columnFamily : columnFamilies )
{
columnFamilyStores_.put( columnFamily, new ColumnFamilyStore(table, columnFamily) );
columnFamilyStores_.put(columnFamily, ColumnFamilyStore.getColumnFamilyStore(table, columnFamily));
}
}
catch ( IOException ex )