mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
70aa7424c4
(All commit emails since 4.0.1 checked) This had to be done now, before the 4.1 tree changes to much, to make it easy to propagate bug fixes to the 4.1 tree. BUILD/SETUP.sh: Added -DPEDANTIC_SAFEMALLOC as standard debug option Docs/manual.texi: Changes for new version. client/mysql.cc: Fixed default value for rehash cleanup client/mysqladmin.c: Cleanup client/mysqlbinlog.cc: cleanup client/mysqldump.c: Cleanup client/mysqlmanager-pwgen.c: Cleanup client/mysqlmanagerc.c: Cleanup client/mysqltest.c: Cleanup dbug/dbug.c: Cleanup extra/resolve_stack_dump.c: Cleanup & Simple optimizations include/ft_global.h: Cleanup include/my_alloc.h: Cleanup include/my_global.h: Cleanup include/my_sys.h: Cleanup include/myisam.h: Cleanup libmysql/libmysql.c: Cleanup libmysql/manager.c: Cleanup myisam/ft_boolean_search.c: Cleanup myisam/ft_dump.c: Change strcpy -> strmov myisam/ft_eval.c: Cleanup myisam/ft_nlq_search.c: Cleanup myisam/ft_test1.c: strncpy -> strnmov myisam/ft_update.c: Cleanup myisam/mi_static.c: Cleanup myisam/mi_test2.c: Cleanup myisam/mi_write.c: Cleanup mysys/mf_fn_ext.c: Cleanup mysys/mf_iocache.c: Cleanup mysys/mf_iocache2.c: Cleanup mysys/my_getopt.c: Cleanup mysys/my_read.c: Cleanup mysys/my_thr_init.c: Cleanup mysys/queues.c: Cleanup mysys/safemalloc.c: Cleanup sql/field.cc: Indentation cleanups sql/ha_berkeley.cc: Indentation cleanups sql/ha_myisam.cc: Cleanup sql/item.h: Indentation cleanups sql/item_cmpfunc.cc: Indentation cleanups sql/item_create.cc: cleanup sql/item_func.cc: Cleanup sql/item_func.h: Indentation cleanups sql/item_strfunc.cc: Indentation cleanups sql/item_sum.cc: Indentation cleanups sql/item_timefunc.cc: Indentation cleanups sql/lock.cc: Indentation cleanups sql/log.cc: Cleanup strnmov -> strmake sql/log_event.cc: Cleanup + optimizations Fixed memory leak Added missing pthread_mutex_unlock() (On error condition) sql/log_event.h: Indentation and comment cleanup Merged #ifdef's into common blocks for better readability sql/mini_client.cc: Indentation cleanup sql/mysql_priv.h: Cleanup Changed int function to bool sql/mysqld.cc: Indentation and comment cleanup sql/net_pkg.cc: Indentation cleanup sql/net_serv.cc: Changed int function -> bool sql/nt_servc.cc: Cleanup sql/opt_range.cc: Indentation cleanup sql/repl_failsafe.cc: Cleanup + simple optimization strnmov -> strmake sql/slave.cc: strnmov -> strmake Cleanups sql/slave.h: Cleanup sql/sql_acl.cc: Indentation and DBUG_PRINT cleanup Changed WITH MAX... to not use = sql/sql_base.cc: Indentation cleanup sql/sql_cache.cc: Indentation cleanup sql/sql_class.cc: Indentation cleanup sql/sql_class.h: Renamed some struct slots sql/sql_delete.cc: Indentation cleanup sql/sql_handler.cc: Indentation cleanup sql/sql_insert.cc: Use new slot names. sql/sql_lex.cc: Indentation cleanup sql/sql_lex.h: Indentation cleanup sql/sql_load.cc: Indentation cleanup sql/sql_parse.cc: Indentation cleanup Removed not used check from LOCK TABLES sql/sql_repl.cc: strnmov -> strmake sql/sql_repl.h: Removed test if file is included (We want to know if it's included twice to avoid this) sql/sql_select.cc: Indentation cleanup sql/sql_show.cc: Indentation cleanup sql/sql_string.cc: Indentation cleanup sql/sql_table.cc: Indentation cleanup sql/sql_union.cc: Use renamed struct slot sql/sql_update.cc: Indentation cleanup sql/sql_yacc.yy: Removed = after GRANT ... MAX_ to make the syntax uniform sql/table.cc: Indentation cleanup sql/table.h: Indentation cleanup sql/time.cc: Indentation cleanup sql/udf_example.cc: Indentation cleanup sql/unireg.cc: strnmov -> strmake tests/grant.pl: Added test for LOCK TABLES tools/mysqlmanager.c: Cleanup fopen() -> my_fopen() vio/viosocket.c: DBUG_PRINT cleanups vio/viosslfactories.c: Indentation cleanup Checking of results from malloc() Fixed possible memory leak BitKeeper/etc/ignore: Added scripts/mysql_secure_installation to the ignore list BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
279 lines
7.6 KiB
C
279 lines
7.6 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 */
|
|
|
|
/* Written by Sergei A. Golubchik, who has a shared copyright to this code */
|
|
|
|
/* functions to work with full-text indices */
|
|
|
|
#include "ftdefs.h"
|
|
#include <math.h>
|
|
|
|
/**************************************************************
|
|
This is to make ft-code to ignore keyseg.length at all *
|
|
and to index the whole VARCHAR/BLOB instead... */
|
|
#undef set_if_smaller
|
|
#define set_if_smaller(A,B) /* no op */
|
|
/**************************************************************/
|
|
|
|
void _mi_ft_segiterator_init(MI_INFO *info, uint keynr, const byte *record,
|
|
FT_SEG_ITERATOR *ftsi)
|
|
{
|
|
ftsi->num=info->s->keyinfo[keynr].keysegs-FT_SEGS;
|
|
ftsi->seg=info->s->keyinfo[keynr].seg;
|
|
ftsi->rec=record;
|
|
}
|
|
|
|
void _mi_ft_segiterator_dummy_init(const byte *record, uint len,
|
|
FT_SEG_ITERATOR *ftsi)
|
|
{
|
|
ftsi->num=1;
|
|
ftsi->seg=0;
|
|
ftsi->pos=record;
|
|
ftsi->len=len;
|
|
}
|
|
|
|
/*
|
|
This function breaks convention "return 0 in success"
|
|
but it's easier to use like this
|
|
|
|
while(_mi_ft_segiterator())
|
|
|
|
so "1" means "OK", "0" means "EOF"
|
|
*/
|
|
|
|
uint _mi_ft_segiterator(register FT_SEG_ITERATOR *ftsi)
|
|
{
|
|
if (!ftsi->num) return 0; else ftsi->num--;
|
|
if (!ftsi->seg) return 1; else ftsi->seg--;
|
|
|
|
if (ftsi->seg->null_bit &&
|
|
(ftsi->rec[ftsi->seg->null_pos] & ftsi->seg->null_bit))
|
|
{
|
|
ftsi->pos=0;
|
|
return 1;
|
|
}
|
|
ftsi->pos= ftsi->rec+ftsi->seg->start;
|
|
if (ftsi->seg->flag & HA_VAR_LENGTH)
|
|
{
|
|
ftsi->len=uint2korr(ftsi->pos);
|
|
ftsi->pos+=2; /* Skip VARCHAR length */
|
|
set_if_smaller(ftsi->len,ftsi->seg->length);
|
|
return 1;
|
|
}
|
|
if (ftsi->seg->flag & HA_BLOB_PART)
|
|
{
|
|
ftsi->len=_mi_calc_blob_length(ftsi->seg->bit_start,ftsi->pos);
|
|
memcpy_fixed((char*) &ftsi->pos, ftsi->pos+ftsi->seg->bit_start,
|
|
sizeof(char*));
|
|
set_if_smaller(ftsi->len,ftsi->seg->length);
|
|
return 1;
|
|
}
|
|
ftsi->len=ftsi->seg->length;
|
|
return 1;
|
|
}
|
|
|
|
|
|
/* parses a document i.e. calls ft_parse for every keyseg */
|
|
|
|
uint _mi_ft_parse(TREE *parsed, MI_INFO *info, uint keynr, const byte *record)
|
|
{
|
|
FT_SEG_ITERATOR ftsi;
|
|
_mi_ft_segiterator_init(info, keynr, record, &ftsi);
|
|
|
|
ft_parse_init(parsed, info->s->keyinfo[keynr].seg->charset);
|
|
while (_mi_ft_segiterator(&ftsi))
|
|
{
|
|
if (ftsi.pos)
|
|
if (ft_parse(parsed, (byte *)ftsi.pos, ftsi.len))
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
FT_WORD * _mi_ft_parserecord(MI_INFO *info, uint keynr,
|
|
byte *keybuf __attribute__((unused)),
|
|
const byte *record)
|
|
{
|
|
TREE ptree;
|
|
|
|
bzero((char*) &ptree, sizeof(ptree));
|
|
if (_mi_ft_parse(&ptree, info, keynr, record))
|
|
return NULL;
|
|
|
|
return ft_linearize(/*info, keynr, keybuf, */ &ptree);
|
|
}
|
|
|
|
static int _mi_ft_store(MI_INFO *info, uint keynr, byte *keybuf,
|
|
FT_WORD *wlist, my_off_t filepos)
|
|
{
|
|
uint key_length;
|
|
|
|
for (; wlist->pos; wlist++)
|
|
{
|
|
key_length=_ft_make_key(info,keynr,keybuf,wlist,filepos);
|
|
if (_mi_ck_write(info,keynr,(uchar*) keybuf,key_length))
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int _mi_ft_erase(MI_INFO *info, uint keynr, byte *keybuf,
|
|
FT_WORD *wlist, my_off_t filepos)
|
|
{
|
|
uint key_length, err=0;
|
|
|
|
for (; wlist->pos; wlist++)
|
|
{
|
|
key_length=_ft_make_key(info,keynr,keybuf,wlist,filepos);
|
|
if (_mi_ck_delete(info,keynr,(uchar*) keybuf,key_length))
|
|
err=1;
|
|
}
|
|
return err;
|
|
}
|
|
|
|
/*
|
|
Compares an appropriate parts of two WORD_KEY keys directly out of records
|
|
returns 1 if they are different
|
|
*/
|
|
|
|
#define THOSE_TWO_DAMN_KEYS_ARE_REALLY_DIFFERENT 1
|
|
#define GEE_THEY_ARE_ABSOLUTELY_IDENTICAL 0
|
|
|
|
int _mi_ft_cmp(MI_INFO *info, uint keynr, const byte *rec1, const byte *rec2)
|
|
{
|
|
FT_SEG_ITERATOR ftsi1, ftsi2;
|
|
CHARSET_INFO *cs=info->s->keyinfo[keynr].seg->charset;
|
|
_mi_ft_segiterator_init(info, keynr, rec1, &ftsi1);
|
|
_mi_ft_segiterator_init(info, keynr, rec2, &ftsi2);
|
|
|
|
while (_mi_ft_segiterator(&ftsi1) && _mi_ft_segiterator(&ftsi2))
|
|
{
|
|
if ((ftsi1.pos != ftsi2.pos) &&
|
|
(!ftsi1.pos || !ftsi2.pos ||
|
|
_mi_compare_text(cs, (uchar*) ftsi1.pos,ftsi1.len,
|
|
(uchar*) ftsi2.pos,ftsi2.len,0)))
|
|
return THOSE_TWO_DAMN_KEYS_ARE_REALLY_DIFFERENT;
|
|
}
|
|
return GEE_THEY_ARE_ABSOLUTELY_IDENTICAL;
|
|
}
|
|
|
|
|
|
/* update a document entry */
|
|
|
|
int _mi_ft_update(MI_INFO *info, uint keynr, byte *keybuf,
|
|
const byte *oldrec, const byte *newrec, my_off_t pos)
|
|
{
|
|
int error= -1;
|
|
FT_WORD *oldlist,*newlist, *old_word, *new_word;
|
|
CHARSET_INFO *cs=info->s->keyinfo[keynr].seg->charset;
|
|
uint key_length;
|
|
int cmp, cmp2;
|
|
|
|
if (!(old_word=oldlist=_mi_ft_parserecord(info, keynr, keybuf, oldrec)))
|
|
goto err0;
|
|
if (!(new_word=newlist=_mi_ft_parserecord(info, keynr, keybuf, newrec)))
|
|
goto err1;
|
|
|
|
error=0;
|
|
while(old_word->pos && new_word->pos)
|
|
{
|
|
cmp=_mi_compare_text(cs, (uchar*) old_word->pos,old_word->len,
|
|
(uchar*) new_word->pos,new_word->len,0);
|
|
cmp2= cmp ? 0 : (fabs(old_word->weight - new_word->weight) > 1.e-5);
|
|
|
|
if (cmp < 0 || cmp2)
|
|
{
|
|
key_length=_ft_make_key(info,keynr,keybuf,old_word,pos);
|
|
if ((error=_mi_ck_delete(info,keynr,(uchar*) keybuf,key_length)))
|
|
goto err2;
|
|
}
|
|
if (cmp > 0 || cmp2)
|
|
{
|
|
key_length=_ft_make_key(info,keynr,keybuf,new_word,pos);
|
|
if ((error=_mi_ck_write(info,keynr,(uchar*) keybuf,key_length)))
|
|
goto err2;
|
|
}
|
|
if (cmp<=0) old_word++;
|
|
if (cmp>=0) new_word++;
|
|
}
|
|
if (old_word->pos)
|
|
error=_mi_ft_erase(info,keynr,keybuf,old_word,pos);
|
|
else if (new_word->pos)
|
|
error=_mi_ft_store(info,keynr,keybuf,new_word,pos);
|
|
|
|
err2:
|
|
my_free((char*) newlist,MYF(0));
|
|
err1:
|
|
my_free((char*) oldlist,MYF(0));
|
|
err0:
|
|
return error;
|
|
}
|
|
|
|
|
|
/* adds a document to the collection */
|
|
|
|
int _mi_ft_add(MI_INFO *info, uint keynr, byte *keybuf, const byte *record,
|
|
my_off_t pos)
|
|
{
|
|
int error= -1;
|
|
FT_WORD *wlist;
|
|
|
|
if ((wlist=_mi_ft_parserecord(info, keynr, keybuf, record)))
|
|
{
|
|
error=_mi_ft_store(info,keynr,keybuf,wlist,pos);
|
|
my_free((char*) wlist,MYF(0));
|
|
}
|
|
return error;
|
|
}
|
|
|
|
|
|
/* removes a document from the collection */
|
|
|
|
int _mi_ft_del(MI_INFO *info, uint keynr, byte *keybuf, const byte *record,
|
|
my_off_t pos)
|
|
{
|
|
int error= -1;
|
|
FT_WORD *wlist;
|
|
if ((wlist=_mi_ft_parserecord(info, keynr, keybuf, record)))
|
|
{
|
|
error=_mi_ft_erase(info,keynr,keybuf,wlist,pos);
|
|
my_free((char*) wlist,MYF(0));
|
|
}
|
|
return error;
|
|
}
|
|
|
|
uint _ft_make_key(MI_INFO *info, uint keynr, byte *keybuf, FT_WORD *wptr,
|
|
my_off_t filepos)
|
|
{
|
|
byte buf[HA_FT_MAXLEN+16];
|
|
|
|
#if HA_FT_WTYPE == HA_KEYTYPE_FLOAT
|
|
float weight=(float) ((filepos==HA_OFFSET_ERROR) ? 0 : wptr->weight);
|
|
mi_float4store(buf,weight);
|
|
#else
|
|
#error
|
|
#endif
|
|
|
|
#ifdef EVAL_RUN
|
|
*(buf+HA_FT_WLEN)=wptr->cnt;
|
|
int2store(buf+HA_FT_WLEN+1,wptr->len);
|
|
memcpy(buf+HA_FT_WLEN+3,wptr->pos,wptr->len);
|
|
#else /* EVAL_RUN */
|
|
int2store(buf+HA_FT_WLEN,wptr->len);
|
|
memcpy(buf+HA_FT_WLEN+2,wptr->pos,wptr->len);
|
|
#endif /* EVAL_RUN */
|
|
return _mi_make_key(info,keynr,(uchar*) keybuf,buf,filepos);
|
|
}
|