branches/zip: HASH_SEARCH(): Add the parameter TYPE, for the type of DATA.

C++ requires explicit type casts when converting from void*, and *.ic files
are now inlined in ha_innodb.cc.

fil_space_get_by_id(), fil_space_get_by_name(): New inline functions, to
replace occurrences of the HASH_SEARCH() macro in fil0fil.c.  This should
improve readability.

buf/buf0buddy.c

@@ -178,7 +178,7 @@ buf_buddy_block_free(
 	ut_ad(!mutex_own(&buf_pool->zip_mutex));
 	ut_a(!ut_align_offset(buf, UNIV_PAGE_SIZE));
 
-	HASH_SEARCH(hash, buf_pool->zip_hash, fold, bpage,
+	HASH_SEARCH(hash, buf_pool->zip_hash, fold, buf_page_t*, bpage,
 		    ((buf_block_t*) bpage)->frame == buf);
 	ut_a(bpage);
 	ut_a(buf_page_get_state(bpage) == BUF_BLOCK_MEMORY);

dict/dict0dict.c

@@ -881,7 +881,8 @@ dict_table_add_to_cache(
 	/* Look for a table with the same name: error if such exists */
 	{
 		dict_table_t*	table2;
-		HASH_SEARCH(name_hash, dict_sys->table_hash, fold, table2,
+		HASH_SEARCH(name_hash, dict_sys->table_hash, fold,
+			    dict_table_t*, table2,
 			    (ut_strcmp(table2->name, table->name) == 0));
 		ut_a(table2 == NULL);
 	}
@@ -889,7 +890,8 @@ dict_table_add_to_cache(
 	/* Look for a table with the same id: error if such exists */
 	{
 		dict_table_t*	table2;
-		HASH_SEARCH(id_hash, dict_sys->table_id_hash, id_fold, table2,
+		HASH_SEARCH(id_hash, dict_sys->table_id_hash, id_fold,
+			    dict_table_t*, table2,
 			    (ut_dulint_cmp(table2->id, table->id) == 0));
 		ut_a(table2 == NULL);
 	}
@@ -972,7 +974,8 @@ dict_table_rename_in_cache(
 	/* Look for a table with the same name: error if such exists */
 	{
 		dict_table_t*	table2;
-		HASH_SEARCH(name_hash, dict_sys->table_hash, fold, table2,
+		HASH_SEARCH(name_hash, dict_sys->table_hash, fold,
+			    dict_table_t*, table2,
 			    (ut_strcmp(table2->name, new_name) == 0));
 		if (table2) {
 			fprintf(stderr,

fil/fil0fil.c

@@ -352,6 +352,44 @@ fil_write(
 					   byte_offset, len, buf, message));
 }
 
+/***********************************************************************
+Returns the table space by a given id, NULL if not found. */
+UNIV_INLINE
+fil_space_t*
+fil_space_get_by_id(
+/*================*/
+	ulint	id)	/* in: space id */
+{
+	fil_space_t*	space;
+
+	ut_ad(mutex_own(&fil_system->mutex));
+
+	HASH_SEARCH(hash, fil_system->spaces, id,
+		    fil_space_t*, space, space->id == id);
+
+	return(space);
+}
+
+/***********************************************************************
+Returns the table space by a given name, NULL if not found. */
+UNIV_INLINE
+fil_space_t*
+fil_space_get_by_name(
+/*==================*/
+	const char*	name)	/* in: space name */
+{
+	fil_space_t*	space;
+	ulint		fold;
+
+	ut_ad(mutex_own(&fil_system->mutex));
+
+	fold = ut_fold_string(name);
+
+	HASH_SEARCH(name_hash, fil_system->name_hash, fold,
+		    fil_space_t*, space, !strcmp(name, space->name));
+
+	return(space);
+}
 
 /***********************************************************************
 Returns the version number of a tablespace, -1 if not found. */
@@ -371,7 +409,7 @@ fil_space_get_version(
 
 	mutex_enter(&(system->mutex));
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	if (space) {
 		version = space->tablespace_version;
@@ -400,7 +438,7 @@ fil_space_get_latch(
 
 	mutex_enter(&(system->mutex));
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	ut_a(space);
 
@@ -429,7 +467,7 @@ fil_space_get_type(
 
 	mutex_enter(&(system->mutex));
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	ut_a(space);
 
@@ -456,7 +494,7 @@ fil_space_get_ibuf_data(
 
 	mutex_enter(&(system->mutex));
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	mutex_exit(&(system->mutex));
 
@@ -531,7 +569,7 @@ fil_node_create(
 	node->modification_counter = 0;
 	node->flush_counter = 0;
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	if (!space) {
 		ut_print_timestamp(stderr);
@@ -860,8 +898,8 @@ fil_mutex_enter_and_prepare_for_io(
 		return;
 	}
 
-	HASH_SEARCH(hash, system->spaces, space_id, space,
-		    space->id == space_id);
+	space = fil_space_get_by_id(space_id);
+
 	if (space != NULL && space->stop_ios) {
 		/* We are going to do a rename file and want to stop new i/o's
 		for a while */
@@ -1005,7 +1043,7 @@ fil_space_truncate_start(
 
 	mutex_enter(&(system->mutex));
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	ut_a(space);
 
@@ -1049,8 +1087,8 @@ fil_space_create(
 
 	mutex_enter(&(system->mutex));
 
-	HASH_SEARCH(name_hash, system->name_hash, ut_fold_string(name), space,
-		    0 == strcmp(name, space->name));
+	space = fil_space_get_by_name(name);
+
 	if (UNIV_LIKELY_NULL(space)) {
 		ulint	namesake_id;
 
@@ -1097,7 +1135,7 @@ fil_space_create(
 		goto try_again;
 	}
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	if (UNIV_LIKELY_NULL(space)) {
 		fprintf(stderr,
@@ -1234,7 +1272,7 @@ fil_space_free(
 
 	mutex_enter(&(system->mutex));
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	if (!space) {
 		ut_print_timestamp(stderr);
@@ -1250,8 +1288,7 @@ fil_space_free(
 
 	HASH_DELETE(fil_space_t, hash, system->spaces, id, space);
 
-	HASH_SEARCH(name_hash, system->name_hash, ut_fold_string(space->name),
-		    namespace, 0 == strcmp(space->name, namespace->name));
+	namespace = fil_space_get_by_name(space->name);
 	ut_a(namespace);
 	ut_a(space == namespace);
 
@@ -1307,7 +1344,7 @@ fil_get_space_for_id_low(
 
 	ut_ad(system);
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	return(space);
 }
@@ -1332,7 +1369,7 @@ fil_space_get_size(
 
 	fil_mutex_enter_and_prepare_for_io(id);
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	if (space == NULL) {
 		mutex_exit(&(system->mutex));
@@ -1386,7 +1423,7 @@ fil_space_get_zip_size(
 
 	fil_mutex_enter_and_prepare_for_io(id);
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	if (space == NULL) {
 		mutex_exit(&(system->mutex));
@@ -1793,7 +1830,7 @@ fil_inc_pending_ibuf_merges(
 
 	mutex_enter(&(system->mutex));
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	if (space == NULL) {
 		fprintf(stderr,
@@ -1828,7 +1865,7 @@ fil_decr_pending_ibuf_merges(
 
 	mutex_enter(&(system->mutex));
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	if (space == NULL) {
 		fprintf(stderr,
@@ -2126,7 +2163,7 @@ fil_delete_tablespace(
 stop_ibuf_merges:
 	mutex_enter(&(system->mutex));
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	if (space != NULL) {
 		space->stop_ibuf_merges = TRUE;
@@ -2166,7 +2203,7 @@ fil_delete_tablespace(
 try_again:
 	mutex_enter(&(system->mutex));
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	if (space == NULL) {
 		ut_print_timestamp(stderr);
@@ -2311,8 +2348,7 @@ fil_rename_tablespace_in_mem(
 	fil_space_t*	space2;
 	const char*	old_name	= space->name;
 
-	HASH_SEARCH(name_hash, system->name_hash, ut_fold_string(old_name),
-		    space2, 0 == strcmp(old_name, space2->name));
+	space2 = fil_space_get_by_name(old_name);
 	if (space != space2) {
 		fputs("InnoDB: Error: cannot find ", stderr);
 		ut_print_filename(stderr, old_name);
@@ -2321,8 +2357,7 @@ fil_rename_tablespace_in_mem(
 		return(FALSE);
 	}
 
-	HASH_SEARCH(name_hash, system->name_hash, ut_fold_string(path),
-		    space2, 0 == strcmp(path, space2->name));
+	space2 = fil_space_get_by_name(path);
 	if (space2 != NULL) {
 		fputs("InnoDB: Error: ", stderr);
 		ut_print_filename(stderr, path);
@@ -2432,7 +2467,7 @@ fil_rename_tablespace(
 
 	mutex_enter(&(system->mutex));
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	if (space == NULL) {
 		fprintf(stderr,
@@ -3537,7 +3572,7 @@ fil_tablespace_deleted_or_being_deleted_in_mem(
 
 	mutex_enter(&(system->mutex));
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	if (space == NULL || space->is_being_deleted) {
 		mutex_exit(&(system->mutex));
@@ -3573,7 +3608,7 @@ fil_tablespace_exists_in_mem(
 
 	mutex_enter(&(system->mutex));
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	if (space == NULL) {
 		mutex_exit(&(system->mutex));
@@ -3627,14 +3662,12 @@ fil_space_for_table_exists_in_mem(
 
 	/* Look if there is a space with the same id */
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	/* Look if there is a space with the same name; the name is the
 	directory path from the datadir to the file */
 
-	HASH_SEARCH(name_hash, system->name_hash,
-		    ut_fold_string(path), namespace,
-		    0 == strcmp(namespace->name, path));
+	namespace = fil_space_get_by_name(path);
 	if (space && space == namespace) {
 		/* Found */
 
@@ -3757,9 +3790,8 @@ fil_get_space_id_for_table(
 	/* Look if there is a space with the same name; the name is the
 	directory path to the file */
 
-	HASH_SEARCH(name_hash, system->name_hash,
-		    ut_fold_string(path), namespace,
-		    0 == strcmp(namespace->name, path));
+	namespace = fil_space_get_by_name(path);
+
 	if (namespace) {
 		id = namespace->id;
 	}
@@ -3803,8 +3835,7 @@ fil_extend_space_to_desired_size(
 
 	fil_mutex_enter_and_prepare_for_io(space_id);
 
-	HASH_SEARCH(hash, system->spaces, space_id, space,
-		    space->id == space_id);
+	space = fil_space_get_by_id(space_id);
 	ut_a(space);
 
 	if (space->size >= size_after_extend) {
@@ -3991,7 +4022,7 @@ fil_space_reserve_free_extents(
 
 	mutex_enter(&(system->mutex));
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	ut_a(space);
 
@@ -4023,7 +4054,7 @@ fil_space_release_free_extents(
 
 	mutex_enter(&(system->mutex));
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	ut_a(space);
 	ut_a(space->n_reserved_extents >= n_reserved);
@@ -4050,7 +4081,7 @@ fil_space_get_n_reserved_extents(
 
 	mutex_enter(&(system->mutex));
 
-	HASH_SEARCH(hash, system->spaces, id, space, space->id == id);
+	space = fil_space_get_by_id(id);
 
 	ut_a(space);
 
@@ -4270,8 +4301,8 @@ fil_io(
 
 	fil_mutex_enter_and_prepare_for_io(space_id);
 
-	HASH_SEARCH(hash, system->spaces, space_id, space,
-		    space->id == space_id);
+	space = fil_space_get_by_id(space_id);
+
 	if (!space) {
 		mutex_exit(&(system->mutex));
 
@@ -4481,8 +4512,8 @@ fil_flush(
 
 	mutex_enter(&(system->mutex));
 
-	HASH_SEARCH(hash, system->spaces, space_id, space,
-		    space->id == space_id);
+	space = fil_space_get_by_id(space_id);
+
 	if (!space || space->is_being_deleted) {
 		mutex_exit(&(system->mutex));
 

include/buf0buf.ic

@@ -872,7 +872,7 @@ buf_page_hash_get(
 
 	fold = buf_page_address_fold(space, offset);
 
-	HASH_SEARCH(hash, buf_pool->page_hash, fold, bpage,
+	HASH_SEARCH(hash, buf_pool->page_hash, fold, buf_page_t*, bpage,
 		    bpage->space == space && bpage->offset == offset);
 	ut_a(!bpage || buf_page_in_file(bpage));
 	ut_ad(!bpage || bpage->in_page_hash);

include/dict0dict.ic

@@ -649,8 +649,8 @@ dict_table_check_if_in_cache_low(
 	/* Look for the table name in the hash table */
 	table_fold = ut_fold_string(table_name);
 
-	HASH_SEARCH(name_hash, dict_sys->table_hash, table_fold, table,
-		    ut_strcmp(table->name, table_name) == 0);
+	HASH_SEARCH(name_hash, dict_sys->table_hash, table_fold,
+		    dict_table_t*, table, !strcmp(table->name, table_name));
 	return(table);
 }
 
@@ -695,8 +695,8 @@ dict_table_get_on_id_low(
 	/* Look for the table name in the hash table */
 	fold = ut_fold_dulint(table_id);
 
-	HASH_SEARCH(id_hash, dict_sys->table_id_hash, fold, table,
-		    ut_dulint_cmp(table->id, table_id) == 0);
+	HASH_SEARCH(id_hash, dict_sys->table_id_hash, fold,
+		    dict_table_t*, table, !ut_dulint_cmp(table->id, table_id));
 	if (table == NULL) {
 		table = dict_load_table_on_id(table_id);
 	}

include/hash0hash.h

@@ -151,12 +151,12 @@ Gets the next struct in a hash chain, NULL if none. */
 
 /************************************************************************
 Looks for a struct in a hash table. */
-#define HASH_SEARCH(NAME, TABLE, FOLD, DATA, TEST)\
+#define HASH_SEARCH(NAME, TABLE, FOLD, TYPE, DATA, TEST)\
 {\
 \
 	HASH_ASSERT_OWNED(TABLE, FOLD)\
 \
-	(DATA) = HASH_GET_FIRST(TABLE, hash_calc_hash(FOLD, TABLE));\
+	(DATA) = (TYPE) HASH_GET_FIRST(TABLE, hash_calc_hash(FOLD, TABLE));\
 	HASH_ASSERT_VALID(DATA);\
 \
 	while ((DATA) != NULL) {\
@@ -164,7 +164,7 @@ Looks for a struct in a hash table. */
 			break;\
 		} else {\
 			HASH_ASSERT_VALID(HASH_GET_NEXT(NAME, DATA));\
-			(DATA) = HASH_GET_NEXT(NAME, DATA);\
+			(DATA) = (TYPE) HASH_GET_NEXT(NAME, DATA);\
 		}\
 	}\
 }

thr/thr0loc.c

@@ -71,7 +71,7 @@ thr_local_get(
 	local = NULL;
 
 	HASH_SEARCH(hash, thr_local_hash, os_thread_pf(id),
-		    local, os_thread_eq(local->id, id));
+		    thr_local_t*, local, os_thread_eq(local->id, id));
 	if (local == NULL) {
 		mutex_exit(&thr_local_mutex);
 
@@ -195,7 +195,7 @@ thr_local_free(
 	/* Look for the local struct in the hash table */
 
 	HASH_SEARCH(hash, thr_local_hash, os_thread_pf(id),
-		    local, os_thread_eq(local->id, id));
+		    thr_local_t*, local, os_thread_eq(local->id, id));
 	if (local == NULL) {
 		mutex_exit(&thr_local_mutex);