From 2820fea30beca62202d88689a2845db67d98346a Mon Sep 17 00:00:00 2001 From: obdev Date: Wed, 9 Aug 2023 13:54:25 +0000 Subject: [PATCH] fix ret code is changed when alloc memory failed --- src/sql/optimizer/ob_table_location.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/sql/optimizer/ob_table_location.cpp b/src/sql/optimizer/ob_table_location.cpp index 95855ec2d4..391186c7ff 100644 --- a/src/sql/optimizer/ob_table_location.cpp +++ b/src/sql/optimizer/ob_table_location.cpp @@ -5360,7 +5360,10 @@ int ObTableLocation::get_full_leader_table_loc(ObDASLocationRouter &loc_router, ObDASTableLocMeta *loc_meta = NULL; char *table_buf = static_cast(allocator.alloc(sizeof(ObDASTableLoc) + sizeof(ObDASTableLocMeta))); - CK(OB_NOT_NULL(table_buf)); + if (OB_ISNULL(table_buf)) { + ret = OB_ALLOCATE_MEMORY_FAILED; + LOG_WARN("fail to alloc memory", K(ret)); + } if (OB_SUCC(ret)) { table_loc = new(table_buf) ObDASTableLoc(allocator); loc_meta = new(table_buf+sizeof(ObDASTableLoc)) ObDASTableLocMeta(allocator); @@ -5372,7 +5375,10 @@ int ObTableLocation::get_full_leader_table_loc(ObDASLocationRouter &loc_router, for (int64_t i = 0; OB_SUCC(ret) && i < tablet_ids.count(); i++) { ObDASTabletLoc *tablet_loc = NULL; void *tablet_buf = allocator.alloc(sizeof(ObDASTabletLoc)); - CK(OB_NOT_NULL(tablet_buf)); + if (OB_ISNULL(tablet_buf)) { + ret = OB_ALLOCATE_MEMORY_FAILED; + LOG_WARN("fail to alloc memory", K(ret)); + } OX(tablet_loc = new(tablet_buf) ObDASTabletLoc()); OX(tablet_loc->loc_meta_ = loc_meta); OX(tablet_loc->partition_id_ = partition_ids.at(i));