Merge pull request #221 from Zhou-jw/hbase_compat_3_2.0_enable_disable

add enable disable to OHTableAccessControlExecutor

Author: WeiXinChan

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

@@ -0,0 +1,55 @@
+package com.alipay.oceanbase.hbase.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alipay.oceanbase.hbase.execute.AbstractObTableMetaExecutor;
+import com.alipay.oceanbase.rpc.ObTableClient;
+import com.alipay.oceanbase.rpc.meta.ObTableMetaRequest;
+import com.alipay.oceanbase.rpc.meta.ObTableMetaResponse;
+import com.alipay.oceanbase.rpc.meta.ObTableRpcMetaType;
+import org.apache.hadoop.hbase.TableNotDisabledException;
+import org.apache.hadoop.hbase.TableNotEnabledException;
+import org.apache.hadoop.hbase.TableNotFoundException;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class OHTableAccessControlExecutor extends AbstractObTableMetaExecutor<Void> {
+    private final ObTableClient tableClient;
+    private final ObTableRpcMetaType type;
+
+    OHTableAccessControlExecutor(ObTableClient tableClient, ObTableRpcMetaType type) {
+        this.tableClient = tableClient;
+        this.type = type;
+    }
+
+    @Override
+    public ObTableRpcMetaType getMetaType() throws IOException {
+        return this.type;
+    }
+
+    @Override
+    public Boolean parse(ObTableMetaResponse response) throws IOException {
+    }
+
+    public void enableTable(String tableName) throws IOException, TableNotFoundException, TableNotEnabledException {
+        ObTableMetaRequest request = new ObTableMetaRequest();
+        request.setMetaType(getMetaType());
+        Map<String, Object> requestData = new HashMap<>();
+        requestData.put("name", tableName);
+        String jsonData = JSON.toJSONString(requestData);
+        request.setData(jsonData);
+        execute(tableClient, request);
+    }
+
+    public void disableTable(String tableName) throws IOException, TableNotFoundException, TableNotDisabledException {
+        ObTableMetaRequest request = new ObTableMetaRequest();
+        request.setMetaType(getMetaType());
+        Map<String, Object> requestData = new HashMap<>();
+        requestData.put("name", tableName);
+        String jsonData = JSON.toJSONString(requestData);
+        request.setData(jsonData);
+        execute(tableClient, request);
+    }
+}

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

@@ -29,9 +29,11 @@
 import org.apache.hadoop.hbase.client.*;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Pair;
+
 import org.junit.Assert;
 import org.junit.Test;
 
+
 import java.io.IOException;
 import java.sql.Statement;
 import java.util.ArrayList;
@@ -268,6 +270,121 @@ public void testGetStartEndKeysOHTablePoolLoadNon() throws Exception {
         Assert.assertEquals(0, startEndKeys.getSecond()[0].length);
     }
 
