From b475f25042dcef35d271547055588c247de1470d Mon Sep 17 00:00:00 2001 From: yah01 Date: Wed, 30 Aug 2023 09:52:27 +0800 Subject: [PATCH] Remove invalid offset check while filling data (#26666) Signed-off-by: yah01 --- internal/core/src/segcore/SegmentGrowingImpl.cpp | 4 +--- internal/core/src/segcore/SegmentSealedImpl.cpp | 15 +++------------ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/internal/core/src/segcore/SegmentGrowingImpl.cpp b/internal/core/src/segcore/SegmentGrowingImpl.cpp index 662ba2f0c1..999e854f08 100644 --- a/internal/core/src/segcore/SegmentGrowingImpl.cpp +++ b/internal/core/src/segcore/SegmentGrowingImpl.cpp @@ -469,9 +469,7 @@ SegmentGrowingImpl::bulk_subscript_impl(const VectorBase* vec_raw, auto output = reinterpret_cast(output_raw); for (int64_t i = 0; i < count; ++i) { auto offset = seg_offsets[i]; - if (offset != INVALID_SEG_OFFSET) { - output[i] = vec[offset]; - } + output[i] = vec[offset]; } } diff --git a/internal/core/src/segcore/SegmentSealedImpl.cpp b/internal/core/src/segcore/SegmentSealedImpl.cpp index e63e891d3d..42bcb20a61 100644 --- a/internal/core/src/segcore/SegmentSealedImpl.cpp +++ b/internal/core/src/segcore/SegmentSealedImpl.cpp @@ -739,9 +739,7 @@ SegmentSealedImpl::bulk_subscript_impl(const void* src_raw, for (int64_t i = 0; i < count; ++i) { auto offset = seg_offsets[i]; - if (offset != INVALID_SEG_OFFSET) { - dst[i] = src[offset]; - } + dst[i] = src[offset]; } } @@ -755,9 +753,7 @@ SegmentSealedImpl::bulk_subscript_impl(const ColumnBase* column, auto dst = reinterpret_cast(dst_raw); for (int64_t i = 0; i < count; ++i) { auto offset = seg_offsets[i]; - if (offset != INVALID_SEG_OFFSET) { - dst[i] = std::move(T(field->RawAt(offset))); - } + dst[i] = std::move(T(field->RawAt(offset))); } } @@ -772,13 +768,8 @@ SegmentSealedImpl::bulk_subscript_impl(int64_t element_sizeof, auto dst_vec = reinterpret_cast(dst_raw); for (int64_t i = 0; i < count; ++i) { auto offset = seg_offsets[i]; + auto src = src_vec + element_sizeof * offset; auto dst = dst_vec + i * element_sizeof; - const char* src = (offset == INVALID_SEG_OFFSET - ? nullptr - : (src_vec + element_sizeof * offset)); - if (!src) { - continue; - } memcpy(dst, src, element_sizeof); } }