Some changes in multi-table deletes, with some speed-ups and
incorporations of the new stuff. When Monty approves / corrects it, I will "port" it to multi-table updates. sql/sql_insert.cc: A small bug fix sql/sql_update.cc: query cache invalidation
This commit is contained in:
parent
9f0c13f394
commit
e9b8c183a2
@ -656,7 +656,7 @@ public:
|
|||||||
uint num_of_tables;
|
uint num_of_tables;
|
||||||
int error;
|
int error;
|
||||||
thr_lock_type lock_option;
|
thr_lock_type lock_option;
|
||||||
bool do_delete;
|
bool do_delete, not_trans_safe;
|
||||||
public:
|
public:
|
||||||
multi_delete(THD *thd, TABLE_LIST *dt, thr_lock_type lock_option_arg,
|
multi_delete(THD *thd, TABLE_LIST *dt, thr_lock_type lock_option_arg,
|
||||||
uint num_of_tables);
|
uint num_of_tables);
|
||||||
|
@ -216,6 +216,7 @@ multi_delete::multi_delete(THD *thd_arg, TABLE_LIST *dt,
|
|||||||
do_delete(false)
|
do_delete(false)
|
||||||
{
|
{
|
||||||
uint counter=0;
|
uint counter=0;
|
||||||
|
not_trans_safe=false;
|
||||||
tempfiles = (Unique **) sql_calloc(sizeof(Unique *) * (num_of_tables-1));
|
tempfiles = (Unique **) sql_calloc(sizeof(Unique *) * (num_of_tables-1));
|
||||||
|
|
||||||
(void) dt->table->file->extra(HA_EXTRA_NO_READCHECK);
|
(void) dt->table->file->extra(HA_EXTRA_NO_READCHECK);
|
||||||
@ -225,8 +226,9 @@ multi_delete::multi_delete(THD *thd_arg, TABLE_LIST *dt,
|
|||||||
for (dt=dt->next ; dt ; dt=dt->next,counter++)
|
for (dt=dt->next ; dt ; dt=dt->next,counter++)
|
||||||
{
|
{
|
||||||
TABLE *table=dt->table;
|
TABLE *table=dt->table;
|
||||||
(void) dt->table->file->extra(HA_EXTRA_NO_READCHECK);
|
(void) table->file->extra(HA_EXTRA_NO_READCHECK);
|
||||||
(void) dt->table->file->extra(HA_EXTRA_NO_KEYREAD);
|
(void) table->file->extra(HA_EXTRA_NO_KEYREAD);
|
||||||
|
table->used_keys=0;
|
||||||
tempfiles[counter] = new Unique (refposcmp2,
|
tempfiles[counter] = new Unique (refposcmp2,
|
||||||
(void *) &table->file->ref_length,
|
(void *) &table->file->ref_length,
|
||||||
table->file->ref_length,
|
table->file->ref_length,
|
||||||
@ -279,8 +281,11 @@ multi_delete::initialize_tables(JOIN *join)
|
|||||||
walk=walk->next;
|
walk=walk->next;
|
||||||
if (tab == join->join_tab)
|
if (tab == join->join_tab)
|
||||||
tab->table->no_keyread=1;
|
tab->table->no_keyread=1;
|
||||||
|
if (!not_trans_safe && !tab->table->file->has_transactions())
|
||||||
|
not_trans_safe=true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
init_ftfuncs(thd,1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -290,7 +295,11 @@ multi_delete::~multi_delete()
|
|||||||
for (table_being_deleted=delete_tables ;
|
for (table_being_deleted=delete_tables ;
|
||||||
table_being_deleted ;
|
table_being_deleted ;
|
||||||
table_being_deleted=table_being_deleted->next)
|
table_being_deleted=table_being_deleted->next)
|
||||||
(void) table_being_deleted->table->file->extra(HA_EXTRA_READCHECK);
|
{
|
||||||
|
TABLE *t=table_being_deleted->table;
|
||||||
|
(void) t->file->extra(HA_EXTRA_READCHECK);
|
||||||
|
t->no_keyread=0;
|
||||||
|
}
|
||||||
|
|
||||||
for (uint counter = 0; counter < num_of_tables-1; counter++)
|
for (uint counter = 0; counter < num_of_tables-1; counter++)
|
||||||
{
|
{
|
||||||
@ -339,28 +348,13 @@ bool multi_delete::send_data(List<Item> &values)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* Return true if some table is not transaction safe */
|
|
||||||
|
|
||||||
static bool some_table_is_not_transaction_safe (TABLE_LIST *tl)
|
|
||||||
{
|
|
||||||
for (; tl ; tl=tl->next)
|
|
||||||
{
|
|
||||||
if (!(tl->table->file->has_transactions()))
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void multi_delete::send_error(uint errcode,const char *err)
|
void multi_delete::send_error(uint errcode,const char *err)
|
||||||
{
|
{
|
||||||
/* First send error what ever it is ... */
|
/* First send error what ever it is ... */
|
||||||
::send_error(&thd->net,errcode,err);
|
::send_error(&thd->net,errcode,err);
|
||||||
|
|
||||||
/* reset used flags */
|
/* reset used flags */
|
||||||
delete_tables->table->no_keyread=0;
|
// delete_tables->table->no_keyread=0;
|
||||||
|
|
||||||
/* If nothing deleted return */
|
/* If nothing deleted return */
|
||||||
if (!deleted)
|
if (!deleted)
|
||||||
@ -376,8 +370,7 @@ void multi_delete::send_error(uint errcode,const char *err)
|
|||||||
In all other cases do attempt deletes ...
|
In all other cases do attempt deletes ...
|
||||||
*/
|
*/
|
||||||
if ((table_being_deleted->table->file->has_transactions() &&
|
if ((table_being_deleted->table->file->has_transactions() &&
|
||||||
table_being_deleted == delete_tables) ||
|
table_being_deleted == delete_tables) || !not_trans_safe)
|
||||||
!some_table_is_not_transaction_safe(delete_tables->next))
|
|
||||||
ha_rollback_stmt(thd);
|
ha_rollback_stmt(thd);
|
||||||
else if (do_delete)
|
else if (do_delete)
|
||||||
VOID(do_deletes(true));
|
VOID(do_deletes(true));
|
||||||
@ -441,7 +434,6 @@ int multi_delete::do_deletes (bool from_send_error)
|
|||||||
|
|
||||||
READ_RECORD info;
|
READ_RECORD info;
|
||||||
init_read_record(&info,thd,table,NULL,0,0);
|
init_read_record(&info,thd,table,NULL,0,0);
|
||||||
bool not_trans_safe = some_table_is_not_transaction_safe(delete_tables);
|
|
||||||
while (!(error=info.read_record(&info)) &&
|
while (!(error=info.read_record(&info)) &&
|
||||||
(!thd->killed || from_send_error || not_trans_safe))
|
(!thd->killed || from_send_error || not_trans_safe))
|
||||||
{
|
{
|
||||||
@ -468,7 +460,7 @@ bool multi_delete::send_eof()
|
|||||||
int error = do_deletes(false); /* do_deletes returns 0 if success */
|
int error = do_deletes(false); /* do_deletes returns 0 if success */
|
||||||
|
|
||||||
/* reset used flags */
|
/* reset used flags */
|
||||||
delete_tables->table->no_keyread=0;
|
// delete_tables->table->no_keyread=0; // Will stay in comment until Monty approves changes
|
||||||
thd->proc_info="end";
|
thd->proc_info="end";
|
||||||
if (error)
|
if (error)
|
||||||
{
|
{
|
||||||
@ -481,20 +473,21 @@ bool multi_delete::send_eof()
|
|||||||
was a non-transaction-safe table involved, since
|
was a non-transaction-safe table involved, since
|
||||||
modifications in it cannot be rolled back. */
|
modifications in it cannot be rolled back. */
|
||||||
|
|
||||||
if (deleted || some_table_is_not_transaction_safe(delete_tables))
|
if (deleted || not_trans_safe)
|
||||||
{
|
{
|
||||||
mysql_update_log.write(thd,thd->query,thd->query_length);
|
mysql_update_log.write(thd,thd->query,thd->query_length);
|
||||||
if (mysql_bin_log.is_open())
|
if (mysql_bin_log.is_open())
|
||||||
{
|
{
|
||||||
Query_log_event qinfo(thd, thd->query);
|
Query_log_event qinfo(thd, thd->query);
|
||||||
if (mysql_bin_log.write(&qinfo) &&
|
if (mysql_bin_log.write(&qinfo) &&
|
||||||
!some_table_is_not_transaction_safe(delete_tables))
|
!not_trans_safe)
|
||||||
error=1; // Log write failed: roll back the SQL statement
|
error=1; // Log write failed: roll back the SQL statement
|
||||||
}
|
}
|
||||||
/* Commit or rollback the current SQL statement */
|
/* Commit or rollback the current SQL statement */
|
||||||
VOID(ha_autocommit_or_rollback(thd,error > 0));
|
VOID(ha_autocommit_or_rollback(thd,error > 0));
|
||||||
}
|
}
|
||||||
|
if (deleted)
|
||||||
|
query_cache.invalidate(delete_tables);
|
||||||
::send_ok(&thd->net,deleted);
|
::send_ok(&thd->net,deleted);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -1328,7 +1328,7 @@ void select_insert::send_error(uint errcode,const char *err)
|
|||||||
::send_error(&thd->net,errcode,err);
|
::send_error(&thd->net,errcode,err);
|
||||||
table->file->extra(HA_EXTRA_NO_CACHE);
|
table->file->extra(HA_EXTRA_NO_CACHE);
|
||||||
table->file->activate_all_index(thd);
|
table->file->activate_all_index(thd);
|
||||||
ha_rollback(thd);
|
ha_rollback_stmt(thd);
|
||||||
if (info.copied || info.deleted)
|
if (info.copied || info.deleted)
|
||||||
query_cache.invalidate(table);
|
query_cache.invalidate(table);
|
||||||
}
|
}
|
||||||
|
@ -1862,8 +1862,8 @@ mysql_execute_command(void)
|
|||||||
/* Fix tables-to-be-deleted-from list to point at opened tables */
|
/* Fix tables-to-be-deleted-from list to point at opened tables */
|
||||||
for (auxi=(TABLE_LIST*) aux_tables ; auxi ; auxi=auxi->next)
|
for (auxi=(TABLE_LIST*) aux_tables ; auxi ; auxi=auxi->next)
|
||||||
auxi->table= ((TABLE_LIST*) auxi->table)->table;
|
auxi->table= ((TABLE_LIST*) auxi->table)->table;
|
||||||
if ((result=new multi_delete(thd,aux_tables,lex->lock_option,
|
if (!thd->fatal_error && (result=new multi_delete(thd,aux_tables,
|
||||||
table_count)) && ! thd->fatal_error)
|
lex->lock_option,table_count)))
|
||||||
{
|
{
|
||||||
res=mysql_select(thd,tables,select_lex->item_list,
|
res=mysql_select(thd,tables,select_lex->item_list,
|
||||||
select_lex->where,
|
select_lex->where,
|
||||||
@ -1872,10 +1872,10 @@ mysql_execute_command(void)
|
|||||||
select_lex->options | thd->options |
|
select_lex->options | thd->options |
|
||||||
SELECT_NO_JOIN_CACHE,
|
SELECT_NO_JOIN_CACHE,
|
||||||
result);
|
result);
|
||||||
|
delete result;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
res= -1; // Error is not sent
|
res= -1; // Error is not sent
|
||||||
delete result;
|
|
||||||
close_thread_tables(thd);
|
close_thread_tables(thd);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -792,6 +792,8 @@ bool multi_update::send_eof()
|
|||||||
char buff[80];
|
char buff[80];
|
||||||
sprintf(buff,ER(ER_UPDATE_INFO), (long) found, (long) updated,
|
sprintf(buff,ER(ER_UPDATE_INFO), (long) found, (long) updated,
|
||||||
(long) thd->cuted_fields);
|
(long) thd->cuted_fields);
|
||||||
|
if (updated)
|
||||||
|
query_cache.invalidate(update_tables);
|
||||||
::send_ok(&thd->net,
|
::send_ok(&thd->net,
|
||||||
(thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated,
|
(thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated,
|
||||||
thd->insert_id_used ? thd->insert_id() : 0L,buff);
|
thd->insert_id_used ? thd->insert_id() : 0L,buff);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user