+    @Test
+    public void testAdminEnDisableTable() throws Exception {
+        java.sql.Connection conn = ObHTableTestUtil.getConnection();
+        Statement st = conn.createStatement();
+        st.execute("CREATE TABLEGROUP IF NOT EXISTS test_multi_cf SHARDING = 'ADAPTIVE';\n" +
+                "\n" +
+                "CREATE TABLE IF NOT EXISTS `test_multi_cf$family_with_group1` (\n" +
+                "    `K` varbinary(1024) NOT NULL,\n" +
+                "    `Q` varbinary(256) NOT NULL,\n" +
+                "    `T` bigint(20) NOT NULL,\n" +
+                "    `V` varbinary(1024) DEFAULT NULL,\n" +
+                "    PRIMARY KEY (`K`, `Q`, `T`)\n" +
+                ") TABLEGROUP = test_multi_cf PARTITION BY KEY(`K`) PARTITIONS 3;\n" +
+                "\n" +
+                "CREATE TABLE IF NOT EXISTS `test_multi_cf$family_with_group2` (\n" +
+                "    `K` varbinary(1024) NOT NULL,\n" +
+                "    `Q` varbinary(256) NOT NULL,\n" +
+                "    `T` bigint(20) NOT NULL,\n" +
+                "    `V` varbinary(1024) DEFAULT NULL,\n" +
+                "    PRIMARY KEY (`K`, `Q`, `T`)\n" +
+                ") TABLEGROUP = test_multi_cf PARTITION BY KEY(`K`) PARTITIONS 3;\n" +
+                "\n" +
+                "CREATE TABLE IF NOT EXISTS `test_multi_cf$family_with_group3` (\n" +
+                "    `K` varbinary(1024) NOT NULL,\n" +
+                "    `Q` varbinary(256) NOT NULL,\n" +
+                "    `T` bigint(20) NOT NULL,\n" +
+                "    `V` varbinary(1024) DEFAULT NULL,\n" +
+                "    PRIMARY KEY (`K`, `Q`, `T`)\n" +
+                ") TABLEGROUP = test_multi_cf PARTITION BY KEY(`K`) PARTITIONS 3;\n" +
+                "\n" +
+                "CREATE DATABASE IF NOT EXISTS `n1`;\n" +
+                "use `n1`;\n" +
+                "CREATE TABLEGROUP IF NOT EXISTS `n1:test` SHARDING = 'ADAPTIVE';\n" +
+                "CREATE TABLE IF NOT EXISTS `n1:test$family_group` (\n" +
+                "      `K` varbinary(1024) NOT NULL,\n" +
+                "      `Q` varbinary(256) NOT NULL,\n" +
+                "      `T` bigint(20) NOT NULL,\n" +
+                "      `V` varbinary(1024) DEFAULT NULL,\n" +
+                "      PRIMARY KEY (`K`, `Q`, `T`)\n" +
+                ") TABLEGROUP = `n1:test`;" +
+                "\n" +
+                "CREATE TABLE IF NOT EXISTS `n1:test$family1` (\n" +
+                "      `K` varbinary(1024) NOT NULL,\n" +
+                "      `Q` varbinary(256) NOT NULL,\n" +
+                "      `T` bigint(20) NOT NULL,\n" +
+                "      `V` varbinary(1024) DEFAULT NULL,\n" +
+                "      PRIMARY KEY (`K`, `Q`, `T`)\n" +
+                ") TABLEGROUP = `n1:test`;");
+        Configuration conf = ObHTableTestUtil.newConfiguration();
+        Connection connection = ConnectionFactory.createConnection(conf);
+        Admin admin = connection.getAdmin();
+        admin.disableTable(TableName.valueOf("test_multi_cf"));
+        assertTrue(admin.tableExists(TableName.valueOf("n1", "test")));
+        assertTrue(admin.tableExists(TableName.valueOf("test_multi_cf")));
+        // disable a non-existed table
+        IOException thrown = assertThrows(IOException.class,
+                () -> {
+                    admin.disableTable(TableName.valueOf("tablegroup_not_exists"));
+                });
+        assertTrue(thrown.getCause() instanceof ObTableException);
+        Assert.assertEquals(ResultCodes.OB_TABLEGROUP_NOT_EXIST.errorCode, ((ObTableException) thrown.getCause()).getErrorCode());
+
+        // write an enabled table, should succeed
+        batchInsert(10, "test_multi_ch");
+        // disable a disabled table
+        thrown = assertThrows(IOException.class,
+                () -> {
+                    admin.disableTable(TableName.valueOf("test_multi_cf"));
+                });
+        assertTrue(thrown.getCause() instanceof ObTableException);
+        Assert.assertEquals(ResultCodes.OB_KV_TABLE_NOT_DISABLED.errorCode, ((ObTableException) thrown.getCause()).getErrorCode());
+
+        // write an enabled table, should fail
+        batchInsert(10, "test_multi_ch");
+        enDisableRead(10, "test_multi_ch");
+
+        // enable a disabled table
+        admin.enableTable(TableName.valueOf("test_multi_cf"));
+
+        // write an enabled table, should succeed
+        batchInsert(10, "test_multi_ch");
+        enDisableRead(10, "test_multi_ch");
+
+        // enable an enabled table
+        thrown = assertThrows(IOException.class,
+                () -> {
+                    admin.disableTable(TableName.valueOf("n1", "test");
+                });
+        assertTrue(thrown.getCause() instanceof ObTableException);
+        Assert.assertEquals(ResultCodes.OB_KV_TABLE_NOT_ENABLED.errorCode, ((ObTableException) thrown.getCause()).getErrorCode());
+
+        admin.deleteTable(TableName.valueOf("n1", "test"));
+        admin.deleteTable(TableName.valueOf("test_multi_cf"));
+        assertFalse(admin.tableExists(TableName.valueOf("n1", "test")));
+        assertFalse(admin.tableExists(TableName.valueOf("test_multi_cf")));
+    }
+
+    private void enDisableRead(int rows, String tablegroup) throws Exception {
+        Configuration conf = ObHTableTestUtil.newConfiguration();
+        Connection connection = ConnectionFactory.createConnection(conf);
+        Table table = connection.getTable(TableName.valueOf(tablegroup));
+        List<Row> batchLsit = new LinkedList<>();
+        for (int i = 0; i < rows; ++i) {
+            Get get = new Get(toBytes("Key" + i));
+            batchLsit.add(get);
+            if (i % 100 == 0) { // 100 rows one batch to avoid OB_TIMEOUT
+                Object[] results = new Object[batchLsit.size()];
+                table.batch(batchLsit, results);
+                batchLsit.clear();
+            }
+        }
+        Object[] results = new Object[batchLsit.size()];
+        table.batch(batchLsit, results);
+    }
+
     @Test
     public void testAdminGetRegionMetrics() throws Exception {
         java.sql.Connection conn = ObHTableTestUtil.getConnection();