You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/08/17 17:11:35 UTC
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches:
refs/heads/cassandra-1.1 8b1336f00 -> a343c85b7
refs/heads/trunk 1124615a6 -> f70945eaa
Merge branch 'cassandra-1.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f70945ea
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f70945ea
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f70945ea
Branch: refs/heads/trunk
Commit: f70945eaa6675ab9382b30eaa24406099a682a7a
Parents: d147175 a343c85
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Aug 17 10:11:21 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Aug 17 10:11:21 2012 -0500
----------------------------------------------------------------------
.../cassandra/db/index/SecondaryIndexManager.java | 62 +++++----------
1 files changed, 19 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f70945ea/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
index 1d62746,7258835..7c87941
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
@@@ -304,11 -279,13 +304,11 @@@ public class SecondaryIndexManage
/**
* Flush all indexes to disk
- * @throws ExecutionException
- * @throws InterruptedException
*/
- public void flushIndexesBlocking() throws IOException
+ public void flushIndexesBlocking()
{
- for (Map.Entry<ByteBuffer, SecondaryIndex> entry : indexesByColumn.entrySet())
- entry.getValue().forceBlockingFlush();
+ for (SecondaryIndex index : indexesByColumn.values())
+ index.forceBlockingFlush();
}
/**