mirror/dble
1
0
Fork 0
mirror of https://github.com/actiontech/dble.git synced 2026-04-25 07:39:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

issue 2135 (#2141)

Browse Source
This commit is contained in:
wenyh
2020-09-25 13:51:30 +08:00
committed by wenyh1
parent c3a6bcd519
commit 7fccc64542
3 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/actiontech/dble/meta/ViewMeta.java
+3
View File
@@ -259,4 +259,7 @@ public class ViewMeta {
return schema;
}
public void setSchema(String schema) {
this.schema = schema;
}
}
src/main/java/com/actiontech/dble/meta/ViewMetaParser.java
+6 -3
View File
@@ -38,18 +38,21 @@ public class ViewMetaParser {
viewName = viewName.toLowerCase();
}
String vSchema = null;
//delete the schema if exists
if (viewName.indexOf('.') != -1) {
String[] viewNameInfo = viewName.split("\\.");
String schema = StringUtil.removeBackQuote(viewNameInfo[0]);
if (DbleServer.getInstance().getConfig().getSchemas().get(schema) == null) {
throw new SQLException("Unknown database '" + schema + "'", "42000", ErrorCode.ER_BAD_DB_ERROR);
vSchema = StringUtil.removeBackQuote(viewNameInfo[0]);
if (DbleServer.getInstance().getConfig().getSchemas().get(vSchema) == null) {
throw new SQLException("Unknown database '" + vSchema + "'", "42000", ErrorCode.ER_BAD_DB_ERROR);
}
viewName = viewNameInfo[1];
}
viewName = StringUtil.removeBackQuote(viewName);
if (!StringUtil.isEmpty(vSchema))
viewMeta.setSchema(vSchema);
//get the name of view
viewMeta.setViewName(viewName);
//get the list of column name
src/main/java/com/actiontech/dble/server/handler/ViewHandler.java
+22 -15
View File
@@ -40,11 +40,6 @@ public final class ViewHandler {
public static void handle(int type, String sql, ServerConnection c) {
String schema = c.getSchema();
if (StringUtil.isEmpty(schema)) {
c.writeErrMessage("3D000", "No database selected", ErrorCode.ER_NO_DB_ERROR);
return;
}
try {
handleView(type, schema, sql, c);
} catch (SQLException e) {
@@ -66,7 +61,7 @@ public final class ViewHandler {
replaceView(schema, sql, sqlType, c);
break;
case ServerParse.DROP_VIEW:
deleteView(schema, sql, c);
dropView(schema, sql, c);
break;
default:
break;
@@ -77,6 +72,7 @@ public final class ViewHandler {
//create a new object of the view
ViewMeta vm = new ViewMeta(schema, sql, ProxyMeta.getInstance().getTmManager());
vm.init();
checkSchema(vm.getSchema());
// if the sql can push down nosharding sharding
if (vm.getViewQuery() instanceof TableNode) {
RouteResultset rrs = new RouteResultset(RouterUtil.removeSchema(sql, vm.getSchema()), sqlType);
@@ -94,6 +90,7 @@ public final class ViewHandler {
//create a new object of the view
ViewMeta vm = new ViewMeta(schema, sql, ProxyMeta.getInstance().getTmManager());
vm.init();
checkSchema(vm.getSchema());
// if exist
PlanNode oldViewNode = ProxyMeta.getInstance().getTmManager().getSyncView(vm.getSchema(), vm.getViewName());
if (oldViewNode instanceof TableNode && vm.getViewQuery() instanceof QueryNode) {
@@ -118,7 +115,7 @@ public final class ViewHandler {
writeOkPackage(c);
}
private static void deleteView(String currentSchema, String sql, ServerConnection c) throws Exception {
private static void dropView(String currentSchema, String sql, ServerConnection c) throws Exception {
SQLStatementParser parser = new MySqlStatementParser(sql);
SQLDropViewStatement viewStatement = (SQLDropViewStatement) parser.parseStatement(true);
if (viewStatement.getTableSources() == null || viewStatement.getTableSources().size() == 0) {
@@ -129,23 +126,27 @@ public final class ViewHandler {
ProxyMetaManager proxyManger = ProxyMeta.getInstance().getTmManager();
List<String> deleteMysqlViews = new ArrayList<>(5);
String schema = null;
String vSchema = null;
for (SQLExprTableSource table : viewStatement.getTableSources()) {
schema = table.getSchema() == null ? currentSchema : StringUtil.removeBackQuote(table.getSchema());
vSchema = table.getSchema() == null ? currentSchema : StringUtil.removeBackQuote(table.getSchema());
checkSchema(vSchema);
String viewName = StringUtil.removeBackQuote(table.getName().getSimpleName()).trim();
if (!proxyManger.getCatalogs().get(schema).getViewMetas().containsKey(viewName) && !ifExistsFlag) {
if (proxyManger.getCatalogs().get(vSchema) == null) {
throw new SQLException("Unknown database " + vSchema, "42000", ErrorCode.ER_BAD_DB_ERROR);
}
if (!proxyManger.getCatalogs().get(vSchema).getViewMetas().containsKey(viewName) && !ifExistsFlag) {
throw new SQLException("Unknown view '" + viewName + "'", "HY000", ErrorCode.ER_NO_TABLES_USED);
}
proxyManger.addMetaLock(table.getSchema(), viewName, sql);
proxyManger.addMetaLock(vSchema, viewName, sql);
try {
proxyManger.getRepository().delete(schema, viewName);
ViewMeta vm = proxyManger.getCatalogs().get(schema).getViewMetas().remove(viewName);
proxyManger.getRepository().delete(vSchema, viewName);
ViewMeta vm = proxyManger.getCatalogs().get(vSchema).getViewMetas().remove(viewName);
if (vm != null && vm.getViewQuery() instanceof TableNode) {
deleteMysqlViews.add(viewName);
}
} finally {
proxyManger.removeMetaLock(table.getSchema(), viewName);
proxyManger.removeMetaLock(vSchema, viewName);
}
}
@@ -161,7 +162,7 @@ public final class ViewHandler {
}
dropStmt.deleteCharAt(dropStmt.length() - 1);
RouteResultset rrs = new RouteResultset(dropStmt.toString(), ServerParse.DROP_VIEW);
RouterUtil.routeToSingleNode(rrs, DbleServer.getInstance().getConfig().getSchemas().get(schema).getShardingNode());
RouterUtil.routeToSingleNode(rrs, DbleServer.getInstance().getConfig().getSchemas().get(vSchema).getShardingNode());
MysqlDropViewHandler handler = new MysqlDropViewHandler(c.getSession2(), rrs, deleteMysqlViews.size());
handler.execute();
return;
@@ -181,4 +182,10 @@ public final class ViewHandler {
c.getSession2().multiStatementNextSql(multiStatementFlag);
}
private static void checkSchema(String schema) throws SQLException {
if (StringUtil.isEmpty(schema)) {
throw new SQLException("No database selected", "3D000", ErrorCode.ER_NO_DB_ERROR);
}
}
}