~tsarev/percona-server/5.5-processlist_rows_stats-sporadic_fails-fix

# name       : innodb_adaptive_hash_index_num.patch

# introduced : XtraDB on 5.5 (-13?)

# maintainer : Yasufumi

#

#!!! notice !!!

# Any small change to this file in the main branch

# should be done or reviewed by the maintainer!

diff -ruN a/storage/innobase/btr/btr0btr.c b/storage/innobase/btr/btr0btr.c

--- a/storage/innobase/btr/btr0btr.c	2010-12-04 15:52:23.355483176 +0900

+++ b/storage/innobase/btr/btr0btr.c	2010-12-04 16:12:48.639514256 +0900

@@ -1518,7 +1518,7 @@

 	}

 	ut_a(block);

-	btr_search_drop_page_hash_index(block);

+	btr_search_drop_page_hash_index(block, NULL);

 	header = buf_block_get_frame(block) + PAGE_HEADER + PAGE_BTR_SEG_TOP;

 #ifdef UNIV_BTR_DEBUG

@@ -1587,7 +1587,7 @@

 #ifndef UNIV_HOTBACKUP

 	if (UNIV_LIKELY(!recovery)) {

-		btr_search_drop_page_hash_index(block);

+		btr_search_drop_page_hash_index(block, index);

 	}

 	block->check_index_page_at_flush = TRUE;

@@ -1755,7 +1755,7 @@

 	ut_a(!page_zip || page_zip_validate(page_zip, page));

 #endif /* UNIV_ZIP_DEBUG */

-	btr_search_drop_page_hash_index(block);

+	btr_search_drop_page_hash_index(block, index);

 	btr_blob_dbg_remove(page, index, "btr_page_empty");

 	/* Recreate the page: note that global data on page (possible

@@ -3065,7 +3065,7 @@

 		mem_heap_free(heap);

 	}

-	btr_search_drop_page_hash_index(block);

+	btr_search_drop_page_hash_index(block, index);

 	/* Make the father empty */

 	btr_page_empty(father_block, father_page_zip, index, page_level, mtr);

@@ -3289,7 +3289,7 @@

 			goto err_exit;

 		}

-		btr_search_drop_page_hash_index(block);

+		btr_search_drop_page_hash_index(block, index);

 		/* Remove the page from the level list */

 		btr_level_list_remove(space, zip_size, page, mtr);

@@ -3330,7 +3330,7 @@

 			goto err_exit;

 		}

-		btr_search_drop_page_hash_index(block);

+		btr_search_drop_page_hash_index(block, index);

 #ifdef UNIV_BTR_DEBUG

 		if (UNIV_LIKELY_NULL(merge_page_zip)) {

@@ -3445,7 +3445,7 @@

 		ut_a(btr_page_get_next(page, mtr) == FIL_NULL);

 		ut_ad(mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX));

-		btr_search_drop_page_hash_index(block);

+		btr_search_drop_page_hash_index(block, index);

 		btr_page_get_father(index, block, mtr, &cursor);

 		father = btr_cur_get_block(&cursor);

@@ -3550,7 +3550,7 @@

 	page = buf_block_get_frame(block);

 	ut_a(page_is_comp(merge_page) == page_is_comp(page));

-	btr_search_drop_page_hash_index(block);

