mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed so that innodb_compress_index pages means that if true also index

Browse source 
pages are compressed if false index pages are not compressed.

Fixed small output error when page_compression_level was incorrectly
given.
This commit is contained in:
Jan Lindström 2014-03-07 08:20:43 +02:00
parent 67cb55c51d
commit c556b9d817
6 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
storage/innobase/handler/ha_innodb.cc
View file

@ -9907,7 +9907,7 @@ ha_innobase::check_table_options(
HA_WRONG_CREATE_OPTION,
"InnoDB: invalid PAGE_COMPRESSION_LEVEL = %lu."
" Valid values are [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]",
create_info->key_block_size);
options->page_compression_level);
return "PAGE_COMPRESSION_LEVEL";
}
}
@ -16795,8 +16795,8 @@ static MYSQL_SYSVAR_LONG(trim_pct, srv_trim_pct,
static MYSQL_SYSVAR_BOOL(compress_index_pages, srv_page_compress_index_pages,
PLUGIN_VAR_OPCMDARG,
"Use page compression for only index pages. Default TRUE.",
NULL, NULL, TRUE);
"Use page compression also for index pages. Default FALSE.",
NULL, NULL, FALSE);
static MYSQL_SYSVAR_BOOL(use_trim, srv_use_trim,
PLUGIN_VAR_OPCMDARG,

8
storage/innobase/os/os0file.cc
View file

@ -4464,14 +4464,12 @@ found:
slot->page_compression = page_compression;
/* If the space is page compressed and this is write operation
and if either only index pages compression is disabled or
page is index page and only index pages compression is enabled then
we compress the page */
and either index compression is enabled or page is not a index
page then we compress the page */
if (message1 &&
type == OS_FILE_WRITE &&
page_compression &&
(srv_page_compress_index_pages == false ||
(srv_page_compress_index_pages == true && fil_page_is_index_page(slot->buf)))) {
(srv_page_compress_index_pages == true || !fil_page_is_index_page(slot->buf))) {
ulint real_len = len;
byte* tmp = NULL;

2
storage/innobase/srv/srv0srv.cc
View file

@ -148,7 +148,7 @@ UNIV_INTERN my_bool srv_use_native_aio = TRUE;
/* If this flag is TRUE, then we will use page compression
only for index pages */
UNIV_INTERN my_bool srv_page_compress_index_pages = TRUE;
UNIV_INTERN my_bool srv_page_compress_index_pages = FALSE;
UNIV_INTERN long srv_trim_pct = 100;
/* If this flag is TRUE, then we will use fallocate(PUCH_HOLE)
to the pages */

6
storage/xtradb/handler/ha_innodb.cc
View file

@ -10420,7 +10420,7 @@ ha_innobase::check_table_options(
HA_WRONG_CREATE_OPTION,
"InnoDB: invalid PAGE_COMPRESSION_LEVEL = %lu."
" Valid values are [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]",
create_info->key_block_size);
options->page_compression_level);
return "PAGE_COMPRESSION_LEVEL";
}
}
@ -17949,8 +17949,8 @@ static MYSQL_SYSVAR_UINT(compression_level, page_zip_level,
static MYSQL_SYSVAR_BOOL(compress_index_pages, srv_page_compress_index_pages,
PLUGIN_VAR_OPCMDARG,
"Use page compression for only index pages. Default TRUE.",
NULL, NULL, TRUE);
"Use page compression also for index pages. Default FALSE.",
NULL, NULL, FALSE);
static MYSQL_SYSVAR_BOOL(use_trim, srv_use_trim,
PLUGIN_VAR_OPCMDARG,

8
storage/xtradb/os/os0file.cc
View file

@ -4580,14 +4580,12 @@ found:
slot->page_compression = page_compression;
/* If the space is page compressed and this is write operation
and if either only index pages compression is disabled or
page is index page and only index pages compression is enabled then
we compress the page */
and either index compression is enabled or page is not a index
page then we compress the page */
if (message1 &&
type == OS_FILE_WRITE &&
page_compression &&
(srv_page_compress_index_pages == false ||
(srv_page_compress_index_pages == true && fil_page_is_index_page(slot->buf)))) {
(srv_page_compress_index_pages == true || !fil_page_is_index_page(slot->buf))) {
ulint real_len = len;
byte* tmp = NULL;

2
storage/xtradb/srv/srv0srv.cc
View file

@ -163,7 +163,7 @@ UNIV_INTERN my_bool srv_use_native_aio = TRUE;
/* If this flag is TRUE, then we will use page compression
only for index pages */
UNIV_INTERN my_bool srv_page_compress_index_pages = TRUE;
UNIV_INTERN my_bool srv_page_compress_index_pages = FALSE;
UNIV_INTERN long srv_trim_pct = 100;
/* Default compression level if page compression is used and no compression
level is set for the table*/