Skip to content

fix: improve SQL query for features search to include results that cross the pre-rank threshold. #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rkettelerij merged 2 commits into from
Feb 19, 2026
Merged

fix: improve SQL query for features search to include results that cross the pre-rank threshold. #395

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cc5768
fix: improve SQL query for features search to include results that cr…
rkettelerij Feb 19, 2026
c1ba7b6
chore: add comment
rkettelerij Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions internal/ogc/features/datasources/postgres/postgres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,21 +431,21 @@ func makeSearchQuery(index string, bboxFilter string, axisOrder d.AxisOrder) str
FROM
results r
WHERE
-- less then rank threshold results don't need to be pre-ranked, they can be ranked based on score
-- less than rank-threshold results don't need to be pre-ranked, they can be ranked based on score
CASE WHEN (SELECT c from results_count) < @rt THEN 1 = 1 END
) UNION ALL (
SELECT
*
FROM
results r
WHERE
-- pre-rank more then rank threshold results by ordering on suggest length and display_name
CASE WHEN (SELECT c from results_count) = @rt THEN 1 = 1 END AND
array_length(string_to_array(r.suggest, ' '), 1) <= @prwcc
-- pre-rank more than rank-threshold results by ordering on suggest length and display_name
CASE WHEN (SELECT c from results_count) >= @rt THEN 1 = 1 END
ORDER BY
array_length(string_to_array(r.suggest, ' '), 1) ASC,
-- order by the number of words in the suggest string, up to the limit given in @prwcc
(SELECT COUNT(*) FROM unnest(regexp_split_to_array(r.suggest, '\s+')) AS words LIMIT @prwcc) ASC,
r.display_name COLLATE "custom_numeric" ASC
LIMIT (@lm::int * @prlm::int) -- return limited pre-ranked results for ranking based on scor
LIMIT (@lm::int * @prlm::int) -- return limited pre-ranked results for ranking based on score
)
) u
LEFT JOIN
Expand Down