mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
3c46af6cf4
Don't read character set files if we are using only the default charset. In most cases the user will not anymore get a warning about missing character set files Compare strings with space extend instead of space strip. Now the following comparisons holds: "a" == "a " and "a\t" < "a". (Bug #3152). Note: Because of the above fix, one has to do a REPAIR on any table that has an ascii character < 32 last in a CHAR/VARCHAR/TEXT columns. heap/hp_hash.c: Comments and DBUG information include/my_handler.h: Updated prototype for mi_compare_text myisam/ft_boolean_search.c: Updated calls to mi_compare_text myisam/ft_nlq_search.c: Updated calls to mi_compare_text myisam/ft_parser.c: Updated calls to mi_compare_text myisam/ft_stopwords.c: Updated calls to mi_compare_text myisam/ft_update.c: Updated calls to mi_compare_text myisam/mi_check.c: Updated calls to mi_compare_text myisam/mi_search.c: Changed all string comparisons that removed end space to instead extend the shorter string with space myisam/mi_unique.c: Updated calls to mi_compare_text myisam/mi_write.c: Updated calls to mi_compare_text myisam/myisam_ftdump.c: Removed compiler warning mysql-test/r/ctype_collate.result: Fixed wrong result mysql-test/r/heap_btree.result: More tests mysql-test/t/heap_btree.test: more tests mysys/charset.c: Don't read charsets if we are only using default charset Don't require 'init_available_charsets' to succeed. mysys/my_handler.c: Compare strings with space extend instead of space strip mysys/tree.c: Fixed code to get better results for range optimzier sql/field.cc: Compare strings with space extend instead of space strip sql/filesort.cc: Compare strings with space extend instead of space strip sql/ha_heap.cc: Created bit map for keys that are using BTREE. This allows the optimzer to use BTREE's for sorting sql/ha_heap.h: Created bit map for keys that are using BTREE. This allows the optimzer to use BTREE's for sorting strings/ctype-big5.c: Compare strings with space extend instead of space strip strings/ctype-czech.c: Indentation cleanup. Should be fixed to use space extend strings/ctype-gbk.c: Compare strings with space extend instead of space strip strings/ctype-latin1.c: Compare strings with space extend instead of space strip Added missing my_hash_sort_latin1_de function strings/ctype-mb.c: For binary strings, don't remove end space when comparing strings/ctype-simple.c: Compare strings with space extend instead of space strip strings/ctype-sjis.c: Compare strings with space extend instead of space strip strings/ctype-tis620.c: Added comments that we should fix end space handling strings/ctype-ucs2.c: indentation fixes strings/ctype-utf8.c: Added comments that we should fix end space handling strings/ctype-win1250ch.c: Added comments that we should fix end space handling
340 lines
8.3 KiB
C
340 lines
8.3 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 */
|
|
|
|
#define FT_CORE
|
|
#include "ftdefs.h"
|
|
|
|
/* search with natural language queries */
|
|
|
|
typedef struct ft_doc_rec
|
|
{
|
|
my_off_t dpos;
|
|
double weight;
|
|
} FT_DOC;
|
|
|
|
struct st_ft_info
|
|
{
|
|
struct _ft_vft *please;
|
|
MI_INFO *info;
|
|
int ndocs;
|
|
int curdoc;
|
|
FT_DOC doc[1];
|
|
};
|
|
|
|
typedef struct st_all_in_one
|
|
{
|
|
MI_INFO *info;
|
|
uint keynr;
|
|
CHARSET_INFO *charset;
|
|
uchar *keybuff;
|
|
TREE dtree;
|
|
} ALL_IN_ONE;
|
|
|
|
typedef struct st_ft_superdoc
|
|
{
|
|
FT_DOC doc;
|
|
FT_WORD *word_ptr;
|
|
double tmp_weight;
|
|
} FT_SUPERDOC;
|
|
|
|
static int FT_SUPERDOC_cmp(void* cmp_arg __attribute__((unused)),
|
|
FT_SUPERDOC *p1, FT_SUPERDOC *p2)
|
|
{
|
|
if (p1->doc.dpos < p2->doc.dpos)
|
|
return -1;
|
|
if (p1->doc.dpos == p2->doc.dpos)
|
|
return 0;
|
|
return 1;
|
|
}
|
|
|
|
static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio)
|
|
{
|
|
int subkeys, r;
|
|
uint keylen, doc_cnt;
|
|
FT_SUPERDOC sdoc, *sptr;
|
|
TREE_ELEMENT *selem;
|
|
double gweight=1;
|
|
MI_INFO *info=aio->info;
|
|
uchar *keybuff=aio->keybuff;
|
|
MI_KEYDEF *keyinfo=info->s->keyinfo+aio->keynr;
|
|
my_off_t key_root=info->s->state.key_root[aio->keynr];
|
|
uint extra=HA_FT_WLEN+info->s->base.rec_reflength;
|
|
#if HA_FT_WTYPE == HA_KEYTYPE_FLOAT
|
|
float tmp_weight;
|
|
#else
|
|
#error
|
|
#endif
|
|
|
|
DBUG_ENTER("walk_and_match");
|
|
|
|
word->weight=LWS_FOR_QUERY;
|
|
|
|
keylen=_ft_make_key(info,aio->keynr,(char*) keybuff,word,0);
|
|
keylen-=HA_FT_WLEN;
|
|
doc_cnt=0;
|
|
|
|
r=_mi_search(info, keyinfo, keybuff, keylen, SEARCH_FIND, key_root);
|
|
info->update|= HA_STATE_AKTIV; /* for _mi_test_if_changed() */
|
|
|
|
while (!r && gweight)
|
|
{
|
|
|
|
if (keylen &&
|
|
mi_compare_text(aio->charset,info->lastkey+1,
|
|
info->lastkey_length-extra-1, keybuff+1,keylen-1,0,0))
|
|
break;
|
|
|
|
subkeys=ft_sintXkorr(info->lastkey+info->lastkey_length-extra);
|
|
if (subkeys<0)
|
|
{
|
|
if (doc_cnt)
|
|
DBUG_RETURN(1); /* index is corrupted */
|
|
/*
|
|
TODO here: unsafe optimization, should this word
|
|
be skipped (based on subkeys) ?
|
|
*/
|
|
keybuff+=keylen;
|
|
keyinfo=& info->s->ft2_keyinfo;
|
|
key_root=info->lastpos;
|
|
keylen=0;
|
|
r=_mi_search_first(info, keyinfo, key_root);
|
|
continue;
|
|
}
|
|
#if HA_FT_WTYPE == HA_KEYTYPE_FLOAT
|
|
tmp_weight=*(float*)&subkeys;
|
|
#else
|
|
#error
|
|
#endif
|
|
if (tmp_weight==0)
|
|
DBUG_RETURN(doc_cnt); /* stopword, doc_cnt should be 0 */
|
|
|
|
sdoc.doc.dpos=info->lastpos;
|
|
|
|
/* saving document matched into dtree */
|
|
if (!(selem=tree_insert(&aio->dtree, &sdoc, 0, aio->dtree.custom_arg)))
|
|
DBUG_RETURN(1);
|
|
|
|
sptr=(FT_SUPERDOC *)ELEMENT_KEY((&aio->dtree), selem);
|
|
|
|
if (selem->count==1) /* document's first match */
|
|
sptr->doc.weight=0;
|
|
else
|
|
sptr->doc.weight+=sptr->tmp_weight*sptr->word_ptr->weight;
|
|
|
|
sptr->word_ptr=word;
|
|
sptr->tmp_weight=tmp_weight;
|
|
|
|
doc_cnt++;
|
|
|
|
gweight=word->weight*GWS_IN_USE;
|
|
if (gweight < 0 || doc_cnt > 2000000)
|
|
gweight=0;
|
|
|
|
if (_mi_test_if_changed(info) == 0)
|
|
r=_mi_search_next(info, keyinfo, info->lastkey, info->lastkey_length,
|
|
SEARCH_BIGGER, key_root);
|
|
else
|
|
r=_mi_search(info, keyinfo, info->lastkey, info->lastkey_length,
|
|
SEARCH_BIGGER, key_root);
|
|
}
|
|
word->weight=gweight;
|
|
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
static int walk_and_copy(FT_SUPERDOC *from,
|
|
uint32 count __attribute__((unused)), FT_DOC **to)
|
|
{
|
|
DBUG_ENTER("walk_and_copy");
|
|
from->doc.weight+=from->tmp_weight*from->word_ptr->weight;
|
|
(*to)->dpos=from->doc.dpos;
|
|
(*to)->weight=from->doc.weight;
|
|
(*to)++;
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
static int walk_and_push(FT_SUPERDOC *from,
|
|
uint32 count __attribute__((unused)), QUEUE *best)
|
|
{
|
|
DBUG_ENTER("walk_and_copy");
|
|
from->doc.weight+=from->tmp_weight*from->word_ptr->weight;
|
|
set_if_smaller(best->elements, ft_query_expansion_limit-1);
|
|
queue_insert(best, (byte *)& from->doc);
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
static int FT_DOC_cmp(void *unused __attribute__((unused)),
|
|
FT_DOC *a, FT_DOC *b)
|
|
{
|
|
return sgn(b->weight - a->weight);
|
|
}
|
|
|
|
|
|
FT_INFO *ft_init_nlq_search(MI_INFO *info, uint keynr, byte *query,
|
|
uint query_len, uint flags, byte *record)
|
|
{
|
|
TREE wtree;
|
|
ALL_IN_ONE aio;
|
|
FT_DOC *dptr;
|
|
FT_INFO *dlist=NULL;
|
|
my_off_t saved_lastpos=info->lastpos;
|
|
DBUG_ENTER("ft_init_nlq_search");
|
|
|
|
/* black magic ON */
|
|
if ((int) (keynr = _mi_check_index(info,keynr)) < 0)
|
|
DBUG_RETURN(NULL);
|
|
if (_mi_readinfo(info,F_RDLCK,1))
|
|
DBUG_RETURN(NULL);
|
|
/* black magic OFF */
|
|
|
|
aio.info=info;
|
|
aio.keynr=keynr;
|
|
aio.charset=info->s->keyinfo[keynr].seg->charset;
|
|
aio.keybuff=info->lastkey+info->s->base.max_key_length;
|
|
|
|
bzero(&wtree,sizeof(wtree));
|
|
|
|
init_tree(&aio.dtree,0,0,sizeof(FT_SUPERDOC),(qsort_cmp2)&FT_SUPERDOC_cmp,0,
|
|
NULL, NULL);
|
|
|
|
ft_parse_init(&wtree, aio.charset);
|
|
if (ft_parse(&wtree,query,query_len,0))
|
|
goto err;
|
|
|
|
if (tree_walk(&wtree, (tree_walk_action)&walk_and_match, &aio,
|
|
left_root_right))
|
|
goto err;
|
|
|
|
if (flags & FT_EXPAND && ft_query_expansion_limit)
|
|
{
|
|
QUEUE best;
|
|
init_queue(&best,ft_query_expansion_limit,0,0, (queue_compare) &FT_DOC_cmp,
|
|
0);
|
|
tree_walk(&aio.dtree, (tree_walk_action) &walk_and_push,
|
|
&best, left_root_right);
|
|
while (best.elements)
|
|
{
|
|
my_off_t docid=((FT_DOC *)queue_remove(& best, 0))->dpos;
|
|
if (!(*info->read_record)(info,docid,record))
|
|
{
|
|
info->update|= HA_STATE_AKTIV;
|
|
_mi_ft_parse(&wtree, info, keynr, record,1);
|
|
}
|
|
}
|
|
delete_queue(&best);
|
|
reset_tree(&aio.dtree);
|
|
if (tree_walk(&wtree, (tree_walk_action)&walk_and_match, &aio,
|
|
left_root_right))
|
|
goto err;
|
|
|
|
}
|
|
|
|
dlist=(FT_INFO *)my_malloc(sizeof(FT_INFO)+
|
|
sizeof(FT_DOC)*(aio.dtree.elements_in_tree-1),
|
|
MYF(0));
|
|
if (!dlist)
|
|
goto err;
|
|
|
|
dlist->please= (struct _ft_vft *) & _ft_vft_nlq;
|
|
dlist->ndocs=aio.dtree.elements_in_tree;
|
|
dlist->curdoc=-1;
|
|
dlist->info=aio.info;
|
|
dptr=dlist->doc;
|
|
|
|
tree_walk(&aio.dtree, (tree_walk_action) &walk_and_copy,
|
|
&dptr, left_root_right);
|
|
|
|
if (flags & FT_SORTED)
|
|
qsort2(dlist->doc, dlist->ndocs, sizeof(FT_DOC), (qsort2_cmp)&FT_DOC_cmp, 0);
|
|
|
|
err:
|
|
delete_tree(&aio.dtree);
|
|
delete_tree(&wtree);
|
|
info->lastpos=saved_lastpos;
|
|
DBUG_RETURN(dlist);
|
|
}
|
|
|
|
|
|
int ft_nlq_read_next(FT_INFO *handler, char *record)
|
|
{
|
|
MI_INFO *info= (MI_INFO *) handler->info;
|
|
|
|
if (++handler->curdoc >= handler->ndocs)
|
|
{
|
|
--handler->curdoc;
|
|
return HA_ERR_END_OF_FILE;
|
|
}
|
|
|
|
info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
|
|
|
|
info->lastpos=handler->doc[handler->curdoc].dpos;
|
|
if (!(*info->read_record)(info,info->lastpos,record))
|
|
{
|
|
info->update|= HA_STATE_AKTIV; /* Record is read */
|
|
return 0;
|
|
}
|
|
return my_errno;
|
|
}
|
|
|
|
|
|
float ft_nlq_find_relevance(FT_INFO *handler,
|
|
byte *record __attribute__((unused)),
|
|
uint length __attribute__((unused)))
|
|
{
|
|
int a,b,c;
|
|
FT_DOC *docs=handler->doc;
|
|
my_off_t docid=handler->info->lastpos;
|
|
|
|
if (docid == HA_POS_ERROR)
|
|
return -5.0;
|
|
|
|
/* Assuming docs[] is sorted by dpos... */
|
|
|
|
for (a=0, b=handler->ndocs, c=(a+b)/2; b-a>1; c=(a+b)/2)
|
|
{
|
|
if (docs[c].dpos > docid)
|
|
b=c;
|
|
else
|
|
a=c;
|
|
}
|
|
if (docs[a].dpos == docid)
|
|
return (float) docs[a].weight;
|
|
else
|
|
return 0.0;
|
|
}
|
|
|
|
|
|
void ft_nlq_close_search(FT_INFO *handler)
|
|
{
|
|
my_free((gptr)handler,MYF(0));
|
|
}
|
|
|
|
|
|
float ft_nlq_get_relevance(FT_INFO *handler)
|
|
{
|
|
return (float) handler->doc[handler->curdoc].weight;
|
|
}
|
|
|
|
|
|
void ft_nlq_reinit_search(FT_INFO *handler)
|
|
{
|
|
handler->curdoc=-1;
|
|
}
|
|
|