diff --git a/deps/oblib/src/lib/container/ob_2d_array.h b/deps/oblib/src/lib/container/ob_2d_array.h index 59a0b1d23d..c4cadab7d2 100644 --- a/deps/oblib/src/lib/container/ob_2d_array.h +++ b/deps/oblib/src/lib/container/ob_2d_array.h @@ -272,7 +272,7 @@ void Ob2DArray (ptr), 0, sizeof(T) * cnt); } } diff --git a/src/observer/virtual_table/ob_agent_table_base.cpp b/src/observer/virtual_table/ob_agent_table_base.cpp index f1b87e263b..45611cb81f 100644 --- a/src/observer/virtual_table/ob_agent_table_base.cpp +++ b/src/observer/virtual_table/ob_agent_table_base.cpp @@ -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)) { diff --git a/src/sql/ob_sql_utils.cpp b/src/sql/ob_sql_utils.cpp index 6d1631197f..ab63ebddea 100644 --- a/src/sql/ob_sql_utils.cpp +++ b/src/sql/ob_sql_utils.cpp @@ -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()))) {