提交 9fe304b6 编写于 作者: X XuYi

remove excption

上级 83c94de1
......@@ -43,7 +43,7 @@ public class TsfileDatabaseMetadata implements DatabaseMetaData {
Utils.verifySuccess(resp.getStatus());
Map<String, List<String>> deltaObjectList = resp.getDeltaObjectMap();
if(deltaObjectList == null || !deltaObjectList.containsKey(deltaObjectPattern)){
throw new SQLException("No schema for delta object");
new TsfileMetadataResultSet(null, new ArrayList<>());
}
return new TsfileMetadataResultSet(null, deltaObjectList.get(deltaObjectPattern));
} catch (TException e) {
......@@ -60,9 +60,11 @@ public class TsfileDatabaseMetadata implements DatabaseMetaData {
resp = client.fetchMetadata(req);
Utils.verifySuccess(resp.getStatus());
List<ColumnSchema> columnSchemaNew = new ArrayList<>();
columnSchemaNew.add(new ColumnSchema(columnPattern,
resp.getDataType() == null ? null : TSDataType.valueOf(resp.getDataType()),
null));
if(resp.getDataType() != null){
columnSchemaNew.add(new ColumnSchema(columnPattern,
TSDataType.valueOf(resp.getDataType()),
null));
}
return new TsfileMetadataResultSet(columnSchemaNew, null);
} catch (TException e) {
throw new SQLException("Conncetion error when fetching column data type");
......
......@@ -166,40 +166,37 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
return new TSFetchMetadataResp(status);
}
TSFetchMetadataResp resp = new TSFetchMetadataResp();
try {
switch (req.getType()) {
case METADATA_IN_JSON:
String metadataInJson = MManager.getInstance().getMetadataInString();
resp.setMetadataInJson(metadataInJson);
status = new TS_Status(TS_StatusCode.SUCCESS_STATUS);
break;
case DELTAOBJECT:
Metadata metadata = MManager.getInstance().getMetadata();
switch (req.getType()) {
case METADATA_IN_JSON:
String metadataInJson = MManager.getInstance().getMetadataInString();
resp.setMetadataInJson(metadataInJson);
status = new TS_Status(TS_StatusCode.SUCCESS_STATUS);
break;
case DELTAOBJECT:
Metadata metadata;
try {
metadata = MManager.getInstance().getMetadata();
Map<String, List<String>> deltaObjectMap = metadata.getDeltaObjectMap();
resp.setDeltaObjectMap(deltaObjectMap);
status = new TS_Status(TS_StatusCode.SUCCESS_STATUS);
break;
case COLUMN:
} catch (PathErrorException e) {
//LOGGER.error("cannot get delta object map", e);
}
status = new TS_Status(TS_StatusCode.SUCCESS_STATUS);
break;
case COLUMN:
try {
resp.setDataType(MManager.getInstance().getSeriesType(req.getColumnPath()).toString());
status = new TS_Status(TS_StatusCode.SUCCESS_STATUS);
break;
default:
status = new TS_Status(TS_StatusCode.ERROR_STATUS);
status.setErrorMessage(String.format("Unsuport fetch metadata operation %s", req.getType()));
break;
} catch (PathErrorException e) {
//LOGGER.error("cannot get column {} data type", req.getColumnPath(), e);
}
resp.setStatus(status);
} catch (PathErrorException e) {
LOGGER.error("TsFileDB Server: failed to get all schema", e);
status = new TS_Status(TS_StatusCode.ERROR_STATUS);
status.setErrorMessage(e.getMessage());
resp.setStatus(status);
} catch (Exception e) {
LOGGER.error("TsFileDB Server: failed to get all schema for unknown reason", e);
status = new TS_Status(TS_StatusCode.SUCCESS_STATUS);
break;
default:
status = new TS_Status(TS_StatusCode.ERROR_STATUS);
status.setErrorMessage(e.getMessage());
resp.setStatus(status);
status.setErrorMessage(String.format("Unsuport fetch metadata operation %s", req.getType()));
break;
}
resp.setStatus(status);
return resp;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册