Skip to content

O
oceanbase

天地威能 / oceanbase
与 Fork 源项目一致

Fork自 oceanbase / oceanbase

通知 1
Star 0
Fork 0
O
oceanbase

体验新版 GitCode，发现更多精彩内容 >>

提交 69c03f57 编写于 作者: S seuwebber 提交者： wangzelin.wzl
浏览文件
操作

[CP] [to #45091799]fix bug schema_gaurd not inited

上级 8129d41b
隐藏空白更改
内联 并排
Showing with 7 addition and 2 deletion
src/sql/ob_spi.cpp
浏览文件 @ 69c03f57
...@@ -1708,6 +1708,7 @@ int ObSPIService::spi_prepare(common::ObIAllocator &allocator, ...@@ -1708,6 +1708,7 @@ int ObSPIService::spi_prepare(common::ObIAllocator &allocator,
spi_resolve_prepare(allocator, spi_resolve_prepare(allocator,
session, session,
sql_proxy, sql_proxy,
schema_guard,
expr_factory, expr_factory,
sql, sql,
is_cursor, is_cursor,
...@@ -1807,6 +1808,7 @@ int ObSPIService::spi_parse_prepare(common::ObIAllocator &allocator, ...@@ -1807,6 +1808,7 @@ int ObSPIService::spi_parse_prepare(common::ObIAllocator &allocator,
int ObSPIService::spi_build_record_type_by_result_set(common::ObIAllocator &allocator, int ObSPIService::spi_build_record_type_by_result_set(common::ObIAllocator &allocator,
ObSQLSessionInfo &session, ObSQLSessionInfo &session,
share::schema::ObSchemaGetterGuard &schema_guard,
const sql::ObResultSet &result_set, const sql::ObResultSet &result_set,
int64_t hidden_column_count, int64_t hidden_column_count,
ObRecordType *&record_type, ObRecordType *&record_type,
...@@ -1854,8 +1856,6 @@ int ObSPIService::spi_build_record_type_by_result_set(common::ObIAllocator &allo ...@@ -1854,8 +1856,6 @@ int ObSPIService::spi_build_record_type_by_result_set(common::ObIAllocator &allo
if (OB_SUCC(ret) && 1 == hidden_column_count) { if (OB_SUCC(ret) && 1 == hidden_column_count) {
const common::ObField &field = columns->at(columns->count() - 1); const common::ObField &field = columns->at(columns->count() - 1);
uint64_t table_id = OB_INVALID_ID; uint64_t table_id = OB_INVALID_ID;
share::schema::ObSchemaGetterGuard schema_guard;
OZ (GCTX.schema_service_->get_tenant_schema_guard(session.get_effective_tenant_id(), schema_guard));
OZ (schema_guard.get_table_id(session.get_effective_tenant_id(), field.dname_, field.org_tname_, OZ (schema_guard.get_table_id(session.get_effective_tenant_id(), field.dname_, field.org_tname_,
false, ObSchemaGetterGuard::ALL_NON_HIDDEN_TYPES, table_id)); false, ObSchemaGetterGuard::ALL_NON_HIDDEN_TYPES, table_id));
OX (rowid_table_id = table_id); OX (rowid_table_id = table_id);
...@@ -1869,6 +1869,7 @@ int ObSPIService::spi_build_record_type_by_result_set(common::ObIAllocator &allo ...@@ -1869,6 +1869,7 @@ int ObSPIService::spi_build_record_type_by_result_set(common::ObIAllocator &allo
int ObSPIService::spi_resolve_prepare(common::ObIAllocator &allocator, int ObSPIService::spi_resolve_prepare(common::ObIAllocator &allocator,
ObSQLSessionInfo &session, ObSQLSessionInfo &session,
ObMySQLProxy &sql_proxy, ObMySQLProxy &sql_proxy,
share::schema::ObSchemaGetterGuard &schema_guard,
sql::ObRawExprFactory &expr_factory, sql::ObRawExprFactory &expr_factory,
const ObString &sql, const ObString &sql,
bool is_cursor, bool is_cursor,
...@@ -1921,6 +1922,7 @@ int ObSPIService::spi_resolve_prepare(common::ObIAllocator &allocator, ...@@ -1921,6 +1922,7 @@ int ObSPIService::spi_resolve_prepare(common::ObIAllocator &allocator,
&& inner_result->result_set().get_field_columns()->count() > 0) { && inner_result->result_set().get_field_columns()->count() > 0) {
OZ (spi_build_record_type_by_result_set(allocator, OZ (spi_build_record_type_by_result_set(allocator,
session, session,
schema_guard,
inner_result->result_set(), inner_result->result_set(),
prepare_result.has_hidden_rowid_ ? 1 : 0, prepare_result.has_hidden_rowid_ ? 1 : 0,
prepare_result.record_type_, prepare_result.record_type_,
...@@ -1948,6 +1950,7 @@ int ObSPIService::spi_resolve_prepare(common::ObIAllocator &allocator, ...@@ -1948,6 +1950,7 @@ int ObSPIService::spi_resolve_prepare(common::ObIAllocator &allocator,
CK (OB_NOT_NULL(result = static_cast<observer::ObInnerSQLResult*>(proxy_result.get_result()))); CK (OB_NOT_NULL(result = static_cast<observer::ObInnerSQLResult*>(proxy_result.get_result())));
OZ (spi_build_record_type_by_result_set(allocator, OZ (spi_build_record_type_by_result_set(allocator,
session, session,
schema_guard,
result->result_set(), result->result_set(),
prepare_result.has_hidden_rowid_ ? 1 : 0, prepare_result.has_hidden_rowid_ ? 1 : 0,
prepare_result.record_type_, prepare_result.record_type_,
......
src/sql/ob_spi.h
浏览文件 @ 69c03f57
...@@ -425,6 +425,7 @@ public: ...@@ -425,6 +425,7 @@ public:
static int spi_build_record_type_by_result_set(common::ObIAllocator &allocator, static int spi_build_record_type_by_result_set(common::ObIAllocator &allocator,
ObSQLSessionInfo &session, ObSQLSessionInfo &session,
share::schema::ObSchemaGetterGuard &schema_guard,
const sql::ObResultSet &result_set, const sql::ObResultSet &result_set,
int64_t hidden_column_count, int64_t hidden_column_count,
pl::ObRecordType *&record_type, pl::ObRecordType *&record_type,
...@@ -577,6 +578,7 @@ private: ...@@ -577,6 +578,7 @@ private:
static int spi_resolve_prepare(common::ObIAllocator &allocator, static int spi_resolve_prepare(common::ObIAllocator &allocator,
ObSQLSessionInfo &session, ObSQLSessionInfo &session,
ObMySQLProxy &sql_proxy, ObMySQLProxy &sql_proxy,
share::schema::ObSchemaGetterGuard &schema_guard,
sql::ObRawExprFactory &expr_factory, sql::ObRawExprFactory &expr_factory,
const ObString &sql, const ObString &sql,
bool is_cursor, bool is_cursor,
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或