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

Have ha_partition ignore HA_EXTRA..CHILDREN extra() calls if no myisamrg

Browse Source 
MDEV-33502 Slowdown when running nested statement with many partitions

Optimization for tables with a lot of partitions
This commit is contained in:
Monty 2024-02-18 16:02:40 +02:00
parent 71834ccb6c
commit a8f6b86c90
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sql/ha_partition.cc
View File

@ -398,6 +398,7 @@ void ha_partition::init_handler_variables()
m_start_key.length= 0;
m_myisam= FALSE;
m_innodb= FALSE;
m_myisammrg= FALSE;
m_extra_cache= FALSE;
m_extra_cache_size= 0;
m_extra_prepare_for_update= FALSE;
@ -3030,6 +3031,10 @@ bool ha_partition::create_handlers(MEM_ROOT *mem_root)
DBUG_PRINT("info", ("InnoDB"));
m_innodb= TRUE;
}
else if (ha_legacy_type(hton0) == DB_TYPE_MRG_MYISAM)
{
m_myisammrg= TRUE;
}
DBUG_RETURN(FALSE);
}
@ -9419,9 +9424,14 @@ int ha_partition::extra(enum ha_extra_function operation)
}
/* Category 9) Operations only used by MERGE */
case HA_EXTRA_ADD_CHILDREN_LIST:
if (!m_myisammrg)
DBUG_RETURN(0);
DBUG_RETURN(loop_partitions(extra_cb, &operation));
case HA_EXTRA_ATTACH_CHILDREN:
{
if (!m_myisammrg)
DBUG_RETURN(0);
int result;
uint num_locks;
handler **file;
@ -9440,8 +9450,9 @@ int ha_partition::extra(enum ha_extra_function operation)
break;
}
case HA_EXTRA_IS_ATTACHED_CHILDREN:
DBUG_RETURN(loop_partitions(extra_cb, &operation));
case HA_EXTRA_DETACH_CHILDREN:
if (!m_myisammrg)
DBUG_RETURN(0);
DBUG_RETURN(loop_partitions(extra_cb, &operation));
case HA_EXTRA_MARK_AS_LOG_TABLE:
/*

1
sql/ha_partition.h
View File

@ -399,6 +399,7 @@ private:
*/
bool m_innodb; // Are all underlying handlers
// InnoDB
bool m_myisammrg; // Are any of the handlers of type MERGE
/*
When calling extra(HA_EXTRA_CACHE) we do not pass this to the underlying
handlers immediately. Instead we cache it and call the underlying