mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
5.6.31-77.0
This commit is contained in:
Sergei Golubchik
parent
b42664e85e
commit
64752acf72
149 changed files with 1631 additions and 1564 deletions
|
|
@ -94,7 +94,10 @@ those defined in mysql file ft_global.h */
|
|||
/** Threshold where our optimize thread automatically kicks in */
|
||||
#define FTS_OPTIMIZE_THRESHOLD 10000000
|
||||
|
||||
#define FTS_DOC_ID_MAX_STEP 10000
|
||||
/** Threshold to avoid exhausting of doc ids. Consecutive doc id difference
|
||||
should not exceed FTS_DOC_ID_MAX_STEP */
|
||||
#define FTS_DOC_ID_MAX_STEP 65535
|
||||
|
||||
/** Variable specifying the FTS parallel sort degree */
|
||||
extern ulong fts_sort_pll_degree;
|
||||
|
||||
|
|
@ -408,7 +411,7 @@ fts_get_next_doc_id(
|
|||
/*================*/
|
||||
const dict_table_t* table, /*!< in: table */
|
||||
doc_id_t* doc_id) /*!< out: new document id */
|
||||
__attribute__((nonnull));
|
||||
MY_ATTRIBUTE((nonnull));
|
||||
/*********************************************************************//**
|
||||
Update the next and last Doc ID in the CONFIG table to be the input
|
||||
"doc_id" value (+ 1). We would do so after each FTS index build or
|
||||
|
|
@ -421,7 +424,7 @@ fts_update_next_doc_id(
|
|||
const dict_table_t* table, /*!< in: table */
|
||||
const char* table_name, /*!< in: table name, or NULL */
|
||||
doc_id_t doc_id) /*!< in: DOC ID to set */
|
||||
__attribute__((nonnull(2)));
|
||||
MY_ATTRIBUTE((nonnull(2)));
|
||||
|
||||
/******************************************************************//**
|
||||
Create a new document id .
|
||||
|
|
@ -437,7 +440,7 @@ fts_create_doc_id(
|
|||
current row that is being
|
||||
inserted. */
|
||||
mem_heap_t* heap) /*!< in: heap */
|
||||
__attribute__((nonnull));
|
||||
MY_ATTRIBUTE((nonnull));
|
||||
/******************************************************************//**
|
||||
Create a new fts_doc_ids_t.
|
||||
@return new fts_doc_ids_t. */
|
||||
|
|
@ -466,7 +469,7 @@ fts_trx_add_op(
|
|||
fts_row_state state, /*!< in: state of the row */
|
||||
ib_vector_t* fts_indexes) /*!< in: FTS indexes affected
|
||||
(NULL=all) */
|
||||
__attribute__((nonnull(1,2)));
|
||||
MY_ATTRIBUTE((nonnull(1,2)));
|
||||
|
||||
/******************************************************************//**
|
||||
Free an FTS trx. */
|
||||
|
|
@ -491,7 +494,7 @@ fts_create_common_tables(
|
|||
index */
|
||||
const char* name, /*!< in: table name */
|
||||
bool skip_doc_id_index) /*!< in: Skip index on doc id */
|
||||
__attribute__((nonnull, warn_unused_result));
|
||||
MY_ATTRIBUTE((nonnull, warn_unused_result));
|
||||
/******************************************************************//**
|
||||
Wrapper function of fts_create_index_tables_low(), create auxiliary
|
||||
tables for an FTS index
|
||||
|
|
@ -503,7 +506,7 @@ fts_create_index_tables(
|
|||
trx_t* trx, /*!< in: transaction handle */
|
||||
const dict_index_t* index) /*!< in: the FTS index
|
||||
instance */
|
||||
__attribute__((nonnull, warn_unused_result));
|
||||
MY_ATTRIBUTE((nonnull, warn_unused_result));
|
||||
/******************************************************************//**
|
||||
Creates the column specific ancillary tables needed for supporting an
|
||||
FTS index on the given table. row_mysql_lock_data_dictionary must have
|
||||
|
|
@ -519,7 +522,7 @@ fts_create_index_tables_low(
|
|||
instance */
|
||||
const char* table_name, /*!< in: the table name */
|
||||
table_id_t table_id) /*!< in: the table id */
|
||||
__attribute__((nonnull, warn_unused_result));
|
||||
MY_ATTRIBUTE((nonnull, warn_unused_result));
|
||||
/******************************************************************//**
|
||||
Add the FTS document id hidden column. */
|
||||
UNIV_INTERN
|
||||
|
|
@ -528,7 +531,7 @@ fts_add_doc_id_column(
|
|||
/*==================*/
|
||||
dict_table_t* table, /*!< in/out: Table with FTS index */
|
||||
mem_heap_t* heap) /*!< in: temporary memory heap, or NULL */
|
||||
__attribute__((nonnull(1)));
|
||||
MY_ATTRIBUTE((nonnull(1)));
|
||||
|
||||
/*********************************************************************//**
|
||||
Drops the ancillary tables needed for supporting an FTS index on the
|
||||
|
|
@ -542,7 +545,7 @@ fts_drop_tables(
|
|||
trx_t* trx, /*!< in: transaction */
|
||||
dict_table_t* table) /*!< in: table has the FTS
|
||||
index */
|
||||
__attribute__((nonnull));
|
||||
MY_ATTRIBUTE((nonnull));
|
||||
/******************************************************************//**
|
||||
The given transaction is about to be committed; do whatever is necessary
|
||||
from the FTS system's POV.
|
||||
|
|
@ -552,7 +555,7 @@ dberr_t
|
|||
fts_commit(
|
||||
/*=======*/
|
||||
trx_t* trx) /*!< in: transaction */
|
||||
__attribute__((nonnull, warn_unused_result));
|
||||
MY_ATTRIBUTE((nonnull, warn_unused_result));
|
||||
|
||||
/*******************************************************************//**
|
||||
FTS Query entry point.
|
||||
|
|
@ -569,7 +572,7 @@ fts_query(
|
|||
in bytes */
|
||||
fts_result_t** result) /*!< out: query result, to be
|
||||
freed by the caller.*/
|
||||
__attribute__((nonnull, warn_unused_result));
|
||||
MY_ATTRIBUTE((nonnull, warn_unused_result));
|
||||
|
||||
/******************************************************************//**
|
||||
Retrieve the FTS Relevance Ranking result for doc with doc_id
|
||||
|
|
@ -687,7 +690,7 @@ dberr_t
|
|||
fts_optimize_table(
|
||||
/*===============*/
|
||||
dict_table_t* table) /*!< in: table to optimiza */
|
||||
__attribute__((nonnull));
|
||||
MY_ATTRIBUTE((nonnull));
|
||||
|
||||
/**********************************************************************//**
|
||||
Startup the optimize thread and create the work queue. */
|
||||
|
|
@ -713,7 +716,7 @@ fts_drop_index_tables(
|
|||
/*==================*/
|
||||
trx_t* trx, /*!< in: transaction */
|
||||
dict_index_t* index) /*!< in: Index to drop */
|
||||
__attribute__((nonnull, warn_unused_result));
|
||||
MY_ATTRIBUTE((nonnull, warn_unused_result));
|
||||
|
||||
/******************************************************************//**
|
||||
Remove the table from the OPTIMIZER's list. We do wait for
|
||||
|
|
@ -754,7 +757,7 @@ fts_savepoint_take(
|
|||
trx_t* trx, /*!< in: transaction */
|
||||
fts_trx_t* fts_trx, /*!< in: fts transaction */
|
||||
const char* name) /*!< in: savepoint name */
|
||||
__attribute__((nonnull));
|
||||
MY_ATTRIBUTE((nonnull));
|
||||
/**********************************************************************//**
|
||||
Refresh last statement savepoint. */
|
||||
UNIV_INTERN
|
||||
|
|
@ -762,7 +765,7 @@ void
|
|||
fts_savepoint_laststmt_refresh(
|
||||
/*===========================*/
|
||||
trx_t* trx) /*!< in: transaction */
|
||||
__attribute__((nonnull));
|
||||
MY_ATTRIBUTE((nonnull));
|
||||
/**********************************************************************//**
|
||||
Release the savepoint data identified by name. */
|
||||
UNIV_INTERN
|
||||
|
|
@ -780,13 +783,12 @@ fts_cache_destroy(
|
|||
/*==============*/
|
||||
fts_cache_t* cache); /*!< in: cache*/
|
||||
|
||||
/*********************************************************************//**
|
||||
Clear cache. */
|
||||
/** Clear cache.
|
||||
@param[in,out] cache fts cache */
|
||||
UNIV_INTERN
|
||||
void
|
||||
fts_cache_clear(
|
||||
/*============*/
|
||||
fts_cache_t* cache); /*!< in: cache */
|
||||
fts_cache_t* cache);
|
||||
|
||||
/*********************************************************************//**
|
||||
Initialize things in cache. */
|
||||
|
|
@ -831,7 +833,7 @@ fts_drop_index_split_tables(
|
|||
/*========================*/
|
||||
trx_t* trx, /*!< in: transaction */
|
||||
dict_index_t* index) /*!< in: fts instance */
|
||||
__attribute__((nonnull, warn_unused_result));
|
||||
MY_ATTRIBUTE((nonnull, warn_unused_result));
|
||||
|
||||
/** Run SYNC on the table, i.e., write out data from the cache to the
|
||||
FTS auxiliary INDEX table and clear the cache at the end.
|
||||
|
|
@ -1023,7 +1025,7 @@ fts_drop_index(
|
|||
dict_table_t* table, /*!< in: Table where indexes are dropped */
|
||||
dict_index_t* index, /*!< in: Index to be dropped */
|
||||
trx_t* trx) /*!< in: Transaction for the drop */
|
||||
__attribute__((nonnull));
|
||||
MY_ATTRIBUTE((nonnull));
|
||||
|
||||
/****************************************************************//**
|
||||
Rename auxiliary tables for all fts index for a table
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue