mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
52cb0c24a6
Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file. Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned. Changed info->lastkey to type MARIA_KEY. Removed info->lastkey_length as this is now part of info->lastkey Renamed old info->lastkey to info->lastkey_buff Use exact key lenghts for keys, not USE_WHOLE_KEY For partial key searches, use SEARCH_PART_KEY When searching to insert new key on page, use SEARCH_INSERT to mark that key has rowid Changes done in a lot of files: - Modified functions to use MARIA_KEY instead of key pointer and key length - Use keyinfo->root_lock instead of share->key_root_lock[keynr] - Simplify code by using local variable keyinfo instead if share->keyinfo[i] - Added #fdef EXTERNAL_LOCKING around removed state elements - HA_MAX_KEY_BUFF -> MARIA_MAX_KEY_BUFF (to reserve space for transid) - Changed type of 'nextflag' to uint32 to ensure all SEARCH_xxx flags fits into it .bzrignore: Added missing temporary directory extra/Makefile.am: comp_err is now deleted on make distclean include/maria.h: Added structure MARIA_KEY, which is used for intern key objects in Maria. Changed functions to take MARIA_KEY as an argument instead of pointer to packed key. Changed some functions that always return true or false to my_bool. Added virtual function make_key() to avoid if in _ma_make_key() Moved rw_lock_t for locking trees from share->key_root_lock to MARIA_KEYDEF. This makes usage of the locks simpler and faster include/my_base.h: Added HA_RTREE_INDEX flag to mark rtree index. Used for easier checks in ma_check() Added SEARCH_INSERT to be used when inserting new keys Added SEARCH_PART_KEY for partial searches Added SEARCH_USER_KEY_HAS_TRANSID to be used when key we use for searching in btree has a TRANSID Added SEARCH_PAGE_KEY_HAS_TRANSID to be used when key we found in btree has a transid include/my_handler.h: Make next_flag 32 bit to make sure we can handle all SEARCH_ bits mysql-test/include/maria_empty_logs.inc: Read and restore current database; Don't assume we are using mysqltest. Don't log use databasename to log. Using this include should not cause any result changes. mysql-test/r/maria-gis-rtree-dynamic.result: Updated results after adding some check table commands to help pinpoint errors mysql-test/r/maria-mvcc.result: New tests mysql-test/r/maria-purge.result: New result after adding removal of logs mysql-test/r/maria-recovery-big.result: maria_empty_logs doesn't log 'use mysqltest' anymore mysql-test/r/maria-recovery-bitmap.result: maria_empty_logs doesn't log 'use mysqltest' anymore mysql-test/r/maria-recovery-rtree-ft.result: maria_empty_logs doesn't log 'use mysqltest' anymore mysql-test/r/maria-recovery.result: maria_empty_logs doesn't log 'use mysqltest' anymore mysql-test/r/maria.result: New tests mysql-test/r/variables-big.result: Don't log id as it's not predictable mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result: Updated results to new binlog results. (Test has not been run in a long time as it requires --big) mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt: Moved file to ndb replication test directory mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test: Fixed wrong path to included tests mysql-test/t/maria-gis-rtree-dynamic.test: Added some check table commands to help pinpoint errors mysql-test/t/maria-mvcc.test: New tests mysql-test/t/maria-purge.test: Remove logs to make test results predictable mysql-test/t/maria.test: New tests for some possible problems mysql-test/t/variables-big.test: Don't log id as it's not predictable mysys/my_handler.c: Updated function comment to reflect old code Changed nextflag to be uint32 to ensure we can have flags > 16 bit Changed checking if we are in insert with NULL keys as next_flag can now include additional bits that have to be ignored. Added SEARCH_INSERT flag to be used when inserting new keys in btree. This flag tells us the that the keys includes row position and it's thus safe to remove SEARCH_FIND Added comparision of transid. This is only done if the keys actually have a transid, which is indicated by nextflag mysys/my_lock.c: Fixed wrong test (Found by Guilhem) scripts/Makefile.am: Ensure that test programs are deleted by make clean sql/rpl_rli.cc: Moved assignment order to fix compiler warning storage/heap/hp_write.c: Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys storage/maria/Makefile.am: Remove also maria log files when doing make distclean storage/maria/ha_maria.cc: Use 'file->start_state' as default state for transactional tables without versioning At table unlock, set file->state to point to live state. (Needed for information schema to pick up right number of rows) In ha_maria::implicit_commit() move all locked (ie open) tables to new transaction. This is needed to ensure ha_maria->info doesn't point to a deleted history event. Disable concurrent inserts for insert ... select and table changes with subqueries if statement based replication as this would cause wrong results on slave storage/maria/ma_blockrec.c: Updated comment storage/maria/ma_check.c: Compact key pages (removes transid) when doing --zerofill Check that 'page_flag' on key pages contains KEYPAGE_FLAG_HAS_TRANSID if there is a single key on the page with a transid Modified functions to use MARIA_KEY instead of key pointer and key length Use new interface to _ma_rec_pos(), _ma_dpointer(), _ma_ft_del(), ma_update_state_lsn() Removed not needed argument from get_record_for_key() Fixed that we check doesn't give errors for RTREE; We now treath these like SPATIAL Remove some SPATIAL specific code where the virtual functions can handle this in a general manner Use info->lastkey_buff instead of info->lastkey _ma_dpos() -> _ma_row_pos_from_key() _ma_make_key() -> keyinfo->make_key() _ma_print_key() -> _ma_print_keydata() _ma_move_key() -> ma_copy_copy() Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys Ensure that data on page doesn't overwrite page checksum position Use DBUG_DUMP_KEY instead of DBUG_DUMP Use exact key lengths instead of USE_WHOLE_KEY to ha_key_cmp() Fixed check if rowid points outside of BLOCK_RECORD data file Use info->lastkey_buff instead of key on stack in some safe places Added #fdef EXTERNAL_LOCKING around removed state elements storage/maria/ma_close.c: Use keyinfo->root_lock instead of share->key_root_lock[keynr] storage/maria/ma_create.c: Removed assert that is already checked in maria_init() Force transactinal tables to be of type BLOCK_RECORD Fixed wrong usage of HA_PACK_RECORD (should be HA_OPTION_PACK_RECORD) Mark keys that uses HA_KEY_ALG_RTREE with HA_RTREE_INDEX for easier handling of these in ma_check Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file. storage/maria/ma_dbug.c: Changed _ma_print_key() to use MARIA_KEY storage/maria/ma_delete.c: Modified functions to use MARIA_KEY instead of key pointer and key length info->lastkey2-> info->lastkey_buff2 Added SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys Use new interface for get_key(), _ma_get_last_key() and others _ma_dpos() -> ma_row_pos_from_key() Simplify setting of prev_key in del() Ensure that KEYPAGE_FLAG_HAS_TRANSID is set in page_flag if key page has transid Treath key pages that may have a transid as if keys would be of variable length storage/maria/ma_delete_all.c: Reset history state if maria_delete_all_rows() are called Update parameters to _ma_update_state_lsns() call storage/maria/ma_extra.c: Store and restore info->lastkey storage/maria/ma_ft_boolean_search.c: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_ft_nlq_search.c: Modified functions to use MARIA_KEY instead of key pointer and key length Use lastkey_buff2 instead of info->lastkey+info->s->base.max_key_length (same thing) storage/maria/ma_ft_update.c: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_ftdefs.h: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_fulltext.h: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_init.c: Check if blocksize is legal (Moved test here from ma_open()) storage/maria/ma_key.c: Added functions for storing/reading of transid Modified functions to use MARIA_KEY instead of key pointer and key length Moved _ma_sp_make_key() out of _ma_make_key() as we now use keyinfo->make_key to create keys Add transid to keys if table is versioned Added _ma_copy_key() storage/maria/ma_key_recover.c: Add logging of page_flag (holds information if there are keys with transid on page) Changed DBUG_PRINT("info" -> DBUG_PRINT("redo" as the redo logging can be quite extensive Added lots of DBUG_PRINT() Added support for index page operations: KEY_OP_SET_PAGEFLAG and KEY_OP_COMPACT_PAGE storage/maria/ma_key_recover.h: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_locking.c: Added new arguments to _ma_update_state_lsns_sub() storage/maria/ma_loghandler.c: Fixed all logging of LSN to look similar in DBUG log Changed if (left != 0) to if (left) as the later is used also later in the code storage/maria/ma_loghandler.h: Added new index page operations storage/maria/ma_open.c: Removed allocated "state_dummy" and instead use share->state.common for transactional tables that are not versioned This is needed to not get double increments of state.records (one in ma_write.c and on when log is written) Changed info->lastkey to MARIA_KEY type Removed resetting of MARIA_HA variables that have 0 as default value (as info is zerofilled) Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned. Check on open that state.create_trid is correct Extend share->base.max_key_length in case of transactional table so that it can hold transid Removed 4.0 compatible fulltext key mode as this is not relevant for Maria Removed old and wrong #ifdef ENABLE_WHEN_WE_HAVE_TRANS_ROW_ID code block Initialize all new virtual function pointers Removed storing of state->unique, state->process and store state->create_trid instead storage/maria/ma_page.c: Added comment to describe key page structure Added functions to compact key page and log the compact operation storage/maria/ma_range.c: Modified functions to use MARIA_KEY instead of key pointer and key length Use SEARCH_PART_KEY indicator instead of USE_WHOLE_KEY to detect if we are doing a part key search Added handling of pages with transid storage/maria/ma_recovery.c: Don't assert if table we opened are not transactional. This may be a table which has been changed from transactional to not transactinal Added new arguments to _ma_update_state_lsns() storage/maria/ma_rename.c: Added new arguments to _ma_update_state_lsns() storage/maria/ma_rkey.c: Modified functions to use MARIA_KEY instead of key pointer and key length Don't use USE_WHOLE_KEY, use real length of key Use share->row_is_visible() to test if row is visible Moved search_flag == HA_READ_KEY_EXACT out of 'read-next-row' loop as this only need to be tested once Removed test if last_used_keyseg != 0 as this is always true storage/maria/ma_rnext.c: Modified functions to use MARIA_KEY instead of key pointer and key length Simplify code by using local variable keyinfo instead if share->keyinfo[i] Use share->row_is_visible() to test if row is visible storage/maria/ma_rnext_same.c: Modified functions to use MARIA_KEY instead of key pointer and key length lastkey2 -> lastkey_buff2 storage/maria/ma_rprev.c: Modified functions to use MARIA_KEY instead of key pointer and key length Simplify code by using local variable keyinfo instead if share->keyinfo[i] Use share->row_is_visible() to test if row is visible storage/maria/ma_rsame.c: Updated comment Simplify code by using local variable keyinfo instead if share->keyinfo[i] Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_rsamepos.c: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_rt_index.c: Modified functions to use MARIA_KEY instead of key pointer and key length Use better variable names Removed not needed casts _ma_dpos() -> _ma_row_pos_from_key() Use info->last_rtree_keypos to save position to key instead of info->int_keypos Simplify err: condition Changed return type for maria_rtree_insert() to my_bool as we are only intressed in ok/fail from this function storage/maria/ma_rt_index.h: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_rt_key.c: Modified functions to use MARIA_KEY instead of key pointer and key length Simplify maria_rtree_add_key by combining idenitcal code and removing added_len storage/maria/ma_rt_key.h: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_rt_mbr.c: Changed type of 'nextflag' to uint32 Added 'to' argument to RT_PAGE_MBR_XXX functions to more clearly see which variables changes value storage/maria/ma_rt_mbr.h: Changed type of 'nextflag' to uint32 storage/maria/ma_rt_split.c: Modified functions to use MARIA_KEY instead of key pointer and key length key_length -> key_data_length to catch possible errors storage/maria/ma_rt_test.c: Fixed wrong comment Reset recinfo to avoid valgrind varnings Fixed wrong argument to create_record() that caused test to fail storage/maria/ma_search.c: Modified functions to use MARIA_KEY instead of key pointer and key length Added support of keys with optional trid Test for SEARCH_PART_KEY instead of USE_WHOLE_KEY to detect part key reads _ma_dpos() -> _ma_row_pos_from_key() If there may be keys with transid on the page, have _ma_bin_search() call _ma_seq_search() Add _ma_skip_xxx() functions to quickly step over keys (faster than calling get_key() in most cases as we don't have to copy key data) Combine similar code at end of _ma_get_binary_pack_key() Removed not used function _ma_move_key() In _ma_search_next() don't call _ma_search() if we aren't on a nod page. Update info->cur_row.trid with trid for found key Removed some not needed casts Added _ma_trid_from_key() Use MARIA_SHARE instead of MARIA_HA as arguments to _ma_rec_pos(), _ma_dpointer() and _ma_xxx_keypos_to_recpos() to make functions faster and smaller storage/maria/ma_sort.c: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_sp_defs.h: _ma_sp_make_key() now fills in and returns (MARIA_KEY *) value storage/maria/ma_sp_key.c: _ma_sp_make_key() now fills in and returns (MARIA_KEY *) value Don't test sizeof(double), test against 8 as we are using float8store() Use mi_float8store() instead of doing swap of value (same thing but faster) storage/maria/ma_state.c: maria_versioning() now only calls _ma_block_get_status() if table supports versioning Added _ma_row_visible_xxx() functions for different occasions When emptying history, set info->state to point to the first history event. storage/maria/ma_state.h: Added _ma_row_visible_xxx() prototypes storage/maria/ma_static.c: Indentation changes storage/maria/ma_statrec.c: Fixed arguments to _ma_dpointer() and _ma_rec_pos() storage/maria/ma_test1.c: Call init_thr_lock() if we have versioning storage/maria/ma_test2.c: Call init_thr_lock() if we have versioning storage/maria/ma_unique.c: Modified functions to use MARIA_KEY storage/maria/ma_update.c: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_write.c: Modified functions to use MARIA_KEY instead of key pointer and key length Simplify code by using local variable keyinfo instead if share->keyinfo[i] In _ma_enlarge_root(), mark in page_flag if new key has transid _ma_dpos() -> _ma_row_pos_from_key() Changed return type of _ma_ck_write_tree() to my_bool as we are only testing if result is true or not Moved 'reversed' to outside block as area was used later storage/maria/maria_chk.c: Added error if trying to sort with HA_BINARY_PACK_KEY Use new interface to get_key() and _ma_dpointer() _ma_dpos() -> _ma_row_pos_from_key() storage/maria/maria_def.h: Modified functions to use MARIA_KEY instead of key pointer and key length Added 'common' to MARIA_SHARE->state for storing state for transactional tables without versioning Added create_trid to MARIA_SHARE Removed not used state variables 'process' and 'unique' Added defines for handling TRID's in index pages Changed to use MARIA_SHARE instead of MARIA_HA for some functions Added 'have_versioning' flag if table supports versioning Moved key_root_lock from MARIA_SHARE to MARIA_KEYDEF Changed last_key to be of type MARIA_KEY. Removed lastkey_length lastkey -> lastkey_buff, lastkey2 -> lastkey_buff2 Added _ma_get_used_and_nod_with_flag() for faster access to page data when page_flag is read Added DBUG_DUMP_KEY for easier DBUG_DUMP of a key Changed 'nextflag' and assocaited variables to uint32 storage/maria/maria_ftdump.c: lastkey -> lastkey_buff storage/maria/trnman.c: Fixed wrong initialization of min_read_from and max_commit_trid Added trnman_get_min_safe_trid() storage/maria/unittest/ma_test_all-t: Added --start-from storage/myisam/mi_check.c: Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order storage/myisam/mi_delete.c: Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order storage/myisam/mi_range.c: Updated comment storage/myisam/mi_write.c: Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order storage/myisam/rt_index.c: Fixed wrong parameter to rtree_get_req() which could cause crash
377 lines
10 KiB
C
377 lines
10 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 */
|
|
|
|
/* Written by Sergei A. Golubchik, who has a shared copyright to this code */
|
|
|
|
#define FT_CORE
|
|
#include "ma_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;
|
|
MARIA_HA *info;
|
|
int ndocs;
|
|
int curdoc;
|
|
FT_DOC doc[1];
|
|
};
|
|
|
|
typedef struct st_all_in_one
|
|
{
|
|
MARIA_HA *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 doc_cnt;
|
|
FT_SUPERDOC sdoc, *sptr;
|
|
TREE_ELEMENT *selem;
|
|
double gweight=1;
|
|
MARIA_HA *info= aio->info;
|
|
uchar *keybuff= (uchar*) aio->keybuff;
|
|
MARIA_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;
|
|
MARIA_KEY key;
|
|
#if HA_FT_WTYPE == HA_KEYTYPE_FLOAT
|
|
float tmp_weight;
|
|
#else
|
|
#error
|
|
#endif
|
|
DBUG_ENTER("walk_and_match");
|
|
|
|
word->weight=LWS_FOR_QUERY;
|
|
|
|
_ma_ft_make_key(info, &key, aio->keynr, keybuff, word, 0);
|
|
key.data_length-= HA_FT_WLEN;
|
|
doc_cnt=0;
|
|
|
|
/* Skip rows inserted by current inserted */
|
|
for (r= _ma_search(info, &key, SEARCH_FIND, key_root) ;
|
|
!r &&
|
|
(subkeys=ft_sintXkorr(info->last_key.data +
|
|
info->last_key.data_length +
|
|
info->last_key.ref_length - extra)) > 0 &&
|
|
info->cur_row.lastpos >= info->state->data_file_length ;
|
|
r= _ma_search_next(info, &info->last_key, SEARCH_BIGGER, key_root))
|
|
;
|
|
|
|
info->update|= HA_STATE_AKTIV; /* for _ma_test_if_changed() */
|
|
|
|
/* The following should be safe, even if we compare doubles */
|
|
while (!r && gweight)
|
|
{
|
|
|
|
if (key.data_length &&
|
|
ha_compare_text(aio->charset,
|
|
info->last_key.data+1,
|
|
info->last_key.data_length +
|
|
info->last_key.ref_length - extra - 1,
|
|
key.data+1, key.data_length-1, 0, 0))
|
|
break;
|
|
|
|
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+= key.data_length;
|
|
keyinfo= &info->s->ft2_keyinfo;
|
|
key_root= info->cur_row.lastpos;
|
|
key.data_length= 0;
|
|
r= _ma_search_first(info, keyinfo, key_root);
|
|
goto do_skip;
|
|
}
|
|
#if HA_FT_WTYPE == HA_KEYTYPE_FLOAT
|
|
tmp_weight=*(float*)&subkeys;
|
|
#else
|
|
#error
|
|
#endif
|
|
/* The following should be safe, even if we compare doubles */
|
|
if (tmp_weight==0)
|
|
DBUG_RETURN(doc_cnt); /* stopword, doc_cnt should be 0 */
|
|
|
|
sdoc.doc.dpos= info->cur_row.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 (_ma_test_if_changed(info) == 0)
|
|
r= _ma_search_next(info, &info->last_key, SEARCH_BIGGER, key_root);
|
|
else
|
|
r= _ma_search(info, &info->last_key, SEARCH_BIGGER, key_root);
|
|
do_skip:
|
|
while ((subkeys=ft_sintXkorr(info->last_key.data +
|
|
info->last_key.data_length +
|
|
info->last_key.ref_length - extra)) > 0 &&
|
|
!r && info->cur_row.lastpos >= info->state->data_file_length)
|
|
r= _ma_search_next(info, &info->last_key, 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, (uchar *)& 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 *maria_ft_init_nlq_search(MARIA_HA *info, uint keynr, uchar *query,
|
|
uint query_len, uint flags, uchar *record)
|
|
{
|
|
TREE wtree;
|
|
ALL_IN_ONE aio;
|
|
FT_DOC *dptr;
|
|
FT_INFO *dlist=NULL;
|
|
MARIA_RECORD_POS saved_lastpos= info->cur_row.lastpos;
|
|
struct st_mysql_ftparser *parser;
|
|
MYSQL_FTPARSER_PARAM *ftparser_param;
|
|
DBUG_ENTER("maria_ft_init_nlq_search");
|
|
|
|
/* black magic ON */
|
|
if ((int) (keynr = _ma_check_index(info,keynr)) < 0)
|
|
DBUG_RETURN(NULL);
|
|
if (_ma_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_buff2;
|
|
parser= info->s->keyinfo[keynr].parser;
|
|
if (! (ftparser_param= maria_ftparser_call_initializer(info, keynr, 0)))
|
|
goto err;
|
|
|
|
bzero(&wtree,sizeof(wtree));
|
|
|
|
init_tree(&aio.dtree,0,0,sizeof(FT_SUPERDOC),(qsort_cmp2)&FT_SUPERDOC_cmp,0,
|
|
NULL, NULL);
|
|
|
|
maria_ft_parse_init(&wtree, aio.charset);
|
|
ftparser_param->flags= 0;
|
|
if (maria_ft_parse(&wtree, query, query_len, parser, ftparser_param,
|
|
&wtree.mem_root))
|
|
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, record, docid))
|
|
{
|
|
info->update|= HA_STATE_AKTIV;
|
|
ftparser_param->flags= MYSQL_FTFLAGS_NEED_COPY;
|
|
if (unlikely(_ma_ft_parse(&wtree, info, keynr, record, ftparser_param,
|
|
&wtree.mem_root)))
|
|
{
|
|
delete_queue(&best);
|
|
goto err;
|
|
}
|
|
}
|
|
}
|
|
delete_queue(&best);
|
|
reset_tree(&aio.dtree);
|
|
if (tree_walk(&wtree, (tree_walk_action)&walk_and_match, &aio,
|
|
left_root_right))
|
|
goto err;
|
|
|
|
}
|
|
|
|
/*
|
|
If ndocs == 0, this will not allocate RAM for FT_INFO.doc[],
|
|
so if ndocs == 0, FT_INFO.doc[] must not be accessed.
|
|
*/
|
|
dlist=(FT_INFO *)my_malloc(sizeof(FT_INFO)+
|
|
sizeof(FT_DOC)*
|
|
(int)(aio.dtree.elements_in_tree-1),
|
|
MYF(0));
|
|
if (!dlist)
|
|
goto err;
|
|
|
|
dlist->please= (struct _ft_vft *) & _ma_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)
|
|
my_qsort2(dlist->doc, dlist->ndocs, sizeof(FT_DOC),
|
|
(qsort2_cmp)&FT_DOC_cmp, 0);
|
|
|
|
err:
|
|
delete_tree(&aio.dtree);
|
|
delete_tree(&wtree);
|
|
info->cur_row.lastpos= saved_lastpos;
|
|
DBUG_RETURN(dlist);
|
|
}
|
|
|
|
|
|
int maria_ft_nlq_read_next(FT_INFO *handler, char *record)
|
|
{
|
|
MARIA_HA *info= (MARIA_HA *) 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->cur_row.lastpos= handler->doc[handler->curdoc].dpos;
|
|
if (!(*info->read_record)(info, (uchar *) record, info->cur_row.lastpos))
|
|
{
|
|
info->update|= HA_STATE_AKTIV; /* Record is read */
|
|
return 0;
|
|
}
|
|
return my_errno;
|
|
}
|
|
|
|
|
|
float maria_ft_nlq_find_relevance(FT_INFO *handler,
|
|
uchar *record __attribute__((unused)),
|
|
uint length __attribute__((unused)))
|
|
{
|
|
int a,b,c;
|
|
FT_DOC *docs=handler->doc;
|
|
MARIA_RECORD_POS docid= handler->info->cur_row.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;
|
|
}
|
|
/* bounds check to avoid accessing unallocated handler->doc */
|
|
if (a < handler->ndocs && docs[a].dpos == docid)
|
|
return (float) docs[a].weight;
|
|
else
|
|
return 0.0;
|
|
}
|
|
|
|
|
|
void maria_ft_nlq_close_search(FT_INFO *handler)
|
|
{
|
|
my_free((uchar*)handler,MYF(0));
|
|
}
|
|
|
|
|
|
float maria_ft_nlq_get_relevance(FT_INFO *handler)
|
|
{
|
|
return (float) handler->doc[handler->curdoc].weight;
|
|
}
|
|
|
|
|
|
void maria_ft_nlq_reinit_search(FT_INFO *handler)
|
|
{
|
|
handler->curdoc=-1;
|
|
}
|
|
|