From e85d9ab53b213e7fd811ba386371e1285b519376 Mon Sep 17 00:00:00 2001 From: JiahuaChen Date: Sun, 7 Apr 2024 08:01:26 +0000 Subject: [PATCH] Fix missing ret --- src/storage/blocksstable/encoding/ob_dict_decoder.cpp | 3 ++- .../blocksstable/encoding/ob_integer_base_diff_decoder.cpp | 4 ++-- src/storage/slog_ckpt/ob_tenant_checkpoint_slog_handler.cpp | 5 ++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/storage/blocksstable/encoding/ob_dict_decoder.cpp b/src/storage/blocksstable/encoding/ob_dict_decoder.cpp index 210004675b..735ea40709 100644 --- a/src/storage/blocksstable/encoding/ob_dict_decoder.cpp +++ b/src/storage/blocksstable/encoding/ob_dict_decoder.cpp @@ -1351,7 +1351,8 @@ int ObDictDecoder::in_operator( ++traverse_it; ++dict_ref; } - if (found && OB_FAIL(set_res_with_bitset(parent, col_ctx, col_data, + if (OB_FAIL(ret)) { + } else if (found && OB_FAIL(set_res_with_bitset(parent, col_ctx, col_data, ref_bitset, pd_filter_info, result_bitmap))) { LOG_WARN("Failed to set result bitmap", K(ret)); } diff --git a/src/storage/blocksstable/encoding/ob_integer_base_diff_decoder.cpp b/src/storage/blocksstable/encoding/ob_integer_base_diff_decoder.cpp index b54f388fc0..e3e396a579 100644 --- a/src/storage/blocksstable/encoding/ob_integer_base_diff_decoder.cpp +++ b/src/storage/blocksstable/encoding/ob_integer_base_diff_decoder.cpp @@ -517,7 +517,7 @@ int ObIntegerBaseDiffDecoder::comparison_operator( const sql::ObWhiteFilterOperatorType op_type = filter.get_op_type(); ObGetFilterCmpRetFunc get_cmp_ret = get_filter_cmp_ret_func(op_type); int cmp_res = 0; - if (OB_FAIL(cmp_func(ref_datum, base_datum, cmp_res))) { + if (FAILEDx(cmp_func(ref_datum, base_datum, cmp_res))) { LOG_WARN("Failed to compare datum", K(ret), K(ref_datum), K(base_datum)); } else if (FALSE_IT(filter_obj_smaller_than_base = cmp_res < 0)){ } else if (filter_obj_smaller_than_base) { @@ -742,7 +742,7 @@ int ObIntegerBaseDiffDecoder::traverse_all_data( cur_datum.ptr_ = reinterpret_cast (&cur_int); // use lambda here to filter and set result bitmap bool result = false; - if (OB_FAIL(lambda(cur_datum, filter, result))) { + if (FAILEDx(lambda(cur_datum, filter, result))) { LOG_WARN("Failed on trying to filter the row", K(ret), K(row_id), K(cur_int)); } else if (result) { if (OB_FAIL(result_bitmap.set(offset))) { diff --git a/src/storage/slog_ckpt/ob_tenant_checkpoint_slog_handler.cpp b/src/storage/slog_ckpt/ob_tenant_checkpoint_slog_handler.cpp index dce666fa7c..28403dc150 100644 --- a/src/storage/slog_ckpt/ob_tenant_checkpoint_slog_handler.cpp +++ b/src/storage/slog_ckpt/ob_tenant_checkpoint_slog_handler.cpp @@ -1450,11 +1450,10 @@ int ObTenantCheckpointSlogHandler::parse( int32_t length = 0; int32_t version = 0; + snprintf(slog_name, ObStorageLogReplayer::MAX_SLOG_NAME_LEN, "update tablet slog: "); if (OB_FAIL(slog_entry.deserialize(buf, len, pos))) { LOG_WARN("fail to deserialize tablet meta", K(ret), KP(buf), K(len), K(pos)); - } - snprintf(slog_name, ObStorageLogReplayer::MAX_SLOG_NAME_LEN, "update tablet slog: "); - if (0 > fprintf(stream, "%s\n version:%d length:%d\n%s\n", slog_name, version, length, to_cstring(slog_entry))) { + } else if (0 > fprintf(stream, "%s\n version:%d length:%d\n%s\n", slog_name, version, length, to_cstring(slog_entry))) { ret = OB_IO_ERROR; LOG_WARN("Fail to print slog to file.", K(ret)); }