mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
4f18083b08
The problem was that TRUNCATE TABLE didn't take a exclusive lock on a table if it resorted to truncating via delete of all rows in the table. Specifically for InnoDB tables, this could break proper isolation as InnoDB ends up aborting some granted locks when truncating a table. The solution is to take a exclusive metadata lock before TRUNCATE TABLE can proceed. This guarantees that no other transaction is using the table. Incompatible change: Truncate via delete no longer fails if sql_safe_updates is activated (this was a undocumented side effect). libmysqld/CMakeLists.txt: Add new files to the build list. libmysqld/Makefile.am: Add new files to the build list. mysql-test/extra/binlog_tests/binlog_truncate.test: Add test case for Bug#42643 mysql-test/include/mix1.inc: Update test case as TRUNCATE TABLE now grabs a exclusive lock. Ensure that TRUNCATE waits for granted locks on the table. mysql-test/suite/binlog/t/binlog_truncate_innodb.test: As with other data modifying statements, TRUNCATE is still not possible in a transaction with isolation level READ COMMITTED or READ UNCOMMITED. It would be possible to implement so, but it is not worth the effort. mysql-test/suite/binlog/t/binlog_truncate_myisam.test: Test under different binlog formats. mysql-test/suite/binlog/t/disabled.def: Re-enable test case. mysql-test/t/innodb_bug38231.test: Truncate no longer works with row-level locks. mysql-test/t/mdl_sync.test: Ensure that a acquired lock is not given up due to a conflict. mysql-test/t/partition_innodb_semi_consistent.test: End transaction as to release metadata locks. mysql-test/t/truncate.test: A metadata lock is now taken before the object is verified. sql/CMakeLists.txt: Add new files to the build list. sql/Makefile.am: Add new files to the build list. sql/datadict.cc: Introduce a new file specific for data dictionary operations. sql/datadict.h: Add header file. sql/sql_base.cc: Rename data dictionary function. sql/sql_bitmap.h: Include dependency. sql/sql_delete.cc: Move away from relying on mysql_delete() to delete all rows of a table. Thus, move any bits related to truncate to sql_truncate.cc sql/sql_delete.h: Remove parameter. sql/sql_parse.cc: Add protection against the global read lock -- a intention exclusive lock can be acquired in the truncate path. sql/sql_show.cc: Add sync point for testing scenarios where a pending flush is ignored. sql/sql_truncate.cc: Acquire a shared metadata lock before accessing table metadata. Upgrade the lock to a exclusive one if the table can be re-created. Rework binlog rules to better reflect the requirements. sql/sql_yacc.yy: Set appropriate lock types for table to be truncated. sql/table.h: Move to data dictionary header.
146 lines
5.3 KiB
C++
146 lines
5.3 KiB
C++
/* Copyright (C) 2003 MySQL AB
|
|
|
|
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/*
|
|
Implementation of a bitmap type.
|
|
The idea with this is to be able to handle any constant number of bits but
|
|
also be able to use 32 or 64 bits bitmaps very efficiently
|
|
*/
|
|
|
|
#ifndef SQL_BITMAP_INCLUDED
|
|
#define SQL_BITMAP_INCLUDED
|
|
|
|
#include <my_sys.h>
|
|
#include <my_bitmap.h>
|
|
|
|
template <uint default_width> class Bitmap
|
|
{
|
|
MY_BITMAP map;
|
|
uint32 buffer[(default_width+31)/32];
|
|
public:
|
|
Bitmap() { init(); }
|
|
Bitmap(const Bitmap& from) { *this=from; }
|
|
explicit Bitmap(uint prefix_to_set) { init(prefix_to_set); }
|
|
void init() { bitmap_init(&map, buffer, default_width, 0); }
|
|
void init(uint prefix_to_set) { init(); set_prefix(prefix_to_set); }
|
|
uint length() const { return default_width; }
|
|
Bitmap& operator=(const Bitmap& map2)
|
|
{
|
|
init();
|
|
memcpy(buffer, map2.buffer, sizeof(buffer));
|
|
return *this;
|
|
}
|
|
void set_bit(uint n) { bitmap_set_bit(&map, n); }
|
|
void clear_bit(uint n) { bitmap_clear_bit(&map, n); }
|
|
void set_prefix(uint n) { bitmap_set_prefix(&map, n); }
|
|
void set_all() { bitmap_set_all(&map); }
|
|
void clear_all() { bitmap_clear_all(&map); }
|
|
void intersect(Bitmap& map2) { bitmap_intersect(&map, &map2.map); }
|
|
void intersect(ulonglong map2buff)
|
|
{
|
|
MY_BITMAP map2;
|
|
bitmap_init(&map2, (uint32 *)&map2buff, sizeof(ulonglong)*8, 0);
|
|
bitmap_intersect(&map, &map2);
|
|
}
|
|
/* Use highest bit for all bits above sizeof(ulonglong)*8. */
|
|
void intersect_extended(ulonglong map2buff)
|
|
{
|
|
intersect(map2buff);
|
|
if (map.n_bits > sizeof(ulonglong) * 8)
|
|
bitmap_set_above(&map, sizeof(ulonglong),
|
|
test(map2buff & (LL(1) << (sizeof(ulonglong) * 8 - 1))));
|
|
}
|
|
void subtract(Bitmap& map2) { bitmap_subtract(&map, &map2.map); }
|
|
void merge(Bitmap& map2) { bitmap_union(&map, &map2.map); }
|
|
my_bool is_set(uint n) const { return bitmap_is_set(&map, n); }
|
|
my_bool is_prefix(uint n) const { return bitmap_is_prefix(&map, n); }
|
|
my_bool is_clear_all() const { return bitmap_is_clear_all(&map); }
|
|
my_bool is_set_all() const { return bitmap_is_set_all(&map); }
|
|
my_bool is_subset(const Bitmap& map2) const { return bitmap_is_subset(&map, &map2.map); }
|
|
my_bool is_overlapping(const Bitmap& map2) const { return bitmap_is_overlapping(&map, &map2.map); }
|
|
my_bool operator==(const Bitmap& map2) const { return bitmap_cmp(&map, &map2.map); }
|
|
char *print(char *buf) const
|
|
{
|
|
char *s=buf;
|
|
const uchar *e=(uchar *)buffer, *b=e+sizeof(buffer)-1;
|
|
while (!*b && b>e)
|
|
b--;
|
|
if ((*s=_dig_vec_upper[*b >> 4]) != '0')
|
|
s++;
|
|
*s++=_dig_vec_upper[*b & 15];
|
|
while (--b>=e)
|
|
{
|
|
*s++=_dig_vec_upper[*b >> 4];
|
|
*s++=_dig_vec_upper[*b & 15];
|
|
}
|
|
*s=0;
|
|
return buf;
|
|
}
|
|
ulonglong to_ulonglong() const
|
|
{
|
|
if (sizeof(buffer) >= 8)
|
|
return uint8korr(buffer);
|
|
DBUG_ASSERT(sizeof(buffer) >= 4);
|
|
return (ulonglong) uint4korr(buffer);
|
|
}
|
|
};
|
|
|
|
template <> class Bitmap<64>
|
|
{
|
|
ulonglong map;
|
|
public:
|
|
Bitmap<64>() { }
|
|
#if defined(__NETWARE__) || defined(__MWERKS__)
|
|
/*
|
|
Metwork compiler gives error on Bitmap<64>
|
|
Changed to Bitmap, since in this case also it will proper construct
|
|
this class
|
|
*/
|
|
explicit Bitmap(uint prefix_to_set) { set_prefix(prefix_to_set); }
|
|
#else
|
|
explicit Bitmap<64>(uint prefix_to_set) { set_prefix(prefix_to_set); }
|
|
#endif
|
|
void init() { }
|
|
void init(uint prefix_to_set) { set_prefix(prefix_to_set); }
|
|
uint length() const { return 64; }
|
|
void set_bit(uint n) { map|= ((ulonglong)1) << n; }
|
|
void clear_bit(uint n) { map&= ~(((ulonglong)1) << n); }
|
|
void set_prefix(uint n)
|
|
{
|
|
if (n >= length())
|
|
set_all();
|
|
else
|
|
map= (((ulonglong)1) << n)-1;
|
|
}
|
|
void set_all() { map=~(ulonglong)0; }
|
|
void clear_all() { map=(ulonglong)0; }
|
|
void intersect(Bitmap<64>& map2) { map&= map2.map; }
|
|
void intersect(ulonglong map2) { map&= map2; }
|
|
void intersect_extended(ulonglong map2) { map&= map2; }
|
|
void subtract(Bitmap<64>& map2) { map&= ~map2.map; }
|
|
void merge(Bitmap<64>& map2) { map|= map2.map; }
|
|
my_bool is_set(uint n) const { return test(map & (((ulonglong)1) << n)); }
|
|
my_bool is_prefix(uint n) const { return map == (((ulonglong)1) << n)-1; }
|
|
my_bool is_clear_all() const { return map == (ulonglong)0; }
|
|
my_bool is_set_all() const { return map == ~(ulonglong)0; }
|
|
my_bool is_subset(const Bitmap<64>& map2) const { return !(map & ~map2.map); }
|
|
my_bool is_overlapping(const Bitmap<64>& map2) const { return (map & map2.map)!= 0; }
|
|
my_bool operator==(const Bitmap<64>& map2) const { return map == map2.map; }
|
|
char *print(char *buf) const { longlong2str(map,buf,16); return buf; }
|
|
ulonglong to_ulonglong() const { return map; }
|
|
};
|
|
|
|
|
|
#endif /* SQL_BITMAP_INCLUDED */
|