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

fix create as select partition print error

Browse Source
This commit is contained in:
hy-guo 2023-09-25 09:40:29 +00:00 committed by ob-robot
parent 119e6cbf24
commit d498ccf937
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/share/schema/ob_schema_printer.cpp
View File

@ -2870,9 +2870,9 @@ int ObSchemaPrinter::print_hash_sub_partition_elements(ObSubPartition **sub_part
SHARE_SCHEMA_LOG(WARN, "sub partition is null", K(ret), K(sub_part_num));
} else {
const ObString &part_name = sub_partition->get_part_name();
if (OB_FAIL(databuff_printf(buf, buf_len, pos, "subpartition %.*s",
part_name.length(),
part_name.ptr()))) {
if (OB_FAIL(databuff_printf(buf, buf_len, pos, "subpartition "))) {
SHARE_SCHEMA_LOG(WARN, "print subpartition failed", K(ret));
} else if (OB_FAIL(print_identifier(buf, buf_len, pos, part_name, lib::is_oracle_mode()))) {
SHARE_SCHEMA_LOG(WARN, "print part name failed", K(ret), K(part_name));
} else if (OB_FAIL(print_tablespace_definition_for_table(
sub_partition->get_tenant_id(), sub_partition->get_tablespace_id(), buf, buf_len, pos))) {
@ -2933,11 +2933,13 @@ int ObSchemaPrinter::print_list_sub_partition_elements(
SHARE_SCHEMA_LOG(WARN, "sub partition is null", K(ret), K(sub_part_num));
} else {
const ObString &part_name = sub_partition->get_part_name();
if (OB_FAIL(databuff_printf(buf, buf_len, pos, "subpartition %.*s values %s (",
part_name.length(),
part_name.ptr(),
is_oracle_mode ? "" : "in"))) {
if (OB_FAIL(databuff_printf(buf, buf_len, pos, "subpartition "))) {
SHARE_SCHEMA_LOG(WARN, "print subpartition failed", K(ret));
} else if (OB_FAIL(print_identifier(buf, buf_len, pos, part_name, is_oracle_mode))) {
SHARE_SCHEMA_LOG(WARN, "print part name failed", K(ret), K(part_name));
} else if (OB_FAIL(databuff_printf(buf, buf_len, pos, " values %s (",
is_oracle_mode ? "" : "in"))) {
SHARE_SCHEMA_LOG(WARN, "print values failed", K(ret));
} else if (OB_FAIL(ObPartitionUtils::convert_rows_to_sql_literal(
is_oracle_mode, sub_partition->get_list_row_values(), buf, buf_len, pos, false, tz_info))) {
SHARE_SCHEMA_LOG(WARN, "convert rows to sql literal",
@ -2981,10 +2983,12 @@ int ObSchemaPrinter::print_range_sub_partition_elements(
SHARE_SCHEMA_LOG(WARN, "sub partition is null", K(ret), K(sub_part_num));
} else {
const ObString &part_name = sub_partition->get_part_name();
if (OB_FAIL(databuff_printf(buf, buf_len, pos, "subpartition %.*s values less than (",
part_name.length(),
part_name.ptr()))) {
if (OB_FAIL(databuff_printf(buf, buf_len, pos, "subpartition "))) {
SHARE_SCHEMA_LOG(WARN, "print subpartition failed", K(ret));
} else if (OB_FAIL(print_identifier(buf, buf_len, pos, part_name, is_oracle_mode))) {
SHARE_SCHEMA_LOG(WARN, "print part name failed", K(ret), K(part_name));
} else if (OB_FAIL(databuff_printf(buf, buf_len, pos, " values less than ("))) {
SHARE_SCHEMA_LOG(WARN, "print values less than failed", K(ret));
} else if (OB_FAIL(ObPartitionUtils::convert_rowkey_to_sql_literal(
is_oracle_mode, sub_partition->get_high_bound_val(),
buf, buf_len, pos, false, tz_info))) {
@ -3125,11 +3129,13 @@ int ObSchemaPrinter::print_list_partition_elements(const ObPartitionSchema *&sch
// do nothing
} else if (!is_first && OB_FAIL(databuff_printf(buf, buf_len, pos, ",\n"))) {
SHARE_SCHEMA_LOG(WARN, "print enter failed", K(ret));
} else if (OB_FAIL(databuff_printf(buf, buf_len, pos, "partition %.*s values %s (",
part_name.length(),
part_name.ptr(),
is_oracle_mode ? "" : "in"))) {
} else if (OB_FAIL(databuff_printf(buf, buf_len, pos, "partition "))) {
SHARE_SCHEMA_LOG(WARN, "print partition failed", K(ret));
} else if (OB_FAIL(print_identifier(buf, buf_len, pos, part_name, is_oracle_mode))) {
SHARE_SCHEMA_LOG(WARN, "print partition name failed", K(ret), K(part_name));
} else if (OB_FAIL(databuff_printf(buf, buf_len, pos, " values %s (",
is_oracle_mode ? "" : "in"))) {
SHARE_SCHEMA_LOG(WARN, "print values failed", K(ret));
} else if (OB_FAIL(ObPartitionUtils::convert_rows_to_sql_literal(
is_oracle_mode, partition->get_list_row_values(), buf, buf_len, pos, print_collation, tz_info))) {
SHARE_SCHEMA_LOG(WARN, "convert rows to sql literal failed",
@ -3203,10 +3209,12 @@ int ObSchemaPrinter::print_range_partition_elements(const ObPartitionSchema *&sc
} else {
const ObString &part_name = partition->get_part_name();
bool print_collation = agent_mode && tablegroup_def;
if (OB_FAIL(databuff_printf(buf, buf_len, pos, "partition %.*s values less than (",
part_name.length(),
part_name.ptr()))) {
if (OB_FAIL(databuff_printf(buf, buf_len, pos, "partition "))) {
SHARE_SCHEMA_LOG(WARN, "print partition failed", K(ret));
} else if (OB_FAIL(print_identifier(buf, buf_len, pos, part_name, is_oracle_mode))) {
SHARE_SCHEMA_LOG(WARN, "print partition name failed", K(ret), K(part_name));
} else if (OB_FAIL(databuff_printf(buf, buf_len, pos, " values less than ("))) {
SHARE_SCHEMA_LOG(WARN, "print values less than failed", K(ret));
} else if (OB_FAIL(ObPartitionUtils::convert_rowkey_to_sql_literal(
is_oracle_mode, partition->get_high_bound_val(),
buf, buf_len, pos, print_collation, tz_info))) {
@ -5064,9 +5072,9 @@ int ObSchemaPrinter::print_hash_partition_elements(const ObPartitionSchema *&sch
SHARE_SCHEMA_LOG(WARN, "partition is NULL", K(ret), K(part_num));
} else {
const ObString &part_name = partition->get_part_name();
if (OB_FAIL(databuff_printf(buf, buf_len, pos, "partition %.*s",
part_name.length(),
part_name.ptr()))) {
if (OB_FAIL(databuff_printf(buf, buf_len, pos, "partition "))) {
SHARE_SCHEMA_LOG(WARN, "print partition failed", K(ret));
} else if (OB_FAIL(print_identifier(buf, buf_len, pos, part_name, lib::is_oracle_mode()))) {
SHARE_SCHEMA_LOG(WARN, "print partition name failed", K(ret), K(part_name));
} else if (agent_mode &&
OB_FAIL(databuff_printf(buf, buf_len, pos, " id %ld", partition->get_part_id()))) { // print id

3
src/sql/ob_dml_stmt_printer.cpp
View File

@ -1321,7 +1321,8 @@ int ObDMLStmtPrinter::print_base_table(const TableItem *table_item)
const ObIArray<ObString> &part_names = table_item->part_names_;
DATA_PRINTF(" partition(");
for (int64_t i = 0; OB_SUCC(ret) && i < part_names.count(); ++i) {
DATA_PRINTF("%.*s,", LEN_AND_PTR(part_names.at(i)));
PRINT_IDENT_WITH_QUOT(part_names.at(i));
DATA_PRINTF(",");
}
if (OB_SUCC(ret)) {
--*pos_;