postgres/typesense
1
0
Fork 0
mirror of https://github.com/typesense/typesense.git synced 2025-05-21 22:33:27 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Handle null values in nested object arrays for optional fields.

Browse Source
This commit is contained in:
Kishore Nallan 2023-11-02 16:13:04 +05:30
parent 862437620a
commit 2254d25955
2 changed files with 104 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/field.cpp
View File

@ -833,9 +833,8 @@ bool field::flatten_obj(nlohmann::json& doc, nlohmann::json& value, bool has_arr
while(it != value.end()) {
const std::string& child_field_name = flat_name + "." + it.key();
if(it.value().is_null()) {
if(has_array) {
doc[child_field_name].push_back(nullptr);
} else {
if(!has_array) {
// we don't want to push null values into an array because that's not valid
doc[child_field_name] = nullptr;
}

102
test/collection_nested_fields_test.cpp
View File

@ -1487,6 +1487,108 @@ TEST_F(CollectionNestedFieldsTest, ExplicitSchemaForNestedArrayTypeValidation) {
"Hint: field inside an array of objects must be an array type as well.", add_op.error());
}
TEST_F(CollectionNestedFieldsTest, OptionalNestedOptionalOjectArrStringField) {
nlohmann::json schema = R"({
"name": "coll1",
"enable_nested_fields": true,
"fields": [
{"facet":true,"name":"data","optional":false,"type":"object"},
{"facet":false,"name":"data.locations.stateShort","optional":true,"type":"string[]"}
]
})"_json;
auto op = collectionManager.create_collection(schema);
ASSERT_TRUE(op.ok());
Collection* coll1 = op.get();
auto doc1 = R"({
"data": {
"locations": [
{
"stateShort": null
}
]
}
})"_json;
auto add_op = coll1->add(doc1.dump(), CREATE);
ASSERT_TRUE(add_op.ok());
doc1 = R"({
"data": {
"locations": [
{
"stateShort": null
},
{
"stateShort": "NY"
}
]
}
})"_json;
coll1->add(doc1.dump(), CREATE);
auto results = coll1->search("ny", {"data.locations.stateShort"},
"", {}, {}, {0}, 10, 1,
token_ordering::FREQUENCY, {true}, 10, spp::sparse_hash_set<std::string>(),
spp::sparse_hash_set<std::string>(), 10, "", 30, 4).get();
ASSERT_EQ(1, results["found"].get<size_t>());
}
TEST_F(CollectionNestedFieldsTest, OptionalNestedNonOptionalOjectArrStringField) {
nlohmann::json schema = R"({
"name": "coll1",
"enable_nested_fields": true,
"fields": [
{"facet":true,"name":"data","type":"object"},
{"facet":false,"name":"data.locations.stateShort","type":"string[]"}
]
})"_json;
auto op = collectionManager.create_collection(schema);
ASSERT_TRUE(op.ok());
Collection* coll1 = op.get();
auto doc1 = R"({
"data": {
"locations": [
{
"stateShort": null
}
]
}
})"_json;
auto add_op = coll1->add(doc1.dump(), CREATE);
ASSERT_FALSE(add_op.ok());
ASSERT_EQ("Field `data.locations.stateShort` has been declared in the schema, but is not found in the document.",
add_op.error());
doc1 = R"({
"data": {
"locations": [
{
"stateShort": null
},
{
"stateShort": "NY"
}
]
}
})"_json;
coll1->add(doc1.dump(), CREATE);
auto results = coll1->search("ny", {"data.locations.stateShort"},
"", {}, {}, {0}, 10, 1,
token_ordering::FREQUENCY, {true}, 10, spp::sparse_hash_set<std::string>(),
spp::sparse_hash_set<std::string>(), 10, "", 30, 4).get();
ASSERT_EQ(1, results["found"].get<size_t>());
}
TEST_F(CollectionNestedFieldsTest, SortByNestedField) {
nlohmann::json schema = R"({
"name": "coll1",