hcq/oceanbase
hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add data_progress and log_progress to DBA_OB_BACKUP_TASKS

Browse Source
This commit is contained in:
oceanoverflow 2024-05-13 13:42:41 +00:00 committed by ob-robot
parent 6584227310
commit 97dbfd2f97
5 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/share/inner_table/ob_inner_table_schema.21251_21300.cpp
View File

@ -660,7 +660,7 @@ int ObInnerTableSchema::dba_ob_backup_tasks_schema(ObTableSchema &table_schema)
table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
if (OB_SUCC(ret)) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TASK_ID, JOB_ID, INCARNATION, BACKUP_SET_ID, USEC_TO_TIME(START_TS) AS START_TIMESTAMP, CASE WHEN END_TS = 0 THEN NULL ELSE USEC_TO_TIME(END_TS) END AS END_TIMESTAMP, STATUS, START_SCN, END_SCN, USER_LS_START_SCN, ENCRYPTION_MODE, PASSWD, INPUT_BYTES, OUTPUT_BYTES, CASE WHEN END_TS = 0 THEN 0 ELSE OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000) END AS OUTPUT_RATE_BYTES, EXTRA_BYTES AS EXTRA_META_BYTES, TABLET_COUNT, FINISH_TABLET_COUNT, MACRO_BLOCK_COUNT, FINISH_MACRO_BLOCK_COUNT, FILE_COUNT, META_TURN_ID, DATA_TURN_ID, RESULT, COMMENT, PATH, MINOR_TURN_ID, MAJOR_TURN_ID FROM OCEANBASE.__all_virtual_backup_task WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TASK_ID, JOB_ID, INCARNATION, BACKUP_SET_ID, USEC_TO_TIME(START_TS) AS START_TIMESTAMP, CASE WHEN END_TS = 0 THEN NULL ELSE USEC_TO_TIME(END_TS) END AS END_TIMESTAMP, STATUS, START_SCN, END_SCN, USER_LS_START_SCN, ENCRYPTION_MODE, PASSWD, INPUT_BYTES, OUTPUT_BYTES, CASE WHEN END_TS = 0 THEN 0 ELSE OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000) END AS OUTPUT_RATE_BYTES, EXTRA_BYTES AS EXTRA_META_BYTES, TABLET_COUNT, FINISH_TABLET_COUNT, MACRO_BLOCK_COUNT, FINISH_MACRO_BLOCK_COUNT, FILE_COUNT, META_TURN_ID, DATA_TURN_ID, RESULT, COMMENT, PATH, MINOR_TURN_ID, MAJOR_TURN_ID, CASE WHEN MACRO_BLOCK_COUNT = 0 THEN 0.00 WHEN FINISH_MACRO_BLOCK_COUNT > MACRO_BLOCK_COUNT THEN 99.99 ELSE ROUND((FINISH_MACRO_BLOCK_COUNT / MACRO_BLOCK_COUNT) * 100, 2) END AS DATA_PROGRESS, LOG_FILE_COUNT, FINISH_LOG_FILE_COUNT, CASE WHEN LOG_FILE_COUNT = 0 THEN 0.00 WHEN FINISH_LOG_FILE_COUNT > LOG_FILE_COUNT THEN 99.99 ELSE ROUND((FINISH_LOG_FILE_COUNT / LOG_FILE_COUNT) * 100, 2) END AS LOG_PROGRESS FROM OCEANBASE.__all_virtual_backup_task WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
LOG_ERROR("fail to set view_definition", K(ret));
}
}

2
src/share/inner_table/ob_inner_table_schema.25151_25200.cpp
View File

@ -1460,7 +1460,7 @@ int ObInnerTableSchema::dba_ob_backup_tasks_ora_schema(ObTableSchema &table_sche
table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
if (OB_SUCC(ret)) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TASK_ID, JOB_ID, INCARNATION, BACKUP_SET_ID, TO_CHAR(START_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS START_TIMESTAMP, CASE WHEN END_TS = 0 THEN NULL ELSE TO_CHAR(END_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') END AS END_TIMESTAMP, STATUS, START_SCN, END_SCN, USER_LS_START_SCN, ENCRYPTION_MODE, PASSWD, INPUT_BYTES, OUTPUT_BYTES, CASE WHEN END_TS = 0 THEN 0 ELSE OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000) END AS OUTPUT_RATE_BYTES, EXTRA_BYTES AS EXTRA_META_BYTES, TABLET_COUNT, FINISH_TABLET_COUNT, MACRO_BLOCK_COUNT, FINISH_MACRO_BLOCK_COUNT, FILE_COUNT, META_TURN_ID, DATA_TURN_ID, RESULT, "COMMENT", PATH, MINOR_TURN_ID, MAJOR_TURN_ID FROM SYS.ALL_VIRTUAL_BACKUP_TASK WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT TASK_ID, JOB_ID, INCARNATION, BACKUP_SET_ID, TO_CHAR(START_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') AS START_TIMESTAMP, CASE WHEN END_TS = 0 THEN NULL ELSE TO_CHAR(END_TS / (1000 * 60 * 60 * 24 * 1000) + TO_DATE('1970-01-01 08:00:00', 'yyyy-mm-dd hh:mi:ss'), 'yyyy-mm-dd hh24:mi:ss') END AS END_TIMESTAMP, STATUS, START_SCN, END_SCN, USER_LS_START_SCN, ENCRYPTION_MODE, PASSWD, INPUT_BYTES, OUTPUT_BYTES, CASE WHEN END_TS = 0 THEN 0 ELSE OUTPUT_BYTES / ((END_TS - START_TS)/1000/1000) END AS OUTPUT_RATE_BYTES, EXTRA_BYTES AS EXTRA_META_BYTES, TABLET_COUNT, FINISH_TABLET_COUNT, MACRO_BLOCK_COUNT, FINISH_MACRO_BLOCK_COUNT, FILE_COUNT, META_TURN_ID, DATA_TURN_ID, RESULT, "COMMENT", PATH, MINOR_TURN_ID, MAJOR_TURN_ID, CASE WHEN MACRO_BLOCK_COUNT = 0 THEN 0.00 WHEN FINISH_MACRO_BLOCK_COUNT > MACRO_BLOCK_COUNT THEN 99.99 ELSE ROUND((FINISH_MACRO_BLOCK_COUNT / MACRO_BLOCK_COUNT) * 100, 2) END AS DATA_PROGRESS, LOG_FILE_COUNT, FINISH_LOG_FILE_COUNT, CASE WHEN LOG_FILE_COUNT = 0 THEN 0.00 WHEN FINISH_LOG_FILE_COUNT > LOG_FILE_COUNT THEN 99.99 ELSE ROUND((FINISH_LOG_FILE_COUNT / LOG_FILE_COUNT) * 100, 2) END AS LOG_PROGRESS FROM SYS.ALL_VIRTUAL_BACKUP_TASK WHERE TENANT_ID = EFFECTIVE_TENANT_ID() )__"))) {
LOG_ERROR("fail to set view_definition", K(ret));
}
}

