From 3f5733b738f03690bfd0a9d6c39a9bf7f5a6288c Mon Sep 17 00:00:00 2001 From: yah01 Date: Fri, 22 Apr 2022 17:43:42 +0800 Subject: [PATCH] Return the local variable directly, make RVO enabled (#16201) Signed-off-by: yah01 --- internal/core/src/query/visitors/ExecPlanNodeVisitor.cpp | 2 +- internal/core/src/segcore/SegmentSealedImpl.cpp | 4 ++-- internal/core/unittest/test_utils/DataGen.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/core/src/query/visitors/ExecPlanNodeVisitor.cpp b/internal/core/src/query/visitors/ExecPlanNodeVisitor.cpp index 4a43caf911..4bc7d4c48b 100644 --- a/internal/core/src/query/visitors/ExecPlanNodeVisitor.cpp +++ b/internal/core/src/query/visitors/ExecPlanNodeVisitor.cpp @@ -131,7 +131,7 @@ ExecPlanNodeVisitor::visit(RetrievePlanNode& node) { segment->mask_with_delete(bitset_holder, active_count, timestamp_); BitsetView final_view = bitset_holder; - auto seg_offsets = std::move(segment->search_ids(final_view, timestamp_)); + auto seg_offsets = segment->search_ids(final_view, timestamp_); retrieve_result.result_offsets_.assign((int64_t*)seg_offsets.data(), (int64_t*)seg_offsets.data() + seg_offsets.size()); retrieve_result_opt_ = std::move(retrieve_result); diff --git a/internal/core/src/segcore/SegmentSealedImpl.cpp b/internal/core/src/segcore/SegmentSealedImpl.cpp index 5187b710a1..d9842e98d2 100644 --- a/internal/core/src/segcore/SegmentSealedImpl.cpp +++ b/internal/core/src/segcore/SegmentSealedImpl.cpp @@ -571,7 +571,7 @@ SegmentSealedImpl::search_ids(const BitsetType& bitset, Timestamp timestamp) con dst_offset.emplace_back(SegOffset(i)); } } - return std::move(dst_offset); + return dst_offset; } std::vector @@ -582,7 +582,7 @@ SegmentSealedImpl::search_ids(const BitsetView& bitset, Timestamp timestamp) con dst_offset.emplace_back(SegOffset(i)); } } - return std::move(dst_offset); + return dst_offset; } std::string diff --git a/internal/core/unittest/test_utils/DataGen.h b/internal/core/unittest/test_utils/DataGen.h index b39f14e7be..78093bfbcb 100644 --- a/internal/core/unittest/test_utils/DataGen.h +++ b/internal/core/unittest/test_utils/DataGen.h @@ -198,7 +198,7 @@ DataGen(SchemaPtr schema, int64_t N, uint64_t seed = 42, uint64_t ts_offset = 0) } // std::shuffle(res.row_ids_.begin(), res.row_ids_.end(), er); res.generate_rows(N, schema); - return std::move(res); + return res; } inline auto