Author: eevans
Date: Tue Mar 23 23:00:10 2010
New Revision: 926837
URL: http://svn.apache.org/viewvc?rev=926837&view=rev
Log:
don't allow hyphens in column family names
Patch by eevans; reviewed by jbellis for CASSANDRA-915
Modified:
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Modified:
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=926837&r1=926836&r2=926837&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
(original)
+++
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Tue Mar 23 23:00:10 2010
@@ -636,6 +636,10 @@ public class DatabaseDescriptor
{
throw new ConfigurationException("ColumnFamily name
attribute is required");
}
+ if (cfName.contains("-"))
+ {
+ throw new ConfigurationException("ColumnFamily names
cannot contain hyphens");
+ }
String xqlCF = xqlTable + "columnfami...@name='" + cfName
+ "']/";
// Parse out the column type
