Merge pull request #235 from oceanbase/fix_some

add getDesc test case

Author: WeiXinChan

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

@@ -223,7 +223,8 @@ public HTableDescriptor getTableDescriptor() throws IOException {
 
     @Override
     public TableDescriptor getDescriptor() throws IOException {
-        return null;
+        checkStatus();
+        return ohTable.getDescriptor();
     }
 
     @Override

src/main/java/com/alipay/oceanbase/hbase/util/OHAdmin.java

@@ -145,14 +145,16 @@ public HTableDescriptor getTableDescriptor(TableName tableName) throws TableNotF
             if (e.getCause() instanceof ObTableTransportException
                     && ((ObTableTransportException) e.getCause()).getErrorCode() == TransportCodes.BOLT_TIMEOUT) {
                 throw new TimeoutIOException(e.getCause());
+            } else if (e.getCause().getMessage().contains("OB_TABLEGROUP_NOT_EXIST")) {
+                throw new TableNotFoundException(tableName);
             } else {
                 throw e;
             }
         }
     }
 
     @Override
-    public TableDescriptor getDescriptor(TableName tableName) throws TableNotFoundException, IOException {
+    public TableDescriptor getDescriptor(TableName tableName) throws IOException {
         OHConnectionConfiguration connectionConf = new OHConnectionConfiguration(conf);
         ObTableClient tableClient = ObTableClientManager.getOrCreateObTableClientByTableName(tableName, connectionConf);
         OHTableDescriptorExecutor executor = new OHTableDescriptorExecutor(tableName.getNameAsString(), tableClient);
@@ -162,6 +164,8 @@ public TableDescriptor getDescriptor(TableName tableName) throws TableNotFoundEx
             if (e.getCause() instanceof ObTableTransportException
                     && ((ObTableTransportException) e.getCause()).getErrorCode() == TransportCodes.BOLT_TIMEOUT) {
                 throw new TimeoutIOException(e.getCause());
+            } else if (e.getCause().getMessage().contains("OB_TABLEGROUP_NOT_EXIST")) {
+                throw new TableNotFoundException(tableName);
             } else {
                 throw e;
             }

src/test/java/com/alipay/oceanbase/hbase/OHTableClientTest.java

@@ -19,6 +19,8 @@
 
 import com.alipay.oceanbase.hbase.util.ObHTableTestUtil;
 import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
+import org.apache.hadoop.hbase.client.TableDescriptor;
 import org.junit.*;
 
 import java.util.LinkedList;
@@ -77,7 +79,9 @@ public void testNew() throws Exception {
         `T` bigint(20) NOT NULL,
         `V` varbinary(1024) DEFAULT NULL,
         PRIMARY KEY (`K`, `Q`, `T`)
-    ) TABLEGROUP = test_desc PARTITION BY RANGE COLUMNS(K) (
+    ) TABLEGROUP = test_desc
+    KV_ATTRIBUTES ='{"Hbase": {"TimeToLive": 3600, "MaxVersions": 3}}' 
+    PARTITION BY RANGE COLUMNS(K) (
         PARTITION p1 VALUES LESS THAN ('c'),
         PARTITION p2 VALUES LESS THAN ('e'),
         PARTITION p3 VALUES LESS THAN ('g'),
@@ -96,7 +100,9 @@ PARTITION p10 VALUES LESS THAN (MAXVALUE)
         `T` bigint(20) NOT NULL,
         `V` varbinary(1024) DEFAULT NULL,
         PRIMARY KEY (`K`, `Q`, `T`)
-    ) TABLEGROUP = test_desc PARTITION BY RANGE COLUMNS(K) (
+    ) TABLEGROUP = test_desc
+    KV_ATTRIBUTES ='{"Hbase": {"TimeToLive": 7200, "MaxVersions": 3}}'
+    PARTITION BY RANGE COLUMNS(K) (
         PARTITION p1 VALUES LESS THAN ('c'),
         PARTITION p2 VALUES LESS THAN ('e'),
         PARTITION p3 VALUES LESS THAN ('g'),
@@ -116,11 +122,30 @@ public void testGetTableDescriptor() throws Exception {
         OHTableClient hTable2 = ObHTableTestUtil.newOHTableClient(tableNameStr);
         hTable2.init();
         try {
-            HTableDescriptor descriptor = hTable2.getTableDescriptor();
-            Assert.assertNotNull(descriptor);
-            Assert.assertTrue(descriptor.hasFamily("family1".getBytes()));
-            Assert.assertTrue(descriptor.hasFamily("family2".getBytes()));
-            Assert.assertFalse(descriptor.hasFamily("family".getBytes()));
+            {
+                HTableDescriptor descriptor1 = hTable2.getTableDescriptor();
+                Assert.assertNotNull(descriptor1);
+                Assert.assertEquals(2, descriptor1.getColumnFamilyCount());
+                Assert.assertTrue(descriptor1.hasFamily("family1".getBytes()));
+                Assert.assertTrue(descriptor1.hasFamily("family2".getBytes()));
+                Assert.assertFalse(descriptor1.hasFamily("family".getBytes()));
+                ColumnFamilyDescriptor family1 = descriptor1.getColumnFamily("family1".getBytes());
+                ColumnFamilyDescriptor family2 = descriptor1.getColumnFamily("family2".getBytes());
+                Assert.assertEquals(3600, family1.getTimeToLive());
+                Assert.assertEquals(7200, family2.getTimeToLive());
+            }
+            {
+                TableDescriptor descriptor2 = hTable2.getDescriptor();
+                Assert.assertNotNull(descriptor2);
+                Assert.assertEquals(2, descriptor2.getColumnFamilyCount());
+                Assert.assertTrue(descriptor2.hasColumnFamily("family1".getBytes()));
+                Assert.assertTrue(descriptor2.hasColumnFamily("family2".getBytes()));
+                Assert.assertFalse(descriptor2.hasColumnFamily("family".getBytes()));
+                ColumnFamilyDescriptor family1 = descriptor2.getColumnFamily("family1".getBytes());
+                ColumnFamilyDescriptor family2 = descriptor2.getColumnFamily("family2".getBytes());
+                Assert.assertEquals(3600, family1.getTimeToLive());
+                Assert.assertEquals(7200, family2.getTimeToLive());
+            }
         } finally {
             hTable2.close();
         }

src/test/java/unit_test_db.sql

@@ -298,14 +298,15 @@ CREATE TABLE `test_region_locator$family_region_locator` (
 );
 
 CREATE TABLEGROUP test_desc SHARDING = 'ADAPTIVE';
-
 CREATE TABLE `test_desc$family1` (
     `K` varbinary(1024) NOT NULL,
     `Q` varbinary(256) NOT NULL,
     `T` bigint(20) NOT NULL,
     `V` varbinary(1024) DEFAULT NULL,
     PRIMARY KEY (`K`, `Q`, `T`)
-) TABLEGROUP = test_desc PARTITION BY RANGE COLUMNS(K) (
+) TABLEGROUP = test_desc
+KV_ATTRIBUTES ='{"Hbase": {"TimeToLive": 3600, "MaxVersions": 3}}' 
+PARTITION BY RANGE COLUMNS(K) (
     PARTITION p1 VALUES LESS THAN ('c'),
     PARTITION p2 VALUES LESS THAN ('e'),
     PARTITION p3 VALUES LESS THAN ('g'),
@@ -324,7 +325,9 @@ CREATE TABLE `test_desc$family2` (
     `T` bigint(20) NOT NULL,
     `V` varbinary(1024) DEFAULT NULL,
     PRIMARY KEY (`K`, `Q`, `T`)
-) TABLEGROUP = test_desc PARTITION BY RANGE COLUMNS(K) (
+) TABLEGROUP = test_desc
+KV_ATTRIBUTES ='{"Hbase": {"TimeToLive": 7200, "MaxVersions": 3}}'
+PARTITION BY RANGE COLUMNS(K) (
     PARTITION p1 VALUES LESS THAN ('c'),
     PARTITION p2 VALUES LESS THAN ('e'),
     PARTITION p3 VALUES LESS THAN ('g'),