svn commit: r1081876 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/db/ColumnFamilyStore.java

[br...@apache.org]

Author: brandonwilliams
Date: Tue Mar 15 17:36:21 2011
New Revision: 1081876

URL: http://svn.apache.org/viewvc?rev=1081876&view=rev
Log:
Queue secondary indexes for flush before the parent.
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-2330

Modified:
    cassandra/branches/cassandra-0.7/CHANGES.txt
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1081876&r1=1081875&r2=1081876&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Tue Mar 15 17:36:21 2011
@@ -4,6 +4,7 @@
  * clear Built flag in system table when dropping an index (CASSANDRA-2320)
  * validate index names (CASSANDRA-1761)
  * allow job configuration to set the CL used in Hadoop jobs (CASSANDRA-2331)
+ * queue secondary indexes for flush before the parent (CASSANDRA-2330)
 
 
 0.7.4

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1081876&r1=1081875&r2=1081876&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Tue Mar 15 17:36:21 2011
@@ -2199,6 +2199,6 @@ public class ColumnFamilyStore implement
 
     public Iterable<ColumnFamilyStore> concatWithIndexes()
     {
-        return Iterables.concat(Collections.singleton(this), indexedColumns.values());
+        return Iterables.concat(indexedColumns.values(), Collections.singleton(this));
     }
 }