+	btr_search_drop_page_hash_index(block, index);

 	if (left_page_no == FIL_NULL && !page_is_leaf(page)) {

diff -ruN a/storage/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c

--- a/storage/innobase/btr/btr0cur.c	2010-12-04 15:52:23.359513820 +0900

+++ b/storage/innobase/btr/btr0cur.c	2010-12-04 16:12:48.643551837 +0900

@@ -498,7 +498,7 @@

 #ifdef UNIV_SEARCH_PERF_STAT

 	info->n_searches++;

 #endif

-	if (rw_lock_get_writer(&btr_search_latch) == RW_LOCK_NOT_LOCKED

+	if (rw_lock_get_writer(btr_search_get_latch(cursor->index->id)) == RW_LOCK_NOT_LOCKED

 	    && latch_mode <= BTR_MODIFY_LEAF

 	    && info->last_hash_succ

 	    && !estimate

@@ -534,7 +534,7 @@

 	if (has_search_latch) {

 		/* Release possible search latch to obey latching order */

-		rw_lock_s_unlock(&btr_search_latch);

+		rw_lock_s_unlock(btr_search_get_latch(cursor->index->id));

 	}

 	/* Store the position of the tree latch we push to mtr so that we

@@ -856,7 +856,7 @@

 	if (has_search_latch) {

-		rw_lock_s_lock(&btr_search_latch);

+		rw_lock_s_lock(btr_search_get_latch(cursor->index->id));

 	}

 }

@@ -1971,7 +1971,7 @@

 			btr_search_update_hash_on_delete(cursor);

 		}

-		rw_lock_x_lock(&btr_search_latch);

+		rw_lock_x_lock(btr_search_get_latch(cursor->index->id));

 	}

 	if (!(flags & BTR_KEEP_SYS_FLAG)) {

@@ -1985,7 +1985,7 @@

 	row_upd_rec_in_place(rec, index, offsets, update, page_zip);

 	if (block->is_hashed) {

-		rw_lock_x_unlock(&btr_search_latch);

+		rw_lock_x_unlock(btr_search_get_latch(cursor->index->id));

 	}

 	if (page_zip && !dict_index_is_clust(index)

@@ -2763,7 +2763,7 @@

 	}

 	if (block->is_hashed) {

-		rw_lock_x_lock(&btr_search_latch);

+		rw_lock_x_lock(btr_search_get_latch(index->id));

 	}

 	page_zip = buf_block_get_page_zip(block);

@@ -2779,7 +2779,7 @@

 	}

 	if (block->is_hashed) {

-		rw_lock_x_unlock(&btr_search_latch);

+		rw_lock_x_unlock(btr_search_get_latch(index->id));

 	}

 	btr_cur_del_mark_set_clust_rec_log(flags, rec, index, val, trx,

@@ -2906,13 +2906,13 @@

 	      == dict_table_is_comp(cursor->index->table));

 	if (block->is_hashed) {

-		rw_lock_x_lock(&btr_search_latch);

+		rw_lock_x_lock(btr_search_get_latch(cursor->index->id));

 	}

 	btr_rec_set_deleted_flag(rec, buf_block_get_page_zip(block), val);

 	if (block->is_hashed) {

-		rw_lock_x_unlock(&btr_search_latch);

+		rw_lock_x_unlock(btr_search_get_latch(cursor->index->id));

 	}

 	btr_cur_del_mark_set_sec_rec_log(rec, val, mtr);

diff -ruN a/storage/innobase/btr/btr0sea.c b/storage/innobase/btr/btr0sea.c

--- a/storage/innobase/btr/btr0sea.c	2010-12-04 15:52:23.387513429 +0900

+++ b/storage/innobase/btr/btr0sea.c	2010-12-04 16:14:51.721884049 +0900

@@ -48,6 +48,8 @@

 UNIV_INTERN char		btr_search_enabled	= TRUE;

 UNIV_INTERN ibool		btr_search_fully_disabled = FALSE;

+UNIV_INTERN ulint		btr_search_index_num	= 1;

+

 /** Mutex protecting btr_search_enabled */

 static mutex_t			btr_search_enabled_mutex;

@@ -79,7 +81,9 @@

 /* We will allocate the latch from dynamic memory to get it to the

 same DRAM page as other hotspot semaphores */

-UNIV_INTERN rw_lock_t*		btr_search_latch_temp;

+//UNIV_INTERN rw_lock_t*		btr_search_latch_temp;

+

+UNIV_INTERN rw_lock_t**		btr_search_latch_part;

 /** padding to prevent other memory update hotspots from residing on

 the same memory cache line */

@@ -131,18 +135,19 @@

 will not guarantee success. */

 static

 void

-btr_search_check_free_space_in_heap(void)

+btr_search_check_free_space_in_heap(

 /*=====================================*/

+	index_id_t	key)

 {

 	hash_table_t*	table;

 	mem_heap_t*	heap;

 #ifdef UNIV_SYNC_DEBUG

-	ut_ad(!rw_lock_own(&btr_search_latch, RW_LOCK_SHARED));

-	ut_ad(!rw_lock_own(&btr_search_latch, RW_LOCK_EX));

+	ut_ad(!rw_lock_own(btr_search_get_latch(key), RW_LOCK_SHARED));

+	ut_ad(!rw_lock_own(btr_search_get_latch(key), RW_LOCK_EX));

 #endif /* UNIV_SYNC_DEBUG */

-	table = btr_search_sys->hash_index;

+	table = btr_search_get_hash_index(key);

 	heap = table->heap;

@@ -153,7 +158,7 @@

 	if (heap->free_block == NULL) {

 		buf_block_t*	block = buf_block_alloc(NULL);

-		rw_lock_x_lock(&btr_search_latch);

+		rw_lock_x_lock(btr_search_get_latch(key));

 		if (heap->free_block == NULL) {

 			heap->free_block = block;

@@ -161,7 +166,7 @@

 			buf_block_free(block);

 		}

-		rw_lock_x_unlock(&btr_search_latch);

+		rw_lock_x_unlock(btr_search_get_latch(key));

 	}

 }

@@ -173,19 +178,30 @@

 /*==================*/

 	ulint	hash_size)	/*!< in: hash index hash table size */

 {

+	ulint i;

 	/* We allocate the search latch from dynamic memory:

 	see above at the global variable definition */

-	btr_search_latch_temp = mem_alloc(sizeof(rw_lock_t));

+	//btr_search_latch_temp = mem_alloc(sizeof(rw_lock_t));

-	rw_lock_create(btr_search_latch_key, &btr_search_latch,

-		       SYNC_SEARCH_SYS);

+	//rw_lock_create(btr_search_latch_key, &btr_search_latch,

+	//	       SYNC_SEARCH_SYS);

 	mutex_create(btr_search_enabled_mutex_key,

 		     &btr_search_enabled_mutex, SYNC_SEARCH_SYS_CONF);

 	btr_search_sys = mem_alloc(sizeof(btr_search_sys_t));

-	btr_search_sys->hash_index = ha_create(hash_size, 0, 0);

+	/* btr_search_index_num should be <= 32. (bits of trx->has_search_latch) */

+	btr_search_latch_part = mem_alloc(sizeof(rw_lock_t*) * btr_search_index_num);

+	btr_search_sys->hash_index = mem_alloc(sizeof(hash_table_t*) * btr_search_index_num);

+	for (i = 0; i < btr_search_index_num; i++) {

+		btr_search_latch_part[i] = mem_alloc(sizeof(rw_lock_t));

+

+		rw_lock_create(btr_search_latch_key,

+				btr_search_latch_part[i], SYNC_SEARCH_SYS);

+

+		btr_search_sys->hash_index[i] = ha_create(hash_size, 0, 0);

+	}

 }

 /*****************************************************************//**

@@ -195,11 +211,22 @@

 btr_search_sys_free(void)

 /*=====================*/

 {

-	rw_lock_free(&btr_search_latch);

-	mem_free(btr_search_latch_temp);

-	btr_search_latch_temp = NULL;

-	mem_heap_free(btr_search_sys->hash_index->heap);

-	hash_table_free(btr_search_sys->hash_index);

+	ulint i;

+

+	for (i = 0; i < btr_search_index_num; i++) {

+		mem_heap_free(btr_search_sys->hash_index[i]->heap);

+		hash_table_free(btr_search_sys->hash_index[i]);

+

+		rw_lock_free(btr_search_latch_part[i]);

+

+		mem_free(btr_search_latch_part[i]);

+	}

+	mem_free(btr_search_sys->hash_index);

+	mem_free(btr_search_latch_part);

+

+	//rw_lock_free(&btr_search_latch);

+	//mem_free(btr_search_latch_temp);

+	//btr_search_latch_temp = NULL;

 	mem_free(btr_search_sys);

 	btr_search_sys = NULL;

 }

@@ -212,7 +239,7 @@

 /*====================*/

 {

 	mutex_enter(&btr_search_enabled_mutex);

-	rw_lock_x_lock(&btr_search_latch);

+	btr_search_x_lock_all();

 	/* Disable access to hash index, also tell ha_insert_for_fold()

 	stop adding new nodes to hash index, but still allow updating

@@ -230,7 +257,7 @@

 	/* btr_search_enabled_mutex should guarantee this. */

 	ut_ad(!btr_search_enabled);

-	rw_lock_x_unlock(&btr_search_latch);

+	btr_search_x_unlock_all();

 	mutex_exit(&btr_search_enabled_mutex);

 }

@@ -242,12 +269,12 @@

 /*====================*/

 {

 	mutex_enter(&btr_search_enabled_mutex);

-	rw_lock_x_lock(&btr_search_latch);

+	btr_search_x_lock_all();

 	btr_search_enabled = TRUE;

 	btr_search_fully_disabled = FALSE;

-	rw_lock_x_unlock(&btr_search_latch);

+	btr_search_x_unlock_all();

 	mutex_exit(&btr_search_enabled_mutex);

 }

@@ -300,20 +327,21 @@

 ulint

 btr_search_info_get_ref_count(

 /*==========================*/

-	btr_search_t*   info)	/*!< in: search info. */

+	btr_search_t*   info,	/*!< in: search info. */

+	index_id_t	key)

 {

 	ulint ret;

 	ut_ad(info);

 #ifdef UNIV_SYNC_DEBUG

-	ut_ad(!rw_lock_own(&btr_search_latch, RW_LOCK_SHARED));

-	ut_ad(!rw_lock_own(&btr_search_latch, RW_LOCK_EX));

+	ut_ad(!rw_lock_own(btr_search_get_latch(key), RW_LOCK_SHARED));

+	ut_ad(!rw_lock_own(btr_search_get_latch(key), RW_LOCK_EX));

 #endif /* UNIV_SYNC_DEBUG */

-	rw_lock_s_lock(&btr_search_latch);

+	rw_lock_s_lock(btr_search_get_latch(key));

 	ret = info->ref_count;

-	rw_lock_s_unlock(&btr_search_latch);

+	rw_lock_s_unlock(btr_search_get_latch(key));

 	return(ret);

 }

@@ -334,8 +362,8 @@

 	int		cmp;

 #ifdef UNIV_SYNC_DEBUG

-	ut_ad(!rw_lock_own(&btr_search_latch, RW_LOCK_SHARED));

-	ut_ad(!rw_lock_own(&btr_search_latch, RW_LOCK_EX));

+	ut_ad(!rw_lock_own(btr_search_get_latch(cursor->index->id), RW_LOCK_SHARED));

+	ut_ad(!rw_lock_own(btr_search_get_latch(cursor->index->id), RW_LOCK_EX));

 #endif /* UNIV_SYNC_DEBUG */

 	index = cursor->index;

@@ -453,8 +481,8 @@

 				/*!< in: cursor */

 {

 #ifdef UNIV_SYNC_DEBUG

-	ut_ad(!rw_lock_own(&btr_search_latch, RW_LOCK_SHARED));

-	ut_ad(!rw_lock_own(&btr_search_latch, RW_LOCK_EX));

+	ut_ad(!rw_lock_own(btr_search_get_latch(cursor->index->id), RW_LOCK_SHARED));

+	ut_ad(!rw_lock_own(btr_search_get_latch(cursor->index->id), RW_LOCK_EX));

 	ut_ad(rw_lock_own(&block->lock, RW_LOCK_SHARED)

 	      || rw_lock_own(&block->lock, RW_LOCK_EX));

 #endif /* UNIV_SYNC_DEBUG */

@@ -538,7 +566,7 @@

 	ut_ad(cursor->flag == BTR_CUR_HASH_FAIL);

 #ifdef UNIV_SYNC_DEBUG

-	ut_ad(rw_lock_own(&btr_search_latch, RW_LOCK_EX));

+	ut_ad(rw_lock_own(btr_search_get_latch(cursor->index->id), RW_LOCK_EX));

 	ut_ad(rw_lock_own(&(block->lock), RW_LOCK_SHARED)

 	      || rw_lock_own(&(block->lock), RW_LOCK_EX));

 #endif /* UNIV_SYNC_DEBUG */

@@ -578,10 +606,10 @@

 			mem_heap_free(heap);

 		}

 #ifdef UNIV_SYNC_DEBUG

-		ut_ad(rw_lock_own(&btr_search_latch, RW_LOCK_EX));

+		ut_ad(rw_lock_own(btr_search_get_latch(cursor->index->id), RW_LOCK_EX));

 #endif /* UNIV_SYNC_DEBUG */

-		ha_insert_for_fold(btr_search_sys->hash_index, fold,

+		ha_insert_for_fold(btr_search_get_hash_index(cursor->index->id), fold,

 				   block, rec);

 	}

 }

