mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 10.0 into 10.1

Browse source
This commit is contained in:
Marko Mäkelä 2017-04-21 17:41:40 +03:00
commit 7445ff84f4
8 changed files with 38 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5788,23 +5788,22 @@ buf_print_io_instance(
pool_info->pages_written_rate);
if (pool_info->n_page_get_delta) {
double hit_rate = ((1000 * pool_info->page_read_delta)
/ pool_info->n_page_get_delta);
double hit_rate = double(pool_info->page_read_delta)
/ pool_info->n_page_get_delta;
if (hit_rate > 1000) {
hit_rate = 1000;
if (hit_rate > 1) {
hit_rate = 1;
}
hit_rate = 1000 - hit_rate;
fprintf(file,
"Buffer pool hit rate %lu / 1000,"
" young-making rate %lu / 1000 not %lu / 1000\n",
(ulint) hit_rate,
(ulint) (1000 * pool_info->young_making_delta
/ pool_info->n_page_get_delta),
(ulint) (1000 * pool_info->not_young_making_delta
/ pool_info->n_page_get_delta));
"Buffer pool hit rate " ULINTPF " / 1000,"
" young-making rate " ULINTPF " / 1000 not "
ULINTPF " / 1000\n",
ulint(1000 * (1 - hit_rate)),
ulint(1000 * double(pool_info->young_making_delta)
/ pool_info->n_page_get_delta),
ulint(1000 * double(pool_info->not_young_making_delta)
/ pool_info->n_page_get_delta));
} else {
fputs("No buffer pool page gets since the last printout\n",
file);

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

@ -5974,8 +5974,8 @@ os_aio_print(
os_n_file_writes,
os_n_fsyncs);
const ulint n_reads = MONITOR_VALUE(MONITOR_OS_PENDING_READS);
const ulint n_writes = MONITOR_VALUE(MONITOR_OS_PENDING_WRITES);
const ulint n_reads = ulint(MONITOR_VALUE(MONITOR_OS_PENDING_READS));
const ulint n_writes = ulint(MONITOR_VALUE(MONITOR_OS_PENDING_WRITES));
if (n_reads != 0 || n_writes != 0) {
fprintf(file,

7
storage/innobase/row/row0ftsort.cc
View file

@ -1317,10 +1317,9 @@ row_fts_build_sel_tree_level(
int child_left;
int child_right;
ulint i;
ulint num_item;
ulint num_item = ulint(1) << level;
start = static_cast<ulint>((1 << level) - 1);
num_item = static_cast<ulint>(1 << level);
start = num_item - 1;
for (i = 0; i < num_item; i++) {
child_left = sel_tree[(start + i) * 2 + 1];
@ -1389,7 +1388,7 @@ row_fts_build_sel_tree(
treelevel++;
}
start = (1 << treelevel) - 1;
start = (ulint(1) << treelevel) - 1;
for (i = 0; i < (int) fts_sort_pll_degree; i++) {
sel_tree[i + start] = i;

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

@ -1480,10 +1480,10 @@ srv_export_innodb_status(void)
mutex_enter(&srv_innodb_monitor_mutex);
export_vars.innodb_data_pending_reads =
MONITOR_VALUE(MONITOR_OS_PENDING_READS);
ulint(MONITOR_VALUE(MONITOR_OS_PENDING_READS));
export_vars.innodb_data_pending_writes =
MONITOR_VALUE(MONITOR_OS_PENDING_WRITES);
ulint(MONITOR_VALUE(MONITOR_OS_PENDING_WRITES));
export_vars.innodb_data_pending_fsyncs =
fil_n_pending_log_flushes

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

@ -5928,23 +5928,22 @@ buf_print_io_instance(
pool_info->pages_written_rate);
if (pool_info->n_page_get_delta) {
double hit_rate = ((1000 * pool_info->page_read_delta)
/ pool_info->n_page_get_delta);
double hit_rate = double(pool_info->page_read_delta)
/ pool_info->n_page_get_delta;
if (hit_rate > 1000) {
hit_rate = 1000;
if (hit_rate > 1) {
hit_rate = 1;
}
hit_rate = 1000 - hit_rate;
fprintf(file,
"Buffer pool hit rate %lu / 1000,"
" young-making rate %lu / 1000 not %lu / 1000\n",
(ulint) hit_rate,
(ulint) (1000 * pool_info->young_making_delta
/ pool_info->n_page_get_delta),
(ulint) (1000 * pool_info->not_young_making_delta
/ pool_info->n_page_get_delta));
"Buffer pool hit rate " ULINTPF " / 1000,"
" young-making rate " ULINTPF " / 1000 not "
ULINTPF " / 1000\n",
ulint(1000 * (1 - hit_rate)),
ulint(1000 * double(pool_info->young_making_delta)
/ pool_info->n_page_get_delta),
ulint(1000 * double(pool_info->not_young_making_delta)
/ pool_info->n_page_get_delta));
} else {
fputs("No buffer pool page gets since the last printout\n",
file);

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

@ -6102,8 +6102,8 @@ os_aio_print(
os_n_file_writes,
os_n_fsyncs);
const ulint n_reads = MONITOR_VALUE(MONITOR_OS_PENDING_READS);
const ulint n_writes = MONITOR_VALUE(MONITOR_OS_PENDING_WRITES);
const ulint n_reads = ulint(MONITOR_VALUE(MONITOR_OS_PENDING_READS));
const ulint n_writes = ulint(MONITOR_VALUE(MONITOR_OS_PENDING_WRITES));
if (n_reads != 0 || n_writes != 0) {
fprintf(file,

7
storage/xtradb/row/row0ftsort.cc
View file

@ -1320,10 +1320,9 @@ row_fts_build_sel_tree_level(
int child_left;
int child_right;
ulint i;
ulint num_item;
ulint num_item = ulint(1) << level;
start = static_cast<ulint>((1 << level) - 1);
num_item = static_cast<ulint>(1 << level);
start = num_item - 1;
for (i = 0; i < num_item; i++) {
child_left = sel_tree[(start + i) * 2 + 1];
@ -1392,7 +1391,7 @@ row_fts_build_sel_tree(
treelevel++;
}
start = (1 << treelevel) - 1;
start = (ulint(1) << treelevel) - 1;
for (i = 0; i < (int) fts_sort_pll_degree; i++) {
sel_tree[i + start] = i;

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

@ -1819,10 +1819,10 @@ srv_export_innodb_status(void)
mutex_enter(&srv_innodb_monitor_mutex);
export_vars.innodb_data_pending_reads =
MONITOR_VALUE(MONITOR_OS_PENDING_READS);
ulint(MONITOR_VALUE(MONITOR_OS_PENDING_READS));
export_vars.innodb_data_pending_writes =
MONITOR_VALUE(MONITOR_OS_PENDING_WRITES);
ulint(MONITOR_VALUE(MONITOR_OS_PENDING_WRITES));
export_vars.innodb_data_pending_fsyncs =
fil_n_pending_log_flushes