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

Fix bug with 3 sort fields without text match criteria.

Browse Source
This commit is contained in:
Kishore Nallan 2022-06-27 20:41:18 +05:30
parent b451225ac6
commit 963d9a873c
2 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/index.cpp
View File

@ -3145,7 +3145,7 @@ void Index::search_across_fields(const std::vector<token_t>& query_tokens,
}
int64_t scores[3] = {0};
int64_t match_score_index = 0;
int64_t match_score_index = -1;
compute_sort_scores(sort_fields, sort_order, field_values, geopoint_indices, seq_id,
max_field_match_score, scores, match_score_index);
@ -3170,7 +3170,9 @@ void Index::search_across_fields(const std::vector<token_t>& query_tokens,
<< ", aggregated_score: " << aggregated_score;*/
KV kv(0, searched_queries.size(), 0, seq_id, distinct_id, match_score_index, scores);
kv.scores[match_score_index] = aggregated_score;
if(match_score_index != -1) {
kv.scores[match_score_index] = aggregated_score;
}
topster->add(&kv);
result_ids.push_back(seq_id);
});

45
test/collection_specific_more_test.cpp
View File

@ -678,3 +678,48 @@ TEST_F(CollectionSpecificMoreTest, PrefixSearchOnSpecificFields) {
collectionManager.drop_collection("coll1");
}
TEST_F(CollectionSpecificMoreTest, OrderWithThreeSortFields) {
std::vector<field> fields = {field("name", field_types::STRING, false),
field("type", field_types::INT32, false),
field("valid_from", field_types::INT64, false),
field("created_at", field_types::INT64, false),};
Collection* coll1 = collectionManager.create_collection("coll1", 1, fields).get();
nlohmann::json doc1;
doc1["name"] = "should be 1st";
doc1["type"] = 2;
doc1["valid_from"] = 1655741107972;
doc1["created_at"] = 1655741107724;
ASSERT_TRUE(coll1->add(doc1.dump()).ok());
doc1["name"] = "should be 2nd";
doc1["type"] = 1;
doc1["valid_from"] = 1656309617303;
doc1["created_at"] = 1656309617194;
ASSERT_TRUE(coll1->add(doc1.dump()).ok());
doc1["name"] = "should be 3rd";
doc1["type"] = 0;
doc1["valid_from"] = 0;
doc1["created_at"] = 1656309677131;
ASSERT_TRUE(coll1->add(doc1.dump()).ok());
sort_fields = {sort_by("type", "desc"), sort_by("valid_from", "desc"), sort_by("created_at", "desc")};
auto results = coll1->search("s", {"name"},
"", {}, sort_fields, {2}, 10,
1, FREQUENCY, {true},
0).get();
ASSERT_EQ(3, results["hits"].size());
ASSERT_EQ("0", results["hits"][0]["document"]["id"].get<std::string>());
ASSERT_EQ("1", results["hits"][1]["document"]["id"].get<std::string>());
ASSERT_EQ("2", results["hits"][2]["document"]["id"].get<std::string>());
collectionManager.drop_collection("coll1");
}