diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 20:41:24 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 20:41:24 +0300 |
commit | 4d21a145de11eaff28f98fe4ebed56a803450ce0 (patch) | |
tree | 5c4b00b96e189e3492de198c4080265e81efc832 /storage/innobase/include/fts0types.h | |
parent | 4f59f9078fd9af1e958f4a30788084598053bf50 (diff) | |
parent | 059a5f11711fd502982abed8781faf9f255fa975 (diff) | |
download | mariadb-git-4d21a145de11eaff28f98fe4ebed56a803450ce0.tar.gz |
Merge 10.6bb-10.6-MDEV-26769
Diffstat (limited to 'storage/innobase/include/fts0types.h')
-rw-r--r-- | storage/innobase/include/fts0types.h | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/storage/innobase/include/fts0types.h b/storage/innobase/include/fts0types.h index ed204bb88b1..0938514995b 100644 --- a/storage/innobase/include/fts0types.h +++ b/storage/innobase/include/fts0types.h @@ -149,6 +149,9 @@ struct fts_cache_t size_t total_size; /*!< total size consumed by the ilist field of all nodes. SYNC is run whenever this gets too big */ + /** total_size at the time of the previous SYNC request */ + size_t total_size_at_sync; + fts_sync_t* sync; /*!< sync structure to sync data to disk */ ib_alloc_t* sync_heap; /*!< The heap allocator, for indexes @@ -314,16 +317,6 @@ int fts_doc_id_cmp( const void* p2); /*!< in: id2 */ /******************************************************************//** -Decode and return the integer that was encoded using our VLC scheme.*/ -UNIV_INLINE -ulint -fts_decode_vlc( -/*===========*/ - /*!< out: value decoded */ - byte** ptr); /*!< in: ptr to decode from, this ptr is - incremented by the number of bytes decoded */ - -/******************************************************************//** Duplicate a string. */ UNIV_INLINE void @@ -338,28 +331,6 @@ fts_string_dup( mem_heap_t* heap); /*!< in: heap to use */ /******************************************************************//** -Return length of val if it were encoded using our VLC scheme. */ -UNIV_INLINE -ulint -fts_get_encoded_len( -/*================*/ - /*!< out: length of value - encoded, in bytes */ - ulint val); /*!< in: value to encode */ - -/******************************************************************//** -Encode an integer using our VLC scheme and return the length in bytes. */ -UNIV_INLINE -ulint -fts_encode_int( -/*===========*/ - /*!< out: length of value - encoded, in bytes */ - ulint val, /*!< in: value to encode */ - byte* buf); /*!< in: buffer, must have - enough space */ - -/******************************************************************//** Get the selected FTS aux INDEX suffix. */ UNIV_INLINE const char* @@ -380,6 +351,5 @@ fts_select_index( ulint len); #include "fts0types.ic" -#include "fts0vlc.ic" #endif /* INNOBASE_FTS0TYPES_H */ |