Skip to content

Commit

Permalink
Cleanup: btr_store_big_rec_extern_fields() does not really modify pcur
Browse files Browse the repository at this point in the history
  • Loading branch information
dr-m committed Jun 2, 2022
1 parent 5294695 commit 5909e0e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 deletions.
8 changes: 0 additions & 8 deletions storage/innobase/btr/btr0bulk.cc
Original file line number Diff line number Diff line change
Expand Up @@ -820,14 +820,6 @@ PageBulk::storeExt(
dberr_t err = btr_store_big_rec_extern_fields(
&btr_pcur, offsets, big_rec, &m_mtr, BTR_STORE_INSERT_BULK);

/* Reset m_block and m_cur_rec from page cursor, because
block may be changed during blob insert. (FIXME: Can it really?) */
ut_ad(m_block == btr_pcur.btr_cur.page_cur.block);

m_block = btr_pcur.btr_cur.page_cur.block;
m_cur_rec = btr_pcur.btr_cur.page_cur.rec;
m_page = buf_block_get_frame(m_block);

return(err);
}

Expand Down
4 changes: 1 addition & 3 deletions storage/innobase/btr/btr0cur.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7221,9 +7221,7 @@ the file, in case the file was somehow truncated in the crash.
dberr_t
btr_store_big_rec_extern_fields(
/*============================*/
btr_pcur_t* pcur, /*!< in/out: a persistent cursor. if
btr_mtr is restarted, then this can
be repositioned. */
btr_pcur_t* pcur, /*!< in: a persistent cursor */
rec_offs* offsets, /*!< in/out: rec_get_offsets() on
pcur. the "external storage" flags
in offsets will correctly correspond
Expand Down
6 changes: 2 additions & 4 deletions storage/innobase/include/btr0cur.h
Original file line number Diff line number Diff line change
Expand Up @@ -677,9 +677,7 @@ file segment of the index tree.
dberr_t
btr_store_big_rec_extern_fields(
/*============================*/
btr_pcur_t* pcur, /*!< in/out: a persistent cursor. if
btr_mtr is restarted, then this can
be repositioned. */
btr_pcur_t* pcur, /*!< in: a persistent cursor */
rec_offs* offsets, /*!< in/out: rec_get_offsets() on
pcur. the "external storage" flags
in offsets will correctly correspond
Expand All @@ -690,7 +688,7 @@ btr_store_big_rec_extern_fields(
latches to the clustered index. can be
committed and restarted. */
enum blob_op op) /*! in: operation code */
MY_ATTRIBUTE((warn_unused_result));
MY_ATTRIBUTE((nonnull, warn_unused_result));

/*******************************************************************//**
Frees the space in an externally stored field to the file space
Expand Down

0 comments on commit 5909e0e

Please sign in to comment.