@@ -601,8 +629,8 @@

 	ulint*		params2;

 #ifdef UNIV_SYNC_DEBUG

-	ut_ad(!rw_lock_own(&btr_search_latch, RW_LOCK_SHARED));

-	ut_ad(!rw_lock_own(&btr_search_latch, RW_LOCK_EX));

+	ut_ad(!rw_lock_own(btr_search_get_latch(cursor->index->id), RW_LOCK_SHARED));

+	ut_ad(!rw_lock_own(btr_search_get_latch(cursor->index->id), RW_LOCK_EX));

 #endif /* UNIV_SYNC_DEBUG */

 	block = btr_cur_get_block(cursor);

@@ -623,7 +651,7 @@

 	if (build_index || (cursor->flag == BTR_CUR_HASH_FAIL)) {

-		btr_search_check_free_space_in_heap();

+		btr_search_check_free_space_in_heap(cursor->index->id);

 	}

 	if (cursor->flag == BTR_CUR_HASH_FAIL) {

@@ -633,11 +661,11 @@

 		btr_search_n_hash_fail++;

 #endif /* UNIV_SEARCH_PERF_STAT */

-		rw_lock_x_lock(&btr_search_latch);

+		rw_lock_x_lock(btr_search_get_latch(cursor->index->id));

 		btr_search_update_hash_ref(info, block, cursor);

-		rw_lock_x_unlock(&btr_search_latch);

+		rw_lock_x_unlock(btr_search_get_latch(cursor->index->id));

 	}

 	if (build_index) {

@@ -881,17 +909,17 @@

 	cursor->flag = BTR_CUR_HASH;

 	if (UNIV_LIKELY(!has_search_latch)) {

-		rw_lock_s_lock(&btr_search_latch);

+		rw_lock_s_lock(btr_search_get_latch(index_id));

 		if (UNIV_UNLIKELY(!btr_search_enabled)) {

 			goto failure_unlock;

 		}

 	}

-	ut_ad(rw_lock_get_writer(&btr_search_latch) != RW_LOCK_EX);

-	ut_ad(rw_lock_get_reader_count(&btr_search_latch) > 0);

+	ut_ad(rw_lock_get_writer(btr_search_get_latch(index_id)) != RW_LOCK_EX);

+	ut_ad(rw_lock_get_reader_count(btr_search_get_latch(index_id)) > 0);

-	rec = ha_search_and_get_data(btr_search_sys->hash_index, fold);

+	rec = ha_search_and_get_data(btr_search_get_hash_index(index_id), fold);

 	if (UNIV_UNLIKELY(!rec)) {

 		goto failure_unlock;

@@ -909,7 +937,7 @@

 			goto failure_unlock;

 		}

-		rw_lock_s_unlock(&btr_search_latch);

+		rw_lock_s_unlock(btr_search_get_latch(index_id));

 		buf_block_dbg_add_level(block, SYNC_TREE_NODE_FROM_HASH);

 	}

