svn commit: r1148872 - in /cassandra/branches/cassandra-0.8: CHANGES.txt src/java/org/apache/cassandra/config/CFMetaData.java

[jbellis]

Author: jbellis
Date: Wed Jul 20 18:09:10 2011
New Revision: 1148872

URL: http://svn.apache.org/viewvc?rev=1148872&view=rev
Log:
prepend CF to default indexnames
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-2903

Modified:
    cassandra/branches/cassandra-0.8/CHANGES.txt
    
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1148872&r1=1148871&r2=1148872&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Wed Jul 20 18:09:10 2011
@@ -36,6 +36,7 @@
  * add simplified facade to SSTableWriter for bulk loading use
    (CASSANDRA-2911)
  * fix re-using index CF sstable names after drop/recreate (CASSANDRA-2872)
+ * prepend CF to default index names (CASSANDRA-2903)
 
 
 0.8.1

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=1148872&r1=1148871&r2=1148872&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 Jul 20 18:09:10 2011
@@ -378,7 +378,7 @@ public final class CFMetaData
         {
             ColumnDefinition cd = ColumnDefinition.inflate(aColumn_metadata);
             if (cd.getIndexName() == null)
-                cd.setIndexName(getDefaultIndexName(comparator, cd.name));
+                cd.setIndexName(getDefaultIndexName(cf.name.toString(), 
comparator, cd.name));
             column_metadata.put(cd.name, cd);
         }
 
@@ -964,13 +964,13 @@ public final class CFMetaData
         for (org.apache.cassandra.thrift.ColumnDef column : 
cf_def.column_metadata)
         {
             if (column.index_type != null && column.index_name == null)
-                column.index_name = getDefaultIndexName(comparator, 
column.name);
+                column.index_name = getDefaultIndexName(cf_def.name, 
comparator, column.name);
         }
     }
 
-    public static String getDefaultIndexName(AbstractType comparator, 
ByteBuffer columnName)
+    public static String getDefaultIndexName(String cfName, AbstractType 
comparator, ByteBuffer columnName)
     {
-        return comparator.getString(columnName).replaceAll("\\W", "") + "_idx";
+        return (cfName + "_" + comparator.getString(columnName) + 
"_idx").replaceAll("\\W", "");
     }
 
     @Override