svn commit: r1589225 - in /hbase/branches/0.89-fb/src: main/java/org/apache/hadoop/hbase/client/ main/java/org/apache/hadoop/hbase/regionserver/ test/java/org/apache/hadoop/hbase/client/

[li...@apache.org]

Author: liyin
Date: Tue Apr 22 18:18:33 2014
New Revision: 1589225

URL: http://svn.apache.org/r1589225
Log:
[HBASE-9704] Return Empty string in case when the conf property is non existent on the server

Author: manukranthk

Summary: Returning empty string on the server side in case of non existent properties on the server side.

Test Plan: Run TestServerConfigFromClient

Reviewers: liyintang, daviddeng

Reviewed By: daviddeng

CC: hbase-eng@

Differential Revision: https://phabricator.fb.com/D1286838

Task ID: 3922005

Modified:
    hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HConnection.java
    hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HTable.java
    hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
    hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestServerConfigFromClient.java

Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HConnection.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HConnection.java?rev=1589225&r1=1589224&r2=1589225&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HConnection.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HConnection.java Tue Apr 22 18:18:33 2014
@@ -422,6 +422,7 @@ public interface HConnection extends Clo
    * through this connection without retries.
    * @param prop : the String configuration property we want
    * @return String encoding of the property value
+   * Empty string if non property non existent.
    * @throws IOException
    */
   public String getServerConfProperty(String prop) throws IOException;

Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HTable.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HTable.java?rev=1589225&r1=1589224&r2=1589225&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HTable.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HTable.java Tue Apr 22 18:18:33 2014
@@ -749,6 +749,7 @@ public class HTable implements HTableInt
    *
    * @param name : The name of the property requested
    * @return String value of the property requested
+   * Empty string for non existent properties
    * @throws IOException
    */
   public String getServerConfProperty(final String name) throws IOException {

Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1589225&r1=1589224&r2=1589225&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Tue Apr 22 18:18:33 2014
@@ -2930,7 +2930,9 @@ public class HRegionServer implements HR
 
   @Override
   public String getConfProperty(String name){
-      return conf.get(name);
+      String ret = conf.get(name);
+      if (ret == null) return "";
+      return ret;
   }
 
   //

Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestServerConfigFromClient.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestServerConfigFromClient.java?rev=1589225&r1=1589224&r2=1589225&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestServerConfigFromClient.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestServerConfigFromClient.java Tue Apr 22 18:18:33 2014
@@ -88,9 +88,9 @@ public class TestServerConfigFromClient 
     assertEquals("test1", "org.apache.hadoop.hbase.ipc.HRegionInterface", val1);
     String val2 = table.getServerConfProperty("clientconfquery");
     assertEquals("test2", "Hello World", val2);
-    // should return null for nonexistent properties
+    // should return empty string for nonexistent properties
     String val3 = table.getServerConfProperty("notaproperty");
-    assertEquals("test3", null, val3);
+    assertEquals("test3", "", val3);
   }
 
 }