1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed failing test

Browse Source 
Increased default buffers to speed up maria_chk

mysql-test/suite/maria/r/maria3.result:
  Fixed failing test
storage/maria/maria_chk.c:
  Increase default page_buffer_size
storage/maria/maria_def.h:
  Increased default sort buffer size for maria_chk.
This commit is contained in:
Michael Widenius 2010-08-25 01:18:01 +03:00
parent a826711789
commit b9b6ffe73e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/maria/r/maria3.result
View File

@ -310,12 +310,12 @@ maria_log_file_size 4294959104
maria_log_purge_type immediate maria_log_purge_type immediate
maria_max_sort_file_size 9223372036853727232 maria_max_sort_file_size 9223372036853727232
maria_pagecache_age_threshold 300 maria_pagecache_age_threshold 300
maria_pagecache_buffer_size 8384512 maria_pagecache_buffer_size 134213632
maria_pagecache_division_limit 100 maria_pagecache_division_limit 100
maria_page_checksum OFF maria_page_checksum OFF
maria_recover NORMAL maria_recover NORMAL
maria_repair_threads 1 maria_repair_threads 1
maria_sort_buffer_size 8388608 maria_sort_buffer_size 134217728
maria_stats_method nulls_unequal maria_stats_method nulls_unequal
maria_sync_log_dir NEWFILE maria_sync_log_dir NEWFILE
show status like 'maria%'; show status like 'maria%';

2
storage/maria/maria_chk.c
View File

@ -370,7 +370,7 @@ static struct my_option my_long_options[] =
{ "page_buffer_size", OPT_PAGE_BUFFER_SIZE, { "page_buffer_size", OPT_PAGE_BUFFER_SIZE,
"Size of page buffer. Used by --safe-repair", "Size of page buffer. Used by --safe-repair",
&check_param.use_buffers, &check_param.use_buffers, 0, &check_param.use_buffers, &check_param.use_buffers, 0,
GET_ULONG, REQUIRED_ARG, (long) USE_BUFFER_INIT, 1024L*1024L, GET_ULONG, REQUIRED_ARG, (long) USE_BUFFER_INIT, 128L*1024L*1024L,
(long) ~0L, (long) MALLOC_OVERHEAD, (long) IO_SIZE, 0}, (long) ~0L, (long) MALLOC_OVERHEAD, (long) IO_SIZE, 0},
{ "read_buffer_size", OPT_READ_BUFFER_SIZE, "", { "read_buffer_size", OPT_READ_BUFFER_SIZE, "",
&check_param.read_buffer_length, &check_param.read_buffer_length,

2
storage/maria/maria_def.h
View File

@ -1083,7 +1083,7 @@ typedef struct st_maria_block_info
#define USE_BUFFER_INIT (((1024L*1024L*128-MALLOC_OVERHEAD)/8192)*8192) #define USE_BUFFER_INIT (((1024L*1024L*128-MALLOC_OVERHEAD)/8192)*8192)
#define READ_BUFFER_INIT (1024L*256L-MALLOC_OVERHEAD) #define READ_BUFFER_INIT (1024L*256L-MALLOC_OVERHEAD)
#define SORT_BUFFER_INIT (1024L*1024L*64-MALLOC_OVERHEAD) #define SORT_BUFFER_INIT (1024L*1024L*256-MALLOC_OVERHEAD)
#define MIN_SORT_BUFFER (4096-MALLOC_OVERHEAD) #define MIN_SORT_BUFFER (4096-MALLOC_OVERHEAD)
#define fast_ma_writeinfo(INFO) if (!(INFO)->s->tot_locks) (void) _ma_writeinfo((INFO),0) #define fast_ma_writeinfo(INFO) if (!(INFO)->s->tot_locks) (void) _ma_writeinfo((INFO),0)