@@ -1006,7 +1034,7 @@

 	/*-------------------------------------------*/

 failure_unlock:

 	if (UNIV_LIKELY(!has_search_latch)) {

-		rw_lock_s_unlock(&btr_search_latch);

+		rw_lock_s_unlock(btr_search_get_latch(index_id));

 	}

 failure:

 	cursor->flag = BTR_CUR_HASH_FAIL;

@@ -1029,10 +1057,11 @@

 void

 btr_search_drop_page_hash_index(

 /*============================*/

-	buf_block_t*	block)	/*!< in: block containing index page,

+	buf_block_t*	block,	/*!< in: block containing index page,

 				s- or x-latched, or an index page

 				for which we know that

 				block->buf_fix_count == 0 */

+	dict_index_t*	index_in)

 {

 	hash_table_t*		table;

 	ulint			n_fields;

@@ -1051,22 +1080,60 @@

 	ulint*			offsets;

 #ifdef UNIV_SYNC_DEBUG

-	ut_ad(!rw_lock_own(&btr_search_latch, RW_LOCK_SHARED));

-	ut_ad(!rw_lock_own(&btr_search_latch, RW_LOCK_EX));

+	if (index_in) {

+		ut_ad(!rw_lock_own(btr_search_get_latch(index_in->id), RW_LOCK_SHARED));

+		ut_ad(!rw_lock_own(btr_search_get_latch(index_in->id), RW_LOCK_EX));

+	}

 #endif /* UNIV_SYNC_DEBUG */

 retry:

-	rw_lock_s_lock(&btr_search_latch);

+	if (index_in) {

+		index = index_in;

+		rw_lock_s_lock(btr_search_get_latch(index->id));

+	} else if (btr_search_index_num > 1) {

+		rw_lock_t*	btr_search_latch;

+

+		/* FIXME: This may be optimistic implementation still. */

+		btr_search_latch = (rw_lock_t*)(block->btr_search_latch);

+		if (UNIV_LIKELY(!btr_search_latch)) {

+			if (block->is_hashed) {

+				goto retry;

+			}

+			return;

+		}

+		rw_lock_s_lock(btr_search_latch);

+		if (UNIV_LIKELY(btr_search_latch != block->btr_search_latch)) {

+			rw_lock_s_unlock(btr_search_latch);

+			goto retry;

+		}

+		if (UNIV_LIKELY(!block->is_hashed)) {

+			rw_lock_s_unlock(btr_search_latch);

+			goto retry;

+		}

+		index = block->index;

+		ut_a(btr_search_latch == btr_search_get_latch(index->id));

+	} else {

+		/* btr_search_index_num == 1 */

+		/* btr_search_latch is only one and able to obtain

+		   before evaluating block->is_hashed. */

+		rw_lock_s_lock(btr_search_latch_part[0]);

+		if (UNIV_LIKELY(!block->is_hashed)) {

+			rw_lock_s_unlock(btr_search_latch_part[0]);

+			return;

+		}

+		index = block->index;

+	}

+

 	page = block->frame;

 	if (UNIV_LIKELY(!block->is_hashed)) {

-		rw_lock_s_unlock(&btr_search_latch);

+		rw_lock_s_unlock(btr_search_get_latch(index->id));

 		return;

 	}

-	table = btr_search_sys->hash_index;

+	table = btr_search_get_hash_index(index->id);

 #ifdef UNIV_SYNC_DEBUG

 	ut_ad(rw_lock_own(&(block->lock), RW_LOCK_SHARED)

@@ -1076,14 +1143,14 @@

 	n_fields = block->curr_n_fields;

 	n_bytes = block->curr_n_bytes;

-	index = block->index;

+	ut_a(index == block->index);

 	ut_a(!dict_index_is_ibuf(index));

 	/* NOTE: The fields of block must not be accessed after

 	releasing btr_search_latch, as the index page might only

 	be s-latched! */

-	rw_lock_s_unlock(&btr_search_latch);

+	rw_lock_s_unlock(btr_search_get_latch(index->id));

 	ut_a(n_fields + n_bytes > 0);

@@ -1133,7 +1200,7 @@

 		mem_heap_free(heap);

 	}

-	rw_lock_x_lock(&btr_search_latch);

+	rw_lock_x_lock(btr_search_get_latch(index->id));

 	if (UNIV_UNLIKELY(!block->is_hashed)) {

 		/* Someone else has meanwhile dropped the hash index */

@@ -1149,7 +1216,7 @@

 		/* Someone else has meanwhile built a new hash index on the

 		page, with different parameters */

-		rw_lock_x_unlock(&btr_search_latch);

+		rw_lock_x_unlock(btr_search_get_latch(index->id));

 		mem_free(folds);

 		goto retry;

@@ -1165,6 +1232,7 @@

 	block->is_hashed = FALSE;

 	block->index = NULL;

+	block->btr_search_latch = NULL;

 cleanup:

 #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG

@@ -1177,14 +1245,14 @@

 			"InnoDB: the hash index to a page of %s,"

 			" still %lu hash nodes remain.\n",

 			index->name, (ulong) block->n_pointers);

-		rw_lock_x_unlock(&btr_search_latch);

+		rw_lock_x_unlock(btr_search_get_latch(index->id));

 		btr_search_validate();

 	} else {

-		rw_lock_x_unlock(&btr_search_latch);

+		rw_lock_x_unlock(btr_search_get_latch(index->id));

 	}

 #else /* UNIV_AHI_DEBUG || UNIV_DEBUG */

