Merge Bug#36210202 from branch 'mysql-8.0' into mysql-8.4

Change-Id: Ied2a322cbd370becc0ec0e77cb782d721db7b00a

Author: Andrzej Jarzabek

storage/innobase/fts/fts0fts.cc

@@ -2523,7 +2523,8 @@ static fts_trx_table_t *fts_trx_table_create(
   ftt->table = table;
   ftt->fts_trx = fts_trx;
 
-  ftt->rows = rbt_create(sizeof(fts_trx_row_t), fts_trx_row_doc_id_cmp);
+  ftt->rows =
+      rbt_create(sizeof(fts_trx_row_t), fts_doc_id_field_cmp<fts_trx_row_t>);
 
   return (ftt);
 }
@@ -2543,7 +2544,8 @@ static fts_trx_table_t *fts_trx_table_clone(
   ftt->table = ftt_src->table;
   ftt->fts_trx = ftt_src->fts_trx;
 
-  ftt->rows = rbt_create(sizeof(fts_trx_row_t), fts_trx_row_doc_id_cmp);
+  ftt->rows =
+      rbt_create(sizeof(fts_trx_row_t), fts_doc_id_field_cmp<fts_trx_row_t>);
 
   /* Copy the rb tree values to the new savepoint. */
   rbt_merge_uniq(ftt->rows, ftt_src->rows);
@@ -4030,7 +4032,7 @@ dberr_t fts_write_node(trx_t *trx,             /*!< in: transaction */
 
   ut_a(ib_vector_size(doc_ids) > 0);
 
-  ib_vector_sort(doc_ids, fts_update_doc_id_cmp);
+  ib_vector_sort(doc_ids, fts_doc_id_field_cmp<fts_update_t>);
 
   info = pars_info_create();
 

storage/innobase/fts/fts0opt.cc

@@ -1033,7 +1033,7 @@ dberr_t fts_table_fetch_doc_ids(
   if (error == DB_SUCCESS) {
     fts_sql_commit(trx);
 
-    ib_vector_sort(doc_ids->doc_ids, fts_update_doc_id_cmp);
+    ib_vector_sort(doc_ids->doc_ids, fts_doc_id_field_cmp<fts_update_t>);
   } else {
     fts_sql_rollback(trx);
   }

storage/innobase/fts/fts0que.cc

@@ -294,6 +294,9 @@ struct fts_word_freq_t {
   double idf;          /*!< Inverse document frequency */
 };
 
+static ib_rbt_compare fts_ranking_doc_id_cmp =
+    fts_doc_id_field_cmp<fts_ranking_t>;
+
 /********************************************************************
 Callback function to fetch the rows in an FTS INDEX record.
 @return always true */
@@ -382,21 +385,7 @@ fts_query_terms_in_document(
         fts_query_t*    query,          /*!< in: FTS query state */
         doc_id_t        doc_id,         /*!< in: the word to check */
         ulint*          total);         /*!< out: total words in document */
-#endif
-
-/********************************************************************
-Compare two fts_doc_freq_t doc_ids.
-@return < 0 if n1 < n2, 0 if n1 == n2, > 0 if n1 > n2 */
-static inline int fts_freq_doc_id_cmp(const void *p1, /*!< in: id1 */
-                                      const void *p2) /*!< in: id2 */
-{
-  const fts_doc_freq_t *fq1 = (const fts_doc_freq_t *)p1;
-  const fts_doc_freq_t *fq2 = (const fts_doc_freq_t *)p2;
-
-  return ((int)(fq1->doc_id - fq2->doc_id));
-}
 
-#if 0
 /*******************************************************************//**
 Print the table used for calculating LCS. */
 static
@@ -645,8 +634,8 @@ static fts_word_freq_t *fts_query_add_word_freq(
 
     word_freq.doc_count = 0;
 
-    word_freq.doc_freqs =
-        rbt_create(sizeof(fts_doc_freq_t), fts_freq_doc_id_cmp);
+    word_freq.doc_freqs = rbt_create(sizeof(fts_doc_freq_t),
+                                     fts_doc_id_field_cmp<fts_doc_freq_t>);
 
     parent.last = rbt_add_node(query->word_freqs, &parent, &word_freq);
 
@@ -3707,7 +3696,7 @@ dberr_t fts_query(trx_t *trx, dict_index_t *index, uint flags,
   DEBUG_SYNC_C("fts_deleted_doc_ids_append");
 
   /* Sort the vector so that we can do a binary search over the ids. */
-  ib_vector_sort(query.deleted->doc_ids, fts_update_doc_id_cmp);
+  ib_vector_sort(query.deleted->doc_ids, fts_doc_id_field_cmp<fts_update_t>);
 
   /* Convert the query string to lower case before parsing. We own
   the ut_malloc'ed result and so remember to free it before return. */

storage/innobase/include/fts0types.h

@@ -311,26 +311,8 @@ extern const fts_index_selector_t fts_index_selector[];
 /** It's defined in fts/fts0fts.c */
 extern const fts_index_selector_t fts_index_selector_5_7[];
 
-/** Compare two fts_trx_row_t instances doc_ids.
-@param[in]      p1      id1
-@param[in]      p2      id2
-@return < 0 if n1 < n2, < 0 if n1 < n2, > 0 if n1 > n2 */
-static inline int fts_trx_row_doc_id_cmp(const void *p1, const void *p2);
-
-/** Compare two fts_ranking_t instances doc_ids.
-@param[in]      p1      id1
-@param[in]      p2      id2
-@return < 0 if n1 < n2, < 0 if n1 < n2, > 0 if n1 > n2 */
-static inline int fts_ranking_doc_id_cmp(const void *p1, const void *p2);
-
-/** Compare two fts_update_t instances doc_ids.
-@param[in]      p1      id1
-@param[in]      p2      id2
-@return < 0 if n1 < n2, < 0 if n1 < n2, > 0 if n1 > n2 */
-static inline int fts_update_doc_id_cmp(const void *p1, const void *p2);
-
 /** Decode and return the integer that was encoded using our VLC scheme.*/
-static inline ulint fts_decode_vlc(
+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 */
@@ -340,11 +322,11 @@ static inline ulint fts_decode_vlc(
 @param[in]      src     src string
 @param[in]      heap    heap to use
 */
-static inline void fts_string_dup(fts_string_t *dst, const fts_string_t *src,
-                                  mem_heap_t *heap);
+inline void fts_string_dup(fts_string_t *dst, const fts_string_t *src,
+                           mem_heap_t *heap);
 
 /** Return length of val if it were encoded using our VLC scheme. */
-static inline ulint fts_get_encoded_len(
+inline ulint fts_get_encoded_len(
     /*!< out: length of value
      encoded, in bytes */
     ulint val); /*!< in: value to encode */
@@ -353,24 +335,23 @@ static inline ulint fts_get_encoded_len(
 @param[in]      val     value to encode
 @param[in]      buf     buffer, must have enough space
 @return length of value encoded, in bytes */
-static inline ulint fts_encode_int(ulint val, byte *buf);
+inline ulint fts_encode_int(ulint val, byte *buf);
 
 /** Get the selected FTS aux INDEX suffix. */
-static inline const char *fts_get_suffix(
-    ulint selected); /*!< in: selected index */
+inline const char *fts_get_suffix(ulint selected); /*!< in: selected index */
 
 /** Return the selected FTS aux index suffix in 5.7 compatible format
 @param[in]      selected        selected index
 @return the suffix name */
-static inline const char *fts_get_suffix_5_7(ulint selected);
+inline const char *fts_get_suffix_5_7(ulint selected);
 
-/** Select the FTS auxiliary index for the given character.
+/** Select the FTS auxiliary table for the given character.
 @param[in]      cs      charset
 @param[in]      str     string
 @param[in]      len     string length in bytes
-@return the index to use for the string */
-static inline ulint fts_select_index(const CHARSET_INFO *cs, const byte *str,
-                                     ulint len);
+@retval the auxiliary table number to use for the string, zero-based */
+inline ulint fts_select_index(const CHARSET_INFO *cs, const byte *str,
+                              ulint len);
 
 #include "fts0types.ic"
 #include "fts0vlc.ic"

storage/innobase/include/fts0types.ic

@@ -38,10 +38,9 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "rem0cmp.h"
 
 /** Duplicate a string. */
-static inline void fts_string_dup(
-    fts_string_t *dst,       /*!< in: dup to here */
-    const fts_string_t *src, /*!< in: src string */
-    mem_heap_t *heap)        /*!< in: heap to use */
+inline void fts_string_dup(fts_string_t *dst,       /*!< in: dup to here */
+                           const fts_string_t *src, /*!< in: src string */
+                           mem_heap_t *heap)        /*!< in: heap to use */
 {
   dst->f_str = (byte *)mem_heap_alloc(heap, src->f_len + 1);
   memcpy(dst->f_str, src->f_str, src->f_len);
@@ -51,37 +50,30 @@ static inline void fts_string_dup(
   dst->f_n_char = src->f_n_char;
 }
 
-/** Compare two fts_trx_row_t doc_ids.
- @return < 0 if n1 < n2, 0 if n1 == n2, > 0 if n1 > n2 */
-static inline int fts_trx_row_doc_id_cmp(const void *p1, /*!< in: id1 */
-                                         const void *p2) /*!< in: id2 */
-{
-  const fts_trx_row_t *tr1 = (const fts_trx_row_t *)p1;
-  const fts_trx_row_t *tr2 = (const fts_trx_row_t *)p2;
-
-  return ((int)(tr1->doc_id - tr2->doc_id));
-}
-
-/** Compare two fts_ranking_t doc_ids.
- @return < 0 if n1 < n2, 0 if n1 == n2, > 0 if n1 > n2 */
-static inline int fts_ranking_doc_id_cmp(const void *p1, /*!< in: id1 */
-                                         const void *p2) /*!< in: id2 */
-{
-  const fts_ranking_t *rk1 = (const fts_ranking_t *)p1;
-  const fts_ranking_t *rk2 = (const fts_ranking_t *)p2;
-
-  return ((int)(rk1->doc_id - rk2->doc_id));
+/** Compare two doc_ids.
+ @param[in] id1  1st doc_id to compare
+ @param[in] id2  2nd doc_id to compare
+ @return < 0 if id1 < id2, 0 if id1 == id2, > 0 if id1 > id2 */
+inline int fts_doc_id_cmp(doc_id_t id1, doc_id_t id2) {
+  if (id1 < id2) {
+    return -1;
+  } else if (id1 > id2) {
+    return 1;
+  } else {
+    return 0;
+  }
 }
 
-/** Compare two fts_update_t doc_ids.
- @return < 0 if n1 < n2, 0 if n1 == n2, > 0 if n1 > n2 */
-static inline int fts_update_doc_id_cmp(const void *p1, /*!< in: id1 */
-                                        const void *p2) /*!< in: id2 */
-{
-  const fts_update_t *up1 = (const fts_update_t *)p1;
-  const fts_update_t *up2 = (const fts_update_t *)p2;
+/** Compare doc_ids of 2 objects.
+ @param[in] p1 Pointer to first instance o1 of T
+ @param[in] p2 Pointer to second instance o2 of T
+ @return sign(o1->doc_id - o2->doc_id) */
+template <typename T>
+int fts_doc_id_field_cmp(const void *p1, const void *p2) {
+  const T *o1 = static_cast<const T *>(p1);
+  const T *o2 = static_cast<const T *>(p2);
 
-  return ((int)(up1->doc_id - up2->doc_id));
+  return fts_doc_id_cmp(o1->doc_id, o2->doc_id);
 }
 
 /** Get the first character's code position for FTS index partition
@@ -96,7 +88,7 @@ extern ulint innobase_strnxfrm(const CHARSET_INFO *cs, const uchar *p2,
 @param[in]      cs      charset
 @retval true    if the charset is cjk
 @retval false   if not. */
-static inline bool fts_is_charset_cjk(const CHARSET_INFO *cs) {
+inline bool fts_is_charset_cjk(const CHARSET_INFO *cs) {
   if (strcmp(cs->m_coll_name, "gb2312_chinese_ci") == 0 ||
       strcmp(cs->m_coll_name, "gbk_chinese_ci") == 0 ||
       strcmp(cs->m_coll_name, "big5_chinese_ci") == 0 ||
@@ -117,8 +109,8 @@ static inline bool fts_is_charset_cjk(const CHARSET_INFO *cs) {
 @param[in]      str     string
 @param[in]      len     string length
 @retval the index to use for the string */
-static inline ulint fts_select_index_by_range(const CHARSET_INFO *cs,
-                                              const byte *str, ulint len) {
+inline ulint fts_select_index_by_range(const CHARSET_INFO *cs, const byte *str,
+                                       ulint len) {
   ulint selected = 0;
   ulint value = innobase_strnxfrm(cs, str, len);
 
@@ -143,8 +135,8 @@ static inline ulint fts_select_index_by_range(const CHARSET_INFO *cs,
 @param[in]      str     string
 @param[in]      len     string length
 @retval the index to use for the string */
-static inline ulint fts_select_index_by_hash(const CHARSET_INFO *cs,
-                                             const byte *str, ulint len) {
+inline ulint fts_select_index_by_hash(const CHARSET_INFO *cs, const byte *str,
+                                      ulint len) {
   int char_len;
 
   ut_ad(!(str == nullptr && len > 0));
@@ -175,8 +167,8 @@ static inline ulint fts_select_index_by_hash(const CHARSET_INFO *cs,
 @param[in]      str     string
 @param[in]      len     string length in bytes
 @retval the auxiliary table number to use for the string, zero-based */
-static inline ulint fts_select_index(const CHARSET_INFO *cs, const byte *str,
-                                     ulint len) {
+inline ulint fts_select_index(const CHARSET_INFO *cs, const byte *str,
+                              ulint len) {
   /* Words which compare equal using the character set's collation (have
   the same sort order) MUST go into the same auxiliary table.
   This is necessary as selecting a word using the equality operator will
@@ -199,16 +191,15 @@ static inline ulint fts_select_index(const CHARSET_INFO *cs, const byte *str,
 }
 
 /** Return the selected FTS aux index suffix. */
-static inline const char *fts_get_suffix(
-    ulint selected) /*!< in: selected index */
+inline const char *fts_get_suffix(ulint selected) /*!< in: selected index */
 {
   return (fts_index_selector[selected].suffix);
 }
 
 /** Return the selected FTS aux index suffix in 5.7 compatible format
 @param[in]      selected        selected index
 @return the suffix name */
-static inline const char *fts_get_suffix_5_7(ulint selected) {
+inline const char *fts_get_suffix_5_7(ulint selected) {
   return (fts_index_selector_5_7[selected].suffix);
 }
 

storage/innobase/include/fts0vlc.ic

@@ -39,7 +39,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 /** Return length of val if it were encoded using our VLC scheme.
  FIXME: We will need to be able encode 8 bytes value
  @return length of value encoded, in bytes */
-static inline ulint fts_get_encoded_len(ulint val) /* in: value to encode */
+inline ulint fts_get_encoded_len(ulint val) /* in: value to encode */
 {
   if (val <= 127) {
     return (1);
@@ -61,9 +61,8 @@ static inline ulint fts_get_encoded_len(ulint val) /* in: value to encode */
 
 /** Encode an integer using our VLC scheme and return the length in bytes.
  @return length of value encoded, in bytes */
-static inline ulint fts_encode_int(
-    ulint val, /* in: value to encode */
-    byte *buf) /* in: buffer, must have enough space */
+inline ulint fts_encode_int(ulint val, /* in: value to encode */
+                            byte *buf) /* in: buffer, must have enough space */
 {
   ulint len;
 
@@ -111,7 +110,7 @@ static inline ulint fts_encode_int(
 
 /** Decode and return the integer that was encoded using our VLC scheme.
  @return value decoded */
-static inline ulint fts_decode_vlc(
+inline ulint fts_decode_vlc(
     byte **ptr) /* in: ptr to decode from, this ptr is
                 incremented by the number of bytes decoded */
 {

unittest/gunit/innodb/CMakeLists.txt

@@ -51,6 +51,7 @@ SET(TESTS
   ut0mem
   ut0new
   ut0rnd
+  ut0rbt
 )
 
 ADD_COMPILE_FLAGS(