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

Fix issue with 3-way sort fields.

Browse Source
This commit is contained in:
Kishore Nallan 2021-05-11 18:20:54 +05:30
parent d827ddbc7a
commit eca0d952e9
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/index.cpp
View File

@ -2125,7 +2125,7 @@ void Index::score_results(const std::vector<sort_by> & sort_fields, const uint16
}
if(sort_fields.size() > 2) {
if(field_values[2] != TEXT_MATCH_SENTINEL) {
if(field_values[2] == TEXT_MATCH_SENTINEL) {
scores[2] = int64_t(match_score);
match_score_index = 2;
} else if (field_values[2] == SEQ_ID_SENTINEL) {

42
test/collection_sorting_test.cpp
View File

@ -405,6 +405,48 @@ TEST_F(CollectionSortingTest, ThreeSortFieldsLimit) {
collectionManager.drop_collection("coll1");
}
TEST_F(CollectionSortingTest, ThreeSortFieldsTextMatchLast) {
Collection *coll1;
std::vector<field> fields = { field("title", field_types::STRING, false),
field("artist", field_types::STRING, false),
field("popularity", field_types::INT32, false),
field("points", field_types::INT32, false),};
coll1 = collectionManager.get_collection("coll1").get();
if(coll1 == nullptr) {
coll1 = collectionManager.create_collection("coll1", 1, fields, "points").get();
}
std::vector<std::vector<std::string>> records = {
{"Coby Grant", "100"}, // text_match: 33684577
{"Coby Prant", "84642"}, // text_match: 129377
};
for(size_t i=0; i<records.size(); i++) {
nlohmann::json doc;
doc["id"] = std::to_string(i);
doc["title"] = records[i][0];
doc["artist"] = records[i][0];
doc["popularity"] = std::stoi(records[i][1]);
doc["points"] = i;
ASSERT_TRUE(coll1->add(doc.dump()).ok());
}
std::vector<sort_by> sort_fields = { sort_by("popularity", "DESC"), sort_by("points", "DESC"), sort_by(sort_field_const::text_match, "DESC") };
auto res = coll1->search("grant",
{"title","artist"}, "", {}, sort_fields, 1, 10, 1, FREQUENCY).get();
ASSERT_EQ(2, res["found"].get<size_t>());
ASSERT_STREQ("1", res["hits"][0]["document"]["id"].get<std::string>().c_str());
ASSERT_STREQ("0", res["hits"][1]["document"]["id"].get<std::string>().c_str());
collectionManager.drop_collection("coll1");
}
TEST_F(CollectionSortingTest, NegativeInt64Value) {
Collection *coll1;