-	rw_lock_x_unlock(&btr_search_latch);

+	rw_lock_x_unlock(btr_search_get_latch(index->id));

 #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */

 	mem_free(folds);

@@ -1216,9 +1284,9 @@

 	ulint*		offsets;

 	ibool		released_search_latch;

-	rw_lock_s_lock(&btr_search_latch);

+	rw_lock_s_lock(btr_search_get_latch(index->id));

-	table = btr_search_sys->hash_index;

+	table = btr_search_get_hash_index(index->id);

 	for (j = 0; j < srv_buf_pool_instances; j++) {

 		buf_pool_t*	buf_pool;

@@ -1252,7 +1320,7 @@

 					/* keeping latch order */

-					rw_lock_s_unlock(&btr_search_latch);

+					rw_lock_s_unlock(btr_search_get_latch(index->id));

 					released_search_latch = TRUE;

 					rw_lock_x_lock(&block->lock);

@@ -1304,7 +1372,7 @@

 						mem_heap_empty(heap);

 					}

-					rw_lock_x_lock(&btr_search_latch);

+					rw_lock_x_lock(btr_search_get_latch(index->id));

 					if (UNIV_UNLIKELY(!block->is_hashed)) {

 						goto cleanup;

@@ -1314,12 +1382,12 @@

 					if (UNIV_UNLIKELY(block->curr_n_fields != n_fields)

 					    || UNIV_UNLIKELY(block->curr_n_bytes != n_bytes)) {

-						rw_lock_x_unlock(&btr_search_latch);

+						rw_lock_x_unlock(btr_search_get_latch(index->id));

 						rw_lock_x_unlock(&block->lock);

 						mem_free(folds);

-						rw_lock_s_lock(&btr_search_latch);

+						rw_lock_s_lock(btr_search_get_latch(index->id));

 						goto retry;

 					}

@@ -1333,6 +1401,7 @@

 					block->is_hashed = FALSE;

 					block->index = NULL;

+					block->btr_search_latch = NULL;

 cleanup:

 #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG

@@ -1345,18 +1414,18 @@

 							index->name, (ulong) block->n_pointers);

 					}

 #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */

-					rw_lock_x_unlock(&btr_search_latch);

+					rw_lock_x_unlock(btr_search_get_latch(index->id));

 					rw_lock_x_unlock(&block->lock);

 					mem_free(folds);

-					rw_lock_s_lock(&btr_search_latch);

+					rw_lock_s_lock(btr_search_get_latch(index->id));

 				}

 			}

 		} while (released_search_latch);

 	}

