Merge branch 'mysql-8.0' into mysql-trunk

Author: mayprasa

storage/innobase/btr/btr0cur.cc

@@ -3924,7 +3924,9 @@ dberr_t btr_cur_pessimistic_update(
 
   ut_ad(!page_is_comp(page) || !rec_get_node_ptr_flag(rec));
   ut_ad(rec_offs_validate(rec, index, *offsets));
-  n_ext += lob::btr_push_update_extern_fields(new_entry, update, entry_heap);
+
+  /* Get number of externally stored columns in updated record */
+  n_ext = new_entry->get_n_ext();
 
   if (page_zip_rec_needs_ext(rec_get_converted_size(index, new_entry, n_ext),
                              page_is_comp(page), dict_index_get_n_fields(index),

storage/innobase/include/data0data.h

@@ -792,6 +792,18 @@ struct dtuple_t {
 
     return (compare(rec, index, offsets, &matched_fields));
   }
+
+  /** Get number of externally stored fields.
+  @retval number of externally stored fields. */
+  inline ulint get_n_ext() const {
+    ulint n_ext = 0;
+    for (ulint i = 0; i < n_fields; ++i) {
+      if (dfield_is_ext(&fields[i])) {
+        n_ext++;
+      }
+    }
+    return (n_ext);
+  }
 };
 
 /** A slot for a field in a big rec vector */

storage/innobase/include/lob0lob.h

@@ -1503,16 +1503,6 @@ byte *btr_copy_externally_stored_field_func(
 #endif /* UNIV_DEBUG */
     mem_heap_t *heap);
 
-/** Flags the data tuple fields that are marked as extern storage in the
-update vector.  We use this function to remember which fields we must
-mark as extern storage in a record inserted for an update.
-@param[in,out]	tuple	data tuple
-@param[in]	update	update vector
-@param[in]	heap	memory heap
-@return number of flagged external columns */
-ulint btr_push_update_extern_fields(dtuple_t *tuple, const upd_t *update,
-                                    mem_heap_t *heap);
-
 /** Gets the externally stored size of a record, in units of a database page.
 @param[in]	rec	record
 @param[in]	offsets	array returned by rec_get_offsets()

storage/innobase/include/rem0rec.ic

@@ -1065,6 +1065,7 @@ ulint rec_get_converted_size(
 
   data_size = dtuple_get_data_size(dtuple, 0);
 
+  ut_ad(n_ext == dtuple->get_n_ext());
   extra_size = rec_get_converted_extra_size(data_size,
                                             dtuple_get_n_fields(dtuple), n_ext);
 

storage/innobase/lob/lob0lob.cc

@@ -1078,83 +1078,6 @@ void blob_free(dict_index_t *index, buf_block_t *block, bool all, mtr_t *mtr) {
   }
 }
 
-/** Flags the data tuple fields that are marked as extern storage in the
-update vector.  We use this function to remember which fields we must
-mark as extern storage in a record inserted for an update.
-@param[in,out]	tuple	data tuple
-@param[in]	update	update vector
-@param[in]	heap	memory heap
-@return number of flagged external columns */
-ulint btr_push_update_extern_fields(dtuple_t *tuple, const upd_t *update,
-                                    mem_heap_t *heap) {
-  DBUG_TRACE;
-
-  ulint n_pushed = 0;
-  ulint n;
-  upd_field_t *uf;
-
-  ut_ad(tuple);
-  ut_ad(update);
-
-  uf = update->fields;
-  n = upd_get_n_fields(update);
-
-  for (; n--; uf++) {
-    if (dfield_is_ext(&uf->new_val)) {
-      dfield_t *field = dtuple_get_nth_field(tuple, uf->field_no);
-
-      if (dfield_is_ext(field)) {
-        uf->ext_in_old = true;
-      } else {
-        uf->ext_in_old = false;
-        dfield_set_ext(field);
-        n_pushed++;
-      }
-
-      switch (uf->orig_len) {
-        byte *data;
-        ulint len;
-        byte *buf;
-        case 0:
-          break;
-        case BTR_EXTERN_FIELD_REF_SIZE:
-          /* Restore the original locally stored
-          part of the column.  In the undo log,
-          InnoDB writes a longer prefix of externally
-          stored columns, so that column prefixes
-          in secondary indexes can be reconstructed. */
-          dfield_set_data(field,
-                          (byte *)dfield_get_data(field) +
-                              dfield_get_len(field) - BTR_EXTERN_FIELD_REF_SIZE,
-                          BTR_EXTERN_FIELD_REF_SIZE);
-          dfield_set_ext(field);
-          break;
-        default:
-          /* Reconstruct the original locally
-          stored part of the column.  The data
-          will have to be copied. */
-          ut_a(uf->orig_len > BTR_EXTERN_FIELD_REF_SIZE);
-
-          data = (byte *)dfield_get_data(field);
-          len = dfield_get_len(field);
-
-          buf = (byte *)mem_heap_alloc(heap, uf->orig_len);
-          /* Copy the locally stored prefix. */
-          memcpy(buf, data, uf->orig_len - BTR_EXTERN_FIELD_REF_SIZE);
-          /* Copy the BLOB pointer. */
-          memcpy(buf + uf->orig_len - BTR_EXTERN_FIELD_REF_SIZE,
-                 data + len - BTR_EXTERN_FIELD_REF_SIZE,
-                 BTR_EXTERN_FIELD_REF_SIZE);
-
-          dfield_set_data(field, buf, uf->orig_len);
-          dfield_set_ext(field);
-      }
-    }
-  }
-
-  return n_pushed;
-}
-
 /** Gets the externally stored size of a record, in units of a database page.
 @param[in]	rec	record
 @param[in]	offsets	array returned by rec_get_offsets()

storage/innobase/trx/trx0rec.cc

@@ -2593,12 +2593,14 @@ bool trx_undo_prev_version_build(
     fields. Store the info: */
 
     entry = row_rec_to_index_entry(rec, index, offsets, &n_ext, heap);
-    n_ext += lob::btr_push_update_extern_fields(entry, update, heap);
     /* The page containing the clustered index record
     corresponding to entry is latched in mtr.  Thus the
     following call is safe. */
     row_upd_index_replace_new_col_vals(entry, index, update, heap);
 
+    /* Get number of externally stored columns in updated record */
+    n_ext = entry->get_n_ext();
+
     buf = static_cast<byte *>(
         mem_heap_alloc(heap, rec_get_converted_size(index, entry, n_ext)));