database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Don't delete non existing .TMD and .OLD files for Aria internal temporary tables

Browse Source 
(Simple speedup)
This commit is contained in:
Monty
2015-11-10 13:47:28 +02:00
parent 65151e0cd1
commit 3f24cf2dbd
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/maria/ha_maria.cc
View File

@@ -2655,7 +2655,7 @@ void ha_maria::drop_table(const char *name)
{
DBUG_ASSERT(file->s->temporary);
(void) ha_close();
(void) maria_delete_table_files(name, 0);
(void) maria_delete_table_files(name, 1, 0);
}

15
storage/maria/ma_delete_table.c
View File

@@ -78,11 +78,11 @@ int maria_delete_table(const char *name)
DBUG_RETURN(1);
}
DBUG_RETURN(maria_delete_table_files(name, sync_dir));
DBUG_RETURN(maria_delete_table_files(name, 0, sync_dir));
}
int maria_delete_table_files(const char *name, myf sync_dir)
int maria_delete_table_files(const char *name, my_bool temporary, myf sync_dir)
{
char from[FN_REFLEN];
DBUG_ENTER("maria_delete_table_files");
@@ -97,9 +97,12 @@ int maria_delete_table_files(const char *name, myf sync_dir)
DBUG_RETURN(my_errno);
// optional files from maria_pack:
fn_format(from,name,"",".TMD",MY_UNPACK_FILENAME|MY_APPEND_EXT);
mysql_file_delete_with_symlink(key_file_dfile, from, MYF(0));
fn_format(from,name,"",".OLD",MY_UNPACK_FILENAME|MY_APPEND_EXT);
mysql_file_delete_with_symlink(key_file_dfile, from, MYF(0));
if (!temporary)
{
fn_format(from,name,"",".TMD",MY_UNPACK_FILENAME|MY_APPEND_EXT);
mysql_file_delete_with_symlink(key_file_dfile, from, MYF(0));
fn_format(from,name,"",".OLD",MY_UNPACK_FILENAME|MY_APPEND_EXT);
mysql_file_delete_with_symlink(key_file_dfile, from, MYF(0));
}
DBUG_RETURN(0);
}

3
storage/maria/maria_def.h
View File

@@ -1351,7 +1351,8 @@ void _ma_remap_file(MARIA_HA *info, my_off_t size);
MARIA_RECORD_POS _ma_write_init_default(MARIA_HA *info, const uchar *record);
my_bool _ma_write_abort_default(MARIA_HA *info);
int maria_delete_table_files(const char *name, myf sync_dir);
int maria_delete_table_files(const char *name, my_bool temporary,
myf sync_dir);
/*
This cannot be in my_base.h as it clashes with HA_SPATIAL.