mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
126c1228f5
Will in future changeset (soon) av versioning of status variables (number of rows) and index Changed some LEX_STRING to LEX_CUSTRING to avoid casts and warnings Removed some not needed variables (as noticed by Guilhem) include/maria.h: Added prototypes for maria_chk_init_for_check(), maria_versioning() and maria_ignore_trids() include/my_base.h: Add new error HA_ERR_ROW_NOT_VISIBLE include/myisamchk.h: Added variables for checking visibility of rows during maria_chk include/thr_lock.h: Changed argument type from int to my_bool for get_status Added variable allow_multiple_concurrent_insert, to signal if table supports multiple concurrent inserts mysql-test/r/maria-page-checksum.result: Added missing drop table mysql-test/t/maria-page-checksum.test: Added missing drop table mysys/my_handler.c: Added new error messages mysys/thr_lock.c: Added support for multiple concurrent inserts, if table handler supports it sql/sql_yacc.yy: Added LOCK TABLE table_name WRITE CONCURRENT This was added (temporarly?) to be able to check versioning with Maria storage/csv/ha_tina.cc: Updated parameter for get_status storage/maria/ha_maria.cc: Added calls to maria_chk_init_status() Fixed call to ma_control_file_open() storage/maria/ma_blockrec.c: Changed some LEX_STRING to LEX_CUSTRING to avoid casts and warnings Changed back some 'header' parameters to const char* Removed some casts Added support for versioning: - If info->row_flag & ROW_FLAG_TRANSID is set, store transaction id together with the row - When reading rows, check if rows are visible. Give error if not - When scanning table, ignore not visible rows - Added function parameters to some functions, to be able to call _ma_compact_block_page() with different parameters depending of if the page is a HEAD or TAIL page - _ma_compact_block_page() deletes transaction id's that are visible by all running transactions - Added functions for thr_lock() to enable multiple concurrent inserts - Added helper function 'mysql_versioning()' to enable/disable versioning - Added helper function maria_ignore_trids(), used by maria_chk and maria_pack to see all rows. storage/maria/ma_blockrec.h: Updated parameters for some functions. Added new functions to read/store state with thr_lock storage/maria/ma_check.c: Enable handling of transaction id's in rows Give a readable error if a table contains a transation id that makes rows not visible storage/maria/ma_control_file.c: Added option to not give warning if control file doesn't exists. storage/maria/ma_control_file.h: Updated parameter lists for ma_control_file_open() storage/maria/ma_delete.c: Removed not used variable (suggestion by Guilhem) storage/maria/ma_locking.c: Changed type of argument from int -> my_bool storage/maria/ma_open.c: Removed not used variables 'key_write_undo_lsn' and 'key_delete_undo_lsn' Added new thr_lock interface functions for BLOCK_RECORD to enable multiple concurrent insert storage/maria/ma_test1.c: Added option --versioning (-C) to check versioning storage/maria/ma_test2.c: Added option -C to check versioning storage/maria/ma_test_recovery: Forward argumetns to ma_test_recovery.pl storage/maria/ma_write.c: Removed not used variable key_write_undo_lsn storage/maria/maria_chk.c: Always read control file (if exist) at start Initialize checking of tables by calling maria_chk_init_for_check() In verbose mode and in case of error, print max found transaction id storage/maria/maria_def.h: Added Trid to MARIA_ROW to be able to check transaction id for found row Moved 'base_length' from MARIA_ROW to MARIA_HA to be able to handle different base length (with and without TRANSID) without if's Added default row_flag to MARIA_HA for the same reason Changed LEX_STRING -> LEX_CUSTRING to avoid casts in ma_blockrec.c Removed not needed variables key_write_undo_lsn and key_delete_undo_lsn Added prototypes for new functions and fixed those that had changed storage/maria/maria_pack.c: Ensure we can read all rows from the file, independent of the used transaction id storage/maria/maria_read_log.c: Updated arguments to ma_control_file_open() storage/maria/trnman.c: If we have only one transaction, fixed that min_read_from contains current transaction Fixed that trnman_can_read_from() returns that row is readable if it was written by current transaction storage/maria/unittest/ma_control_file-t.c: Updated arguments to ma_control_file_open() storage/maria/unittest/ma_test_all-t: Added test of versioning Removed printing of one extra space storage/maria/unittest/ma_test_loghandler-t.c: Updated arguments to ma_control_file_open() storage/maria/unittest/ma_test_loghandler_first_lsn-t.c: Updated arguments to ma_control_file_open() storage/maria/unittest/ma_test_loghandler_max_lsn-t.c: Updated arguments to ma_control_file_open() storage/maria/unittest/ma_test_loghandler_multigroup-t.c: Updated arguments to ma_control_file_open() storage/maria/unittest/ma_test_loghandler_multithread-t.c: Updated arguments to ma_control_file_open() storage/maria/unittest/ma_test_loghandler_noflush-t.c: Updated arguments to ma_control_file_open() storage/maria/unittest/ma_test_loghandler_nologs-t.c: Updated arguments to ma_control_file_open() storage/maria/unittest/ma_test_loghandler_pagecache-t.c: Updated arguments to ma_control_file_open() storage/maria/unittest/ma_test_loghandler_purge-t.c: Updated arguments to ma_control_file_open() storage/maria/unittest/ma_test_recovery.expected: Updated file with result from new tests storage/maria/unittest/ma_test_recovery.pl: Added options --abort-on-error and --verbose In case of --verbose, print all excuted shell commands Added test of versioning storage/myisam/mi_locking.c: Updated type of parameter storage/myisam/myisamdef.h: Updated type of parameter mysql-test/r/maria-mvcc.result: New BitKeeper file ``mysql-test/r/maria-mvcc.result'' mysql-test/t/maria-mvcc.test: New BitKeeper file ``mysql-test/t/maria-mvcc.test''
176 lines
6.2 KiB
C
176 lines
6.2 KiB
C
/* Copyright (C) 2006 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* Definitions needed for myisamchk/mariachk.c */
|
|
|
|
/*
|
|
Entries marked as "QQ to be removed" are NOT used to
|
|
pass check/repair options to xxx_check.c. They are used
|
|
internally by xxxchk.c or/and ha_xxxx.cc and should NOT
|
|
be stored together with other flags. They should be removed
|
|
from the following list to make addition of new flags possible.
|
|
*/
|
|
|
|
#ifndef _myisamchk_h
|
|
#define _myisamchk_h
|
|
|
|
#define T_AUTO_INC 1
|
|
#define T_AUTO_REPAIR 2 /* QQ to be removed */
|
|
#define T_BACKUP_DATA 4
|
|
#define T_CALC_CHECKSUM 8
|
|
#define T_CHECK 16 /* QQ to be removed */
|
|
#define T_CHECK_ONLY_CHANGED 32 /* QQ to be removed */
|
|
#define T_CREATE_MISSING_KEYS 64
|
|
#define T_DESCRIPT 128
|
|
#define T_DONT_CHECK_CHECKSUM 256
|
|
#define T_EXTEND 512
|
|
#define T_FAST (1L << 10) /* QQ to be removed */
|
|
#define T_FORCE_CREATE (1L << 11) /* QQ to be removed */
|
|
#define T_FORCE_UNIQUENESS (1L << 12)
|
|
#define T_INFO (1L << 13)
|
|
#define T_MEDIUM (1L << 14)
|
|
#define T_QUICK (1L << 15) /* QQ to be removed */
|
|
#define T_READONLY (1L << 16) /* QQ to be removed */
|
|
#define T_REP (1L << 17)
|
|
#define T_REP_BY_SORT (1L << 18) /* QQ to be removed */
|
|
#define T_REP_PARALLEL (1L << 19) /* QQ to be removed */
|
|
#define T_RETRY_WITHOUT_QUICK (1L << 20)
|
|
#define T_SAFE_REPAIR (1L << 21)
|
|
#define T_SILENT (1L << 22)
|
|
#define T_SORT_INDEX (1L << 23) /* QQ to be removed */
|
|
#define T_SORT_RECORDS (1L << 24) /* QQ to be removed */
|
|
#define T_STATISTICS (1L << 25)
|
|
#define T_UNPACK (1L << 26)
|
|
#define T_UPDATE_STATE (1L << 27)
|
|
#define T_VERBOSE (1L << 28)
|
|
#define T_VERY_SILENT (1L << 29)
|
|
#define T_WAIT_FOREVER (1L << 30)
|
|
#define T_WRITE_LOOP ((ulong) 1L << 31)
|
|
#define T_ZEROFILL ((ulonglong) 1L << 32)
|
|
#define T_ZEROFILL_KEEP_LSN ((ulonglong) 1L << 33)
|
|
/** If repair should not bump create_rename_lsn */
|
|
#define T_NO_CREATE_RENAME_LSN ((ulonglong) 1L << 33)
|
|
|
|
#define T_REP_ANY (T_REP | T_REP_BY_SORT | T_REP_PARALLEL)
|
|
|
|
/*
|
|
Flags used by xxxxchk.c or/and ha_xxxx.cc that are NOT passed
|
|
to xxxcheck.c follows:
|
|
*/
|
|
|
|
#define TT_USEFRM 1
|
|
#define TT_FOR_UPGRADE 2
|
|
|
|
#define O_NEW_INDEX 1 /* Bits set in out_flag */
|
|
#define O_NEW_DATA 2
|
|
#define O_DATA_LOST 4
|
|
|
|
typedef struct st_sort_key_blocks /* Used when sorting */
|
|
{
|
|
uchar *buff, *end_pos;
|
|
uchar lastkey[HA_MAX_POSSIBLE_KEY_BUFF];
|
|
uint last_length;
|
|
int inited;
|
|
} SORT_KEY_BLOCKS;
|
|
|
|
|
|
/*
|
|
MARIA/MYISAM supports several statistics collection
|
|
methods. Currently statistics collection method is not stored in
|
|
MARIA file and has to be specified for each table analyze/repair
|
|
operation in MI_CHECK::stats_method.
|
|
*/
|
|
|
|
typedef enum
|
|
{
|
|
/* Treat NULLs as inequal when collecting statistics (default for 4.1/5.0) */
|
|
MI_STATS_METHOD_NULLS_NOT_EQUAL,
|
|
/* Treat NULLs as equal when collecting statistics (like 4.0 did) */
|
|
MI_STATS_METHOD_NULLS_EQUAL,
|
|
/* Ignore NULLs - count only tuples without NULLs in the index components */
|
|
MI_STATS_METHOD_IGNORE_NULLS
|
|
} enum_handler_stats_method;
|
|
|
|
|
|
typedef struct st_handler_check_param
|
|
{
|
|
char *isam_file_name;
|
|
MY_TMPDIR *tmpdir;
|
|
void *thd;
|
|
const char *db_name, *table_name, *op_name;
|
|
ulonglong auto_increment_value;
|
|
ulonglong max_data_file_length;
|
|
ulonglong keys_in_use;
|
|
ulonglong max_record_length;
|
|
/*
|
|
The next two are used to collect statistics, see update_key_parts for
|
|
description.
|
|
*/
|
|
ulonglong unique_count[HA_MAX_KEY_SEG + 1];
|
|
ulonglong notnull_count[HA_MAX_KEY_SEG + 1];
|
|
|
|
my_off_t search_after_block;
|
|
my_off_t new_file_pos, key_file_blocks;
|
|
my_off_t keydata, totaldata, key_blocks, start_check_pos;
|
|
my_off_t used, empty, splits, del_length, link_used, lost;
|
|
ha_rows total_records, total_deleted, records,del_blocks;
|
|
ha_rows full_page_count, tail_count;
|
|
ha_checksum record_checksum, glob_crc;
|
|
ha_checksum key_crc[HA_MAX_POSSIBLE_KEY];
|
|
ha_checksum tmp_key_crc[HA_MAX_POSSIBLE_KEY];
|
|
ha_checksum tmp_record_checksum;
|
|
ulonglong org_key_map;
|
|
ulonglong testflag;
|
|
|
|
/* Following is used to check if rows are visible */
|
|
ulonglong max_trid, max_found_trid;
|
|
ulonglong not_visible_rows_found;
|
|
|
|
size_t use_buffers, read_buffer_length, write_buffer_length;
|
|
size_t sort_buffer_length, sort_key_blocks;
|
|
ulong rec_per_key_part[HA_MAX_KEY_SEG * HA_MAX_POSSIBLE_KEY];
|
|
double new_rec_per_key_part[HA_MAX_KEY_SEG * HA_MAX_POSSIBLE_KEY];
|
|
uint out_flag, warning_printed, error_printed, verbose;
|
|
uint opt_sort_key, total_files, max_level;
|
|
uint key_cache_block_size, pagecache_block_size;
|
|
int tmpfile_createflag, err_count;
|
|
myf myf_rw;
|
|
uint8 language;
|
|
my_bool using_global_keycache, opt_lock_memory, opt_follow_links;
|
|
my_bool retry_repair, force_sort, calc_checksum, static_row_size;
|
|
char temp_filename[FN_REFLEN];
|
|
IO_CACHE read_cache;
|
|
enum_handler_stats_method stats_method;
|
|
} HA_CHECK;
|
|
|
|
|
|
typedef struct st_sort_ftbuf
|
|
{
|
|
uchar *buf, *end;
|
|
int count;
|
|
uchar lastkey[HA_MAX_KEY_BUFF];
|
|
} SORT_FT_BUF;
|
|
|
|
|
|
typedef struct st_buffpek {
|
|
my_off_t file_pos; /* Where we are in the sort file */
|
|
uchar *base, *key; /* Key pointers */
|
|
ha_rows count; /* Number of rows in table */
|
|
ulong mem_count; /* numbers of keys in memory */
|
|
ulong max_keys; /* Max keys in buffert */
|
|
} BUFFPEK;
|
|
|
|
#endif /* _myisamchk_h */
|