mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 12:01:42 +01:00
27b9989d31
The InnoDB adaptive hash index is sometimes degrading the performance of InnoDB, and it is sometimes disabled to get more consistent performance. We should have a compile-time option to disable the adaptive hash index. Let us introduce two options: OPTION(WITH_INNODB_AHI "Include innodb_adaptive_hash_index" ON) OPTION(WITH_INNODB_ROOT_GUESS "Cache index root block descriptors" ON) where WITH_INNODB_AHI always implies WITH_INNODB_ROOT_GUESS. As part of this change, the misleadingly named function trx_search_latch_release_if_reserved(trx) will be replaced with the macro trx_assert_no_search_latch(trx) that will be empty unless BTR_CUR_HASH_ADAPT is defined (cmake -DWITH_INNODB_AHI=ON). We will also remove the unused column INFORMATION_SCHEMA.INNODB_TRX.TRX_ADAPTIVE_HASH_TIMEOUT. In MariaDB Server 10.1, it used to reflect the value of trx_t::search_latch_timeout which could be adjusted during row_search_for_mysql(). In 10.2, there is no such field. Other than the removal of the unused column TRX_ADAPTIVE_HASH_TIMEOUT, this is an almost non-functional change to the server when using the default build options. Some tests are adjusted so that they will work with both -DWITH_INNODB_AHI=ON and -DWITH_INNODB_AHI=OFF. The test innodb.innodb_monitor has been renamed to innodb.monitor in order to track MySQL 5.7, and the duplicate tests sys_vars.innodb_monitor_* are removed.
77 lines
2.6 KiB
Text
77 lines
2.6 KiB
Text
/*****************************************************************************
|
|
|
|
Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
|
|
|
|
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; version 2 of the License.
|
|
|
|
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.,
|
|
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
|
|
|
|
*****************************************************************************/
|
|
|
|
/******************************************************************//**
|
|
@file include/dict0mem.ic
|
|
Data dictionary memory object creation
|
|
|
|
Created 1/8/1996 Heikki Tuuri
|
|
***********************************************************************/
|
|
|
|
#include "data0type.h"
|
|
#include "dict0mem.h"
|
|
#include "fil0fil.h"
|
|
|
|
/**********************************************************************//**
|
|
This function poplulates a dict_index_t index memory structure with
|
|
supplied information. */
|
|
UNIV_INLINE
|
|
void
|
|
dict_mem_fill_index_struct(
|
|
/*=======================*/
|
|
dict_index_t* index, /*!< out: index to be filled */
|
|
mem_heap_t* heap, /*!< in: memory heap */
|
|
const char* table_name, /*!< in: table name */
|
|
const char* index_name, /*!< in: index name */
|
|
ulint space, /*!< in: space where the index tree is
|
|
placed, ignored if the index is of
|
|
the clustered type */
|
|
ulint type, /*!< in: DICT_UNIQUE,
|
|
DICT_CLUSTERED, ... ORed */
|
|
ulint n_fields) /*!< in: number of fields */
|
|
{
|
|
|
|
if (heap) {
|
|
index->heap = heap;
|
|
index->name = mem_heap_strdup(heap, index_name);
|
|
index->fields = (dict_field_t*) mem_heap_alloc(
|
|
heap, 1 + n_fields * sizeof(dict_field_t));
|
|
} else {
|
|
index->name = index_name;
|
|
index->heap = NULL;
|
|
index->fields = NULL;
|
|
}
|
|
|
|
/* Assign a ulint to a 4-bit-mapped field.
|
|
Only the low-order 4 bits are assigned. */
|
|
index->type = type;
|
|
index->space = (unsigned int) space;
|
|
index->page = FIL_NULL;
|
|
index->merge_threshold = DICT_INDEX_MERGE_THRESHOLD_DEFAULT;
|
|
index->table_name = table_name;
|
|
index->n_fields = (unsigned int) n_fields;
|
|
/* The '1 +' above prevents allocation
|
|
of an empty mem block */
|
|
index->nulls_equal = false;
|
|
#ifdef BTR_CUR_HASH_ADAPT
|
|
#ifdef MYSQL_INDEX_DISABLE_AHI
|
|
index->disable_ahi = false;
|
|
#endif
|
|
#endif /* BTR_CUR_HASH_ADAPT */
|
|
ut_d(index->magic_n = DICT_INDEX_MAGIC_N);
|
|
}
|