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

[jbellis]

Author: jbellis
Date: Tue Aug  2 16:06:29 2011
New Revision: 1153175

URL: http://svn.apache.org/viewvc?rev=1153175&view=rev
Log:
avoid trying to create index names, when no index exists
patch by jbellis; reviewed by slebresne for CASSANDRA-2867

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=1153175&r1=1153174&r2=1153175&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Tue Aug  2 16:06:29 2011
@@ -25,6 +25,7 @@
  * throw exception when NTS is given replication_factor as an option
    (CASSANDRA-2960)
  * fix assertion error during compaction of counter CFs (CASSANDRA-2968)
+ * avoid trying to create index names, when no index exists (CASSANDRA-2867)
 
 
 0.8.2

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=1153175&r1=1153174&r2=1153175&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
 Tue Aug  2 16:06:29 2011
@@ -377,7 +377,7 @@ public final class CFMetaData
         for (ColumnDef aColumn_metadata : cf.column_metadata)
         {
             ColumnDefinition cd = ColumnDefinition.inflate(aColumn_metadata);
-            if (cd.getIndexName() == null)
+            if (cd.getIndexType() != null && cd.getIndexName() == null)
                 cd.setIndexName(getDefaultIndexName(cf.name.toString(), 
comparator, cd.name));
             column_metadata.put(cd.name, cd);
         }