database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

UPDATE/DELETE post-fixes

Browse Source
This commit is contained in:
Sergei Golubchik
2024-07-18 14:43:47 +02:00
parent f2512c0fa8
commit f44989ff0f
9 changed files with 130 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
sql/sql_base.cc
View File

@@ -9887,12 +9887,13 @@ int TABLE::hlindex_open(uint nr)
else
mysql_mutex_unlock(&s->LOCK_share);
TABLE *table= (TABLE*)alloc_root(&mem_root, sizeof(*table));
if (!table ||
open_table_from_share(in_use, s->hlindex, &empty_clex_str, db_stat, EXTRA_RECORD,
in_use->open_options, table, 0))
if (!table || open_table_from_share(in_use, s->hlindex, &empty_clex_str,
db_stat, EXTRA_RECORD, in_use->open_options, table, 0))
return 1;
hlindex= table;
}
else if (hlindex->in_use == in_use)
return 0;
hlindex->in_use= in_use; // mark in use for this query
hlindex->use_all_columns();
return hlindex->file->ha_external_lock(in_use, F_WRLCK);
@@ -9902,17 +9903,8 @@ int TABLE::open_hlindexes_for_write()
{
DBUG_ASSERT(s->hlindexes() <= 1);
for (uint i= s->keys; i < s->total_keys; i++)
{
KEY *key= s->key_info + i;
for (uint j=0; j < key->usable_key_parts; j++)
// TODO WHY?
// if (bitmap_is_set(write_set, key->key_part[j].fieldnr - 1))
{
if (hlindex_open(i))
return 1;
break;
}
}
if (hlindex_open(i))
return 1;
return 0;
}
@@ -9937,38 +9929,35 @@ int TABLE::hlindexes_on_insert()
int TABLE::hlindexes_on_update()
{
DBUG_ASSERT(s->total_keys - s->keys == (hlindex != NULL));
if (!hlindex || !hlindex->in_use)
return 0;
int err;
// mark deleted node invalid and insert node for new row
if ((err= mhnsw_invalidate(this, this->record[1], key_info + s->keys)) ||
(err= mhnsw_insert(this, key_info + s->keys)))
return err;
DBUG_ASSERT(s->hlindexes() == (hlindex != NULL));
if (hlindex && hlindex->in_use)
{
int err;
// mark deleted node invalid and insert node for new row
if ((err= mhnsw_invalidate(this, record[1], key_info + s->keys)) ||
(err= mhnsw_insert(this, key_info + s->keys)))
return err;
}
return 0;
}
int TABLE::hlindexes_on_delete()
int TABLE::hlindexes_on_delete(const uchar *buf)
{
DBUG_ASSERT(s->total_keys - s->keys == (hlindex != NULL));
if (!hlindex || !hlindex->in_use)
return 0;
if (int err= mhnsw_invalidate(this, this->record[0], key_info + s->keys))
return err;
DBUG_ASSERT(s->hlindexes() == (hlindex != NULL));
DBUG_ASSERT(buf == record[0] || buf == record[1]); // note: REPLACE
if (hlindex && hlindex->in_use)
if (int err= mhnsw_invalidate(this, buf, key_info + s->keys))
return err;
return 0;
}
int TABLE::hlindexes_on_delete_all()
{
DBUG_ASSERT(s->total_keys - s->keys == (hlindex != NULL));
if (!hlindex || !hlindex->in_use)
return 0;
this->hlindex->file->ha_delete_all_rows();
DBUG_ASSERT(s->hlindexes() == (hlindex != NULL));
if (hlindex && hlindex->in_use)
if (int err= mhnsw_delete_all(this, key_info + s->keys))
return err;
return 0;
}