svn commit: r1202980 - in /hbase/branches/0.89-fb/src: main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaMetrics.java

[ns...@apache.org]

Author: nspiegelberg
Date: Thu Nov 17 01:44:30 2011
New Revision: 1202980

URL: http://svn.apache.org/viewvc?rev=1202980&view=rev
Log:
Rename "tab" as "tbl"

Summary:
When open sourcing:
HBASE-4689 (Make the table level metrics work with rpc* metrics),
Nicolas had a good comments that the common abbreviation for table is "tbl"
instead of "tab"  (normally, cut out the vowels).

It would be nice to change if we're not dependent on this format yet.

Test Plan: Running all the unit tests now

Reviewers: kannan, mbautin, nspiegelberg

Reviewed By: kannan

CC: hbase-eng@lists, kannan

Differential Revision: 353246

Modified:
    hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java
    hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaMetrics.java

Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java?rev=1202980&r1=1202979&r2=1202980&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java Thu Nov 17 01:44:30 2011
@@ -165,7 +165,7 @@ public class SchemaMetrics {
    * per-CF/table metrics.
    */
   public static final String UNKNOWN = "__unknown";
-  private static final String TABLE_PREFIX = "tab.";
+  public static final String TABLE_PREFIX = "tbl.";
   public static final String CF_PREFIX = "cf.";
   public static final String BLOCK_TYPE_PREFIX = "bt.";
   public static final String CF_UNKNOWN_PREFIX = CF_PREFIX + UNKNOWN + ".";

Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaMetrics.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaMetrics.java?rev=1202980&r1=1202979&r2=1202980&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaMetrics.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaMetrics.java Thu Nov 17 01:44:30 2011
@@ -20,9 +20,12 @@
 
 package org.apache.hadoop.hbase.regionserver.metrics;
 
+import static org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics.BOOL_VALUES;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
@@ -30,24 +33,15 @@ import java.util.Set;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.io.hfile.BlockType;
 import org.apache.hadoop.hbase.io.hfile.BlockType.BlockCategory;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
+import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics.BlockMetricType;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.ClassSize;
-
-import static org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics.
-    BOOL_VALUES;
-import static org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics.
-    BlockMetricType;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.junit.runner.manipulation.Sorter;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import static org.junit.Assert.*;
-
 @RunWith(Parameterized.class)
 public class TestSchemaMetrics {
 
@@ -74,8 +68,8 @@ public class TestSchemaMetrics {
 
   @Test
   public void testNaming() {
-    final String metricPrefix = (useTableName ? "tab." +
-        TABLE_NAME + "." : "") + "cf." + CF_NAME + ".";
+    final String metricPrefix = (useTableName ? SchemaMetrics.TABLE_PREFIX +
+        TABLE_NAME + "." : "") + SchemaMetrics.CF_PREFIX + CF_NAME + ".";
     SchemaMetrics schemaMetrics = SchemaMetrics.getInstance(TABLE_NAME,
         CF_NAME);
     SchemaMetrics ALL_CF_METRICS = SchemaMetrics.ALL_SCHEMA_METRICS;
@@ -231,11 +225,11 @@ public class TestSchemaMetrics {
 
     StringBuilder expected = new StringBuilder();
     if (useTableName) {
-      expected.append("tab.");
+      expected.append(SchemaMetrics.TABLE_PREFIX);
       expected.append(tableName);
       expected.append(".");
     }
-    expected.append("cf.");
+    expected.append(SchemaMetrics.CF_PREFIX);
     Set<byte[]> families = new HashSet<byte[]>();
     for (int i = 1; i <= numCF; i++) {
       String cf = "cf" + i;