mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
0f3d4b2f76
Fixed bug in Aria when replacing short keys with long keys and a key tree both overflow and underflow at same time. Fixed several bugs when generating recovery logs when using RGQ with replacing long keys with short keys and vice versa. Lots of new DBUG_ASSERT()'s Added more information to recovery log to make it easier to know from where log entry orginated. Introduced MARIA_PAGE->org_size that tells what the size of the page was in last log entry. This allows us to find out if all key changes for index page was logged. Small code cleanups: - Introduced _ma_log_key_changes() to log crc of key page changes - Added share->max_index_block_size as max size of data one can put in key block (block_size - KEYPAGE_CHECKSUM_SIZE) This will later simplify adding a directory to index pages. - Write page number instead of page postition to DBUG log mysql-test/lib/v1/mysql-test-run.pl: Use --general-log instead of --log to disable warning when using RQG sql/mysqld.cc: If we have already sent ok to client when we get an error, log this to stderr Don't disable option --log-output if CSV engine is not supported. storage/maria/ha_maria.cc: Log queries to recovery log also in LOCK TABLES storage/maria/ma_check.c: If param->max_trid is set, use this value instead of max_trid_in_system(). This is used by recovery to set max_trid to max seen trid so far. keyinfo->block_length - KEYPAGE_CHECKSUM_SIZE -> max_index_block_size (Style optimization) storage/maria/ma_delete.c: Mark tables crashed early Write page number instead of page position to debug log. Added parameter to ma_log_delete() and ma_log_prefix() that is logged so that we can find where wrong log entries where generated. Fixed bug where a page was not proplerly written when same key tree had both an overflow and underflow when deleting a key. keyinfo->block_length - KEYPAGE_CHECKSUM_SIZE => max_index_block_size (Style optimization) ma_log_delete() now has extra parameter of how many bytes from end of page should be appended to log for page (for page overflows) storage/maria/ma_key_recover.c: Added extra parameter to ma_log_prefix() to indicate what caused log entry. Update MARIA_PAGE->org_size when logging info about page. Much more DBUG_ASSERT()'s. Fix some bugs in maria_log_add() to handle page overflows. Added _ma_log_key_changes() to log crc of key page changes. If EXTRA_STORE_FULL_PAGE_IN_KEY_CHANGES is defines, log the resulting pages to log so one can trivally see how the resulting page should have looked like (for errors in CRC values) storage/maria/ma_key_recover.h: Added _ma_log_key_changes() which is only called if EXTRA_DEBUG_KEY_CHANGES is defined. Updated function prototypes. storage/maria/ma_loghandler.h: Added more values to en_key_debug, to get more exact location where things went wrong when logging to recovery log. storage/maria/ma_open.c: Initialize share->max_index_block_size storage/maria/ma_page.c: Added updating and testing of MARIA_PAGE->org_size Write page number instead of page postition to DBUG log Generate error if we read page with wrong data. Removed wrong assert: key_del_current != share->state.key_del. Simplify _ma_log_compact_keypage() storage/maria/ma_recovery.c: Set param.max_trid to max seen trid before running repair table (used for alter table to create index) storage/maria/ma_rt_key.c: Update call to _ma_log_delete() storage/maria/ma_rt_split.c: Use _ma_log_key_changes() Update MARIA_PAGE->org_size storage/maria/ma_unique.c: Remove casts storage/maria/ma_write.c: keyinfo->block_length - KEYPAGE_CHECKSUM_SIZE => share->max_index_block_length. Updated calls to _ma_log_prefix() Changed code to use _ma_log_key_changes() Update ma_page->org_size Fixed bug in _ma_log_split() for pages that overflow Added KEY_OP_DEBUG logging to functions Log KEYPAGE_FLAG in all log entries storage/maria/maria_def.h: Added SHARE->max_index_block_size Added MARIA_PAGE->org_size storage/maria/trnman.c: Reset flags for new transaction.
244 lines
7.1 KiB
C
244 lines
7.1 KiB
C
/* Copyright (C) 2006 MySQL AB & MySQL Finland AB & TCX DataKonsult 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; version 2 of the License.
|
|
|
|
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 */
|
|
|
|
/* Functions to check if a row is unique */
|
|
|
|
#include "maria_def.h"
|
|
#include <m_ctype.h>
|
|
|
|
/**
|
|
Check if there exist a row with the same hash
|
|
|
|
@notes
|
|
This function is not versioning safe. For the moment this is not a problem
|
|
as it's only used for internal temporary tables in MySQL for which there
|
|
isn't any versioning information.
|
|
*/
|
|
|
|
my_bool _ma_check_unique(MARIA_HA *info, MARIA_UNIQUEDEF *def, uchar *record,
|
|
ha_checksum unique_hash, my_off_t disk_pos)
|
|
{
|
|
my_off_t lastpos=info->cur_row.lastpos;
|
|
MARIA_KEYDEF *keyinfo= &info->s->keyinfo[def->key];
|
|
uchar *key_buff= info->lastkey_buff2;
|
|
MARIA_KEY key;
|
|
DBUG_ENTER("_ma_check_unique");
|
|
DBUG_PRINT("enter",("unique_hash: %lu", (ulong) unique_hash));
|
|
|
|
maria_unique_store(record+keyinfo->seg->start, unique_hash);
|
|
/* Can't be spatial so it's ok to call _ma_make_key directly here */
|
|
_ma_make_key(info, &key, def->key, key_buff, record, 0, 0);
|
|
|
|
/* The above changed info->lastkey_buff2. Inform maria_rnext_same(). */
|
|
info->update&= ~HA_STATE_RNEXT_SAME;
|
|
|
|
DBUG_ASSERT(key.data_length == MARIA_UNIQUE_HASH_LENGTH);
|
|
if (_ma_search(info, &key, SEARCH_FIND, info->s->state.key_root[def->key]))
|
|
{
|
|
info->page_changed=1; /* Can't optimize read next */
|
|
info->cur_row.lastpos= lastpos;
|
|
DBUG_RETURN(0); /* No matching rows */
|
|
}
|
|
|
|
for (;;)
|
|
{
|
|
if (info->cur_row.lastpos != disk_pos &&
|
|
!(*info->s->compare_unique)(info,def,record,info->cur_row.lastpos))
|
|
{
|
|
my_errno=HA_ERR_FOUND_DUPP_UNIQUE;
|
|
info->errkey= (int) def->key;
|
|
info->dup_key_pos= info->cur_row.lastpos;
|
|
info->page_changed= 1; /* Can't optimize read next */
|
|
info->cur_row.lastpos= lastpos;
|
|
DBUG_PRINT("info",("Found duplicate"));
|
|
DBUG_RETURN(1); /* Found identical */
|
|
}
|
|
DBUG_ASSERT(info->last_key.data_length == MARIA_UNIQUE_HASH_LENGTH);
|
|
if (_ma_search_next(info, &info->last_key, SEARCH_BIGGER,
|
|
info->s->state.key_root[def->key]) ||
|
|
bcmp(info->last_key.data, key_buff, MARIA_UNIQUE_HASH_LENGTH))
|
|
{
|
|
info->page_changed= 1; /* Can't optimize read next */
|
|
info->cur_row.lastpos= lastpos;
|
|
DBUG_RETURN(0); /* end of tree */
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
Calculate a hash for a row
|
|
|
|
TODO
|
|
Add support for bit fields
|
|
*/
|
|
|
|
ha_checksum _ma_unique_hash(MARIA_UNIQUEDEF *def, const uchar *record)
|
|
{
|
|
const uchar *pos, *end;
|
|
ha_checksum crc= 0;
|
|
ulong seed1=0, seed2= 4;
|
|
HA_KEYSEG *keyseg;
|
|
|
|
for (keyseg=def->seg ; keyseg < def->end ; keyseg++)
|
|
{
|
|
enum ha_base_keytype type=(enum ha_base_keytype) keyseg->type;
|
|
uint length=keyseg->length;
|
|
|
|
if (keyseg->null_bit)
|
|
{
|
|
if (record[keyseg->null_pos] & keyseg->null_bit)
|
|
{
|
|
/*
|
|
Change crc in a way different from an empty string or 0.
|
|
(This is an optimisation; The code will work even if this isn't
|
|
done)
|
|
*/
|
|
crc=((crc << 8) + 511+
|
|
(crc >> (8*sizeof(ha_checksum)-8)));
|
|
continue;
|
|
}
|
|
}
|
|
pos= record+keyseg->start;
|
|
if (keyseg->flag & HA_VAR_LENGTH_PART)
|
|
{
|
|
uint pack_length= keyseg->bit_start;
|
|
uint tmp_length= (pack_length == 1 ? (uint) *pos :
|
|
uint2korr(pos));
|
|
pos+= pack_length; /* Skip VARCHAR length */
|
|
set_if_smaller(length,tmp_length);
|
|
}
|
|
else if (keyseg->flag & HA_BLOB_PART)
|
|
{
|
|
uint tmp_length= _ma_calc_blob_length(keyseg->bit_start,pos);
|
|
memcpy_fixed((uchar*) &pos,pos+keyseg->bit_start,sizeof(char*));
|
|
if (!length || length > tmp_length)
|
|
length=tmp_length; /* The whole blob */
|
|
}
|
|
end= pos+length;
|
|
if (type == HA_KEYTYPE_TEXT || type == HA_KEYTYPE_VARTEXT1 ||
|
|
type == HA_KEYTYPE_VARTEXT2)
|
|
{
|
|
keyseg->charset->coll->hash_sort(keyseg->charset,
|
|
(const uchar*) pos, length, &seed1,
|
|
&seed2);
|
|
crc^= seed1;
|
|
}
|
|
else
|
|
while (pos != end)
|
|
crc=((crc << 8) +
|
|
(((uchar) *pos++))) +
|
|
(crc >> (8*sizeof(ha_checksum)-8));
|
|
}
|
|
return crc;
|
|
}
|
|
|
|
|
|
/*
|
|
compare unique key for two rows
|
|
|
|
TODO
|
|
Add support for bit fields
|
|
|
|
RETURN
|
|
0 if both rows have equal unique value
|
|
1 Rows are different
|
|
*/
|
|
|
|
my_bool _ma_unique_comp(MARIA_UNIQUEDEF *def, const uchar *a, const uchar *b,
|
|
my_bool null_are_equal)
|
|
{
|
|
const uchar *pos_a, *pos_b, *end;
|
|
HA_KEYSEG *keyseg;
|
|
|
|
for (keyseg=def->seg ; keyseg < def->end ; keyseg++)
|
|
{
|
|
enum ha_base_keytype type=(enum ha_base_keytype) keyseg->type;
|
|
uint a_length, b_length;
|
|
a_length= b_length= keyseg->length;
|
|
|
|
/* If part is NULL it's regarded as different */
|
|
if (keyseg->null_bit)
|
|
{
|
|
uint tmp;
|
|
if ((tmp=(a[keyseg->null_pos] & keyseg->null_bit)) !=
|
|
(uint) (b[keyseg->null_pos] & keyseg->null_bit))
|
|
return 1;
|
|
if (tmp)
|
|
{
|
|
if (!null_are_equal)
|
|
return 1;
|
|
continue;
|
|
}
|
|
}
|
|
pos_a= a+keyseg->start;
|
|
pos_b= b+keyseg->start;
|
|
if (keyseg->flag & HA_VAR_LENGTH_PART)
|
|
{
|
|
uint pack_length= keyseg->bit_start;
|
|
if (pack_length == 1)
|
|
{
|
|
a_length= (uint) *pos_a++;
|
|
b_length= (uint) *pos_b++;
|
|
}
|
|
else
|
|
{
|
|
a_length= uint2korr(pos_a);
|
|
b_length= uint2korr(pos_b);
|
|
pos_a+= 2; /* Skip VARCHAR length */
|
|
pos_b+= 2;
|
|
}
|
|
set_if_smaller(a_length, keyseg->length); /* Safety */
|
|
set_if_smaller(b_length, keyseg->length); /* safety */
|
|
}
|
|
else if (keyseg->flag & HA_BLOB_PART)
|
|
{
|
|
/* Only compare 'length' characters if length != 0 */
|
|
a_length= _ma_calc_blob_length(keyseg->bit_start,pos_a);
|
|
b_length= _ma_calc_blob_length(keyseg->bit_start,pos_b);
|
|
/* Check that a and b are of equal length */
|
|
if (keyseg->length)
|
|
{
|
|
/*
|
|
This is used in some cases when we are not interested in comparing
|
|
the whole length of the blob.
|
|
*/
|
|
set_if_smaller(a_length, keyseg->length);
|
|
set_if_smaller(b_length, keyseg->length);
|
|
}
|
|
memcpy_fixed((uchar*) &pos_a,pos_a+keyseg->bit_start,sizeof(char*));
|
|
memcpy_fixed((uchar*) &pos_b,pos_b+keyseg->bit_start,sizeof(char*));
|
|
}
|
|
if (type == HA_KEYTYPE_TEXT || type == HA_KEYTYPE_VARTEXT1 ||
|
|
type == HA_KEYTYPE_VARTEXT2)
|
|
{
|
|
if (ha_compare_text(keyseg->charset, pos_a, a_length,
|
|
pos_b, b_length, 0, 1))
|
|
return 1;
|
|
}
|
|
else
|
|
{
|
|
if (a_length != b_length)
|
|
return 1;
|
|
end= pos_a+a_length;
|
|
while (pos_a != end)
|
|
{
|
|
if (*pos_a++ != *pos_b++)
|
|
return 1;
|
|
}
|
|
}
|
|
}
|
|
return 0;
|
|
}
|