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

fix inner sql retry memleak

Browse Source
This commit is contained in:
obdev
2023-03-10 10:14:15 +00:00
committed by ob-robot
parent 962180cc52
commit f0e7fcb85f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/observer/ob_inner_sql_connection.cpp
View File

@ -1953,7 +1953,10 @@ int ObInnerSQLConnection::execute_read(const int64_t cluster_id,
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
auto function = [&]() { return execute_read_inner(cluster_id, tenant_id, sql, res, is_user_sql, sql_exec_addr); }; auto function = [&]() {
res.reuse();
return execute_read_inner(cluster_id, tenant_id, sql, res, is_user_sql, sql_exec_addr);
};
if (OB_FAIL(retry_while_no_tenant_resource(cluster_id, tenant_id, function))) { if (OB_FAIL(retry_while_no_tenant_resource(cluster_id, tenant_id, function))) {
LOG_WARN("execute_read failed", K(ret), K(cluster_id), K(tenant_id)); LOG_WARN("execute_read failed", K(ret), K(cluster_id), K(tenant_id));
} }
@ -1994,7 +1997,6 @@ int ObInnerSQLConnection::execute_read_inner(const int64_t cluster_id,
static_assert(ctx_size <= ObISQLClient::ReadResult::BUF_SIZE, "buffer not enough"); static_assert(ctx_size <= ObISQLClient::ReadResult::BUF_SIZE, "buffer not enough");
ObSqlQueryExecutor executor(sql); ObSqlQueryExecutor executor(sql);
const bool local_execute = is_local_execute(cluster_id, tenant_id); const bool local_execute = is_local_execute(cluster_id, tenant_id);
if (!inited_) { if (!inited_) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
LOG_WARN("connection not inited", K(ret)); LOG_WARN("connection not inited", K(ret));