Author: jbellis
Date: Wed Jun 1 15:03:30 2011
New Revision: 1130176
URL: http://svn.apache.org/viewvc?rev=1130176&view=rev
Log:
unbreak indexName compatibility
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java?rev=1130176&r1=1130175&r2=1130176&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
Wed Jun 1 15:03:30 2011
@@ -308,7 +308,9 @@ public final class CFMetaData
/** convention for nameing secondary indexes. */
public String indexName(ColumnDefinition info)
{
- return cfName + "." + (info.getIndexName() == null ?
comparator.getString(info.name) + "_idx" : info.getIndexName());
+ // what we should have done:
+ // return cfName + "." + (info.getIndexName() == null ?
comparator.getString(info.name) + "_idx" : info.getIndexName());
+ return cfName + "." + (info.getIndexName() == null ?
ByteBufferUtil.bytesToHex(info.name) : info.getIndexName());
}
public org.apache.cassandra.db.migration.avro.CfDef deflate()