-	rw_lock_s_unlock(&btr_search_latch);

+	rw_lock_s_unlock(btr_search_get_latch(index->id));

 	if (UNIV_LIKELY_NULL(heap)) {

 		mem_heap_free(heap);

@@ -1403,7 +1472,7 @@

 		buf_block_dbg_add_level(block, SYNC_TREE_NODE_FROM_HASH);

-		btr_search_drop_page_hash_index(block);

+		btr_search_drop_page_hash_index(block, NULL);

 	}

 	mtr_commit(&mtr);

@@ -1445,26 +1514,26 @@

 	ut_ad(index);

 	ut_a(!dict_index_is_ibuf(index));

-	table = btr_search_sys->hash_index;

+	table = btr_search_get_hash_index(index->id);

 	page = buf_block_get_frame(block);

 #ifdef UNIV_SYNC_DEBUG

-	ut_ad(!rw_lock_own(&btr_search_latch, RW_LOCK_EX));

+	ut_ad(!rw_lock_own(btr_search_get_latch(index->id), RW_LOCK_EX));

 	ut_ad(rw_lock_own(&(block->lock), RW_LOCK_SHARED)

 	      || rw_lock_own(&(block->lock), RW_LOCK_EX));

 #endif /* UNIV_SYNC_DEBUG */

-	rw_lock_s_lock(&btr_search_latch);

+	rw_lock_s_lock(btr_search_get_latch(index->id));

 	if (block->is_hashed && ((block->curr_n_fields != n_fields)

 				 || (block->curr_n_bytes != n_bytes)

 				 || (block->curr_left_side != left_side))) {

-		rw_lock_s_unlock(&btr_search_latch);

+		rw_lock_s_unlock(btr_search_get_latch(index->id));

-		btr_search_drop_page_hash_index(block);

+		btr_search_drop_page_hash_index(block, index);

 	} else {

-		rw_lock_s_unlock(&btr_search_latch);

+		rw_lock_s_unlock(btr_search_get_latch(index->id));

 	}

 	n_recs = page_get_n_recs(page);

@@ -1558,9 +1627,9 @@

 		fold = next_fold;

 	}

-	btr_search_check_free_space_in_heap();

+	btr_search_check_free_space_in_heap(index->id);

-	rw_lock_x_lock(&btr_search_latch);

+	rw_lock_x_lock(btr_search_get_latch(index->id));

 	if (UNIV_UNLIKELY(btr_search_fully_disabled)) {

 		goto exit_func;

@@ -1588,6 +1657,7 @@

 	block->curr_n_bytes = n_bytes;

 	block->curr_left_side = left_side;

 	block->index = index;

+	block->btr_search_latch = btr_search_get_latch(index->id);

 	for (i = 0; i < n_cached; i++) {

@@ -1595,7 +1665,7 @@

 	}

 exit_func:

-	rw_lock_x_unlock(&btr_search_latch);

+	rw_lock_x_unlock(btr_search_get_latch(index->id));

 	mem_free(folds);

 	mem_free(recs);

@@ -1634,13 +1704,13 @@

 	ut_a(!(new_block->is_hashed || block->is_hashed)

 	     || !dict_index_is_ibuf(index));

-	rw_lock_s_lock(&btr_search_latch);

+	rw_lock_s_lock(btr_search_get_latch(index->id));

 	if (new_block->is_hashed) {

-		rw_lock_s_unlock(&btr_search_latch);

+		rw_lock_s_unlock(btr_search_get_latch(index->id));

-		btr_search_drop_page_hash_index(block);

+		btr_search_drop_page_hash_index(block, index);

 		return;

 	}

@@ -1655,7 +1725,7 @@

 		new_block->n_bytes = block->curr_n_bytes;

 		new_block->left_side = left_side;

-		rw_lock_s_unlock(&btr_search_latch);

+		rw_lock_s_unlock(btr_search_get_latch(index->id));

 		ut_a(n_fields + n_bytes > 0);

@@ -1667,7 +1737,7 @@

 		return;

 	}

-	rw_lock_s_unlock(&btr_search_latch);

