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

remove ConfigurationException from migration serialization. patch by stuhood, reviewed by gdusbabek. CASSANDRA-1308 

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@981647 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Dusbabek 2010-08-02 18:18:55 +00:00
parent fdc4f50298
commit 25b8945abf
6 changed files with 17 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java/org/apache/cassandra/config/CFMetaData.java
View File

@ -231,20 +231,21 @@ public final class CFMetaData
return cf;
}
public static CFMetaData inflate(org.apache.cassandra.config.avro.CfDef cf) throws ConfigurationException
public static CFMetaData inflate(org.apache.cassandra.config.avro.CfDef cf)
{
AbstractType comparator = DatabaseDescriptor.getComparator(cf.comparator_type.toString());
AbstractType comparator;
AbstractType subcolumnComparator = null;
if (cf.subcomparator_type != null)
subcolumnComparator = DatabaseDescriptor.getComparator(cf.subcomparator_type.toString());
AbstractReconciler reconciler = null;
AbstractReconciler reconciler;
try
{
comparator = DatabaseDescriptor.getComparator(cf.comparator_type.toString());
if (cf.subcomparator_type != null)
subcolumnComparator = DatabaseDescriptor.getComparator(cf.subcomparator_type.toString());
reconciler = (AbstractReconciler)Class.forName(cf.reconciler.toString()).newInstance();
}
catch (Exception ex)
{
throw new ConfigurationException("Could not create Reconciler of type " + cf.reconciler, ex);
throw new RuntimeException("Could not inflate CFMetaData for " + cf, ex);
}
Map<byte[], ColumnDefinition> column_metadata = new TreeMap<byte[], ColumnDefinition>(FBUtilities.byteArrayComparator);
Iterator<org.apache.cassandra.config.avro.ColumnDef> cditer = cf.column_metadata.iterator();

2
src/java/org/apache/cassandra/config/ColumnDefinition.java
View File

@ -65,7 +65,7 @@ public class ColumnDefinition {
return cd;
}
public static ColumnDefinition inflate(org.apache.cassandra.config.avro.ColumnDef cd) throws ConfigurationException
public static ColumnDefinition inflate(org.apache.cassandra.config.avro.ColumnDef cd)
{
byte[] name = new byte[cd.name.remaining()];
cd.name.get(name, 0, name.length);

4
src/java/org/apache/cassandra/config/KSMetaData.java
View File

@ -92,7 +92,7 @@ public final class KSMetaData
return ks;
}
public static KSMetaData inflate(org.apache.cassandra.config.avro.KsDef ks) throws ConfigurationException
public static KSMetaData inflate(org.apache.cassandra.config.avro.KsDef ks)
{
Class<AbstractReplicationStrategy> repStratClass;
try
@ -101,7 +101,7 @@ public final class KSMetaData
}
catch (Exception ex)
{
throw new ConfigurationException("Could not create ReplicationStrategy of type " + ks.strategy_class, ex);
throw new RuntimeException("Could not create ReplicationStrategy of type " + ks.strategy_class, ex);
}
Map<String, String> strategyOptions = null;
if (ks.strategy_options != null)

17
src/java/org/apache/cassandra/db/DefsTable.java
View File

@ -102,19 +102,12 @@ public class DefsTable
// deserialize keyspaces using schema
Collection<KSMetaData> keyspaces = new ArrayList<KSMetaData>();
try
for (IColumn column : cf.getSortedColumns())
{
for (IColumn column : cf.getSortedColumns())
{
if (Arrays.equals(column.name(), DEFINITION_SCHEMA_COLUMN_NAME))
continue;
org.apache.cassandra.config.avro.KsDef ks = SerDeUtils.<org.apache.cassandra.config.avro.KsDef>deserialize(schema, column.value());
keyspaces.add(KSMetaData.inflate(ks));
}
}
catch (ConfigurationException e)
{
throw new IOException(e);
if (Arrays.equals(column.name(), DEFINITION_SCHEMA_COLUMN_NAME))
continue;
org.apache.cassandra.config.avro.KsDef ks = SerDeUtils.<org.apache.cassandra.config.avro.KsDef>deserialize(schema, column.value());
keyspaces.add(KSMetaData.inflate(ks));
}
return keyspaces;
}

9
src/java/org/apache/cassandra/db/migration/AddColumnFamily.java
View File

@ -50,14 +50,7 @@ public class AddColumnFamily extends Migration
rm = RowMutation.serializer().deserialize(din);
// deserialize cf
try
{
cfm = CFMetaData.inflate(SerDeUtils.<org.apache.cassandra.config.avro.CfDef>deserializeWithSchema(FBUtilities.readShortByteArray(din)));
}
catch (ConfigurationException e)
{
throw new IOException(e);
}
cfm = CFMetaData.inflate(SerDeUtils.<org.apache.cassandra.config.avro.CfDef>deserializeWithSchema(FBUtilities.readShortByteArray(din)));
}
public AddColumnFamily(CFMetaData cfm) throws ConfigurationException, IOException

9
src/java/org/apache/cassandra/db/migration/AddKeyspace.java
View File

@ -48,14 +48,7 @@ public class AddKeyspace extends Migration
rm = RowMutation.serializer().deserialize(din);
// deserialize ks
try
{
ksm = KSMetaData.inflate(SerDeUtils.<org.apache.cassandra.config.avro.KsDef>deserializeWithSchema(FBUtilities.readShortByteArray(din)));
}
catch (ConfigurationException e)
{
throw new IOException(e);
}
ksm = KSMetaData.inflate(SerDeUtils.<org.apache.cassandra.config.avro.KsDef>deserializeWithSchema(FBUtilities.readShortByteArray(din)));
}
public AddKeyspace(KSMetaData ksm) throws ConfigurationException, IOException