milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: fix wrong method is called to fetch variable valid data (#37304) 

issue: https://github.com/milvus-io/milvus/issues/37147

Signed-off-by: sunby <sunbingyi1992@gmail.com>
pull/37324/head
Bingyi Sun 2024-11-01 01:52:20 +08:00 committed by GitHub
parent 247f75180f
commit cd2655c861
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/core/src/exec/expression/ColumnExpr.cpp
View File

@ -85,11 +85,12 @@ PhyColumnExpr::DoEval() {
current_chunk_id_,
current_chunk_pos_);
for (int i = 0; i < real_batch_size; ++i) {
if (!chunk_data().has_value()) {
auto data = chunk_data();
if (!data.has_value()) {
valid_res[i] = false;
continue;
}
res_value[i] = boost::get<T>(chunk_data().value());
res_value[i] = boost::get<T>(data.value());
}
return res_vec;
} else {

53
internal/core/src/segcore/SegmentChunkReader.cpp
View File

@ -39,10 +39,9 @@ SegmentChunkReader::GetChunkDataAccessor(FieldId field_id,
};
}
}
auto chunk_data =
segment_->chunk_data<T>(field_id, current_chunk_id).data();
auto chunk_valid_data =
segment_->chunk_data<T>(field_id, current_chunk_id).valid_data();
auto chunk_info = segment_->chunk_data<T>(field_id, current_chunk_id);
auto chunk_data = chunk_info.data();
auto chunk_valid_data = chunk_info.valid_data();
auto current_chunk_size = segment_->chunk_size(field_id, current_chunk_id);
return [=,
&current_chunk_id,
@ -50,11 +49,10 @@ SegmentChunkReader::GetChunkDataAccessor(FieldId field_id,
if (current_chunk_pos >= current_chunk_size) {
current_chunk_id++;
current_chunk_pos = 0;
chunk_data =
segment_->chunk_data<T>(field_id, current_chunk_id).data();
chunk_valid_data =
segment_->chunk_data<T>(field_id, current_chunk_id)
.valid_data();
auto chunk_info =
segment_->chunk_data<T>(field_id, current_chunk_id);
chunk_data = chunk_info.data();
chunk_valid_data = chunk_info.valid_data();
current_chunk_size =
segment_->chunk_size(field_id, current_chunk_id);
}
@ -94,12 +92,10 @@ SegmentChunkReader::GetChunkDataAccessor<std::string>(
!storage::MmapManager::GetInstance()
.GetMmapConfig()
.growing_enable_mmap) {
auto chunk_data =
segment_->chunk_data<std::string>(field_id, current_chunk_id)
.data();
auto chunk_valid_data =
segment_->chunk_data<std::string>(field_id, current_chunk_id)
.valid_data();
auto chunk_info =
segment_->chunk_data<std::string>(field_id, current_chunk_id);
auto chunk_data = chunk_info.data();
auto chunk_valid_data = chunk_info.valid_data();
auto current_chunk_size =
segment_->chunk_size(field_id, current_chunk_id);
return [=,
@ -126,12 +122,12 @@ SegmentChunkReader::GetChunkDataAccessor<std::string>(
return chunk_data[current_chunk_pos++];
};
} else {
auto chunk_data =
segment_->chunk_view<std::string_view>(field_id, current_chunk_id)
.first.data();
auto chunk_valid_data =
segment_->chunk_data<std::string_view>(field_id, current_chunk_id)
.valid_data();
auto chunk_info =
segment_->chunk_view<std::string_view>(field_id, current_chunk_id);
auto chunk_data = chunk_info.first.data();
auto chunk_valid_data = chunk_info.second;
auto current_chunk_size =
segment_->chunk_size(field_id, current_chunk_id);
return [=,
@ -140,18 +136,15 @@ SegmentChunkReader::GetChunkDataAccessor<std::string>(
if (current_chunk_pos >= current_chunk_size) {
current_chunk_id++;
current_chunk_pos = 0;
chunk_data = segment_
->chunk_view<std::string_view>(
field_id, current_chunk_id)
.first.data();
chunk_valid_data = segment_
->chunk_data<std::string_view>(
field_id, current_chunk_id)
.valid_data();
auto chunk_info = segment_->chunk_view<std::string_view>(
field_id, current_chunk_id);
chunk_data = chunk_info.first.data();
chunk_valid_data = chunk_info.second;
current_chunk_size =
segment_->chunk_size(field_id, current_chunk_id);
}
if (chunk_valid_data && !chunk_valid_data[current_chunk_pos]) {
if (current_chunk_pos < chunk_valid_data.size() &&
!chunk_valid_data[current_chunk_pos]) {
current_chunk_pos++;
return std::nullopt;
}