+	rw_lock_s_unlock(btr_search_get_latch(index->id));

 }

 /********************************************************************//**

@@ -1706,7 +1776,7 @@

 	ut_a(block->curr_n_fields + block->curr_n_bytes > 0);

 	ut_a(!dict_index_is_ibuf(cursor->index));

-	table = btr_search_sys->hash_index;

+	table = btr_search_get_hash_index(cursor->index->id);

 	index_id = cursor->index->id;

 	fold = rec_fold(rec, rec_get_offsets(rec, cursor->index, offsets_,

@@ -1715,11 +1785,11 @@

 	if (UNIV_LIKELY_NULL(heap)) {

 		mem_heap_free(heap);

 	}

-	rw_lock_x_lock(&btr_search_latch);

+	rw_lock_x_lock(btr_search_get_latch(cursor->index->id));

 	ha_search_and_delete_if_found(table, fold, rec);

-	rw_lock_x_unlock(&btr_search_latch);

+	rw_lock_x_unlock(btr_search_get_latch(cursor->index->id));

 }

 /********************************************************************//**

@@ -1753,21 +1823,21 @@

 	ut_a(block->index == cursor->index);

 	ut_a(!dict_index_is_ibuf(cursor->index));

-	rw_lock_x_lock(&btr_search_latch);

+	rw_lock_x_lock(btr_search_get_latch(cursor->index->id));

 	if ((cursor->flag == BTR_CUR_HASH)

 	    && (cursor->n_fields == block->curr_n_fields)

 	    && (cursor->n_bytes == block->curr_n_bytes)

 	    && !block->curr_left_side) {

-		table = btr_search_sys->hash_index;

+		table = btr_search_get_hash_index(cursor->index->id);

 		ha_search_and_update_if_found(table, cursor->fold, rec,

 					      block, page_rec_get_next(rec));

-		rw_lock_x_unlock(&btr_search_latch);

+		rw_lock_x_unlock(btr_search_get_latch(cursor->index->id));

 	} else {

-		rw_lock_x_unlock(&btr_search_latch);

+		rw_lock_x_unlock(btr_search_get_latch(cursor->index->id));

 		btr_search_update_hash_on_insert(cursor);

 	}

@@ -1802,9 +1872,9 @@

 	ulint*		offsets		= offsets_;

 	rec_offs_init(offsets_);

-	table = btr_search_sys->hash_index;

+	table = btr_search_get_hash_index(cursor->index->id);

-	btr_search_check_free_space_in_heap();

+	btr_search_check_free_space_in_heap(cursor->index->id);

 	rec = btr_cur_get_rec(cursor);

@@ -1849,7 +1919,7 @@

 	} else {

 		if (left_side) {

-			rw_lock_x_lock(&btr_search_latch);

+			rw_lock_x_lock(btr_search_get_latch(index_id));

 			locked = TRUE;

@@ -1863,7 +1933,7 @@

 		if (!locked) {

-			rw_lock_x_lock(&btr_search_latch);

+			rw_lock_x_lock(btr_search_get_latch(index_id));

 			locked = TRUE;

 		}

@@ -1881,7 +1951,7 @@

 		if (!left_side) {

 			if (!locked) {

-				rw_lock_x_lock(&btr_search_latch);

+				rw_lock_x_lock(btr_search_get_latch(index_id));

 				locked = TRUE;

 			}

@@ -1896,7 +1966,7 @@

 		if (!locked) {

-			rw_lock_x_lock(&btr_search_latch);

+			rw_lock_x_lock(btr_search_get_latch(index_id));

 			locked = TRUE;

 		}

@@ -1919,7 +1989,7 @@

 		mem_heap_free(heap);

 	}

 	if (locked) {

-		rw_lock_x_unlock(&btr_search_latch);

+		rw_lock_x_unlock(btr_search_get_latch(index_id));

 	}

 }

@@ -1935,7 +2005,7 @@

 	ha_node_t*	node;

 	ulint		n_page_dumps	= 0;

 	ibool		ok		= TRUE;

-	ulint		i;

+	ulint		i,j;

 	ulint		cell_count;

 	mem_heap_t*	heap		= NULL;

 	ulint		offsets_[REC_OFFS_NORMAL_SIZE];

@@ -1947,23 +2017,25 @@

 	rec_offs_init(offsets_);

-	rw_lock_x_lock(&btr_search_latch);

+	btr_search_x_lock_all();

 	buf_pool_page_hash_x_lock_all();

-	cell_count = hash_get_n_cells(btr_search_sys->hash_index);

+	for (j = 0; j < btr_search_index_num; j++) {

+

+	cell_count = hash_get_n_cells(btr_search_sys->hash_index[j]);

 	for (i = 0; i < cell_count; i++) {

 		/* We release btr_search_latch every once in a while to

 		give other queries a chance to run. */

 		if ((i != 0) && ((i % chunk_size) == 0)) {

 			buf_pool_page_hash_x_unlock_all();

-			rw_lock_x_unlock(&btr_search_latch);

+			btr_search_x_unlock_all();

 			os_thread_yield();

-			rw_lock_x_lock(&btr_search_latch);

+			btr_search_x_lock_all();

 			buf_pool_page_hash_x_lock_all();

 		}

-		node = hash_get_nth_cell(btr_search_sys->hash_index, i)->node;

+		node = hash_get_nth_cell(btr_search_sys->hash_index[j], i)->node;

 		for (; node != NULL; node = node->next) {

 			const buf_block_t*	block

@@ -2072,19 +2144,21 @@

 		give other queries a chance to run. */

 		if (i != 0) {

 			buf_pool_page_hash_x_unlock_all();

-			rw_lock_x_unlock(&btr_search_latch);

+			btr_search_x_unlock_all();

 			os_thread_yield();

-			rw_lock_x_lock(&btr_search_latch);

+			btr_search_x_lock_all();

 			buf_pool_page_hash_x_lock_all();

 		}

-		if (!ha_validate(btr_search_sys->hash_index, i, end_index)) {

+		if (!ha_validate(btr_search_sys->hash_index[j], i, end_index)) {

 			ok = FALSE;

 		}

 	}

+	} /*for (j = 0; j < btr_search_index_num; j++)*/

+

 	buf_pool_page_hash_x_unlock_all();

-	rw_lock_x_unlock(&btr_search_latch);

+	btr_search_x_unlock_all();

 	if (UNIV_LIKELY_NULL(heap)) {

 		mem_heap_free(heap);

 	}

diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c

--- a/storage/innobase/buf/buf0buf.c	2010-12-04 15:55:21.351597052 +0900

+++ b/storage/innobase/buf/buf0buf.c	2010-12-04 16:12:48.654550708 +0900

@@ -949,6 +949,7 @@

 	block->check_index_page_at_flush = FALSE;

 	block->index = NULL;

+	block->btr_search_latch = NULL;

 	block->is_hashed = FALSE;

@@ -1477,7 +1478,7 @@

 			/* To follow the latching order, we

 			have to release btr_search_latch

 			before acquiring block->latch. */

-			rw_lock_x_unlock(&btr_search_latch);

+			btr_search_x_unlock_all();

 			/* When we release the search latch,

 			we must rescan all blocks, because

 			some may become hashed again. */

