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 2014/02/28 21:45:42 UTC
[4/7] git commit: fix build
fix build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89da2c97
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89da2c97
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89da2c97
Branch: refs/heads/cassandra-2.1
Commit: 89da2c9704b5d2a4148a97a274170c3f634a1f0f
Parents: 5b80b97
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Feb 28 14:45:04 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Feb 28 14:45:04 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/89da2c97/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 4acae0b..210ae17 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -387,12 +387,12 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
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);
}
@@ -401,7 +401,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
String columnFamily,
IPartitioner partitioner,
CFMetaData metadata,
- boolean loadSSTables) throws ConfigurationException
+ boolean loadSSTables)
{
// get the max generation number, to prevent generation conflicts
Directories directories = Directories.create(keyspace.getName(), columnFamily);
@@ -412,8 +412,8 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
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;