Bug #31685095 INNODB] ASSERTION FAILURE: FSP0FSP.CC:4648:NOT_FULL_N_USED_1 == NOT_FULL_N_USED_

Post push fix to resolve a valgrind failure by removing debug code.

This is a follow up fix for bug#31685095.  There are two places where
the changes to the first page of zlob was done using btr_mtr.  These
changes are now done by using local_mtr.

rb#26924 approved by Kuba <[email protected]>

Author: gurusami

storage/innobase/btr/btr0btr.cc

@@ -450,14 +450,6 @@ buf_block_t *btr_page_alloc_priv(dict_index_t *index, page_no_t hint_page_no,
 ) {
   buf_block_t *new_block;
 
-#ifdef UNIV_DEBUG
-  {
-    std::ostringstream out;
-    out << "[Allocating Page: mtr=" << (void *)mtr << ", " << loc;
-    mtr->m_trace.push_back(out.str());
-  }
-#endif /* UNIV_DEBUG */
-
   if (dict_index_is_ibuf(index)) {
     return (btr_page_alloc_for_ibuf(index, mtr));
   }
@@ -546,15 +538,6 @@ void btr_page_free_lower(dict_index_t *index, buf_block_t *block, ulint level,
   fseg_header_t *seg_header;
   page_t *root;
 
-#ifdef UNIV_DEBUG
-  {
-    std::ostringstream out;
-    out << "[Freeing Page: mtr=" << (void *)mtr
-        << ": page_id=" << block->get_page_id() << ", " << loc << "]";
-    mtr->m_trace.push_back(out.str());
-  }
-#endif /* UNIV_DEBUG */
-
   ut_ad(mtr_is_block_fix(mtr, block, MTR_MEMO_PAGE_X_FIX, index->table));
   /* The page gets invalid for optimistic searches: increment the frame
   modify clock */

storage/innobase/include/mtr0mtr.h

@@ -664,17 +664,6 @@ struct mtr_t {
   static Logging s_logging;
 #endif /* !UNIV_HOTBACKUP */
 
-#ifdef UNIV_DEBUG
- public:
-  std::list<std::string> m_trace;
-
-  std::ostream &print_trace(std::ostream &out) const {
-    std::copy(m_trace.begin(), m_trace.end(),
-              std::ostream_iterator<std::string>(out, "\n"));
-    return out;
-  }
-#endif /* UNIV_DEBUG */
-
  private:
   Impl m_impl;
 

storage/innobase/include/zlob0first.h

@@ -264,16 +264,14 @@ struct z_first_page_t {
     return (fil_addr_t(page_no, offset));
   }
 
-  /** All the index pages are singled linked with each other, and
+  /** All the index pages are singly linked with each other, and
   the first page contains the link to one index page.
   @param[in]  page_no  the page number of an index page. */
   void set_index_page_no(page_no_t page_no) {
-    ut_ad(m_mtr != nullptr);
-    mlog_write_ulint(frame() + OFFSET_INDEX_PAGE_NO, page_no, MLOG_4BYTES,
-                     m_mtr);
+    set_index_page_no(page_no, m_mtr);
   }
 
-  /** All the index pages are singled linked with each other, and
+  /** All the index pages are singly linked with each other, and
   the first page contains the link to one index page.
   @param[in]  page_no  the page number of an index page.
   @param[in]  mtr      use this mini transaction context for redo logs. */
@@ -282,7 +280,7 @@ struct z_first_page_t {
     mlog_write_ulint(frame() + OFFSET_INDEX_PAGE_NO, page_no, MLOG_4BYTES, mtr);
   }
 
-  /** All the index pages are singled linked with each other, and
+  /** All the index pages are singly linked with each other, and
   the first page contains the link to one index page. Get that index
   page number.
   @return the index page number. */
@@ -312,30 +310,44 @@ struct z_first_page_t {
   bool verify_frag_page_no();
 #endif /* UNIV_DEBUG */
 
-  /** All the fragment pages are doubly linked with each other, and
-  the first page contains the link to one fragment page in FIL_PAGE_PREV.
+  /** All the fragment pages (@see z_frag_page_t) are doubly linked with each
+  other, and the first page contains the link to one fragment page in
+  FIL_PAGE_PREV.
   @param[in]  mtr      Mini-transaction for this modification.
   @param[in]  page_no  The page number of a fragment page. */
   void set_frag_page_no(mtr_t *mtr, page_no_t page_no) {
     ut_ad(verify_frag_page_no());
     set_prev_page_no(page_no, mtr);
   }
 
-  /** All the fragment pages are doubly linked with each other, and
-  the first page contains the link to one fragment page in FIL_PAGE_PREV.
+  /** All the fragment pages (@see z_frag_page_t) are doubly linked with each
+  other, and the first page contains the link to one fragment page in
+  FIL_PAGE_PREV.
   @param[in]  page_no  the page number of a fragment page. */
   void set_frag_page_no(page_no_t page_no) {
     ut_ad(verify_frag_page_no());
     set_prev_page_no(page_no, m_mtr);
   }
 
-  /** All the frag node pages are singled linked with each other, and
-  the first page contains the link to one frag node page.
+  /** All the frag node pages (@see z_frag_node_page_t) are singly linked with
+  each other, and the first page contains the link to the last allocated frag
+  node page. The last allocated FIL_PAGE_TYPE_ZLOB_FRAG_ENTRY  page will be the
+  first in this list. This list is used to free these pages.
   @param[in]  page_no  the page number of an frag node page. */
   void set_frag_node_page_no(page_no_t page_no) {
-    ut_ad(m_mtr != nullptr);
+    set_frag_node_page_no(page_no, m_mtr);
+  }
+
+  /** All the frag node pages (@see z_frag_node_page_t) are singly linked with
+  each other, and the first page contains the link to the last allocated frag
+  node page. The last allocated FIL_PAGE_TYPE_ZLOB_FRAG_ENTRY  page will be the
+  first in this list. This list is used to free these pages.
+  @param[in]  page_no  the page number of an frag node page.
+  @param[in]  mtr      mini trx context to generate redo logs. */
+  void set_frag_node_page_no(page_no_t page_no, mtr_t *mtr) {
+    ut_ad(mtr != nullptr);
     mlog_write_ulint(frame() + OFFSET_FRAG_NODES_PAGE_NO, page_no, MLOG_4BYTES,
-                     m_mtr);
+                     mtr);
   }
 
   /** Free all the z_frag_page_t pages. All the z_frag_page_t pages are
@@ -368,7 +380,7 @@ struct z_first_page_t {
   @return the number of pages freed. */
   size_t free_all_data_pages();
 
-  /** All the frag node pages are singled linked with each other, and the
+  /** All the frag node pages are singly linked with each other, and the
   first page contains the link to one frag node page. Get that frag node
   page number.
   @return the index page number. */

storage/innobase/lob/lob0purge.cc

@@ -337,6 +337,9 @@ static void z_purge(DeleteContext *ctx, dict_index_t *index, trx_id_t trxid,
       ref.set_length(0, nullptr);
       ctx->zblob_write_blobref(ctx->m_field_no, mtr);
     } else {
+      /* Only purge operation should reach this else block. */
+      ut_ad(purge_node != nullptr);
+
       /* Note that page_zip will be NULL in
       row_purge_upd_exist_or_extern(). */
       ref.set_page_no(FIL_NULL, mtr);

storage/innobase/lob/zlob0first.cc

@@ -350,7 +350,9 @@ size_t z_first_page_t::free_all_frag_node_pages() {
     z_frag_node_page_t frag_node_page(&local_mtr, m_index);
     frag_node_page.load_x(page_no);
     page_no_t next_page = frag_node_page.get_next_page_no();
-    set_frag_node_page_no(next_page);
+
+    /* Make all changes to the first page using local_mtr. */
+    set_frag_node_page_no(next_page, &local_mtr);
     frag_node_page.dealloc();
     n_pages_freed++;
 
@@ -380,10 +382,8 @@ size_t z_first_page_t::free_all_index_pages() {
     index_page.load_x(page_no);
     page_no_t next_page = index_page.get_next_page_no();
 
-    /* The z_first_page_t::set_index_page_no() modifies the first page of
-    zlob. Since the m_mtr also modifies first page of zlob, we cannot use
-    local_mtr here.  Use m_mtr here. */
-    set_index_page_no(next_page);
+    /* Make all changes to the first page using local_mtr. */
+    set_index_page_no(next_page, &local_mtr);
 
     index_page.dealloc();
     n_pages_freed++;

storage/innobase/mtr/mtr0mtr.cc

@@ -223,9 +223,7 @@ bool mtr_t::conflicts_with(const mtr_t *mtr2) const {
   bool conflict = !m_impl.m_memo.for_each_block_in_reverse(iterator);
   if (conflict) {
     print_memos(std::cout);
-    print_trace(std::cout);
     mtr2->print_memos(std::cout);
-    mtr2->print_trace(std::cout);
   }
   return conflict;
 }
@@ -695,9 +693,6 @@ void mtr_t::commit() {
 #endif /* !UNIV_HOTBACKUP */
 
   ut_d(remove_from_debug_list());
-#ifdef UNIV_DEBUG
-  m_trace.clear();
-#endif /* UNIV_DEBUG */
 }
 
 #ifdef UNIV_DEBUG

unittest/gunit/innodb/lob/zlob0int.h

@@ -563,21 +563,21 @@ struct z_first_page_t {
     return (fil_addr_t(page_no, offset));
   }
 
-  /** All the index pages are singled linked with each other, and the first
+  /** All the index pages are singly linked with each other, and the first
   page contains the link to one index page.
   @param[in]  page_no  the page number of an index page. */
   void set_index_page_no(page_no_t page_no) {
     mlog_write_ulint(frame() + OFFSET_INDEX_PAGE_NO, page_no, MLOG_4BYTES);
   }
 
-  /** All the index pages are singled linked with each other, and the first
+  /** All the index pages are singly linked with each other, and the first
   page contains the link to one index page. Get that index page number.
   @return the index page number. */
   page_no_t get_index_page_no() const {
     return (mach_read_from_4(frame() + OFFSET_INDEX_PAGE_NO));
   }
 
-  /** All the frag node pages are singled linked with each other, and the
+  /** All the frag node pages are singly linked with each other, and the
   first page contains the link to one frag node page.
   @param[in]  page_no  the page number of an frag node page. */
   void set_frag_node_page_no(page_no_t page_no) {
@@ -592,7 +592,7 @@ struct z_first_page_t {
   /** Free all the index pages. */
   void free_all_index_pages();
 
-  /** All the frag node pages are singled linked with each other, and the
+  /** All the frag node pages are singly linked with each other, and the
   first page contains the link to one frag node page. Get that frag node
   page number.
   @return the index page number. */