database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

MDEV-6172: Monitor progress of ALTER TABLE ... ADD INDEX,

Browse Source 
ALGORITHM=INPLACE for InnoDB

Added thd_progress calls to row_merge_sort to give
some hint how merge sort progresses.
This commit is contained in:
Jan Lindström
2014-08-18 10:52:59 +03:00
parent 2062c9a65a
commit 8984bef2e4
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
storage/innobase/row/row0merge.cc
View File

@@ -2100,6 +2100,7 @@ row_merge(
/* Copy the last blocks, if there are any. */
while (foffs0 < ihalf) {
if (UNIV_UNLIKELY(trx_is_interrupted(trx))) {
return(DB_INTERRUPTED);
}
@@ -2116,6 +2117,7 @@ row_merge(
ut_ad(foffs0 == ihalf);
while (foffs1 < file->offset) {
if (trx_is_interrupted(trx)) {
return(DB_INTERRUPTED);
}
@@ -2175,6 +2177,7 @@ row_merge_sort(
{
const ulint half = file->offset / 2;
ulint num_runs;
ulint cur_run = 0;
ulint* run_offset;
dberr_t error = DB_SUCCESS;
DBUG_ENTER("row_merge_sort");
@@ -2198,8 +2201,16 @@ row_merge_sort(
of file marker). Thus, it must be at least one block. */
ut_ad(file->offset > 0);
thd_progress_init(trx->mysql_thd, num_runs);
/* Merge the runs until we have one big run */
do {
cur_run++;
/* Report progress of merge sort to MySQL for
show processlist progress field */
thd_progress_report(trx->mysql_thd, cur_run, num_runs);
error = row_merge(trx, dup, file, block, tmpfd,
&num_runs, run_offset);
@@ -2212,6 +2223,8 @@ row_merge_sort(
mem_free(run_offset);
thd_progress_end(trx->mysql_thd);
DBUG_RETURN(error);
}

13
storage/xtradb/row/row0merge.cc
View File

@@ -2106,6 +2106,7 @@ row_merge(
/* Copy the last blocks, if there are any. */
while (foffs0 < ihalf) {
if (UNIV_UNLIKELY(trx_is_interrupted(trx))) {
return(DB_INTERRUPTED);
}
@@ -2122,6 +2123,7 @@ row_merge(
ut_ad(foffs0 == ihalf);
while (foffs1 < file->offset) {
if (trx_is_interrupted(trx)) {
return(DB_INTERRUPTED);
}
@@ -2181,6 +2183,7 @@ row_merge_sort(
{
const ulint half = file->offset / 2;
ulint num_runs;
ulint cur_run = 0;
ulint* run_offset;
dberr_t error = DB_SUCCESS;
DBUG_ENTER("row_merge_sort");
@@ -2204,8 +2207,16 @@ row_merge_sort(
of file marker). Thus, it must be at least one block. */
ut_ad(file->offset > 0);
thd_progress_init(trx->mysql_thd, num_runs);
/* Merge the runs until we have one big run */
do {
cur_run++;
/* Report progress of merge sort to MySQL for
show processlist progress field */
thd_progress_report(trx->mysql_thd, cur_run, num_runs);
error = row_merge(trx, dup, file, block, tmpfd,
&num_runs, run_offset);
@@ -2218,6 +2229,8 @@ row_merge_sort(
mem_free(run_offset);
thd_progress_end(trx->mysql_thd);
DBUG_RETURN(error);
}