mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

small cleanups as per review

Browse source
This commit is contained in:
Sergei Golubchik 2015-04-05 13:16:59 +02:00
parent 4d40a7d133
commit 72c8b3fcb2
8 changed files with 11 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
storage/innobase/buf/buf0buf.cc
View file

@ -5744,11 +5744,6 @@ buf_page_decrypt_after_read(
buf_page_t* bpage) /*!< in/out: buffer page read from disk */
{
ut_ad(bpage->key_version == 0);
ulint zip_size = buf_page_get_zip_size(bpage);
ulint size = (zip_size) ? zip_size : UNIV_PAGE_SIZE;
byte* dst_frame = (zip_size) ? bpage->zip.data :
((buf_block_t*) bpage)->frame;
if (bpage->offset == 0) {
/* File header pages are not encrypted */
@ -5756,7 +5751,11 @@ buf_page_decrypt_after_read(
return (TRUE);
}
ulint zip_size = buf_page_get_zip_size(bpage);
ulint size = (zip_size) ? zip_size : UNIV_PAGE_SIZE;
byte* dst_frame = (zip_size) ? bpage->zip.data :
((buf_block_t*) bpage)->frame;
const byte* src_frame = bpage->crypt_buf != NULL ?
bpage->crypt_buf : dst_frame;

4
storage/innobase/buf/buf0dblwr.cc
View file

@ -631,10 +631,6 @@ buf_dblwr_process()
fil_flush_file_spaces(FIL_TABLESPACE);
{
fprintf(stderr,
"Clear dblwr buffer after completing "
"processing of it...\n");
size_t bytes = TRX_SYS_DOUBLEWRITE_BLOCK_SIZE * UNIV_PAGE_SIZE;
byte *unaligned_buf = static_cast<byte*>(
ut_malloc(bytes + UNIV_PAGE_SIZE - 1));

28
storage/innobase/include/fts0fts.h
View file

@ -715,34 +715,6 @@ fts_drop_index_tables(
dict_index_t* index) /*!< in: Index to drop */
__attribute__((nonnull, warn_unused_result));
/******************************************************************
Wait for background threads to stop using FTS index
*/
UNIV_INTERN
void
fts_wait_bg_to_stop_using_index(
/*======================*/
trx_t* trx, /*!< in: transaction */
dict_index_t* index, /*!< in: FTS Index */
bool drop_table); /*!< in: in addition to stop
using index, also prevent
threads from start using it,
used by drop table */
/******************************************************************
Wait for background threads to stop using any FTS index of the table
*/
UNIV_INTERN
void
fts_wait_bg_to_stop_using_table(
/*======================*/
trx_t* trx, /*!< in: transaction */
dict_table_t* table, /*!< in: table to stop threads */
bool drop_table); /*!< in: in addition to stop
using table, also prevent
threads from start using it,
used by drop table */
/******************************************************************//**
Remove the table from the OPTIMIZER's list. We do wait for
acknowledgement from the consumer of the message. */

3
storage/innobase/include/srv0srv.h
View file

@ -1028,8 +1028,7 @@ struct export_var_t{
encryption errors */
ulint innodb_sec_rec_cluster_reads; /*!< srv_sec_rec_cluster_reads */
ulint innodb_sec_rec_cluster_reads_avoided;
/*!< srv_sec_rec_cluster_reads_avoided */
ulint innodb_sec_rec_cluster_reads_avoided; /*!< srv_sec_rec_cluster_reads_avoided */
ulint innodb_encryption_rotation_pages_read_from_cache;
ulint innodb_encryption_rotation_pages_read_from_disk;

10
storage/xtradb/buf/buf0buf.cc
View file

@ -5921,11 +5921,6 @@ buf_page_decrypt_after_read(
buf_page_t* bpage) /*!< in/out: buffer page read from disk */
{
ut_ad(bpage->key_version == 0);
ulint zip_size = buf_page_get_zip_size(bpage);
ulint size = (zip_size) ? zip_size : UNIV_PAGE_SIZE;
byte* dst_frame = (zip_size) ? bpage->zip.data :
((buf_block_t*) bpage)->frame;
if (bpage->offset == 0) {
/* File header pages are not encrypted */
@ -5933,6 +5928,11 @@ buf_page_decrypt_after_read(
return (TRUE);
}
ulint zip_size = buf_page_get_zip_size(bpage);
ulint size = (zip_size) ? zip_size : UNIV_PAGE_SIZE;
byte* dst_frame = (zip_size) ? bpage->zip.data :
((buf_block_t*) bpage)->frame;
const byte* src_frame = bpage->crypt_buf != NULL ?
bpage->crypt_buf : dst_frame;

4
storage/xtradb/buf/buf0dblwr.cc
View file

@ -630,10 +630,6 @@ buf_dblwr_process()
fil_flush_file_spaces(FIL_TABLESPACE);
{
fprintf(stderr,
"Clear dblwr buffer after completing "
"processing of it...\n");
size_t bytes = TRX_SYS_DOUBLEWRITE_BLOCK_SIZE * UNIV_PAGE_SIZE;
byte *unaligned_buf = static_cast<byte*>(
ut_malloc(bytes + UNIV_PAGE_SIZE - 1));

28
storage/xtradb/include/fts0fts.h
View file

@ -715,34 +715,6 @@ fts_drop_index_tables(
dict_index_t* index) /*!< in: Index to drop */
__attribute__((nonnull, warn_unused_result));
/******************************************************************
Wait for background threads to stop using FTS index
*/
UNIV_INTERN
void
fts_wait_bg_to_stop_using_index(
/*======================*/
trx_t* trx, /*!< in: transaction */
dict_index_t* index, /*!< in: FTS Index */
bool drop_table); /*!< in: in addition to stop
using index, also prevent
threads from start using it,
used by drop table */
/******************************************************************
Wait for background threads to stop using any FTS index of the table
*/
UNIV_INTERN
void
fts_wait_bg_to_stop_using_table(
/*======================*/
trx_t* trx, /*!< in: transaction */
dict_table_t* table, /*!< in: table to stop threads */
bool drop_table); /*!< in: in addition to stop
using table, also prevent
threads from start using it,
used by drop table */
/******************************************************************//**
Remove the table from the OPTIMIZER's list. We do wait for
acknowledgement from the consumer of the message. */

3
storage/xtradb/include/srv0srv.h
View file

@ -1246,8 +1246,7 @@ struct export_var_t{
encryption errors */
ulint innodb_sec_rec_cluster_reads; /*!< srv_sec_rec_cluster_reads */
ulint innodb_sec_rec_cluster_reads_avoided;
/*!< srv_sec_rec_cluster_reads_avoided */
ulint innodb_sec_rec_cluster_reads_avoided; /*!< srv_sec_rec_cluster_reads_avoided */
ulint innodb_encryption_rotation_pages_read_from_cache;
ulint innodb_encryption_rotation_pages_read_from_disk;