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

fix information_schema.columns memory dynamic leak when resolving views

Browse Source
This commit is contained in:
obdev
2023-02-07 17:16:51 +08:00
committed by ob-robot
parent cc9cadb3ad
commit 8618e5d9bb
5 changed files with 83 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
src/observer/virtual_table/ob_information_columns_table.cpp
View File

@ -46,7 +46,8 @@ ObInfoSchemaColumnsTable::ObInfoSchemaColumnsTable() :
last_filter_column_idx_(-1),
database_schema_array_(),
filter_table_schema_array_(),
view_resolve_alloc_()
mem_context_(nullptr),
iter_cnt_(0)
{
}
@ -59,7 +60,11 @@ void ObInfoSchemaColumnsTable::reset()
{
ObVirtualTableScannerIterator::reset();
tenant_id_ = OB_INVALID_ID;
view_resolve_alloc_.reset();
if (OB_LIKELY(NULL != mem_context_)) {
DESTROY_CONTEXT(mem_context_);
mem_context_ = NULL;
}
iter_cnt_ = 0;
}
int ObInfoSchemaColumnsTable::inner_get_next_row(common::ObNewRow *&row)
@ -72,6 +77,8 @@ int ObInfoSchemaColumnsTable::inner_get_next_row(common::ObNewRow *&row)
} else if (OB_UNLIKELY(OB_INVALID_ID == tenant_id_)) {
ret = OB_NOT_INIT;
SERVER_LOG(WARN, "tenant id is invalid_id", K(ret), K(tenant_id_));
} else if (OB_FAIL(init_mem_context())) {
SERVER_LOG(WARN, "failed to init mem context", K(ret));
} else {
if (!start_to_read_) {
void *tmp_ptr = NULL;
@ -204,7 +211,10 @@ int ObInfoSchemaColumnsTable::iterate_table_schema_array(const bool is_filter_ta
} else {
table_schema = table_schema_array.at(i);
}
if (OB_ISNULL(table_schema)) {
++iter_cnt_;
if (0 == ++iter_cnt_ % 1024 && OB_FAIL(THIS_WORKER.check_status())) {
SERVER_LOG(WARN, "failed to check status", K(ret));
} else if (OB_ISNULL(table_schema)) {
ret = OB_ERR_UNEXPECTED;
SERVER_LOG(WARN, "table_schema should not be NULL", K(ret));
} else {
@ -226,47 +236,49 @@ int ObInfoSchemaColumnsTable::iterate_table_schema_array(const bool is_filter_ta
bool view_is_invalid = (0 == table_schema->get_object_status() || 0 == table_schema->get_column_count());
if (OB_FAIL(ret)) {
} else if (is_normal_view && view_is_invalid) {
view_resolve_alloc_.reset_remain_one_page();
ObString view_definition;
sql::ObSelectStmt *select_stmt = NULL;
sql::ObSelectStmt *real_stmt = NULL;
ObStmtFactory stmt_factory(view_resolve_alloc_);
ObRawExprFactory expr_factory(view_resolve_alloc_);
if (OB_FAIL(ObSQLUtils::generate_view_definition_for_resolve(
view_resolve_alloc_,
session_->get_local_collation_connection(),
table_schema->get_view_schema(),
view_definition))) {
SERVER_LOG(WARN, "fail to generate view definition for resolve", K(ret));
} else if (OB_FAIL(ObTableColumns::resolve_view_definition(&view_resolve_alloc_, session_, schema_guard_,
*table_schema, select_stmt, expr_factory, stmt_factory, false))) {
if (OB_ERR_UNKNOWN_TABLE != ret && OB_ERR_VIEW_INVALID != ret) {
SERVER_LOG(WARN, "failed to resolve view definition", K(view_definition), K(ret), K(table_schema->get_table_id()));
} else {
ret = OB_SUCCESS;
continue;
}
} else if (OB_UNLIKELY(NULL == select_stmt)) {
ret = OB_ERR_UNEXPECTED;
SERVER_LOG(WARN, "select_stmt is NULL", K(ret));
} else if (OB_ISNULL(real_stmt = select_stmt->get_real_stmt())) {
// case : view definition is set_op
// Bug : http://k3.alibaba-inc.com/issue/6455327?stat=1.5.3&toPage=1&versionId=1043693
ret = OB_ERR_UNEXPECTED;
SERVER_LOG(WARN, "real stmt is NULL", K(ret));
}
for (int64_t k = 0; OB_SUCC(ret) && k < real_stmt->get_select_item_size() && !has_more_; ++k) {
if (OB_FAIL(fill_row_cells(database_schema->get_database_name_str(), table_schema,
real_stmt, real_stmt->get_select_item(k), k + 1/* add for position */))) {
SERVER_LOG(WARN, "fail to fill row cells", K(ret));
} else if (OB_FAIL(scanner_.add_row(cur_row_))) {
SERVER_LOG(WARN, "fail to add row", K(ret), K(cur_row_));
if (OB_SIZE_OVERFLOW == ret) {
last_schema_idx_ = last_db_schema_idx;
last_table_idx_ = i;
last_column_idx_ = k;
has_more_ = true;
mem_context_->reset_remain_one_page();
WITH_CONTEXT(mem_context_) {
ObString view_definition;
sql::ObSelectStmt *select_stmt = NULL;
sql::ObSelectStmt *real_stmt = NULL;
ObStmtFactory stmt_factory(mem_context_->get_arena_allocator());
ObRawExprFactory expr_factory(mem_context_->get_arena_allocator());
if (OB_FAIL(ObSQLUtils::generate_view_definition_for_resolve(
mem_context_->get_arena_allocator(),
session_->get_local_collation_connection(),
table_schema->get_view_schema(),
view_definition))) {
SERVER_LOG(WARN, "fail to generate view definition for resolve", K(ret));
} else if (OB_FAIL(ObTableColumns::resolve_view_definition(&mem_context_->get_arena_allocator(), session_, schema_guard_,
*table_schema, select_stmt, expr_factory, stmt_factory, false))) {
if (OB_ERR_UNKNOWN_TABLE != ret && OB_ERR_VIEW_INVALID != ret) {
SERVER_LOG(WARN, "failed to resolve view definition", K(view_definition), K(ret), K(table_schema->get_table_id()), K(mem_context_->used()));
} else {
ret = OB_SUCCESS;
continue;
}
} else if (OB_UNLIKELY(NULL == select_stmt)) {
ret = OB_ERR_UNEXPECTED;
SERVER_LOG(WARN, "select_stmt is NULL", K(ret));
} else if (OB_ISNULL(real_stmt = select_stmt->get_real_stmt())) {
// case : view definition is set_op
// Bug : http://k3.alibaba-inc.com/issue/6455327?stat=1.5.3&toPage=1&versionId=1043693
ret = OB_ERR_UNEXPECTED;
SERVER_LOG(WARN, "real stmt is NULL", K(ret));
}
for (int64_t k = 0; OB_SUCC(ret) && k < real_stmt->get_select_item_size() && !has_more_; ++k) {
if (OB_FAIL(fill_row_cells(database_schema->get_database_name_str(), table_schema,
real_stmt, real_stmt->get_select_item(k), k + 1/* add for position */))) {
SERVER_LOG(WARN, "fail to fill row cells", K(ret));
} else if (OB_FAIL(scanner_.add_row(cur_row_))) {
SERVER_LOG(WARN, "fail to add row", K(ret), K(cur_row_));
if (OB_SIZE_OVERFLOW == ret) {
last_schema_idx_ = last_db_schema_idx;
last_table_idx_ = i;
last_column_idx_ = k;
has_more_ = true;
ret = OB_SUCCESS;
}
}
}
}
@ -1152,5 +1164,21 @@ int ObInfoSchemaColumnsTable::fill_row_cells(const common::ObString &database_na
return ret;
}
inline int ObInfoSchemaColumnsTable::init_mem_context()
{
int ret = common::OB_SUCCESS;
if (OB_LIKELY(NULL == mem_context_)) {
lib::ContextParam param;
param.set_properties(lib::USE_TL_PAGE_OPTIONAL)
.set_mem_attr(tenant_id_, ObModIds::OB_SQL_EXECUTOR, ObCtxIds::DEFAULT_CTX_ID);
if (OB_FAIL(CURRENT_CONTEXT->CREATE_CONTEXT(mem_context_, param))) {
SQL_ENG_LOG(WARN, "create entity failed", K(ret));
} else if (OB_ISNULL(mem_context_)) {
SQL_ENG_LOG(WARN, "mem entity is null", K(ret));
}
}
return ret;
}
} // namespace observer
} // namespace oceanbase

3
src/observer/virtual_table/ob_information_columns_table.h
View File

@ -115,6 +115,7 @@ private:
char* buf,
const int64_t buf_len,
int64_t &pos);
inline int init_mem_context();
private:
uint64_t tenant_id_;
int64_t last_schema_idx_;
@ -130,6 +131,8 @@ private:
common::ObSEArray<const share::schema::ObDatabaseSchema *, 8> database_schema_array_;
common::ObSEArray<const share::schema::ObTableSchema *, 16> filter_table_schema_array_;
ObArenaAllocator view_resolve_alloc_;
lib::MemoryContext mem_context_;
int64_t iter_cnt_;
};
} // namespace observer
} // namespace oceanbase

6
src/observer/virtual_table/ob_table_columns.cpp
View File

@ -927,7 +927,11 @@ int ObTableColumns::resolve_view_definition(
K(select_stmt_node->type_));
} else if (OB_FAIL(select_resolver.resolve(*select_stmt_node))) {
LOG_WARN("resolve view definition failed", K(ret));
ret = OB_ERR_VIEW_INVALID;
if (OB_ALLOCATE_MEMORY_FAILED != ret) {
ret = OB_ERR_VIEW_INVALID;
} else {
LOG_WARN("failed to resolve view", K(ret));
}
if (throw_error) {
LOG_USER_ERROR(OB_ERR_VIEW_INVALID, db_name.length(), db_name.ptr(),
table_name.length(), table_name.ptr());

4
src/share/schema/ob_dependency_info.cpp
View File

@ -1129,7 +1129,9 @@ int ObReferenceObjTable::process_reference_obj_table(const uint64_t tenant_id,
OZ (task_queue.erase_view_id_from_set(dep_obj_id));
}
} else if (OB_FAIL(task_queue.push(task))) {
LOG_WARN("push task failed", K(ret));
if (OB_UNLIKELY(OB_SIZE_OVERFLOW != ret)) {
LOG_WARN("push task failed", K(ret));
}
}
}
}

2
src/sql/executor/ob_maintain_dependency_info_task.cpp
View File

@ -266,7 +266,7 @@ void ObMaintainDepInfoTaskQueue::run2()
task->set_retry_times(task->get_retry_times() - 1);
task->set_last_execute_time(ObTimeUtility::current_time());
if (OB_FAIL(queue_.push(task))) {
LOG_ERROR("push task to queue failed", K(ret));
LOG_WARN("push task to queue failed", K(ret));
} else {
rescheduled = true;
}