mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
b21cf962e3
myisam_max_extra_sort_file_size is depricated Ensure that myisam_data_pointer_size is honoured when creating new MyISAM files Changed default value of myisam_data_pointer_size from 4 to 6 to get rid of 'table-is-full' errors include/myisam.h: Change type of myisam_block_size and myisam_concurrent_insert to make them changeable in mysqld.cc Removed not used varaible myisam_max_extra_temp_length include/thr_lock.h: Added extra parameter to get_status myisam/mi_create.c: Ensure that myisam_data_pointer_size is honoured myisam/mi_dynrec.c: If 'append_insert_at_end' is set, only write at end of myisam record file myisam/mi_locking.c: Add extra argument to 'mi_get_status' to allow thr_lock to signal that we want to do a concurrent insert If this is used, we will append new insert rows at end of data file. Change mi_check_status() to allow concurrent_inserts even if there are holes in the file when myisam_concurent_insert=2 myisam/mi_static.c: Change behavior of myisam_concurrent_insert so that setting this to 2 allows inserts even if there is a hole in the data file. Default value is 2 for MyISAM direct usage but will be set to 1 (old default) by mysqld.cc myisam/mi_statrec.c: If 'append_insert_at_end' is set, only write at end of myisam record file myisam/mi_write.c: If 'append_insert_at_end' is set, only write at end of myisam record file myisam/myisamdef.h: Support for insert-at-end even if there is holes in data file mysql-test/r/gis-rtree.result: Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6 mysql-test/r/group_min_max.result: Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6 mysql-test/r/index_merge.result: Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6 mysql-test/r/index_merge_ror.result: Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6 mysql-test/r/merge.result: Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6 mysql-test/r/myisam.result: Test of concurrent_insert=2 mysql-test/r/null.result: Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6 mysql-test/r/preload.result: Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6 mysql-test/r/ps_1general.result: Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6 mysql-test/r/range.result: Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6 mysql-test/r/variables.result: concurrent_insert is now a integer, not a boolean myisam_extra_sort_file_size is deleted mysql-test/r/view.result: Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6 mysql-test/t/index_merge.test: Test result changed because default value for myisam_data_pointer_size is changed from 4 -> 6 mysql-test/t/myisam.test: Test of concurrent_insert=2 mysql-test/t/ps_1general.test: Drop test table mysql-test/t/variables.test: concurrent_insert is now a integer, not a boolean myisam_extra_sort_file_size is deleted mysql-test/t/view.test: Drop tables that may be left from previous tests mysys/thr_lock.c: Extra paramter to get_status to signal if concurrent_insert was used sql/mysqld.cc: concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file myisam_max_extra_sort_file_size is depricated sql/set_var.cc: concurrent-insert is now an integer, not a bool myisam_max_extra_sort_file_size is deleted
302 lines
8.8 KiB
C
302 lines
8.8 KiB
C
/* Copyright (C) 2000 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; 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 */
|
|
|
|
/* Functions to handle fixed-length-records */
|
|
|
|
#include "myisamdef.h"
|
|
|
|
|
|
int _mi_write_static_record(MI_INFO *info, const byte *record)
|
|
{
|
|
uchar temp[8]; /* max pointer length */
|
|
|
|
if (info->s->state.dellink != HA_OFFSET_ERROR &&
|
|
!info->append_insert_at_end)
|
|
{
|
|
my_off_t filepos=info->s->state.dellink;
|
|
info->rec_cache.seek_not_done=1; /* We have done a seek */
|
|
if (my_pread(info->dfile,(char*) &temp[0],info->s->base.rec_reflength,
|
|
info->s->state.dellink+1,
|
|
MYF(MY_NABP)))
|
|
goto err;
|
|
info->s->state.dellink= _mi_rec_pos(info->s,temp);
|
|
info->state->del--;
|
|
info->state->empty-=info->s->base.pack_reclength;
|
|
if (my_pwrite(info->dfile, (char*) record, info->s->base.reclength,
|
|
filepos,
|
|
MYF(MY_NABP)))
|
|
goto err;
|
|
}
|
|
else
|
|
{
|
|
if (info->state->data_file_length > info->s->base.max_data_file_length-
|
|
info->s->base.pack_reclength)
|
|
{
|
|
my_errno=HA_ERR_RECORD_FILE_FULL;
|
|
return(2);
|
|
}
|
|
if (info->opt_flag & WRITE_CACHE_USED)
|
|
{ /* Cash in use */
|
|
if (my_b_write(&info->rec_cache, (byte*) record,
|
|
info->s->base.reclength))
|
|
goto err;
|
|
if (info->s->base.pack_reclength != info->s->base.reclength)
|
|
{
|
|
uint length=info->s->base.pack_reclength - info->s->base.reclength;
|
|
bzero((char*) temp,length);
|
|
if (my_b_write(&info->rec_cache, (byte*) temp,length))
|
|
goto err;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
info->rec_cache.seek_not_done=1; /* We have done a seek */
|
|
if (my_pwrite(info->dfile,(char*) record,info->s->base.reclength,
|
|
info->state->data_file_length,
|
|
info->s->write_flag))
|
|
goto err;
|
|
if (info->s->base.pack_reclength != info->s->base.reclength)
|
|
{
|
|
uint length=info->s->base.pack_reclength - info->s->base.reclength;
|
|
bzero((char*) temp,length);
|
|
if (my_pwrite(info->dfile, (byte*) temp,length,
|
|
info->state->data_file_length+
|
|
info->s->base.reclength,
|
|
info->s->write_flag))
|
|
goto err;
|
|
}
|
|
}
|
|
info->state->data_file_length+=info->s->base.pack_reclength;
|
|
info->s->state.split++;
|
|
}
|
|
return 0;
|
|
err:
|
|
return 1;
|
|
}
|
|
|
|
int _mi_update_static_record(MI_INFO *info, my_off_t pos, const byte *record)
|
|
{
|
|
info->rec_cache.seek_not_done=1; /* We have done a seek */
|
|
return (my_pwrite(info->dfile,
|
|
(char*) record,info->s->base.reclength,
|
|
pos,
|
|
MYF(MY_NABP)) != 0);
|
|
}
|
|
|
|
|
|
int _mi_delete_static_record(MI_INFO *info)
|
|
{
|
|
uchar temp[9]; /* 1+sizeof(uint32) */
|
|
|
|
info->state->del++;
|
|
info->state->empty+=info->s->base.pack_reclength;
|
|
temp[0]= '\0'; /* Mark that record is deleted */
|
|
_mi_dpointer(info,temp+1,info->s->state.dellink);
|
|
info->s->state.dellink = info->lastpos;
|
|
info->rec_cache.seek_not_done=1;
|
|
return (my_pwrite(info->dfile,(byte*) temp, 1+info->s->rec_reflength,
|
|
info->lastpos, MYF(MY_NABP)) != 0);
|
|
}
|
|
|
|
|
|
int _mi_cmp_static_record(register MI_INFO *info, register const byte *old)
|
|
{
|
|
DBUG_ENTER("_mi_cmp_static_record");
|
|
|
|
/* We are going to do changes; dont let anybody disturb */
|
|
dont_break(); /* Dont allow SIGHUP or SIGINT */
|
|
|
|
if (info->opt_flag & WRITE_CACHE_USED)
|
|
{
|
|
if (flush_io_cache(&info->rec_cache))
|
|
{
|
|
DBUG_RETURN(-1);
|
|
}
|
|
info->rec_cache.seek_not_done=1; /* We have done a seek */
|
|
}
|
|
|
|
if ((info->opt_flag & READ_CHECK_USED))
|
|
{ /* If check isn't disabled */
|
|
info->rec_cache.seek_not_done=1; /* We have done a seek */
|
|
if (my_pread(info->dfile, (char*) info->rec_buff, info->s->base.reclength,
|
|
info->lastpos,
|
|
MYF(MY_NABP)))
|
|
DBUG_RETURN(-1);
|
|
if (memcmp((byte*) info->rec_buff, (byte*) old,
|
|
(uint) info->s->base.reclength))
|
|
{
|
|
DBUG_DUMP("read",old,info->s->base.reclength);
|
|
DBUG_DUMP("disk",info->rec_buff,info->s->base.reclength);
|
|
my_errno=HA_ERR_RECORD_CHANGED; /* Record have changed */
|
|
DBUG_RETURN(1);
|
|
}
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
int _mi_cmp_static_unique(MI_INFO *info, MI_UNIQUEDEF *def,
|
|
const byte *record, my_off_t pos)
|
|
{
|
|
DBUG_ENTER("_mi_cmp_static_unique");
|
|
|
|
info->rec_cache.seek_not_done=1; /* We have done a seek */
|
|
if (my_pread(info->dfile, (char*) info->rec_buff, info->s->base.reclength,
|
|
pos, MYF(MY_NABP)))
|
|
DBUG_RETURN(-1);
|
|
DBUG_RETURN(mi_unique_comp(def, record, info->rec_buff,
|
|
def->null_are_equal));
|
|
}
|
|
|
|
|
|
/* Read a fixed-length-record */
|
|
/* Returns 0 if Ok. */
|
|
/* 1 if record is deleted */
|
|
/* MY_FILE_ERROR on read-error or locking-error */
|
|
|
|
int _mi_read_static_record(register MI_INFO *info, register my_off_t pos,
|
|
register byte *record)
|
|
{
|
|
int error;
|
|
|
|
if (pos != HA_OFFSET_ERROR)
|
|
{
|
|
if (info->opt_flag & WRITE_CACHE_USED &&
|
|
info->rec_cache.pos_in_file <= pos &&
|
|
flush_io_cache(&info->rec_cache))
|
|
return(-1);
|
|
info->rec_cache.seek_not_done=1; /* We have done a seek */
|
|
|
|
error=my_pread(info->dfile,(char*) record,info->s->base.reclength,
|
|
pos,MYF(MY_NABP)) != 0;
|
|
fast_mi_writeinfo(info);
|
|
if (! error)
|
|
{
|
|
if (!*record)
|
|
{
|
|
my_errno=HA_ERR_RECORD_DELETED;
|
|
return(1); /* Record is deleted */
|
|
}
|
|
info->update|= HA_STATE_AKTIV; /* Record is read */
|
|
return(0);
|
|
}
|
|
return(-1); /* Error on read */
|
|
}
|
|
fast_mi_writeinfo(info); /* No such record */
|
|
return(-1);
|
|
}
|
|
|
|
|
|
|
|
int _mi_read_rnd_static_record(MI_INFO *info, byte *buf,
|
|
register my_off_t filepos,
|
|
my_bool skip_deleted_blocks)
|
|
{
|
|
int locked,error,cache_read;
|
|
uint cache_length;
|
|
MYISAM_SHARE *share=info->s;
|
|
DBUG_ENTER("_mi_read_rnd_static_record");
|
|
|
|
cache_read=0;
|
|
cache_length=0;
|
|
if (info->opt_flag & WRITE_CACHE_USED &&
|
|
(info->rec_cache.pos_in_file <= filepos || skip_deleted_blocks) &&
|
|
flush_io_cache(&info->rec_cache))
|
|
DBUG_RETURN(my_errno);
|
|
if (info->opt_flag & READ_CACHE_USED)
|
|
{ /* Cache in use */
|
|
if (filepos == my_b_tell(&info->rec_cache) &&
|
|
(skip_deleted_blocks || !filepos))
|
|
{
|
|
cache_read=1; /* Read record using cache */
|
|
cache_length=(uint) (info->rec_cache.read_end - info->rec_cache.read_pos);
|
|
}
|
|
else
|
|
info->rec_cache.seek_not_done=1; /* Filepos is changed */
|
|
}
|
|
locked=0;
|
|
if (info->lock_type == F_UNLCK)
|
|
{
|
|
if (filepos >= info->state->data_file_length)
|
|
{ /* Test if new records */
|
|
if (_mi_readinfo(info,F_RDLCK,0))
|
|
DBUG_RETURN(my_errno);
|
|
locked=1;
|
|
}
|
|
else
|
|
{ /* We don't nead new info */
|
|
#ifndef UNSAFE_LOCKING
|
|
if ((! cache_read || share->base.reclength > cache_length) &&
|
|
share->tot_locks == 0)
|
|
{ /* record not in cache */
|
|
if (my_lock(share->kfile,F_RDLCK,0L,F_TO_EOF,
|
|
MYF(MY_SEEK_NOT_DONE) | info->lock_wait))
|
|
DBUG_RETURN(my_errno);
|
|
locked=1;
|
|
}
|
|
#else
|
|
info->tmp_lock_type=F_RDLCK;
|
|
#endif
|
|
}
|
|
}
|
|
if (filepos >= info->state->data_file_length)
|
|
{
|
|
DBUG_PRINT("test",("filepos: %ld (%ld) records: %ld del: %ld",
|
|
filepos/share->base.reclength,filepos,
|
|
info->state->records, info->state->del));
|
|
fast_mi_writeinfo(info);
|
|
DBUG_RETURN(my_errno=HA_ERR_END_OF_FILE);
|
|
}
|
|
info->lastpos= filepos;
|
|
info->nextpos= filepos+share->base.pack_reclength;
|
|
|
|
if (! cache_read) /* No cacheing */
|
|
{
|
|
if ((error=_mi_read_static_record(info,filepos,buf)))
|
|
{
|
|
if (error > 0)
|
|
error=my_errno=HA_ERR_RECORD_DELETED;
|
|
else
|
|
error=my_errno;
|
|
}
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
/* Read record with cacheing */
|
|
error=my_b_read(&info->rec_cache,(byte*) buf,share->base.reclength);
|
|
if (info->s->base.pack_reclength != info->s->base.reclength && !error)
|
|
{
|
|
char tmp[8]; /* Skill fill bytes */
|
|
error=my_b_read(&info->rec_cache,(byte*) tmp,
|
|
info->s->base.pack_reclength - info->s->base.reclength);
|
|
}
|
|
if (locked)
|
|
VOID(_mi_writeinfo(info,0)); /* Unlock keyfile */
|
|
if (!error)
|
|
{
|
|
if (!buf[0])
|
|
{ /* Record is removed */
|
|
DBUG_RETURN(my_errno=HA_ERR_RECORD_DELETED);
|
|
}
|
|
/* Found and may be updated */
|
|
info->update|= HA_STATE_AKTIV | HA_STATE_KEY_CHANGED;
|
|
DBUG_RETURN(0);
|
|
}
|
|
/* my_errno should be set if rec_cache.error == -1 */
|
|
if (info->rec_cache.error != -1 || my_errno == 0)
|
|
my_errno=HA_ERR_WRONG_IN_RECORD;
|
|
DBUG_RETURN(my_errno); /* Something wrong (EOF?) */
|
|
}
|