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

adjust error code for agent table && fix compile error

Browse Source
This commit is contained in:
18523270951@163.com
2024-04-01 09:49:10 +00:00
committed by ob-robot
parent b17d28d52d
commit edc410ce3c
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deps/oblib/src/lib/container/ob_2d_array.h vendored
View File

@ -272,7 +272,7 @@ void Ob2DArray<T, max_block_size, BlockAllocatorT, auto_free,
if (!use_trivial_ctor) {
MyOp::array_construct(ptr, cnt);
} else {
memset(ptr, 0, sizeof(T) * cnt);
memset(static_cast<void *> (ptr), 0, sizeof(T) * cnt);
}
}

10
src/observer/virtual_table/ob_agent_table_base.cpp
View File

@ -126,8 +126,14 @@ int ObAgentTableBase::do_open()
mapping_.set_block_allocator(ObWrapperAllocator(allocator_));
FOREACH_CNT_X(c, scan_param_->column_ids_, OB_SUCC(ret)) {
if (OB_ISNULL(table_schema_->get_column_schema(*c))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected column id", K(ret), K(*c));
if (OB_HIDDEN_TRANS_VERSION_COLUMN_ID == *c) {
ret = OB_NOT_SUPPORTED;
LOG_WARN("rowscn not supported", K(ret));
LOG_USER_ERROR(OB_NOT_SUPPORTED, "rowscn");
} else {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected column id", K(ret), K(*c));
}
}
}
if (OB_FAIL(ret)) {

2
src/sql/ob_sql_utils.cpp
View File

@ -5502,7 +5502,7 @@ int ObSQLUtils::check_sys_view_changed(const share::schema::ObTableSchema &old_v
}
}
}
if (!changed) {
if (OB_SUCC(ret) && !changed) {
if (OB_FAIL(GCTX.sql_engine_->get_dep_info_queue()
.add_consistent_sys_view_id_to_set(old_view_schema.get_tenant_id(),
old_view_schema.get_table_id()))) {