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

修复dump的兼容性问题，在超出BUF时进行截断处理

Browse Source
This commit is contained in:
obdev
2024-02-09 14:40:34 +00:00
committed by ob-robot
parent 82ccf93d74
commit 8b37397157
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/sql/engine/expr/ob_expr_func_dump.cpp
View File

@ -26,7 +26,7 @@ using namespace common;
namespace sql namespace sql
{ {
const int64_t MAX_DUMP_BUFFER_SIZE = 1024; const int64_t MAX_DUMP_BUFFER_SIZE = 4000;
const char *CONST_HEADER = "Typ=%d Len=%ld: "; const char *CONST_HEADER = "Typ=%d Len=%ld: ";
enum ReturnFormat { enum ReturnFormat {
@ -76,11 +76,15 @@ int print_value(char *tmp_buf, const int64_t buff_size, int64_t &pos,
for (int64_t i = 0; i < print_value_string.length() && OB_SUCC(ret); ++i) { for (int64_t i = 0; i < print_value_string.length() && OB_SUCC(ret); ++i) {
if (isprint(print_value_string[i])) { if (isprint(print_value_string[i])) {
if (OB_FAIL(databuff_printf(tmp_buf, buff_size, pos, "%c,", print_value_string[i]))) { if (OB_FAIL(databuff_printf(tmp_buf, buff_size, pos, "%c,", print_value_string[i]))) {
LOG_WARN("failed to databuff_printf", K(ret), K(pos)); if (OB_SIZE_OVERFLOW != ret) {
LOG_WARN("failed to databuff_printf", K(ret), K(pos));
}
} }
} else { } else {
if (OB_FAIL(databuff_printf(tmp_buf, buff_size, pos, "%x,", (unsigned)(unsigned char)print_value_string[i]))) { if (OB_FAIL(databuff_printf(tmp_buf, buff_size, pos, "%x,", (unsigned)(unsigned char)print_value_string[i]))) {
LOG_WARN("failed to databuff_printf", K(ret), K(pos)); if (OB_SIZE_OVERFLOW != ret) {
LOG_WARN("failed to databuff_printf", K(ret), K(pos));
}
} }
} }
} }
@ -92,10 +96,15 @@ int print_value(char *tmp_buf, const int64_t buff_size, int64_t &pos,
for (int64_t i = 0; i < print_value_string.length() && OB_SUCC(ret); ++i) { for (int64_t i = 0; i < print_value_string.length() && OB_SUCC(ret); ++i) {
if (OB_FAIL(databuff_printf(tmp_buf, buff_size, pos, fmt_str, (unsigned)(unsigned char)print_value_string[i]))) { if (OB_FAIL(databuff_printf(tmp_buf, buff_size, pos, fmt_str, (unsigned)(unsigned char)print_value_string[i]))) {
LOG_WARN("failed to databuff_printf", K(ret), K(pos)); if (OB_SIZE_OVERFLOW != ret) {
LOG_WARN("failed to databuff_printf", K(ret), K(pos));
}
} }
} }
} }
if (OB_SIZE_OVERFLOW == ret) {
ret = common::OB_SUCCESS; // result string length > MAX_DUMP_BUFFER_SIZE, cut the result string and return
}
} }
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
@ -631,7 +640,7 @@ int ObExprFuncDump::eval_dump(const ObExpr &expr, ObEvalCtx &ctx, ObDatum &expr_
bool dumped = false; bool dumped = false;
if (OB_FAIL(databuff_printf(buf, buf_len, buf_pos, CONST_HEADER, if (OB_FAIL(databuff_printf(buf, buf_len, buf_pos, CONST_HEADER,
expr.args_[0]->datum_meta_.type_, expr.args_[0]->datum_meta_.type_,
static_cast<int64_t>(input->len_)))) { min(static_cast<int64_t>(input->len_), MAX_DUMP_BUFFER_SIZE)))) {
LOG_WARN("data buffer print fail", K(ret)); LOG_WARN("data buffer print fail", K(ret));
} else if (ReturnFormat::RF_OB_SEPC == fmt_val) { } else if (ReturnFormat::RF_OB_SEPC == fmt_val) {
if (OB_FAIL(dump_ob_spec(buf, buf_len, buf_pos, dumped, *expr.args_[0], *input))) { if (OB_FAIL(dump_ob_spec(buf, buf_len, buf_pos, dumped, *expr.args_[0], *input))) {