hbase merge branch 1.3

pom.xml

@@ -54,7 +54,7 @@
         <project.build.sourceEncoding>${project.encoding}</project.build.sourceEncoding>
         <project.encoding>UTF-8</project.encoding>
         <slf4j.version>1.7.21</slf4j.version>
-        <table.client.version>1.2.14.1-SNAPSHOT</table.client.version>
+        <table.client.version>1.2.14.4-SNAPSHOT</table.client.version>
     </properties>
 
     <dependencyManagement>

src/main/java/com/alipay/oceanbase/hbase/OHTablePool.java

@@ -49,6 +49,7 @@
 
 public class OHTablePool implements Closeable {
 
+    private String                                 originTabelName = null;
     private final PoolMap<String, HTableInterface> tables;
     private final int                              maxSize;
     private final PoolMap.PoolType                 poolType;
@@ -314,6 +315,9 @@ int getCurrentPoolSize(String tableName) {
      * @param paramUrl  the table root server http url
      */
     public void setParamUrl(final String tableName, String paramUrl) {
+        if (originTabelName == null) {
+            originTabelName = tableName;
+        }
         setTableAttribute(tableName, HBASE_OCEANBASE_PARAM_URL, Bytes.toBytes(paramUrl));
     }
 
@@ -334,6 +338,9 @@ public String getParamUrl(final String tableName) {
      * @param fullUserName the table login username
      */
     public void setFullUserName(final String tableName, final String fullUserName) {
+        if (originTabelName == null) {
+            originTabelName = tableName;
+        }
         setTableAttribute(tableName, HBASE_OCEANBASE_FULL_USER_NAME, Bytes.toBytes(fullUserName));
     }
 
@@ -354,6 +361,9 @@ public String getFullUserName(final String tableName) {
      * @param password  the table login password
      */
     public void setPassword(final String tableName, final String password) {
+        if (originTabelName == null) {
+            originTabelName = tableName;
+        }
         setTableAttribute(tableName, HBASE_OCEANBASE_PASSWORD, Bytes.toBytes(password));
     }
 
@@ -374,6 +384,9 @@ public String getPassword(final String tableName) {
      * @param sysUserName  the sys username
      */
     public void setSysUserName(final String tableName, final String sysUserName) {
+        if (originTabelName == null) {
+            originTabelName = tableName;
+        }
         setTableAttribute(tableName, HBASE_OCEANBASE_SYS_USER_NAME, Bytes.toBytes(sysUserName));
     }
 
@@ -394,6 +407,9 @@ public String getSysUserName(final String tableName) {
      * @param sysPassword  the sys user password
      */
     public void setSysPassword(final String tableName, final String sysPassword) {
+        if (originTabelName == null) {
+            originTabelName = tableName;
+        }
         setTableAttribute(tableName, HBASE_OCEANBASE_SYS_PASSWORD, Bytes.toBytes(sysPassword));
     }
 
@@ -481,6 +497,10 @@ public long getWriteBufferSize(String tableName) {
             .toLong(attr);
     }
 
+    public String getOriginTableName() {
+        return this.originTabelName;
+    }
+
     /**
      * Sets the operation timeout for the specified tables in this pool.
      *
@@ -520,6 +540,9 @@ public int getOperationTimeout(String tableName) {
      * @param odpAddr ODP address
      */
     public void setOdpAddr(final String tableName, String odpAddr) {
+        if (originTabelName == null) {
+            originTabelName = tableName;
+        }
         setTableAttribute(tableName, HBASE_OCEANBASE_ODP_ADDR, Bytes.toBytes(odpAddr));
     }
 
@@ -545,6 +568,9 @@ public String getOdpAddr(String tableName) {
      * @param odpPort ODP port
      */
     public void setOdpPort(final String tableName, int odpPort) {
+        if (originTabelName == null) {
+            originTabelName = tableName;
+        }
         setTableAttribute(tableName, HBASE_OCEANBASE_ODP_PORT, Bytes.toBytes(odpPort));
     }
 
@@ -564,6 +590,9 @@ public int getOdpPort(String tableName) {
      * @param odpMode ODP mode
      */
     public void setOdpMode(final String tableName, boolean odpMode) {
+        if (originTabelName == null) {
+            originTabelName = tableName;
+        }
         setTableAttribute(tableName, HBASE_OCEANBASE_ODP_MODE, Bytes.toBytes(odpMode));
     }
 
@@ -583,6 +612,9 @@ public boolean getOdpMode(String tableName) {
      * @param database ODP database name
      */
     public void setDatabase(final String tableName, String database) {
+        if (originTabelName == null) {
+            originTabelName = tableName;
+        }
         setTableAttribute(tableName, HBASE_OCEANBASE_DATABASE, Bytes.toBytes(database));
     }
 
@@ -653,6 +685,9 @@ public Object getTableExtendAttribute(String tableName, String attributeName) {
     }
 
     public void setRuntimeBatchExecutor(String tableName, ExecutorService runtimeBatchExecutor) {
+        if (originTabelName == null) {
+            originTabelName = tableName;
+        }
         setTableExtendAttribute(tableName, HBASE_OCEANBASE_BATCH_EXECUTOR, runtimeBatchExecutor);
     }
 

src/main/java/com/alipay/oceanbase/hbase/constants/OHConstants.java

@@ -159,4 +159,8 @@ public final class OHConstants {
 
     public static final int      MAX_KEYVALUE_SIZE_DEFAULT                   = -1;
 
+    public static final String   SOCKET_TIMEOUT                              = "ipc.socket.timeout";
+
+    public static final int      DEFAULT_SOCKET_TIMEOUT                      = 20000;                                   // 20 seconds
+
 }