28
src/share/inner_table/ob_inner_table_schema_def.py
View File

@ -25248,7 +25248,19 @@ def_table_schema(
COMMENT,
PATH,
MINOR_TURN_ID,
MAJOR_TURN_ID
MAJOR_TURN_ID,
CASE
WHEN MACRO_BLOCK_COUNT = 0 THEN 0.00
WHEN FINISH_MACRO_BLOCK_COUNT > MACRO_BLOCK_COUNT THEN 99.99
ELSE ROUND((FINISH_MACRO_BLOCK_COUNT / MACRO_BLOCK_COUNT) * 100, 2)
END AS DATA_PROGRESS,
LOG_FILE_COUNT,
FINISH_LOG_FILE_COUNT,
CASE
WHEN LOG_FILE_COUNT = 0 THEN 0.00
WHEN FINISH_LOG_FILE_COUNT > LOG_FILE_COUNT THEN 99.99
ELSE ROUND((FINISH_LOG_FILE_COUNT / LOG_FILE_COUNT) * 100, 2)
END AS LOG_PROGRESS
FROM OCEANBASE.__all_virtual_backup_task
WHERE TENANT_ID = EFFECTIVE_TENANT_ID()
""".replace("\n", " ")
@ -49759,7 +49771,19 @@ def_table_schema(
"COMMENT",
PATH,
MINOR_TURN_ID,
MAJOR_TURN_ID
MAJOR_TURN_ID,
CASE
WHEN MACRO_BLOCK_COUNT = 0 THEN 0.00
WHEN FINISH_MACRO_BLOCK_COUNT > MACRO_BLOCK_COUNT THEN 99.99
ELSE ROUND((FINISH_MACRO_BLOCK_COUNT / MACRO_BLOCK_COUNT) * 100, 2)
END AS DATA_PROGRESS,
LOG_FILE_COUNT,
FINISH_LOG_FILE_COUNT,
CASE
WHEN LOG_FILE_COUNT = 0 THEN 0.00
WHEN FINISH_LOG_FILE_COUNT > LOG_FILE_COUNT THEN 99.99
ELSE ROUND((FINISH_LOG_FILE_COUNT / LOG_FILE_COUNT) * 100, 2)
END AS LOG_PROGRESS
FROM SYS.ALL_VIRTUAL_BACKUP_TASK
WHERE TENANT_ID = EFFECTIVE_TENANT_ID()
""".replace("\n", " ")

4
tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_mysql.result
View File

@ -3243,6 +3243,10 @@ COMMENT varchar(4096) YES
PATH varchar(4096) YES
MINOR_TURN_ID bigint(20) NO
MAJOR_TURN_ID bigint(20) NO
DATA_PROGRESS decimal(26,2) NO
LOG_FILE_COUNT bigint(20) NO
FINISH_LOG_FILE_COUNT bigint(20) NO
LOG_PROGRESS decimal(26,2) NO
select /*+QUERY_TIMEOUT(60000000)*/ count(*) as cnt from (select * from oceanbase.DBA_OB_BACKUP_TASKS limit 1);
cnt
1

4
tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_sys_views_in_sys.result
View File

@ -4667,6 +4667,10 @@ COMMENT varchar(4096) YES
PATH varchar(4096) YES
MINOR_TURN_ID bigint(20) NO
MAJOR_TURN_ID bigint(20) NO
DATA_PROGRESS decimal(26,2) NO
LOG_FILE_COUNT bigint(20) NO
FINISH_LOG_FILE_COUNT bigint(20) NO
LOG_PROGRESS decimal(26,2) NO
select /*+QUERY_TIMEOUT(60000000)*/ count(*) as cnt from (select * from oceanbase.DBA_OB_BACKUP_TASKS limit 1);
cnt
1