From 10a8adc1b5b850f0001e038ba816641ecf7bddf9 Mon Sep 17 00:00:00 2001 From: "igor@rurik.mysql.com" <> Date: Mon, 30 Jun 2003 09:41:41 -0700 Subject: Many files: Added multiple key cache --- isam/isamchk.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'isam/isamchk.c') diff --git a/isam/isamchk.c b/isam/isamchk.c index dc772290e13..d3db440bf87 100644 --- a/isam/isamchk.c +++ b/isam/isamchk.c @@ -516,7 +516,8 @@ static int nisamchk(my_string filename) if (!rep_quick) { if (testflag & T_EXTEND) - VOID(init_key_cache(use_buffers)); + VOID(init_key_cache(&dflt_keycache,dflt_key_block_size, + use_buffers)); VOID(init_io_cache(&read_cache,datafile,(uint) read_buffer_length, READ_CACHE,share->pack.header_length,1, MYF(MY_WME))); @@ -1459,7 +1460,7 @@ my_string name; printf("Data records: %lu\n",(ulong) share->state.records); } - VOID(init_key_cache(use_buffers)); + VOID(init_key_cache(&dflt_keycache,dflt_key_block_size,use_buffers)); if (init_io_cache(&read_cache,info->dfile,(uint) read_buffer_length, READ_CACHE,share->pack.header_length,1,MYF(MY_WME))) goto err; @@ -1887,12 +1888,12 @@ static void lock_memory(void) static int flush_blocks(file) File file; { - if (flush_key_blocks(file,FLUSH_RELEASE)) + if (flush_key_blocks(dflt_keycache,file,FLUSH_RELEASE)) { print_error("%d when trying to write bufferts",my_errno); return(1); } - end_key_cache(); + end_key_cache(&dflt_keycache,1); return 0; } /* flush_blocks */ @@ -1936,7 +1937,7 @@ int write_info; if (share->state.key_root[sort_key] == NI_POS_ERROR) DBUG_RETURN(0); /* Nothing to do */ - init_key_cache(use_buffers); + init_key_cache(&dflt_keycache,dflt_key_block_size,use_buffers); if (init_io_cache(&info->rec_cache,-1,(uint) write_buffer_length, WRITE_CACHE,share->pack.header_length,1, MYF(MY_WME | MY_WAIT_IF_FULL))) -- cgit v1.2.1 From 9306f55d8e62aca4e00dab3408a8395af85fb947 Mon Sep 17 00:00:00 2001 From: "igor@rurik.mysql.com" <> Date: Sat, 2 Aug 2003 02:43:18 -0700 Subject: Many files: Added key cache assignment mi_locking.c: Added key cache assignment: correction my_sys.h: Added key cache variable structure --- isam/isamchk.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'isam/isamchk.c') diff --git a/isam/isamchk.c b/isam/isamchk.c index d3db440bf87..653d932c79d 100644 --- a/isam/isamchk.c +++ b/isam/isamchk.c @@ -516,8 +516,8 @@ static int nisamchk(my_string filename) if (!rep_quick) { if (testflag & T_EXTEND) - VOID(init_key_cache(&dflt_keycache,dflt_key_block_size, - use_buffers)); + VOID(init_key_cache(dflt_keycache,KEY_CACHE_BLOCK_SIZE, + use_buffers,&dflt_key_cache_var)); VOID(init_io_cache(&read_cache,datafile,(uint) read_buffer_length, READ_CACHE,share->pack.header_length,1, MYF(MY_WME))); @@ -1460,7 +1460,8 @@ my_string name; printf("Data records: %lu\n",(ulong) share->state.records); } - VOID(init_key_cache(&dflt_keycache,dflt_key_block_size,use_buffers)); + VOID(init_key_cache(dflt_keycache,KEY_CACHE_BLOCK_SIZE,use_buffers, + &dflt_key_cache_var)); if (init_io_cache(&read_cache,info->dfile,(uint) read_buffer_length, READ_CACHE,share->pack.header_length,1,MYF(MY_WME))) goto err; @@ -1893,7 +1894,7 @@ File file; print_error("%d when trying to write bufferts",my_errno); return(1); } - end_key_cache(&dflt_keycache,1); + end_key_cache(dflt_keycache,1); return 0; } /* flush_blocks */ @@ -1937,7 +1938,8 @@ int write_info; if (share->state.key_root[sort_key] == NI_POS_ERROR) DBUG_RETURN(0); /* Nothing to do */ - init_key_cache(&dflt_keycache,dflt_key_block_size,use_buffers); + init_key_cache(dflt_keycache,KEY_CACHE_BLOCK_SIZE,use_buffers, + &dflt_key_cache_var); if (init_io_cache(&info->rec_cache,-1,(uint) write_buffer_length, WRITE_CACHE,share->pack.header_length,1, MYF(MY_WME | MY_WAIT_IF_FULL))) -- cgit v1.2.1