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

[scn] fix failure of mittest after refresh feature scn

Browse Source
This commit is contained in:
obdev
2022-11-28 01:46:42 +00:00
committed by ob-robot
parent 49a02f3304
commit 54b64a7263
1898 changed files with 255804 additions and 280809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/monitor/ob_exec_stat.h
View File

@ -357,7 +357,7 @@ struct ObAuditRecordData {
return sql_len_ + tenant_name_len_ + user_name_len_ + db_name_len_;
}
int64_t get_snapshot_version() const
palf::SCN get_snapshot_version() const
{
return snapshot_.version_;
}
@ -423,7 +423,7 @@ struct ObAuditRecordData {
int64_t params_value_len_;
char *params_value_;
struct StmtSnapshot {
int64_t version_; // snapshot version
palf::SCN version_; // snapshot version
int64_t tx_id_; // snapshot inner which txn
int64_t scn_; // snapshot's position in the txn
char const* source_; // snapshot's acquire source

10
src/sql/monitor/ob_monitor_info_manager.cpp
View File

@ -25,7 +25,7 @@ ObMonitorInfoManager::ObMonitorInfoManager()
{
memory_limit_ = min(
MAX_MEMORY_SIZE,
static_cast<int64_t>(static_cast<double>(GMEMCONF.get_server_memory_avail()) * MONITOR_MEM_FACTOR));
static_cast<int64_t>(static_cast<double>(GCONF.get_server_memory_avail()) * MONITOR_MEM_FACTOR));
}
ObMonitorInfoManager::~ObMonitorInfoManager()
@ -149,14 +149,14 @@ int ObMonitorInfoManager::add_monitor_info(ObPhyPlanMonitorInfo *info)
int64_t retry_times = 3;
while (retry_times > 0) {
retry_times --;
int64_t &req_id = info->get_request_id();
int64_t cur_operator_info_size = info->get_operator_info_memory_size();
if (OB_FAIL(slow_query_queue_.push_with_imme_seq((void*)info, req_id))) {
int64_t req_id = 0;
if (OB_FAIL(slow_query_queue_.push((void*)info, req_id))) {
if (OB_SIZE_OVERFLOW == ret) {
clear_queue(OB_BATCH_GC_COUNT);
}
} else {
operator_info_size_ += cur_operator_info_size;
info->set_request_id(req_id);
operator_info_size_ += info->get_operator_info_memory_size();
LOG_DEBUG("add monitor info", K(*info));
break;
}

1
src/sql/monitor/ob_phy_plan_monitor_info.h
View File

@ -72,7 +72,6 @@ public:
}
void set_request_id(int64_t request_id) { request_id_ = request_id; }
void set_plan_id(int64_t plan_id) {plan_id_ = plan_id; }
int64_t &get_request_id() { return request_id_; }
int64_t get_request_id() const { return request_id_; }
int64_t get_plan_id() const { return plan_id_; }
int64_t get_execution_time() const { return execution_time_; }