You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/06/13 18:49:38 UTC
[1/3] git commit: fix typos
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 9baae7b80 -> a8f5278c8
refs/heads/trunk 7765e0e41 -> b47d8a8c4
fix typos
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8f5278c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8f5278c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8f5278c
Branch: refs/heads/cassandra-2.1
Commit: a8f5278c8c7253ff5bd707a6b8b9fd508545fe73
Parents: 9baae7b
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jun 13 11:47:27 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jun 13 11:47:27 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8f5278c/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
index 7ef8a75..718e6f4 100644
--- a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
@@ -106,7 +106,7 @@ public class KeyspaceMetrics
return total;
}
});
- memtableOffHeapDataSize = Metrics.newGauge(factory.createMetricName("MemtableiOffHeapDataSize"), new Gauge<Long>()
+ memtableOffHeapDataSize = Metrics.newGauge(factory.createMetricName("MemtableOffHeapDataSize"), new Gauge<Long>()
{
public Long value()
{
@@ -229,12 +229,13 @@ public class KeyspaceMetrics
*/
public void release()
{
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("AllMemtablesLiveDateSize"));
+ Metrics.defaultRegistry().removeMetric(factory.createMetricName("AllMemtablesLiveDataSize"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("AllMemtablesOnHeapDataSize"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("AllMemtablesOffHeapDataSize"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableLiveDataSize"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableOnHeapDataSize"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableOffHeapDataSize"));
+ Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableColumnsCount"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableSwitchCount"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("PendingFlushes"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("PendingCompactions"));
[2/3] git commit: fix typos
Posted by br...@apache.org.
fix typos
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8f5278c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8f5278c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8f5278c
Branch: refs/heads/trunk
Commit: a8f5278c8c7253ff5bd707a6b8b9fd508545fe73
Parents: 9baae7b
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jun 13 11:47:27 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jun 13 11:47:27 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8f5278c/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
index 7ef8a75..718e6f4 100644
--- a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
@@ -106,7 +106,7 @@ public class KeyspaceMetrics
return total;
}
});
- memtableOffHeapDataSize = Metrics.newGauge(factory.createMetricName("MemtableiOffHeapDataSize"), new Gauge<Long>()
+ memtableOffHeapDataSize = Metrics.newGauge(factory.createMetricName("MemtableOffHeapDataSize"), new Gauge<Long>()
{
public Long value()
{
@@ -229,12 +229,13 @@ public class KeyspaceMetrics
*/
public void release()
{
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("AllMemtablesLiveDateSize"));
+ Metrics.defaultRegistry().removeMetric(factory.createMetricName("AllMemtablesLiveDataSize"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("AllMemtablesOnHeapDataSize"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("AllMemtablesOffHeapDataSize"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableLiveDataSize"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableOnHeapDataSize"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableOffHeapDataSize"));
+ Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableColumnsCount"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableSwitchCount"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("PendingFlushes"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("PendingCompactions"));
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b47d8a8c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b47d8a8c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b47d8a8c
Branch: refs/heads/trunk
Commit: b47d8a8c45724e4ad2575608c78070f5fe4da030
Parents: 7765e0e a8f5278
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jun 13 11:49:33 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jun 13 11:49:33 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b47d8a8c/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
index 384e6c6,718e6f4..c5afcc1
--- a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
@@@ -232,11 -235,10 +235,9 @@@ public class KeyspaceMetric
Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableLiveDataSize"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableOnHeapDataSize"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableOffHeapDataSize"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("AllMemtablesOnHeapDataSize"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("AllMemtablesOffHeapDataSize"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("AllMemtablesLiveDataSize"));
+ Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableColumnsCount"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableSwitchCount"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("PendingFlushes"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("PendingCompactions"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("LiveDiskSpaceUsed"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("TotalDiskSpaceUsed"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterDiskSpaceUsed"));