mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
f1d5c0489b
This patch allows to configure MyISAM for 128 indexes per table. The main problem is the key_map, wich is implemented as an ulonglong. To get rid of the limit and keep the efficient and flexible implementation, the highest bit is now used for all upper keys. This means that the lower keys can be disabled and enabled individually as usual and the high keys can only be disabled and enabled as a block. That way the existing test suite is still applicable, while more keys work, though slightly less efficient. To really get more than 64 keys, some defines need to be changed. Another patch will address this. include/my_bitmap.h: Bug#10932 - Building server with key limit of 128, makes test cases fail Added the declaration for a function that extends the highest bit value to all upper bits of a bigger bitmap. include/myisam.h: Bug#10932 - Building server with key limit of 128, makes test cases fail Changed MI_MAX_POSSIBLE_KEY to what it was meant for. Added a bunch of macros to handle the MyISAM key_map. myisam/mi_check.c: Bug#10932 - Building server with key limit of 128, makes test cases fail Changed key_map access to use the new macros. myisam/mi_create.c: Bug#10932 - Building server with key limit of 128, makes test cases fail Changed key_map access to use the new macros. myisam/mi_delete.c: Bug#10932 - Building server with key limit of 128, makes test cases fail Changed key_map access to use the new macros. myisam/mi_extra.c: Bug#10932 - Building server with key limit of 128, makes test cases fail Changed key_map access to use the new macros. myisam/mi_open.c: Bug#10932 - Building server with key limit of 128, makes test cases fail Changed key_map access to use the new macros. Changed pointer types from signed char* to unsigned char*. myisam/mi_preload.c: Bug#10932 - Building server with key limit of 128, makes test cases fail Changed key_map access to use the new macros. myisam/mi_rsame.c: Bug#10932 - Building server with key limit of 128, makes test cases fail Changed key_map access to use the new macros. myisam/mi_rsamepos.c: Bug#10932 - Building server with key limit of 128, makes test cases fail Changed key_map access to use the new macros. myisam/mi_search.c: Bug#10932 - Building server with key limit of 128, makes test cases fail Changed key_map access to use the new macros. myisam/mi_update.c: Bug#10932 - Building server with key limit of 128, makes test cases fail Changed key_map access to use the new macros. myisam/mi_write.c: Bug#10932 - Building server with key limit of 128, makes test cases fail Changed key_map access to use the new macros. myisam/myisamchk.c: Bug#10932 - Building server with key limit of 128, makes test cases fail Changed key_map access to use the new macros. myisam/myisamdef.h: Bug#10932 - Building server with key limit of 128, makes test cases fail Changed pointer types from signed char* to unsigned char*. myisam/myisamlog.c: Bug#10932 - Building server with key limit of 128, makes test cases fail Changed key_map access to use the new macros. myisam/myisampack.c: Bug#10932 - Building server with key limit of 128, makes test cases fail Changed key_map access to use the new macros. myisam/sort.c: Bug#10932 - Building server with key limit of 128, makes test cases fail Changed key_map access to use the new macros. mysys/my_bitmap.c: Bug#10932 - Building server with key limit of 128, makes test cases fail Added a function that extends the highest bit value to all upper bits of a bigger bitmap. sql/ha_myisam.cc: Bug#10932 - Building server with key limit of 128, makes test cases fail Changed key_map access to use the new macros. sql/sql_bitmap.h: Bug#10932 - Building server with key limit of 128, makes test cases fail Added a method that extends the highest bit value to all upper bits of a bigger bitmap.
139 lines
5 KiB
C++
139 lines
5 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; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
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
|
|
*/
|
|
|
|
#include <my_bitmap.h>
|
|
|
|
template <uint default_width> class Bitmap
|
|
{
|
|
MY_BITMAP map;
|
|
uchar buffer[(default_width+7)/8];
|
|
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, (uchar *)&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.bitmap_size > sizeof(ulonglong))
|
|
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 operator==(const Bitmap& map2) const { return bitmap_cmp(&map, &map2.map); }
|
|
char *print(char *buf) const
|
|
{
|
|
char *s=buf;
|
|
const uchar *e=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 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; }
|
|
};
|
|
|