Skip to content

fix enable & disable syntax errors #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: hbase_compat_3_2.0
Choose a base branch
from
Open

fix enable & disable syntax errors #224

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b418bc9
fix syntax errors
Zhou-jw May 30, 2025
701c1e9
fix syntax errors
Zhou-jw May 30, 2025
e552174
Merge remote-tracking branch 'upstream/hbase_compat_3_2.0' into hbase…
Zhou-jw Jun 4, 2025
9e17e34
Merge remote-tracking branch 'upstream/hbase_compat_3_2.0' into hbase…
Zhou-jw Jun 5, 2025
1bfe302
Align obkv-hbase enable/disable exception handling with HBase
Zhou-jw Jun 5, 2025
c328bca
resolve conflicts
Zhou-jw Jun 5, 2025
da5089c
Align obkv-hbase enable/disable exception handling with HBase
Zhou-jw Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 34 additions & 4 deletions src/main/java/com/alipay/oceanbase/hbase/util/OHTableAccessControlExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import com.alibaba.fastjson.JSON;
import com.alipay.oceanbase.hbase.execute.AbstractObTableMetaExecutor;
import com.alipay.oceanbase.rpc.protocol.payload.ResultCodes;
import com.alipay.oceanbase.rpc.ObTableClient;
import com.alipay.oceanbase.rpc.exception.ObTableException;
import com.alipay.oceanbase.rpc.meta.ObTableMetaRequest;
import com.alipay.oceanbase.rpc.meta.ObTableMetaResponse;
import com.alipay.oceanbase.rpc.meta.ObTableRpcMetaType;
Expand Down Expand Up @@ -33,23 +35,51 @@ public Void parse(ObTableMetaResponse response) throws IOException {
return null;
}

public void enableTable(String tableName) throws IOException, TableNotFoundException, TableNotEnabledException {
public Void enableTable(String tableName) throws IOException, TableNotFoundException, TableNotEnabledException {
ObTableMetaRequest request = new ObTableMetaRequest();
request.setMetaType(getMetaType());
Map<String, Object> requestData = new HashMap<>();
requestData.put("table_name", tableName);
String jsonData = JSON.toJSONString(requestData);
request.setData(jsonData);
execute(tableClient, request);
try {
return execute(tableClient, request);
} catch (IOException e) {
Throwable cause = e.getCause();
if (cause instanceof ObTableException) {
ObTableException obEx = (ObTableException) cause;
int errCode = obEx.getErrorCode();
if(ResultCodes.OB_KV_TABLE_NOT_ENABLED.errorCode == errCode) {
throw new TableNotEnabledException("Table is not enabled: " + tableName + obEx);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

异常描述有误

} else if (ResultCodes.OB_TABLEGROUP_NOT_EXIST.errorCode == errCode) {
throw new TableNotFoundException("Table not found: " + tableName + obEx);
}
}
throw e;
}
}

public void disableTable(String tableName) throws IOException, TableNotFoundException, TableNotDisabledException {
public Void disableTable(String tableName) throws IOException, TableNotFoundException, TableNotDisabledException {
ObTableMetaRequest request = new ObTableMetaRequest();
request.setMetaType(getMetaType());
Map<String, Object> requestData = new HashMap<>();
requestData.put("table_name", tableName);
String jsonData = JSON.toJSONString(requestData);
request.setData(jsonData);
execute(tableClient, request);
try {
return execute(tableClient, request);
} catch (IOException e) {
Throwable cause = e.getCause();
if (cause instanceof ObTableException) {
ObTableException obEx = (ObTableException) cause;
int errCode = obEx.getErrorCode();
if(ResultCodes.OB_KV_TABLE_NOT_DISABLED.errorCode == errCode) {
throw new TableNotDisabledException("Table is not disabled: " + tableName + obEx);
} else if (ResultCodes.OB_TABLEGROUP_NOT_EXIST.errorCode == errCode) {
throw new TableNotFoundException("Table not found: " + tableName + obEx);
}
}
throw e;
}
}
}