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

[CP] Fix show create database bug when enable _show_ddl_in_compat_mode

Browse Source
This commit is contained in:
xianyu-w
2023-05-30 03:17:44 +00:00
committed by ob-robot
parent 4a22ac03af
commit 5991a385e1
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/observer/virtual_table/ob_show_create_database.cpp
View File

@ -14,6 +14,7 @@
#include "observer/virtual_table/ob_show_create_database.h"
#include "share/schema/ob_schema_getter_guard.h"
#include "share/schema/ob_schema_printer.h"
#include "sql/session/ob_sql_session_info.h"
using namespace oceanbase::common;
using namespace oceanbase::share::schema;
@ -108,11 +109,13 @@ int ObShowCreateDatabase::fill_row_cells(uint64_t show_database_id,
const ObString &database_name)
{
int ret = OB_SUCCESS;
bool strict_mode = false;
if (OB_ISNULL(cur_row_.cells_)
|| OB_ISNULL(schema_guard_)
|| OB_ISNULL(allocator_)) {
|| OB_ISNULL(allocator_)
|| OB_ISNULL(session_)) {
ret = OB_NOT_INIT;
LOG_WARN("class isn't inited", K(cur_row_.cells_), K(schema_guard_), K(allocator_));
LOG_WARN("class isn't inited", K(cur_row_.cells_), K(schema_guard_), K(allocator_), K(session_));
} else if (OB_UNLIKELY(cur_row_.count_ < output_column_ids_.count())) {
ret = OB_ERR_UNEXPECTED;
SERVER_LOG(WARN,
@ -120,6 +123,8 @@ int ObShowCreateDatabase::fill_row_cells(uint64_t show_database_id,
K(ret),
K(cur_row_.count_),
K(output_column_ids_.count()));
} else if (OB_FAIL(session_->get_show_ddl_in_compat_mode(strict_mode))) {
SERVER_LOG(WARN, "failed to get _show_ddl_in_compat_mode", K(ret));
} else {
uint64_t cell_idx = 0;
char *db_def_buf = NULL;
@ -145,7 +150,7 @@ int ObShowCreateDatabase::fill_row_cells(uint64_t show_database_id,
}
case OB_APP_MIN_COLUMN_ID + 2: {
// create_database
ObSchemaPrinter schema_printer(*schema_guard_);
ObSchemaPrinter schema_printer(*schema_guard_, strict_mode);
int64_t pos = 0;
if (OB_FAIL(schema_printer.print_database_definiton(effective_tenant_id_,
show_database_id,
@ -166,7 +171,7 @@ int ObShowCreateDatabase::fill_row_cells(uint64_t show_database_id,
}
case OB_APP_MIN_COLUMN_ID + 3: {
// create_database_with_if_not_exists
ObSchemaPrinter schema_printer(*schema_guard_);
ObSchemaPrinter schema_printer(*schema_guard_, strict_mode);
int64_t pos = 0;
if (OB_FAIL(schema_printer.print_database_definiton(effective_tenant_id_,
show_database_id,