Updated Branches: refs/heads/cassandra-1.1 3346771a0 -> ffc9bece4 refs/heads/cassandra-1.2 f07804e0d -> c67e501f1 refs/heads/trunk 585619443 -> b06c45a96
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b06c45a9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b06c45a9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b06c45a9 Branch: refs/heads/trunk Commit: b06c45a96d9bd3f3c0807e87bfbccf8f1a9e2459 Parents: 5856194 c67e501 Author: Yuki Morishita <[email protected]> Authored: Thu Mar 14 16:01:06 2013 -0500 Committer: Yuki Morishita <[email protected]> Committed: Thu Mar 14 16:01:06 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 2 +- debian/changelog | 6 ++++ .../org/apache/cassandra/db/ColumnFamilyStore.java | 6 ---- .../org/apache/cassandra/db/MeteredFlusher.java | 2 +- .../apache/cassandra/service/CassandraDaemon.java | 3 ++ .../org/apache/cassandra/MethodComparator.java | 21 +++++++++++++ .../apache/cassandra/OrderedJUnit4ClassRunner.java | 23 ++++++++++++++- 8 files changed, 55 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b06c45a9/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b06c45a9/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b06c45a9/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 8c4b017,c14ffeb..4de1ebd --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@@ -83,14 -80,8 +83,8 @@@ public class ColumnFamilyStore implemen public static final ExecutorService postFlushExecutor = new JMXEnabledThreadPoolExecutor("MemtablePostFlusher"); - static - { - // (can block if flush queue fills up, so don't put on scheduledTasks) - StorageService.optionalTasks.scheduleWithFixedDelay(new MeteredFlusher(), 1000, 1000, TimeUnit.MILLISECONDS); - } - public final Table table; - public final String columnFamily; + public final String name; public final CFMetaData metadata; public final IPartitioner partitioner; private final String mbeanName; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b06c45a9/src/java/org/apache/cassandra/service/CassandraDaemon.java ----------------------------------------------------------------------
