From 1728b48c8238a4d0372fca01ad733ce703c65874 Mon Sep 17 00:00:00 2001
From: Guangxu Cheng <guangxucheng@gmail.com>
Date: Mon, 5 Mar 2018 11:20:25 +0800
Subject: [PATCH] HBASE-20132 Change the "KV" to "Cell" for web UI

Signed-off-by: Chia-Ping Tsai <chia7712@gmail.com>
---
 .../hadoop/hbase/tmpl/master/RSGroupListTmpl.jamon   | 12 ++++++------
 .../hbase/tmpl/master/RegionServerListTmpl.jamon     |  6 +++---
 .../hbase/tmpl/regionserver/RegionListTmpl.jamon     |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RSGroupListTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RSGroupListTmpl.jamon
index 9a0e36916f1..41fe487f0ec 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RSGroupListTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RSGroupListTmpl.jamon
@@ -310,9 +310,9 @@ if (master.getServerManager() != null) {
 <table class="table table-striped">
 <tr>
     <th>RSGroup Name</th>
-    <th>Num. Compacting KVs</th>
-    <th>Num. Compacted KVs</th>
-    <th>Remaining KVs</th>
+    <th>Num. Compacting Cells</th>
+    <th>Num. Compacted Cells</th>
+    <th>Remaining Cells</th>
     <th>Compaction Progress</th>
 </tr>
 <%java>
@@ -321,7 +321,7 @@ if (master.getServerManager() != null) {
       int numStores = 0;
       long totalCompactingCells = 0;
       long totalCompactedCells = 0;
-      long remainingKVs = 0;
+      long remainingCells = 0;
       long compactionProgress  = 0;
       for (Address server : rsGroupInfo.getServers()) {
         ServerMetrics sl = collectServers.get(server);
@@ -332,7 +332,7 @@ if (master.getServerManager() != null) {
           }
         }
       }
-      remainingKVs = totalCompactingCells - totalCompactedCells;
+      remainingCells = totalCompactingCells - totalCompactedCells;
       String percentDone = "";
       if  (totalCompactingCells > 0) {
            percentDone = String.format("%.2f", 100 *
@@ -343,7 +343,7 @@ if (master.getServerManager() != null) {
 <td><& rsGroupLink; rsGroupName=rsGroupName; &></td>
 <td><% totalCompactingCells %></td>
 <td><% totalCompactedCells %></td>
-<td><% remainingKVs %></td>
+<td><% remainingCells %></td>
 <td><% percentDone %></td>
 </tr>
 <%java>
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
index fb7dd54d0b3..f353d32de56 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
@@ -289,9 +289,9 @@ if (sl != null) {
 <table class="table table-striped">
 <tr>
     <th>ServerName</th>
-    <th>Num. Compacting KVs</th>
-    <th>Num. Compacted KVs</th>
-    <th>Remaining KVs</th>
+    <th>Num. Compacting Cells</th>
+    <th>Num. Compacted Cells</th>
+    <th>Remaining Cells</th>
     <th>Compaction Progress</th>
 </tr>
 <%java>
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon
index d16ce06fbd0..6a0153395e7 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon
@@ -196,8 +196,8 @@
     <table class="table table-striped">
         <tr>
             <th>Region Name</th>
-            <th>Num. Compacting KVs</th>
-            <th>Num. Compacted KVs</th>
+            <th>Num. Compacting Cells</th>
+            <th>Num. Compacted Cells</th>
             <th>Compaction Progress</th>
             <th>Last Major Compaction</th>
         </tr>