Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
72c8b3fc
Commit
72c8b3fc
authored
Apr 05, 2015
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
small cleanups as per review
parent
4d40a7d1
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
78 deletions
+11
-78
storage/innobase/buf/buf0buf.cc
storage/innobase/buf/buf0buf.cc
+4
-5
storage/innobase/buf/buf0dblwr.cc
storage/innobase/buf/buf0dblwr.cc
+0
-4
storage/innobase/include/fts0fts.h
storage/innobase/include/fts0fts.h
+0
-28
storage/innobase/include/srv0srv.h
storage/innobase/include/srv0srv.h
+1
-2
storage/xtradb/buf/buf0buf.cc
storage/xtradb/buf/buf0buf.cc
+5
-5
storage/xtradb/buf/buf0dblwr.cc
storage/xtradb/buf/buf0dblwr.cc
+0
-4
storage/xtradb/include/fts0fts.h
storage/xtradb/include/fts0fts.h
+0
-28
storage/xtradb/include/srv0srv.h
storage/xtradb/include/srv0srv.h
+1
-2
No files found.
storage/innobase/buf/buf0buf.cc
View file @
72c8b3fc
...
@@ -5744,11 +5744,6 @@ buf_page_decrypt_after_read(
...
@@ -5744,11 +5744,6 @@ buf_page_decrypt_after_read(
buf_page_t
*
bpage
)
/*!< in/out: buffer page read from disk */
buf_page_t
*
bpage
)
/*!< in/out: buffer page read from disk */
{
{
ut_ad
(
bpage
->
key_version
==
0
);
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
)
{
if
(
bpage
->
offset
==
0
)
{
/* File header pages are not encrypted */
/* File header pages are not encrypted */
...
@@ -5756,7 +5751,11 @@ buf_page_decrypt_after_read(
...
@@ -5756,7 +5751,11 @@ buf_page_decrypt_after_read(
return
(
TRUE
);
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
?
const
byte
*
src_frame
=
bpage
->
crypt_buf
!=
NULL
?
bpage
->
crypt_buf
:
dst_frame
;
bpage
->
crypt_buf
:
dst_frame
;
...
...
storage/innobase/buf/buf0dblwr.cc
View file @
72c8b3fc
...
@@ -631,10 +631,6 @@ buf_dblwr_process()
...
@@ -631,10 +631,6 @@ buf_dblwr_process()
fil_flush_file_spaces
(
FIL_TABLESPACE
);
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
;
size_t
bytes
=
TRX_SYS_DOUBLEWRITE_BLOCK_SIZE
*
UNIV_PAGE_SIZE
;
byte
*
unaligned_buf
=
static_cast
<
byte
*>
(
byte
*
unaligned_buf
=
static_cast
<
byte
*>
(
ut_malloc
(
bytes
+
UNIV_PAGE_SIZE
-
1
));
ut_malloc
(
bytes
+
UNIV_PAGE_SIZE
-
1
));
...
...
storage/innobase/include/fts0fts.h
View file @
72c8b3fc
...
@@ -715,34 +715,6 @@ fts_drop_index_tables(
...
@@ -715,34 +715,6 @@ fts_drop_index_tables(
dict_index_t
*
index
)
/*!< in: Index to drop */
dict_index_t
*
index
)
/*!< in: Index to drop */
__attribute__
((
nonnull
,
warn_unused_result
));
__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
Remove the table from the OPTIMIZER's list. We do wait for
acknowledgement from the consumer of the message. */
acknowledgement from the consumer of the message. */
...
...
storage/innobase/include/srv0srv.h
View file @
72c8b3fc
...
@@ -1028,8 +1028,7 @@ struct export_var_t{
...
@@ -1028,8 +1028,7 @@ struct export_var_t{
encryption errors */
encryption errors */
ulint
innodb_sec_rec_cluster_reads
;
/*!< srv_sec_rec_cluster_reads */
ulint
innodb_sec_rec_cluster_reads
;
/*!< srv_sec_rec_cluster_reads */
ulint
innodb_sec_rec_cluster_reads_avoided
;
ulint
innodb_sec_rec_cluster_reads_avoided
;
/*!< srv_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_cache
;
ulint
innodb_encryption_rotation_pages_read_from_disk
;
ulint
innodb_encryption_rotation_pages_read_from_disk
;
...
...
storage/xtradb/buf/buf0buf.cc
View file @
72c8b3fc
...
@@ -5921,11 +5921,6 @@ buf_page_decrypt_after_read(
...
@@ -5921,11 +5921,6 @@ buf_page_decrypt_after_read(
buf_page_t
*
bpage
)
/*!< in/out: buffer page read from disk */
buf_page_t
*
bpage
)
/*!< in/out: buffer page read from disk */
{
{
ut_ad
(
bpage
->
key_version
==
0
);
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
)
{
if
(
bpage
->
offset
==
0
)
{
/* File header pages are not encrypted */
/* File header pages are not encrypted */
...
@@ -5933,6 +5928,11 @@ buf_page_decrypt_after_read(
...
@@ -5933,6 +5928,11 @@ buf_page_decrypt_after_read(
return
(
TRUE
);
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
?
const
byte
*
src_frame
=
bpage
->
crypt_buf
!=
NULL
?
bpage
->
crypt_buf
:
dst_frame
;
bpage
->
crypt_buf
:
dst_frame
;
...
...
storage/xtradb/buf/buf0dblwr.cc
View file @
72c8b3fc
...
@@ -630,10 +630,6 @@ buf_dblwr_process()
...
@@ -630,10 +630,6 @@ buf_dblwr_process()
fil_flush_file_spaces
(
FIL_TABLESPACE
);
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
;
size_t
bytes
=
TRX_SYS_DOUBLEWRITE_BLOCK_SIZE
*
UNIV_PAGE_SIZE
;
byte
*
unaligned_buf
=
static_cast
<
byte
*>
(
byte
*
unaligned_buf
=
static_cast
<
byte
*>
(
ut_malloc
(
bytes
+
UNIV_PAGE_SIZE
-
1
));
ut_malloc
(
bytes
+
UNIV_PAGE_SIZE
-
1
));
...
...
storage/xtradb/include/fts0fts.h
View file @
72c8b3fc
...
@@ -715,34 +715,6 @@ fts_drop_index_tables(
...
@@ -715,34 +715,6 @@ fts_drop_index_tables(
dict_index_t
*
index
)
/*!< in: Index to drop */
dict_index_t
*
index
)
/*!< in: Index to drop */
__attribute__
((
nonnull
,
warn_unused_result
));
__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
Remove the table from the OPTIMIZER's list. We do wait for
acknowledgement from the consumer of the message. */
acknowledgement from the consumer of the message. */
...
...
storage/xtradb/include/srv0srv.h
View file @
72c8b3fc
...
@@ -1246,8 +1246,7 @@ struct export_var_t{
...
@@ -1246,8 +1246,7 @@ struct export_var_t{
encryption errors */
encryption errors */
ulint
innodb_sec_rec_cluster_reads
;
/*!< srv_sec_rec_cluster_reads */
ulint
innodb_sec_rec_cluster_reads
;
/*!< srv_sec_rec_cluster_reads */
ulint
innodb_sec_rec_cluster_reads_avoided
;
ulint
innodb_sec_rec_cluster_reads_avoided
;
/*!< srv_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_cache
;
ulint
innodb_encryption_rotation_pages_read_from_disk
;
ulint
innodb_encryption_rotation_pages_read_from_disk
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment