Permalink
Browse files

Merge branch 'cassandra-2.0' into cassandra-2.1

  • Loading branch information...
2 parents 3d25859 + 89da2c9 commit 336a665a14d8305a195cdf13a7c86f227a59317e @jbellis jbellis committed Feb 28, 2014
Showing with 5 additions and 5 deletions.
  1. +5 −5 src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -423,12 +423,12 @@ public int getMeanColumns()
return data.getMeanColumns();
}
- public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, String columnFamily, boolean loadSSTables) throws ConfigurationException
+ public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, String columnFamily, boolean loadSSTables)
{
return createColumnFamilyStore(keyspace, columnFamily, StorageService.getPartitioner(), Schema.instance.getCFMetaData(keyspace.getName(), columnFamily), loadSSTables);
}
- public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, String columnFamily, IPartitioner partitioner, CFMetaData metadata) throws ConfigurationException
+ public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, String columnFamily, IPartitioner partitioner, CFMetaData metadata)
{
return createColumnFamilyStore(keyspace, columnFamily, partitioner, metadata, true);
}
@@ -437,7 +437,7 @@ private static synchronized ColumnFamilyStore createColumnFamilyStore(Keyspace k
String columnFamily,
IPartitioner partitioner,
CFMetaData metadata,
- boolean loadSSTables) throws ConfigurationException
+ boolean loadSSTables)
{
// get the max generation number, to prevent generation conflicts
Directories directories = new Directories(metadata);
@@ -448,8 +448,8 @@ private static synchronized ColumnFamilyStore createColumnFamilyStore(Keyspace k
Descriptor desc = entry.getKey();
generations.add(desc.generation);
if (!desc.isCompatible())
- throw new ConfigurationException(String.format("Incompatible SSTable found. Current version %s is unable to read file: %s. Please run upgradesstables.",
- Descriptor.Version.CURRENT, desc));
+ throw new RuntimeException(String.format("Incompatible SSTable found. Current version %s is unable to read file: %s. Please run upgradesstables.",
+ Descriptor.Version.CURRENT, desc));
}
Collections.sort(generations);
int value = (generations.size() > 0) ? (generations.get(generations.size() - 1)) : 0;

0 comments on commit 336a665

Please sign in to comment.