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
eb636461
Commit
eb636461
authored
Nov 27, 2018
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the redundant variable fil_n_file_opened
parent
b9824074
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
3 additions
and
13 deletions
+3
-13
extra/mariabackup/fil_cur.cc
extra/mariabackup/fil_cur.cc
+0
-2
storage/innobase/fil/fil0fil.cc
storage/innobase/fil/fil0fil.cc
+0
-5
storage/innobase/include/fil0fil.h
storage/innobase/include/fil0fil.h
+0
-3
storage/innobase/include/srv0srv.h
storage/innobase/include/srv0srv.h
+1
-1
storage/innobase/srv/srv0mon.cc
storage/innobase/srv/srv0mon.cc
+1
-1
storage/innobase/srv/srv0srv.cc
storage/innobase/srv/srv0srv.cc
+1
-1
No files found.
extra/mariabackup/fil_cur.cc
View file @
eb636461
...
...
@@ -110,7 +110,6 @@ xb_fil_node_close_file(
ut_a
(
fil_system
->
n_open
>
0
);
fil_system
->
n_open
--
;
fil_n_file_opened
--
;
if
(
node
->
space
->
purpose
==
FIL_TYPE_TABLESPACE
&&
fil_is_user_tablespace_id
(
node
->
space
->
id
))
{
...
...
@@ -179,7 +178,6 @@ xb_fil_cur_open(
mutex_enter
(
&
fil_system
->
mutex
);
fil_system
->
n_open
++
;
fil_n_file_opened
++
;
if
(
node
->
space
->
purpose
==
FIL_TYPE_TABLESPACE
&&
fil_is_user_tablespace_id
(
node
->
space
->
id
))
{
...
...
storage/innobase/fil/fil0fil.cc
View file @
eb636461
...
...
@@ -138,9 +138,6 @@ ulint fil_n_pending_log_flushes = 0;
/** Number of pending tablespace flushes */
ulint
fil_n_pending_tablespace_flushes
=
0
;
/** Number of files currently open */
ulint
fil_n_file_opened
=
0
;
/** The null file address */
fil_addr_t
fil_addr_null
=
{
FIL_NULL
,
0
};
...
...
@@ -758,7 +755,6 @@ fil_node_open_file(
ut_a
(
node
->
is_open
());
fil_system
->
n_open
++
;
fil_n_file_opened
++
;
if
(
fil_space_belongs_in_lru
(
space
))
{
...
...
@@ -797,7 +793,6 @@ fil_node_close_file(
ut_ad
(
!
node
->
is_open
());
ut_a
(
fil_system
->
n_open
>
0
);
fil_system
->
n_open
--
;
fil_n_file_opened
--
;
if
(
fil_space_belongs_in_lru
(
node
->
space
))
{
...
...
storage/innobase/include/fil0fil.h
View file @
eb636461
...
...
@@ -443,9 +443,6 @@ extern ulint fil_n_pending_log_flushes;
/** Number of pending tablespace flushes */
extern
ulint
fil_n_pending_tablespace_flushes
;
/** Number of files currently open */
extern
ulint
fil_n_file_opened
;
#ifndef UNIV_INNOCHECKSUM
/** Look up a tablespace.
...
...
storage/innobase/include/srv0srv.h
View file @
eb636461
...
...
@@ -1020,7 +1020,7 @@ struct export_var_t{
ulint
innodb_system_rows_inserted
;
/*!< srv_n_system_rows_inserted */
ulint
innodb_system_rows_updated
;
/*!< srv_n_system_rows_updated */
ulint
innodb_system_rows_deleted
;
/*!< srv_n_system_rows_deleted*/
ulint
innodb_num_open_files
;
/*!< fil_
n_file_opened
*/
ulint
innodb_num_open_files
;
/*!< fil_
system_t::n_open
*/
ulint
innodb_truncated_status_writes
;
/*!< srv_truncated_status_writes */
ulint
innodb_available_undo_logs
;
/*!< srv_available_undo_logs
*/
...
...
storage/innobase/srv/srv0mon.cc
View file @
eb636461
...
...
@@ -1960,7 +1960,7 @@ srv_mon_process_existing_counter(
break
;
case
MONITOR_OVLD_N_FILE_OPENED
:
value
=
fil_
n_file_opened
;
value
=
fil_
system
->
n_open
;
break
;
case
MONITOR_OVLD_IBUF_MERGE_INSERT
:
...
...
storage/innobase/srv/srv0srv.cc
View file @
eb636461
...
...
@@ -1626,7 +1626,7 @@ srv_export_innodb_status(void)
export_vars
.
innodb_system_rows_deleted
=
srv_stats
.
n_system_rows_deleted
;
export_vars
.
innodb_num_open_files
=
fil_
n_file_opened
;
export_vars
.
innodb_num_open_files
=
fil_
system
->
n_open
;
export_vars
.
innodb_truncated_status_writes
=
srv_truncated_status_writes
;
...
...
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