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 14:54:09 UTC
[20/20] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/Keyspace.java
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/3aa03059
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3aa03059
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3aa03059
Branch: refs/heads/trunk
Commit: 3aa030593a6ad1d8de0704c692dab8e90681c192
Parents: e428ae0 30d3623
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jun 13 07:53:40 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jun 13 07:53:40 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +-
src/java/org/apache/cassandra/db/Keyspace.java | 8 ++++++++
src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java | 4 +++-
3 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3aa03059/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3aa03059/src/java/org/apache/cassandra/db/Keyspace.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/Keyspace.java
index 9e39952,2fe9197..d4ca8e0
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@@ -64,6 -65,8 +65,11 @@@ public class Keyspac
public final KeyspaceMetrics metric;
++<<<<<<< HEAD
++=======
+ public final KeyspaceMetrics metric;
+
++>>>>>>> cassandra-2.1
// It is possible to call Keyspace.open without a running daemon, so it makes sense to ensure
// proper directories here as well as in CassandraDaemon.
static
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3aa03059/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
index b03c32c,4a0980f..6a9cab9
--- a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
@@@ -33,17 -33,9 +33,19 @@@ import org.apache.cassandra.db.Keyspace
public class KeyspaceMetrics
{
/** Total amount of data stored in the memtable, including column related overhead. */
- public final Gauge<Long> memtableDataSize;
+ public final Gauge<Long> memtableLiveDataSize;
+ /** Total amount of data stored in the memtable that resides on-heap, including column related overhead and overwritten rows. */
+ public final Gauge<Long> memtableOnHeapDataSize;
+ /** Total amount of data stored in the memtable that resides off-heap, including column related overhead and overwritten rows. */
+ public final Gauge<Long> memtableOffHeapDataSize;
+ /** Total amount of data stored in the memtables (2i and pending flush memtables included) that resides on-heap. */
+ public final Gauge<Long> allMemtablesOnHeapDataSize;
+ /** Total amount of data stored in the memtables (2i and pending flush memtables included) that resides off-heap. */
+ public final Gauge<Long> allMemtablesOffHeapDataSize;
+ /** Total amount of live data stored in the memtables (2i and pending flush memtables included) that resides off-heap, excluding any data structure overhead */
+ public final Gauge<Long> allMemtablesLiveDataSize;
+ /** Total amount of data stored in the memtables (2i and pending flush memtables included). */
+ public final Gauge<Long> allMemtablesDataSize;
/** Total number of columns present in the memtable. */
public final Gauge<Long> memtableColumnsCount;
/** Number of times flush has resulted in the memtable being switched out. */