You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2013/08/13 20:21:36 UTC
[13/13] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bcd6a6b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcd6a6b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcd6a6b6
Branch: refs/heads/trunk
Commit: bcd6a6b64096a9837c3f9c4247dcfa756344c6f1
Parents: 129d50d 9a154a9
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Aug 13 13:21:11 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Aug 13 13:21:11 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcd6a6b6/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
index 0b1e5de,0f9f87d..ce870c7
--- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
@@@ -328,25 -314,27 +328,27 @@@ public class ColumnFamilyMetric
{
readLatency.release();
writeLatency.release();
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableColumnsCount"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableDataSize"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableSwitchCount"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("CompressionRatio"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("EstimatedRowSizeHistogram"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("EstimatedColumnCountHistogram"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("SSTablesPerReadHistogram"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("PendingTasks"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("LiveSSTableCount"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("LiveDiskSpaceUsed"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("TotalDiskSpaceUsed"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("MinRowSize"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("MaxRowSize"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("MeanRowSize"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterFalsePositives"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("RecentBloomFilterFalsePositives"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterFalseRatio"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("RecentBloomFilterFalseRatio"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterDiskSpaceUsed"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("KeyCacheHitRate"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("SpeculativeRetry"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("MemtableColumnsCount"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("MemtableDataSize"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("MemtableSwitchCount"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("CompressionRatio"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("EstimatedRowSizeHistogram"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("EstimatedColumnCountHistogram"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("SSTablesPerReadHistogram"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("PendingTasks"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("LiveSSTableCount"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("LiveDiskSpaceUsed"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("TotalDiskSpaceUsed"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("MinRowSize"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("MaxRowSize"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("MeanRowSize"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("BloomFilterFalsePositives"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("RecentBloomFilterFalsePositives"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("BloomFilterFalseRatio"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("RecentBloomFilterFalseRatio"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("BloomFilterDiskSpaceUsed"));
++ CassandraMetricRegistry.unregister(factory.createMetricName("KeyCacheHitRate"));
++ CassandraMetricRegistry.unregister(factory.createMetricName("SpeculativeRetry"));
}
class ColumnFamilyMetricNameFactory implements MetricNameFactory