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

Don't return error if limit_hits is hit.

Browse Source
This commit is contained in:
Kishore Nallan 2024-08-30 14:39:29 +05:30
parent c8cd7e0472
commit 478f0ce322
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/collection.cpp
View File

@ -2079,13 +2079,7 @@ Option<nlohmann::json> Collection::search(std::string raw_query,
offset = (per_page * (actual_page - 1));
}
size_t fetch_size = offset + per_page;
if(fetch_size > limit_hits) {
std::string message = "Only upto " + std::to_string(limit_hits) + " hits can be fetched. " +
"Ensure that `page` and `per_page` parameters are within this range.";
return Option<nlohmann::json>(422, message);
}
size_t fetch_size = std::min<size_t>(offset + per_page, limit_hits);
size_t max_hits = DEFAULT_TOPSTER_SIZE;

20
test/collection_test.cpp
View File

@ -3072,16 +3072,24 @@ TEST_F(CollectionTest, WildcardQueryReturnsResultsBasedOnPerPageParam) {
ASSERT_EQ(25, results["found"].get<int>());
// enforce limit_hits
res_op = collection->search("*", query_fields, "", facets, sort_fields, {0}, 10, 3,
auto limit_hits = 20;
results = collection->search("*", query_fields, "", facets, sort_fields, {0}, 10, 3,
FREQUENCY, {false}, 1000,
spp::sparse_hash_set<std::string>(),
spp::sparse_hash_set<std::string>(), 10, "", 30, 4, "", 40, {}, {}, {}, 0,
"<mark>", "</mark>", {1}, 20);
"<mark>", "</mark>", {1}, limit_hits).get();
ASSERT_FALSE(res_op.ok());
ASSERT_STREQ(
"Only upto 20 hits can be fetched. Ensure that `page` and `per_page` parameters are within this range.",
res_op.error().c_str());
ASSERT_EQ(0, results["hits"].size());
ASSERT_EQ(25, results["found"].get<int>());
results = collection->search("*", query_fields, "", facets, sort_fields, {0}, 15, 2,
FREQUENCY, {false}, 1000,
spp::sparse_hash_set<std::string>(),
spp::sparse_hash_set<std::string>(), 10, "", 30, 4, "", 40, {}, {}, {}, 0,
"<mark>", "</mark>", {1}, limit_hits).get();
ASSERT_EQ(5, results["hits"].size());
ASSERT_EQ(25, results["found"].get<int>());
}
TEST_F(CollectionTest, RemoveIfFound) {