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

fix gather truncate longtext string bug and write opt stats gather history bug

Browse Source
This commit is contained in:
wangt1xiuyi
2023-12-19 05:47:51 +00:00
committed by ob-robot
parent 1dd95354cd
commit 60c6bbb06e
4 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/pl/sys_package/ob_dbms_stats.cpp
View File

@ -139,11 +139,7 @@ int ObDbmsStats::gather_table_stats(ObExecContext &ctx, ParamStore &params, ObOb
task_info.task_end_time_ = ObTimeUtility::current_time();
task_info.ret_code_ = ret;
task_info.failed_count_ = ret == OB_SUCCESS ? 0 : 1;
sql::ObSQLSessionInfo *origin_session = THIS_WORKER.get_session();
THIS_WORKER.set_session(NULL);
ObOptStatManager::get_instance().update_opt_stat_task_stat(task_info);
ObOptStatManager::get_instance().update_opt_stat_gather_stat(gather_stat);
THIS_WORKER.set_session(origin_session);
update_optimizer_gather_stat_info(&task_info, &gather_stat);
ObOptStatGatherStatList::instance().remove(gather_stat);
}
return ret;
@ -266,20 +262,14 @@ int ObDbmsStats::gather_schema_stats(ObExecContext &ctx, ParamStore &params, ObO
LOG_TRACE("Succeed to gather table stats", K(stat_param), K(running_monitor));
}
running_monitor.set_monitor_result(ret, ObTimeUtility::current_time(), stat_param.allocator_->used());
sql::ObSQLSessionInfo *origin_session = THIS_WORKER.get_session();
THIS_WORKER.set_session(NULL);
ObOptStatManager::get_instance().update_opt_stat_gather_stat(gather_stat);
THIS_WORKER.set_session(origin_session);
update_optimizer_gather_stat_info(NULL, &gather_stat);
ObOptStatGatherStatList::instance().remove(gather_stat);
task_info.completed_table_count_ ++;
}
task_info.task_end_time_ = ObTimeUtility::current_time();
task_info.ret_code_ = ret;
task_info.failed_count_ = ret == OB_SUCCESS ? 0 : table_ids.count() - i + 1;
sql::ObSQLSessionInfo *origin_session = THIS_WORKER.get_session();
THIS_WORKER.set_session(NULL);
ObOptStatManager::get_instance().update_opt_stat_task_stat(task_info);
THIS_WORKER.set_session(origin_session);
update_optimizer_gather_stat_info(&task_info, NULL);
}
return ret;
}
@ -5359,10 +5349,7 @@ int ObDbmsStats::gather_database_stats_job_proc(sql::ObExecContext &ctx,
ret = ret == OB_TIMEOUT ? OB_SUCCESS : ret;
task_info.task_end_time_ = ObTimeUtility::current_time();
task_info.ret_code_ = ret;
sql::ObSQLSessionInfo *origin_session = THIS_WORKER.get_session();
THIS_WORKER.set_session(NULL);
ObOptStatManager::get_instance().update_opt_stat_task_stat(task_info);
THIS_WORKER.set_session(origin_session);
update_optimizer_gather_stat_info(&task_info, NULL);
}
return ret;
}
@ -5708,10 +5695,7 @@ int ObDbmsStats::gather_table_stats_with_default_param(ObExecContext &ctx,
LOG_TRACE("Succeed to gather table stats", K(stat_param));
}
running_monitor.set_monitor_result(ret, ObTimeUtility::current_time(), stat_param.allocator_->used());
sql::ObSQLSessionInfo *origin_session = THIS_WORKER.get_session();
THIS_WORKER.set_session(NULL);
ObOptStatManager::get_instance().update_opt_stat_gather_stat(gather_stat);
THIS_WORKER.set_session(origin_session);
update_optimizer_gather_stat_info(NULL, &gather_stat);
ObOptStatGatherStatList::instance().remove(gather_stat);
task_info.completed_table_count_ ++;
return ret;
@ -6725,5 +6709,30 @@ bool ObDbmsStats::is_partition_no_regather(int64_t part_id,
return is_true;
}
void ObDbmsStats::update_optimizer_gather_stat_info(const ObOptStatTaskInfo *task_info,
const ObOptStatGatherStat *gather_stat)
{
int ret = OB_SUCCESS;
sql::ObSQLSessionInfo *origin_session = THIS_WORKER.get_session();
int64_t origin_timeout = THIS_WORKER.get_timeout_ts();
THIS_WORKER.set_session(NULL);
const int64_t MAX_UPDATE_OPT_GATHER_STAT_TIMEOUT = 10000000;//default 10 seconds
THIS_WORKER.set_timeout_ts(MAX_UPDATE_OPT_GATHER_STAT_TIMEOUT + ObTimeUtility::current_time());
if (task_info != NULL) {
if (OB_FAIL(ObOptStatManager::get_instance().update_opt_stat_task_stat(*task_info))) {
LOG_WARN("failed to update opt stat task stat", K(ret));
LOG_USER_WARN(OB_ERR_DBMS_STATS_PL, "failed to update opt stat task stat");
}
}
if (gather_stat != NULL) {
if (OB_FAIL(ObOptStatManager::get_instance().update_opt_stat_gather_stat(*gather_stat))) {
LOG_WARN("failed to update opt stat gather stat", K(ret));
LOG_USER_WARN(OB_ERR_DBMS_STATS_PL, "failed to update opt stat gather stat");
}
}
THIS_WORKER.set_session(origin_session);
THIS_WORKER.set_timeout_ts(origin_timeout);
}
}
}