Commit a9e75e63 authored by marko's avatar marko

branches/zip: dtuple_convert_big_rec(): Do not attempt to shorten records

of secondary indexes.  (This is just an optimization; the logic in the
search loop would never store such records externally.)
parent 7e1076c7
...@@ -488,7 +488,8 @@ dtuple_convert_big_rec( ...@@ -488,7 +488,8 @@ dtuple_convert_big_rec(
/* out, own: created big record vector, /* out, own: created big record vector,
NULL if we are not able to shorten NULL if we are not able to shorten
the entry enough, i.e., if there are the entry enough, i.e., if there are
too many short fields in entry */ too many fixed-length or short fields
in entry or the index is clustered */
dict_index_t* index, /* in: index */ dict_index_t* index, /* in: index */
dtuple_t* entry, /* in: index entry */ dtuple_t* entry, /* in: index entry */
const ulint* ext_vec,/* in: array of externally stored fields, const ulint* ext_vec,/* in: array of externally stored fields,
...@@ -507,6 +508,10 @@ dtuple_convert_big_rec( ...@@ -507,6 +508,10 @@ dtuple_convert_big_rec(
ulint i; ulint i;
ulint j; ulint j;
if (UNIV_UNLIKELY(!dict_index_is_clust(index))) {
return(NULL);
}
ut_a(dtuple_check_typed_no_assert(entry)); ut_a(dtuple_check_typed_no_assert(entry));
size = rec_get_converted_size(index, entry); size = rec_get_converted_size(index, entry);
......
...@@ -348,7 +348,8 @@ dtuple_convert_big_rec( ...@@ -348,7 +348,8 @@ dtuple_convert_big_rec(
/* out, own: created big record vector, /* out, own: created big record vector,
NULL if we are not able to shorten NULL if we are not able to shorten
the entry enough, i.e., if there are the entry enough, i.e., if there are
too many short fields in entry */ too many fixed-length or short fields
in entry or the index is clustered */
dict_index_t* index, /* in: index */ dict_index_t* index, /* in: index */
dtuple_t* entry, /* in: index entry */ dtuple_t* entry, /* in: index entry */
const ulint* ext_vec,/* in: array of externally stored fields, const ulint* ext_vec,/* in: array of externally stored fields,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment