mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
9421f1dae9
Some simple optimzations, more comments and indentation changes. Add ` around database in 'use database' in binary log. Moved max_error_count and max_warning_count to variables struct. Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls. Changed string functions to use character set of first string argument as default return characterset (Each string function can change the above assumption if needed) BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BUILD/SETUP.sh: Auto merged BitKeeper/deleted/.del-getopt.h~a9ae679fa84f395: Auto merged BitKeeper/deleted/.del-getvar.c~2a29ff383970fd31: Auto merged Docs/manual.texi: Auto merged SSL/cacert.pem: Auto merged SSL/client-cert.pem: Auto merged SSL/client-key.pem: Auto merged SSL/server-cert.pem: Auto merged SSL/server-key.pem: Auto merged client/mysqldump.c: Auto merged include/my_base.h: Auto merged include/my_sys.h: Auto merged include/mysql_com.h: Auto merged isam/isamlog.c: Auto merged isam/pack_isam.c: Auto merged libmysqld/lib_sql.cc: Auto merged myisam/ft_dump.c: Auto merged myisam/ft_parser.c: Auto merged myisam/ft_static.c: Auto merged myisam/ft_test1.c: Auto merged myisam/ft_update.c: Auto merged myisam/mi_create.c: Auto merged myisam/mi_key.c: Auto merged myisam/mi_open.c: Auto merged myisam/mi_static.c: Auto merged myisam/mi_test1.c: Auto merged myisam/mi_test2.c: Auto merged myisam/mi_test3.c: Auto merged myisam/mi_update.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisamdef.h: Auto merged myisam/myisamlog.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/r/func_math.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/select_found.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/select_found.test: Auto merged mysql-test/t/union.test: Auto merged mysys/default.c: Auto merged mysys/mf_iocache2.c: Auto merged mysys/my_error.c: Auto merged mysys/my_init.c: Auto merged scripts/mysql_config.sh: Auto merged sql/convert.cc: Auto merged sql/filesort.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/hostname.cc: Auto merged sql/item.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/key.cc: Auto merged sql/log.cc: Auto merged sql/net_pkg.cc: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/opt_sum.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/slave.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_db.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_test.cc: Auto merged sql/time.cc: Auto merged sql/unireg.cc: Auto merged strings/Makefile.am: Auto merged strings/ctype-latin1_de.c: Auto merged strings/ctype-tis620.c: Auto merged tools/mysqlmanager.c: Auto merged BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997: merge with 4.0.3 BitKeeper/triggers/post-commit: merge with 4.0.3 client/mysql.cc: merge with 4.0.3 + simple optimsation client/mysqltest.c: merge with 4.0.3 (Indentation change) configure.in: merge with 4.0.3 extra/resolve_stack_dump.c: merge with 4.0.3 (Indentation change) include/Makefile.am: merge with 4.0.3 include/myisam.h: merge with 4.0.3 (Indentation change) include/mysql.h: merge with 4.0.3 (removed not used structure) include/mysqld_error.h: merge with 4.0.3 libmysql/Makefile.shared: merge with 4.0.3 libmysql/libmysql.c: merge with 4.0.3 (Indentation change) libmysqld/Makefile.am: merge with 4.0.3 myisam/ft_boolean_search.c: merge with 4.0.3 (Indentation change) myisam/ft_nlq_search.c: merge with 4.0.3 (Indentation change) myisam/mi_check.c: merge with 4.0.3 myisam/mi_search.c: merge with 4.0.3 myisam/mi_unique.c: merge with 4.0.3 mysys/Makefile.am: merge with 4.0.3 mysys/mf_casecnv.c: merge with 4.0.3 sql-bench/server-cfg.sh: Removed 8000 max row limit for Innodb sql/Makefile.am: merge with 4.0.3 sql/field.cc: Indentation cleanup Changed sprintf -> my_sprintf sql/field.h: merge with 4.0.3 sql/ha_heap.cc: merge with 4.0.3 (Indentation change) sql/item.h: merge with 4.0.3 (Indentation change) sql/item_cmpfunc.cc: merge with 4.0.3 sql/item_cmpfunc.h: Removed size_of() from items Indentation cleanup sql/item_create.cc: merge sql/item_create.h: merge sql/item_func.cc: Added comments Changed string functions to use character set of first string argument as default return characterset Simple optimizations. Removed return of uninitalized variable. sql/item_func.h: merge sql/item_strfunc.cc: merge with 4.0.3 (Indentation change) sql/item_strfunc.h: removed size_of() sql/item_uniq.h: removed size_of() sql/lex.h: merge with 4.0.3 (Indentation change) sql/log_event.cc: Add ` around database in 'use database' in binary log. sql/mysql_priv.h: merge with 4.0.3 sql/mysqld.cc: merge with 4.0.3 (Indentation change) sql/share/czech/errmsg.txt: merge sql/share/danish/errmsg.txt: merge sql/share/dutch/errmsg.txt: merge sql/share/english/errmsg.txt: merge sql/share/estonian/errmsg.txt: merge sql/share/french/errmsg.txt: merge sql/share/german/errmsg.txt: merge sql/share/greek/errmsg.txt: merge sql/share/hungarian/errmsg.txt: merge sql/share/italian/errmsg.txt: merge sql/share/japanese/errmsg.txt: merge sql/share/korean/errmsg.txt: merge sql/share/norwegian-ny/errmsg.txt: merge sql/share/norwegian/errmsg.txt: merge sql/share/polish/errmsg.txt: merge sql/share/portuguese/errmsg.txt: merge sql/share/romanian/errmsg.txt: merge sql/share/russian/errmsg.txt: merge sql/share/slovak/errmsg.txt: merge sql/share/spanish/errmsg.txt: merge sql/share/swedish/errmsg.txt: merge sql/share/ukrainian/errmsg.txt: merge sql/sql_acl.cc: merge with 4.0.3 sql/sql_base.cc: More comments Fixed bug in send_fields() when using convert sql/sql_class.cc: merge sql/sql_class.h: Merge with 4.0.3 Moved max_error_count and max_warning_count to variables struct. sql/sql_delete.cc: merge with 4.0.3 (Indentation change) sql/sql_lex.h: merge with 4.0.3 sql/sql_parse.cc: Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT. (Should be retrived from variables) sql/sql_select.cc: merge with 4.0.3 sql/sql_show.cc: merge with 4.0.3 sql/sql_union.cc: merge with 4.0.3 sql/sql_update.cc: merge with 4.0.3 sql/sql_yacc.yy: merge with 4.0.3 Indentation cleanup sql/structs.h: merge with 4.0.3 sql/table.cc: merge with 4.0.3 sql/table.h: merge with 4.0.3
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);
|
|
}
|