mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
4b20ccafaa
locks on the table Fixing the partitioning specifics after TRUNCATE TABLE in bug-42643 was fixed. Reorganize of code to decrease the size of the giant switch in mysql_execute_command, and to prepare for future parser reengineering. Moved code into Sql_statement objects. Updated patch according to davi's review comments. libmysqld/CMakeLists.txt: Added new files. libmysqld/Makefile.am: Added new files. mysql-test/r/not_partition.result: now returning error on partitioning commands if partitioning is not enabled. mysql-test/r/partition_disabled.result: There is no partition handlerton, so it cannot find the specified engine in the .frm file. mysql-test/r/partition_truncate.result: Updated test results. mysql-test/suite/parts/inc/partition_mgm.inc: Added check that TRUNCATE PARTITION does not delete on failure. mysql-test/suite/parts/r/partition_debug_sync_innodb.result: updated results. mysql-test/suite/parts/r/partition_mgm_lc0_archive.result: updated results. mysql-test/suite/parts/r/partition_mgm_lc1_archive.result: updated results. mysql-test/suite/parts/r/partition_mgm_lc2_archive.result: updated results. mysql-test/suite/parts/t/partition_debug_sync_innodb.test: Test case for this bug. mysql-test/t/not_partition.test: Added check for TRUNCATE PARTITION without partitioning. mysql-test/t/partition_truncate.test: Added test of TRUNCATE PARTITION on non partitioned table. sql/CMakeLists.txt: Added new files. sql/Makefile.am: Added new files. sql/datadict.cc: Moved out the storage engine check into an own function, including assert for lock. sql/datadict.h: added dd_frm_storage_engine. sql/sql_alter_table.cc: moved the code for SQLCOM_ALTER_TABLE in mysql_execute_command into its own file, and using the Sql_statement object to prepare for future parser reengineering. sql/sql_alter_table.h: Created Sql_statement object for ALTER TABLE. sql/sql_lex.cc: resetting m_stmt. sql/sql_lex.h: Temporary hack for forward declaration of enum_alter_table_change_level. sql/sql_parse.cc: Moved out ALTER/ANALYZE/CHECK/OPTIMIZE/REPAIR TABLE from the giant switch into their own Sql_statement objects. sql/sql_parse.h: Exporting check_merge_table_access. sql/sql_partition_admin.cc: created Sql_statement for ALTER TABLE t ANALYZE/CHECK/OPTIMIZE/REPAIR/TRUNCATE PARTITION. To be able to reuse the TABLE equivalents. sql/sql_partition_admin.h: Added Sql_statement of partition admin statements. sql/sql_table.cc: Moved table maintenance code into sql_table_maintenance.cc sql/sql_table.h: Moved table maintenance code into sql_table_maintenance.h exporting functions used by sql_table_maintenance. sql/sql_table_maintenance.cc: Moved table maintenance code from sql_table.cc sql/sql_table_maintenance.h: Sql_statement objects for ANALYZE/CHECK/OPTIMIZE/REPAIR TABLE. Also declaring the keycache functions. sql/sql_truncate.cc: Moved code from SQLCOM_TRUNCATE in mysql_execute_command into Truncate_statement::execute. Added check for partitioned table on TRUNCATE PARTITION. Moved locking fix for partitioned table into Alter_table_truncate_partition::execute. sql/sql_truncate.h: Truncate_statement declaration (sub class of Sql_statement). sql/sql_yacc.yy: Using the new Sql_statment objects.
139 lines
4 KiB
C++
139 lines
4 KiB
C++
/* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
|
|
|
#include "sql_parse.h" // check_one_table_access
|
|
#include "sql_table.h" // mysql_alter_table, etc.
|
|
#include "sql_lex.h" // Sql_statement
|
|
#include "sql_truncate.h" // mysql_truncate_table,
|
|
// Truncate_statement
|
|
#include "sql_table_maintenance.h" // Analyze/Check/.._table_statement
|
|
#include "sql_partition_admin.h" // Alter_table_*_partition
|
|
|
|
#ifndef WITH_PARTITION_STORAGE_ENGINE
|
|
|
|
bool Partition_statement_unsupported::execute(THD *)
|
|
{
|
|
DBUG_ENTER("Partition_statement_unsupported::execute");
|
|
/* error, partitioning support not compiled in... */
|
|
my_error(ER_FEATURE_DISABLED, MYF(0), "partitioning",
|
|
"--with-plugin-partition");
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
|
|
#else
|
|
|
|
bool Alter_table_analyze_partition_statement::execute(THD *thd)
|
|
{
|
|
bool res;
|
|
DBUG_ENTER("Alter_table_analyze_partition_statement::execute");
|
|
|
|
/*
|
|
Flag that it is an ALTER command which administrates partitions, used
|
|
by ha_partition
|
|
*/
|
|
m_lex->alter_info.flags|= ALTER_ADMIN_PARTITION;
|
|
|
|
res= Analyze_table_statement::execute(thd);
|
|
|
|
DBUG_RETURN(res);
|
|
}
|
|
|
|
|
|
bool Alter_table_check_partition_statement::execute(THD *thd)
|
|
{
|
|
bool res;
|
|
DBUG_ENTER("Alter_table_check_partition_statement::execute");
|
|
|
|
/*
|
|
Flag that it is an ALTER command which administrates partitions, used
|
|
by ha_partition
|
|
*/
|
|
m_lex->alter_info.flags|= ALTER_ADMIN_PARTITION;
|
|
|
|
res= Check_table_statement::execute(thd);
|
|
|
|
DBUG_RETURN(res);
|
|
}
|
|
|
|
|
|
bool Alter_table_optimize_partition_statement::execute(THD *thd)
|
|
{
|
|
bool res;
|
|
DBUG_ENTER("Alter_table_optimize_partition_statement::execute");
|
|
|
|
/*
|
|
Flag that it is an ALTER command which administrates partitions, used
|
|
by ha_partition
|
|
*/
|
|
m_lex->alter_info.flags|= ALTER_ADMIN_PARTITION;
|
|
|
|
res= Optimize_table_statement::execute(thd);
|
|
|
|
DBUG_RETURN(res);
|
|
}
|
|
|
|
|
|
bool Alter_table_repair_partition_statement::execute(THD *thd)
|
|
{
|
|
bool res;
|
|
DBUG_ENTER("Alter_table_repair_partition_statement::execute");
|
|
|
|
/*
|
|
Flag that it is an ALTER command which administrates partitions, used
|
|
by ha_partition
|
|
*/
|
|
m_lex->alter_info.flags|= ALTER_ADMIN_PARTITION;
|
|
|
|
res= Repair_table_statement::execute(thd);
|
|
|
|
DBUG_RETURN(res);
|
|
}
|
|
|
|
|
|
bool Alter_table_truncate_partition_statement::execute(THD *thd)
|
|
{
|
|
TABLE_LIST *first_table= thd->lex->select_lex.table_list.first;
|
|
bool res;
|
|
enum_sql_command original_sql_command;
|
|
DBUG_ENTER("Alter_table_truncate_partition_statement::execute");
|
|
|
|
/*
|
|
Execute TRUNCATE PARTITION just like TRUNCATE TABLE.
|
|
Some storage engines (InnoDB, partition) checks thd_sql_command,
|
|
so we set it to SQLCOM_TRUNCATE during the execution.
|
|
*/
|
|
original_sql_command= m_lex->sql_command;
|
|
m_lex->sql_command= SQLCOM_TRUNCATE;
|
|
|
|
/*
|
|
Flag that it is an ALTER command which administrates partitions, used
|
|
by ha_partition.
|
|
*/
|
|
m_lex->alter_info.flags|= ALTER_ADMIN_PARTITION;
|
|
|
|
/*
|
|
Fix the lock types (not the same as ordinary ALTER TABLE).
|
|
*/
|
|
first_table->lock_type= TL_WRITE;
|
|
first_table->mdl_request.set_type(MDL_SHARED_NO_READ_WRITE);
|
|
|
|
/* execute as a TRUNCATE TABLE */
|
|
res= Truncate_statement::execute(thd);
|
|
|
|
m_lex->sql_command= original_sql_command;
|
|
DBUG_RETURN(res);
|
|
}
|
|
|
|
#endif /* WITH_PARTITION_STORAGE_ENGINE */
|