database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-05-28 13:01:26 +03:00
Code

MCOL-218: Make drop database work in the columnstore engine.

Browse Source
This commit is contained in:
Ben Thompson 2016-10-19 15:23:02 -05:00
parent 7c9e6e84c2
commit 87ac01c3d4
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dbcon/mysql/ha_calpont_ddl.cpp
View File

@ -2043,7 +2043,16 @@ int ha_calpont_impl_delete_table_(const char *db, const char *name, cal_connecti
} }
string emsg; string emsg;
stmt = thd->query(); if (thd->lex->sql_command == SQLCOM_DROP_DB)
{
std::string tableName = std::string(name);
tableName.erase(0,tableName.rfind("/")+1);
stmt = std::string("DROP TABLE ") + std::string(tableName);
}
else
{
stmt = thd->query();
}
stmt += ";"; stmt += ";";
int rc = ProcessDDLStatement(stmt, schema, tbl, tid2sid(thd->thread_id), emsg); int rc = ProcessDDLStatement(stmt, schema, tbl, tid2sid(thd->thread_id), emsg);
// cout << "ProcessDDLStatement rc=" << rc << endl; // cout << "ProcessDDLStatement rc=" << rc << endl;

18
dbcon/mysql/ha_calpont_impl.cpp
View File

@ -3161,6 +3161,7 @@ int ha_calpont_impl_create(const char *name, TABLE *table_arg, HA_CREATE_INFO *c
int ha_calpont_impl_delete_table(const char *name) int ha_calpont_impl_delete_table(const char *name)
{ {
THD *thd = current_thd; THD *thd = current_thd;
char *dbName = NULL;
if (!name) if (!name)
{ {
@ -3183,16 +3184,17 @@ int ha_calpont_impl_delete_table(const char *name)
if (!thd->lex) return 0; if (!thd->lex) return 0;
if (!idb_mysql_query_str(thd)) return 0; if (!idb_mysql_query_str(thd)) return 0;
// @bug 1700.
if (thd->lex->sql_command == SQLCOM_DROP_DB) if (thd->lex->sql_command == SQLCOM_DROP_DB)
{ {
thd->get_stmt_da()->set_overwrite_status(true); dbName = thd->lex->name.str;
thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, "Non-empty database can not be dropped. "); }
return 1; else
{
TABLE_LIST *first_table= (TABLE_LIST*) thd->lex->select_lex.table_list.first;
dbName = first_table->db;
} }
TABLE_LIST *first_table= (TABLE_LIST*) thd->lex->select_lex.table_list.first; if (!dbName)
if (!first_table->db)
{ {
setError(thd, ER_INTERNAL_ERROR, "Drop Table with NULL schema not permitted"); setError(thd, ER_INTERNAL_ERROR, "Drop Table with NULL schema not permitted");
return 1; return 1;
@ -3206,7 +3208,7 @@ int ha_calpont_impl_delete_table(const char *name)
return 0; return 0;
} }
// @bug 1793. make vtable droppable in calpontsys. "$vtable" ==> "@0024vtable" passed in as name. // @bug 1793. make vtable droppable in calpontsys. "$vtable" ==> "@0024vtable" passed in as name.
if (strcmp(first_table->db, "calpontsys") == 0 && string(name).find("@0024vtable") == string::npos) if (strcmp(dbName, "calpontsys") == 0 && string(name).find("@0024vtable") == string::npos)
{ {
std::string stmt(idb_mysql_query_str(thd)); std::string stmt(idb_mysql_query_str(thd));
algorithm::to_upper(stmt); algorithm::to_upper(stmt);
@ -3219,7 +3221,7 @@ int ha_calpont_impl_delete_table(const char *name)
return 1; return 1;
} }
int rc = ha_calpont_impl_delete_table_(first_table->db, name, *ci); int rc = ha_calpont_impl_delete_table_(dbName, name, *ci);
return rc; return rc;
} }
int ha_calpont_impl_write_row(uchar *buf, TABLE* table) int ha_calpont_impl_write_row(uchar *buf, TABLE* table)