svn commit: r903479 - in /incubator/cassandra/trunk/src/java/org/apache/cassandra/db: CompactionManager.java HintedHandOffManager.java Table.java

[jb...@apache.org]

Author: jbellis
Date: Tue Jan 26 23:10:47 2010
New Revision: 903479

URL: http://svn.apache.org/viewvc?rev=903479&view=rev
Log:
refactor getColumnFamilyStores to return Collection instead of Map.  patch by jbellis

Modified:
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java?rev=903479&r1=903478&r2=903479&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java Tue Jan 26 23:10:47 2010
@@ -564,7 +564,7 @@
         // perform estimates
         for (String tableName : DatabaseDescriptor.getTables())
         {
-            for (final ColumnFamilyStore cfs : Table.open(tableName).getColumnFamilyStores().values())
+            for (final ColumnFamilyStore cfs : Table.open(tableName).getColumnFamilyStores())
             {
                 Runnable runnable = new Runnable()
                 {
@@ -583,7 +583,7 @@
         // bog down the executor in actual compactions.
         for (String tableName : DatabaseDescriptor.getTables())
         {
-            for (final ColumnFamilyStore cfs : Table.open(tableName).getColumnFamilyStores().values())
+            for (final ColumnFamilyStore cfs : Table.open(tableName).getColumnFamilyStores())
             {
                 submitMinorIfNeeded(cfs);
             }

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java?rev=903479&r1=903478&r2=903479&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java Tue Jan 26 23:10:47 2010
@@ -116,7 +116,7 @@
 
         Table table = Table.open(tableName);
         RowMutation rm = new RowMutation(tableName, key);
-        for (ColumnFamilyStore cfstore : table.getColumnFamilyStores().values())
+        for (ColumnFamilyStore cfstore : table.getColumnFamilyStores())
         {
             ColumnFamily cf = cfstore.getColumnFamily(new IdentityQueryFilter(key, new QueryPath(cfstore.getColumnFamilyName())));
             if (cf != null)

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java?rev=903479&r1=903478&r2=903479&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java Tue Jan 26 23:10:47 2010
@@ -204,9 +204,9 @@
         return tableMetadata.getColumnFamilies();
     }
 
-    Map<String, ColumnFamilyStore> getColumnFamilyStores()
+    Collection<ColumnFamilyStore> getColumnFamilyStores()
     {
-        return columnFamilyStores;
+        return Collections.unmodifiableCollection(columnFamilyStores.values());
     }
 
     public ColumnFamilyStore getColumnFamilyStore(String cfName)