Commit f8fb965a authored by unknown's avatar unknown

InnoDB: Remove unused hash table code and parameters


innobase/ha/ha0ha.c:
  Remove unused first parameter of ha_chain_get_next()
innobase/include/ha0ha.ic:
  Remove unused first parameter of ha_chain_get_next()
  Remove unused function ha_next()
parent dd3bf964
...@@ -205,7 +205,7 @@ ha_remove_all_nodes_to_page( ...@@ -205,7 +205,7 @@ ha_remove_all_nodes_to_page(
node = ha_chain_get_first(table, fold); node = ha_chain_get_first(table, fold);
} else { } else {
node = ha_chain_get_next(table, node); node = ha_chain_get_next(node);
} }
} }
...@@ -216,7 +216,7 @@ ha_remove_all_nodes_to_page( ...@@ -216,7 +216,7 @@ ha_remove_all_nodes_to_page(
while (node) { while (node) {
ut_a(buf_frame_align(ha_node_get_data(node)) != page); ut_a(buf_frame_align(ha_node_get_data(node)) != page);
node = ha_chain_get_next(table, node); node = ha_chain_get_next(node);
} }
} }
...@@ -269,12 +269,6 @@ ha_print_info( ...@@ -269,12 +269,6 @@ ha_print_info(
hash_table_t* table) /* in: hash table */ hash_table_t* table) /* in: hash table */
{ {
hash_cell_t* cell; hash_cell_t* cell;
/*
ha_node_t* node;
ulint len = 0;
ulint max_len = 0;
ulint nodes = 0;
*/
ulint cells = 0; ulint cells = 0;
ulint n_bufs; ulint n_bufs;
ulint i; ulint i;
...@@ -290,27 +284,6 @@ ha_print_info( ...@@ -290,27 +284,6 @@ ha_print_info(
if (cell->node) { if (cell->node) {
cells++; cells++;
/*
len = 0;
node = cell->node;
for (;;) {
len++;
nodes++;
if (ha_chain_get_next(table, node) == NULL) {
break;
}
node = node->next;
}
if (len > max_len) {
max_len = len;
}
*/
} }
} }
......
...@@ -49,11 +49,8 @@ ha_node_t* ...@@ -49,11 +49,8 @@ ha_node_t*
ha_chain_get_next( ha_chain_get_next(
/*==============*/ /*==============*/
/* out: next node, NULL if none */ /* out: next node, NULL if none */
hash_table_t* table __attribute__((unused)), /* in: hash table */
ha_node_t* node) /* in: hash chain node */ ha_node_t* node) /* in: hash chain node */
{ {
ut_ad(table);
return(node->next); return(node->next);
} }
...@@ -96,7 +93,7 @@ ha_search( ...@@ -96,7 +93,7 @@ ha_search(
return(node); return(node);
} }
node = ha_chain_get_next(table, node); node = ha_chain_get_next(node);
} }
return(NULL); return(NULL);
...@@ -128,41 +125,7 @@ ha_search_and_get_data( ...@@ -128,41 +125,7 @@ ha_search_and_get_data(
return(node->data); return(node->data);
} }
node = ha_chain_get_next(table, node); node = ha_chain_get_next(node);
}
return(NULL);
}
/*****************************************************************
Returns the next matching hash table node in chain. */
UNIV_INLINE
ha_node_t*
ha_next(
/*====*/
/* out: pointer to the next hash table node
in chain with the fold value, NULL if not
found */
hash_table_t* table, /* in: hash table */
ha_node_t* node) /* in: hash table node */
{
ulint fold;
fold = node->fold;
#ifdef UNIV_SYNC_DEBUG
ut_ad(!table->mutexes || mutex_own(hash_get_mutex(table, fold)));
#endif /* UNIV_SYNC_DEBUG */
node = ha_chain_get_next(table, node);
while (node) {
if (node->fold == fold) {
return(node);
}
node = ha_chain_get_next(table, node);
} }
return(NULL); return(NULL);
...@@ -194,7 +157,7 @@ ha_search_with_data( ...@@ -194,7 +157,7 @@ ha_search_with_data(
return(node); return(node);
} }
node = ha_chain_get_next(table, node); node = ha_chain_get_next(node);
} }
return(NULL); return(NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment