diff options
| author | Geir Storli <geirst@yahooinc.com> | 2022-04-11 15:07:16 +0000 |
|---|---|---|
| committer | Geir Storli <geirst@yahooinc.com> | 2022-04-11 15:07:16 +0000 |
| commit | 0ae79683fb9ed342c68d9ec5d35274b13e803d61 (patch) | |
| tree | 577b9d14b3fa49a0b4b98b18566bb822f030ce57 /searchcore | |
| parent | 53420d91425d7b456ac25cb74a68fdff94db2cde (diff) | |
Simplify calculation of global filter and fallback to brute force when using nearest neighbor search.
With this change only two parameters are used to adjust the algorithm:
- vespa.matching.global_filter.lower_limit
- vespa.matching.global_filter.upper_limit
Diffstat (limited to 'searchcore')
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp index acee34220a6..37635825295 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp @@ -70,7 +70,8 @@ extractDiversityParams(const RankSetup &rankSetup, const Properties &rankPropert AttributeBlueprintParams extractAttributeBlueprintParams(const RankSetup& rank_setup, const Properties &rankProperties) { - return AttributeBlueprintParams(NearestNeighborBruteForceLimit::lookup(rankProperties, rank_setup.get_nearest_neighbor_brute_force_limit())); + return AttributeBlueprintParams(GlobalFilterLowerLimit::lookup(rankProperties, rank_setup.get_global_filter_lower_limit()), + GlobalFilterUpperLimit::lookup(rankProperties, rank_setup.get_global_filter_upper_limit())); } } // namespace proton::matching::<unnamed> |