admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-06 17:18:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Support JSON default values in FillFieldData (#45455)

Browse Source 
Related to #45445

Previously, FillFieldData for JSON fields would assert and fail when a
default_value was provided, blocking index creation for JSON fields with
default values (including dynamic fields like $meta).

This change enables JSON default value support by:
- Removing the assertion that blocked default values
- Parsing bytes_data into Json objects when default_value is present
- Properly filling data_ array and setting valid_data_ bitset to true
- Maintaining null behavior when no default_value is provided

Impact:
- Fixes index creation failure for JSON fields with default values
- Resolves upgrade issues from 2.5 to 2.6.5 where dynamic fields with
default values couldn't be indexed
- Index builds that were stuck in InProgress state can now complete

Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
This commit is contained in:
congqixia 2025-11-11 10:35:36 +08:00 committed by GitHub
parent 6f4abab6c8
commit 8d1ea751a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
internal/core/src/common/FieldDataInterface.h
View File

@ -724,21 +724,32 @@ class FieldDataJsonImpl : public FieldDataImpl<Json, true> {
void void
FillFieldData(const std::optional<DefaultValueType> default_value, FillFieldData(const std::optional<DefaultValueType> default_value,
ssize_t element_count) override { ssize_t element_count) override {
// todo: add json default_value
AssertInfo(!default_value.has_value(),
"json type not support default_value");
if (element_count == 0) { if (element_count == 0) {
return; return;
} }
null_count_ = element_count;
std::lock_guard lck(tell_mutex_); std::lock_guard lck(tell_mutex_);
if (length_ + element_count > get_num_rows()) { if (length_ + element_count > get_num_rows()) {
resize_field_data(length_ + element_count); resize_field_data(length_ + element_count);
} }
bitset::detail::ElementWiseBitsetPolicy<uint8_t>::op_fill( if (default_value.has_value()) {
valid_data_.data(), length_, element_count, false); AssertInfo(default_value->has_bytes_data(),
"json type default_value shall be bytes data");
auto data = default_value->bytes_data();
Json default_json = Json(data.data(), data.size());
std::fill(data_.data() + length_,
data_.data() + length_ + element_count,
default_json);
bitset::detail::ElementWiseBitsetPolicy<uint8_t>::op_fill(
valid_data_.data(), length_, element_count, true);
} else {
null_count_ = element_count;
bitset::detail::ElementWiseBitsetPolicy<uint8_t>::op_fill(
valid_data_.data(), length_, element_count, false);
}
length_ += element_count; length_ += element_count;
} }