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
de32e663
Commit
de32e663
authored
Oct 25, 2018
by
Sergey Vojtovich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-17441 - InnoDB transition to C++11 atomics
fil_space_t::redo_skipped_count transition to Atomic_counter.
parent
b1c3e6c2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
11 deletions
+7
-11
storage/innobase/fsp/fsp0fsp.cc
storage/innobase/fsp/fsp0fsp.cc
+1
-1
storage/innobase/include/btr0bulk.h
storage/innobase/include/btr0bulk.h
+2
-4
storage/innobase/include/fil0fil.h
storage/innobase/include/fil0fil.h
+3
-5
storage/innobase/mtr/mtr0mtr.cc
storage/innobase/mtr/mtr0mtr.cc
+1
-1
No files found.
storage/innobase/fsp/fsp0fsp.cc
View file @
de32e663
...
...
@@ -621,7 +621,7 @@ fsp_space_modify_check(
case
MTR_LOG_NO_REDO
:
ut_ad
(
space
->
purpose
==
FIL_TYPE_TEMPORARY
||
space
->
purpose
==
FIL_TYPE_IMPORT
||
my_atomic_loadlint
(
&
space
->
redo_skipped_count
)
);
||
space
->
redo_skipped_count
);
return
;
case
MTR_LOG_ALL
:
/* We may only write redo log for a persistent tablespace. */
...
...
storage/innobase/include/btr0bulk.h
View file @
de32e663
...
...
@@ -286,8 +286,7 @@ class BtrBulk
{
#ifdef UNIV_DEBUG
if
(
m_flush_observer
)
my_atomic_addlint
(
&
m_index
->
table
->
space
->
redo_skipped_count
,
1
);
m_index
->
table
->
space
->
redo_skipped_count
++
;
#endif
/* UNIV_DEBUG */
}
...
...
@@ -296,8 +295,7 @@ class BtrBulk
{
#ifdef UNIV_DEBUG
if
(
m_flush_observer
)
my_atomic_addlint
(
&
m_index
->
table
->
space
->
redo_skipped_count
,
ulint
(
-
1
));
m_index
->
table
->
space
->
redo_skipped_count
--
;
#endif
/* UNIV_DEBUG */
}
...
...
storage/innobase/include/fil0fil.h
View file @
de32e663
...
...
@@ -97,11 +97,9 @@ struct fil_space_t {
/** whether undo tablespace truncation is in progress */
bool
is_being_truncated
;
#ifdef UNIV_DEBUG
ulint
redo_skipped_count
;
/*!< reference count for operations who want
to skip redo log in the file space in order
to make fsp_space_modify_check pass.
Uses my_atomic_loadlint() and friends. */
/** reference count for operations who want to skip redo log in the
file space in order to make fsp_space_modify_check pass. */
Atomic_counter
<
ulint
>
redo_skipped_count
;
#endif
fil_type_t
purpose
;
/*!< purpose */
UT_LIST_BASE_NODE_T
(
fil_node_t
)
chain
;
...
...
storage/innobase/mtr/mtr0mtr.cc
View file @
de32e663
...
...
@@ -677,7 +677,7 @@ mtr_t::x_lock_space(ulint space_id, const char* file, unsigned line)
ut_ad
(
get_log_mode
()
!=
MTR_LOG_NO_REDO
||
space
->
purpose
==
FIL_TYPE_TEMPORARY
||
space
->
purpose
==
FIL_TYPE_IMPORT
||
my_atomic_loadlint
(
&
space
->
redo_skipped_count
)
>
0
);
||
space
->
redo_skipped_count
>
0
);
}
ut_ad
(
space
);
...
...
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