From b61a5b8439ae696194f47ac712155de4bc12825c Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@scylladb.com>
Date: Wed, 9 Nov 2016 11:03:31 +0200
Subject: [PATCH] Revert "Implement deprecated metrics in CommitLog and
 CompactionManager"

This reverts commit 9b63a35da6f6c6f8da2ca0e3808e7db0307fd393 in
preparation for Cassandra 3.x compatibility changes.
---
 .../java/org/apache/cassandra/db/commitlog/CommitLog.java   | 6 +++---
 .../apache/cassandra/db/compaction/CompactionManager.java   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/cassandra/db/commitlog/CommitLog.java b/src/main/java/org/apache/cassandra/db/commitlog/CommitLog.java
index d5c6689..784b8bb 100644
--- a/src/main/java/org/apache/cassandra/db/commitlog/CommitLog.java
+++ b/src/main/java/org/apache/cassandra/db/commitlog/CommitLog.java
@@ -73,7 +73,7 @@ public class CommitLog implements CommitLogMBean {
     @Deprecated
     public long getCompletedTasks() {
         log(" getCompletedTasks()");
-        return metrics.completedTasks.value();
+        return c.getLongValue("");
     }
 
     /**
@@ -84,7 +84,7 @@ public class CommitLog implements CommitLogMBean {
     @Deprecated
     public long getPendingTasks() {
         log(" getPendingTasks()");
-        return metrics.pendingTasks.value();
+        return c.getLongValue("");
     }
 
     /**
@@ -95,7 +95,7 @@ public class CommitLog implements CommitLogMBean {
     @Deprecated
     public long getTotalCommitlogSize() {
         log(" getTotalCommitlogSize()");
-        return metrics.totalCommitLogSize.value();
+        return c.getLongValue("");
     }
 
     /**
diff --git a/src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 55c3a60..7cd95be 100644
--- a/src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -117,7 +117,7 @@ public class CompactionManager implements CompactionManagerMBean {
     @Deprecated
     public int getPendingTasks() {
         log(" getPendingTasks()");
-        return metrics.pendingTasks.value();
+        return c.getIntValue("");
     }
 
     /**
@@ -127,7 +127,7 @@ public class CompactionManager implements CompactionManagerMBean {
     @Deprecated
     public long getCompletedTasks() {
         log(" getCompletedTasks()");
-        return metrics.completedTasks.value();
+        return c.getLongValue("");
     }
 
     /**
@@ -147,7 +147,7 @@ public class CompactionManager implements CompactionManagerMBean {
     @Deprecated
     public long getTotalCompactionsCompleted() {
         log(" getTotalCompactionsCompleted()");
-        return metrics.totalCompactionsCompleted.count();
+        return c.getLongValue("");
     }
 
     /**