database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

cleanup: don't allocate memory for virtual columns in rr cache

Browse Source 
as rr_from_cache() does not store virtual columns,
it doesn't need to allocate memory for them either
This commit is contained in:
Sergei Golubchik
2026-01-25 18:26:49 +01:00
parent 28b09e3537
commit 4f9a13e9ec
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/records.cc
View File

@@ -251,10 +251,10 @@ bool init_read_record(READ_RECORD *info,THD *thd, TABLE *table,
!(table->file->ha_table_flags() & HA_FAST_KEY_READ) &&
(table->db_stat & HA_READ_ONLY ||
table->reginfo.lock_type < TL_FIRST_WRITE) &&
(ulonglong) table->s->reclength* (table->file->stats.records+
table->file->stats.deleted) >
(ulonglong) MIN_FILE_LENGTH_TO_USE_ROW_CACHE &&
info->io_cache->end_of_file/info->ref_length * table->s->reclength >
(ulonglong) table->s->stored_rec_length *
(table->file->stats.records + table->file->stats.deleted) >
MIN_FILE_LENGTH_TO_USE_ROW_CACHE &&
info->io_cache->end_of_file/info->ref_length * table->s->stored_rec_length >
(my_off_t) MIN_ROWS_TO_USE_TABLE_CACHE &&
!table->s->blob_fields &&
info->ref_length <= MAX_REFLENGTH)
@@ -661,11 +661,11 @@ static int init_rr_cache(THD *thd, READ_RECORD *info)
uint rec_cache_size, cache_records;
DBUG_ENTER("init_rr_cache");
info->reclength= ALIGN_SIZE(info->table->s->reclength+1);
info->reclength= ALIGN_SIZE(info->table->s->stored_rec_length + 1);
if (info->reclength < STRUCT_LENGTH)
info->reclength= ALIGN_SIZE(STRUCT_LENGTH);
info->error_offset= info->table->s->reclength;
info->error_offset= info->table->s->stored_rec_length;
cache_records= thd->variables.read_rnd_buff_size /
(info->reclength + STRUCT_LENGTH);
rec_cache_size= cache_records * info->reclength;
@@ -711,7 +711,7 @@ static int rr_from_cache(READ_RECORD *info)
else
{
error=0;
memcpy(info->record(), info->cache_pos, table->s->reclength);
memcpy(info->record(), info->cache_pos, table->s->stored_rec_length);
if (table->vfield)
table->update_virtual_fields(table->file, VCOL_UPDATE_FOR_READ);
}

2
sql/sql_const.h
View File

@@ -212,7 +212,7 @@
The following parameters is to decide when to use an extra cache to
optimise seeks when reading a big table in sorted order
*/
#define MIN_FILE_LENGTH_TO_USE_ROW_CACHE (10L*1024*1024)
#define MIN_FILE_LENGTH_TO_USE_ROW_CACHE (10ULL*1024*1024)
#define MIN_ROWS_TO_USE_TABLE_CACHE 100
#define MIN_ROWS_TO_USE_BULK_INSERT 100