Skip to content

Commit 40ab4b2

Browse files
hnwyllmmob-robot
authored andcommitted
fix misusing of CK macro
1 parent 386698b commit 40ab4b2

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/share/ob_define.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ using std::isnan;
6363

6464
#define CK_0(a, b) \
6565
if (!(b)) { \
66-
ret = OB_ERR_UNEXPECTED; \
66+
if (OB_SUCC(ret)) { \
67+
ret = OB_ERR_UNEXPECTED; \
68+
} \
6769
LOG_WARN("invalid arguments", a, b); \
6870
}
6971

src/share/schema/ob_dependency_info.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1427,7 +1427,9 @@ int ObReferenceObjTable::get_or_add_def_obj_item(const uint64_t dep_obj_id,
14271427
if (OB_FAIL(ref_obj_version_table_.get_refactored(ref_obj_key, dep_obj_item))) {
14281428
if (OB_HASH_NOT_EXIST == ret) {
14291429
ret = OB_SUCCESS;
1430-
CK (OB_NOT_NULL(buf = static_cast<char *>(allocator.alloc(sizeof(ObDependencyObjItem)))));
1430+
OV (OB_NOT_NULL(buf = static_cast<char *>(allocator.alloc(sizeof(ObDependencyObjItem)))),
1431+
OB_ALLOCATE_MEMORY_FAILED,
1432+
K(sizeof(ObDependencyObjItem)));
14311433
OX (dep_obj_item = new(buf) ObDependencyObjItem);
14321434
OZ (ref_obj_version_table_.set_refactored(ref_obj_key, dep_obj_item));
14331435
} else {

0 commit comments

Comments
 (0)