summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThirunarayanan Balathandayuthapani <thiru@mariadb.com>2020-07-22 14:40:56 +0530
committerThirunarayanan Balathandayuthapani <thiru@mariadb.com>2020-07-22 16:10:56 +0530
commitd96027c84af4a80630dd05d7f86910ae8b741181 (patch)
tree27ea8c8901dba3977eb6bcf4ca76910de324a716
parent3d01576af2ae0b9868105a06a1456dbedb4b9612 (diff)
downloadmariadb-git-d96027c84af4a80630dd05d7f86910ae8b741181.tar.gz
MDEV-23254 Replace FSP_FLAGS_HAS_PAGE_COMPRESSION with fil_space_t::is_compressed
InnoDB should replace FSP_FLAGS_HAS_PAGE_COMPRESSION check with fil_space_t::is_compressed(). fil_space_t::is_compressed() checks for both non full crc32 and crc32 format.
-rw-r--r--storage/innobase/fil/fil0fil.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
index aaca87be52e..c813bbad39f 100644
--- a/storage/innobase/fil/fil0fil.cc
+++ b/storage/innobase/fil/fil0fil.cc
@@ -723,7 +723,7 @@ fil_space_extend_must_retry(
os_offset_t(FIL_IBD_FILE_INITIAL_SIZE << srv_page_size_shift));
*success = os_file_set_size(node->name, node->handle, new_size,
- FSP_FLAGS_HAS_PAGE_COMPRESSION(space->flags));
+ space->is_compressed());
os_has_said_disk_full = *success;
if (*success) {
@@ -2653,7 +2653,7 @@ fil_ibd_create(
return NULL;
}
- const bool is_compressed = FSP_FLAGS_HAS_PAGE_COMPRESSION(flags);
+ const bool is_compressed = fil_space_t::is_compressed(flags);
bool punch_hole = is_compressed;
#ifdef _WIN32
@@ -3478,7 +3478,7 @@ fil_ibd_load(
/* Adjust the memory-based flags that would normally be set by
dict_tf_to_fsp_flags(). In recovery, we have no data dictionary. */
ulint flags = file.flags();
- if (FSP_FLAGS_HAS_PAGE_COMPRESSION(flags)) {
+ if (fil_space_t::is_compressed(flags)) {
flags |= page_zip_level
<< FSP_FLAGS_MEM_COMPRESSION_LEVEL;
}