1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Initialize the Hash_set during creation

Browse Source 
If the Hash_set is not initialized, one can not call find() on it before
at least one element has been inserted into it.
This commit is contained in:
Vicențiu Ciorbaru 2021-09-28 22:29:23 +03:00
parent b482e87f26
commit cc08872c16
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_hset.h
View File

@ -28,17 +28,15 @@ class Hash_set
public: public:
enum { START_SIZE= 8 }; enum { START_SIZE= 8 };
/** /**
Constructs an empty hash. Does not allocate memory, it is done upon Constructs an empty unique hash.
the first insert. Thus does not cause or return errors.
*/ */
Hash_set(PSI_memory_key psi_key, uchar *(*K)(const T *, size_t *, my_bool), Hash_set(PSI_memory_key psi_key, uchar *(*K)(const T *, size_t *, my_bool),
CHARSET_INFO *cs= &my_charset_bin) CHARSET_INFO *cs= &my_charset_bin)
{ {
my_hash_clear(&m_hash); my_hash_init(psi_key, &m_hash, cs, START_SIZE, 0, 0, (my_hash_get_key)K, 0,
m_hash.get_key= (my_hash_get_key)K; HASH_UNIQUE);
m_hash.charset= cs;
m_hash.array.m_psi_key= psi_key;
} }
Hash_set(PSI_memory_key psi_key, CHARSET_INFO *charset, ulong default_array_elements, Hash_set(PSI_memory_key psi_key, CHARSET_INFO *charset, ulong default_array_elements,
size_t key_offset, size_t key_length, my_hash_get_key get_key, size_t key_offset, size_t key_length, my_hash_get_key get_key,
void (*free_element)(void*), uint flags) void (*free_element)(void*), uint flags)
@ -65,8 +63,6 @@ public:
*/ */
bool insert(T *value) bool insert(T *value)
{ {
my_hash_init_opt(m_hash.array.m_psi_key, &m_hash, m_hash.charset,
START_SIZE, 0, 0, m_hash.get_key, 0, HASH_UNIQUE);
return my_hash_insert(&m_hash, reinterpret_cast<const uchar*>(value)); return my_hash_insert(&m_hash, reinterpret_cast<const uchar*>(value));
} }
bool remove(T *value) bool remove(T *value)