@@ -1508,11 +1509,11 @@

 			anything.  block->is_hashed can only

 			be set on uncompressed file pages. */

-			btr_search_drop_page_hash_index(block);

+			btr_search_drop_page_hash_index(block, NULL);

 			rw_lock_x_unlock(&block->lock);

-			rw_lock_x_lock(&btr_search_latch);

+			btr_search_x_lock_all();

 			ut_ad(!btr_search_enabled);

 		}

@@ -1531,7 +1532,11 @@

 	ibool		released_search_latch;

 #ifdef UNIV_SYNC_DEBUG

-	ut_ad(rw_lock_own(&btr_search_latch, RW_LOCK_EX));

+	ulint	j;

+

+	for (j = 0; j < btr_search_index_num; j++) {

+		ut_ad(rw_lock_own(btr_search_latch_part[j], RW_LOCK_EX));

+	}

 #endif /* UNIV_SYNC_DEBUG */

 	ut_ad(!btr_search_enabled);

@@ -2632,6 +2637,7 @@

 {

 	block->check_index_page_at_flush = FALSE;

 	block->index		= NULL;

+	block->btr_search_latch	= NULL;

 	block->n_hash_helps	= 0;

 	block->is_hashed	= FALSE;

diff -ruN a/storage/innobase/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c

--- a/storage/innobase/buf/buf0lru.c	2010-12-04 15:35:29.137347521 +0900

+++ b/storage/innobase/buf/buf0lru.c	2010-12-04 16:12:48.658550840 +0900

@@ -1798,7 +1798,7 @@

 		UNIV_MEM_VALID(((buf_block_t*) bpage)->frame,

 			       UNIV_PAGE_SIZE);

-		btr_search_drop_page_hash_index((buf_block_t*) bpage);

+		btr_search_drop_page_hash_index((buf_block_t*) bpage, NULL);

 		UNIV_MEM_INVALID(((buf_block_t*) bpage)->frame,

 				 UNIV_PAGE_SIZE);

diff -ruN a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c

--- a/storage/innobase/dict/dict0dict.c	2010-12-04 15:52:23.398513916 +0900

+++ b/storage/innobase/dict/dict0dict.c	2010-12-04 16:12:48.662550715 +0900

@@ -1811,7 +1811,7 @@

 	zero. */

 	for (;;) {

-		ulint ref_count = btr_search_info_get_ref_count(info);

+		ulint ref_count = btr_search_info_get_ref_count(info, index->id);

 		if (ref_count == 0) {

 			break;

 		}

diff -ruN a/storage/innobase/ha/ha0ha.c b/storage/innobase/ha/ha0ha.c

--- a/storage/innobase/ha/ha0ha.c	2010-11-03 07:01:13.000000000 +0900

+++ b/storage/innobase/ha/ha0ha.c	2010-12-04 16:12:48.665593752 +0900

@@ -102,7 +102,8 @@

 	ut_ad(table);

 	ut_ad(table->magic_n == HASH_TABLE_MAGIC_N);

 #ifdef UNIV_SYNC_DEBUG

-	ut_ad(rw_lock_own(&btr_search_latch, RW_LOCK_EXCLUSIVE));

+	/* cannot identificate which btr_search_latch[i] for now */

+	//ut_ad(rw_lock_own(&btr_search_latch, RW_LOCK_EXCLUSIVE));

 #endif /* UNIV_SYNC_DEBUG */

 #ifndef UNIV_HOTBACKUP

diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc

--- a/storage/innobase/handler/ha_innodb.cc	2010-12-04 16:12:20.185850734 +0900

+++ b/storage/innobase/handler/ha_innodb.cc	2010-12-04 16:12:48.674552412 +0900

@@ -11702,6 +11702,11 @@

   "Disable with --skip-innodb-adaptive-hash-index.",

   NULL, innodb_adaptive_hash_index_update, TRUE);

+static MYSQL_SYSVAR_ULONG(adaptive_hash_index_partitions, btr_search_index_num,

+  PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,

+  "Number of InnoDB adaptive hash index partitions (default 1: disable partitioning)",

+  NULL, NULL, 1, 1, sizeof(ulint) * 8, 0);

+

 static MYSQL_SYSVAR_ULONG(replication_delay, srv_replication_delay,

   PLUGIN_VAR_RQCMDARG,

   "Replication thread delay (ms) on the slave server if "

@@ -12068,6 +12073,7 @@

   MYSQL_SYSVAR(use_sys_stats_table),

   MYSQL_SYSVAR(stats_sample_pages),

   MYSQL_SYSVAR(adaptive_hash_index),

+  MYSQL_SYSVAR(adaptive_hash_index_partitions),

   MYSQL_SYSVAR(stats_method),

   MYSQL_SYSVAR(replication_delay),

   MYSQL_SYSVAR(status_file),

diff -ruN a/storage/innobase/include/btr0sea.h b/storage/innobase/include/btr0sea.h

--- a/storage/innobase/include/btr0sea.h	2010-12-03 15:48:03.070987226 +0900

+++ b/storage/innobase/include/btr0sea.h	2010-12-04 16:12:48.707551382 +0900

@@ -85,7 +85,8 @@

 ulint

 btr_search_info_get_ref_count(

 /*==========================*/

-	btr_search_t*   info);	/*!< in: search info. */

+	btr_search_t*   info,	/*!< in: search info. */

+	index_id_t	key);

 /*********************************************************************//**

 Updates the search info. */

 UNIV_INLINE

@@ -136,10 +137,11 @@

 void

 btr_search_drop_page_hash_index(