guix/data-service
2
0
Fork 0
mirror of git://git.savannah.gnu.org/guix/data-service.git synced 2023-12-14 03:23:03 +01:00
Code Issues Releases Wiki Activity

Fix some package search issues

Browse source 
Previously, the name wasn't taken in to account when filtering results, so a
search like "git-annex" wouldn't find the git-annex package, since it's
synopsis or description doesn't include the name.

Filtering on the name made the queries much slower, so to address that, the
filtering by revision is moved to a separate part of the CTE, which means
PostgreSQL filters down the rows by quite a lot before it begins filtering by
name.

Also, add in a variant of the query without dashes (-) because that helps with
searches like ruby-engine.
This commit is contained in:
Christopher Baines 2020-09-26 16:05:06 +01:00
parent 53341c70fc
commit faf46565ce
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
guix-data-service/model/package.scm
View file

@ -144,7 +144,19 @@ WHERE data.name IN (SELECT name FROM package_names);"))
(define query (define query
(string-append (string-append
" "
WITH search_results AS ( WITH revision_packages AS (
SELECT *
FROM packages
WHERE packages.id IN (
SELECT package_derivations.package_id
FROM package_derivations
INNER JOIN guix_revision_package_derivations
ON package_derivations.id = guix_revision_package_derivations.package_derivation_id
INNER JOIN guix_revisions
ON guix_revision_package_derivations.revision_id = guix_revisions.id
WHERE guix_revisions.commit = $1
)
), search_results AS (
SELECT DISTINCT ON (packages.name) packages.name, SELECT DISTINCT ON (packages.name) packages.name,
packages.version, package_synopsis.synopsis, packages.version, package_synopsis.synopsis,
package_synopsis.locale AS synopsis_locale, package_synopsis.locale AS synopsis_locale,
@ -162,7 +174,7 @@ WITH search_results AS (
ORDER BY licenses.name ORDER BY licenses.name
) AS license_data ) AS license_data
) AS licenses ) AS licenses
FROM packages FROM revision_packages AS packages
INNER JOIN package_metadata INNER JOIN package_metadata
ON packages.package_metadata_id = package_metadata.id ON packages.package_metadata_id = package_metadata.id
LEFT OUTER JOIN locations LEFT OUTER JOIN locations
@ -173,16 +185,11 @@ WITH search_results AS (
ON package_metadata_tsvectors.package_synopsis_id = package_synopsis.id ON package_metadata_tsvectors.package_synopsis_id = package_synopsis.id
INNER JOIN package_descriptions INNER JOIN package_descriptions
ON package_metadata_tsvectors.package_description_id = package_descriptions.id ON package_metadata_tsvectors.package_description_id = package_descriptions.id
WHERE packages.id IN ( WHERE (
SELECT package_derivations.package_id to_tsvector(packages.name) @@ (plainto_tsquery($2) || plainto_tsquery(REPLACE($2, '-', ' ')))
FROM package_derivations OR
INNER JOIN guix_revision_package_derivations package_metadata_tsvectors.synopsis_and_description @@ plainto_tsquery($2)
ON package_derivations.id = guix_revision_package_derivations.package_derivation_id
INNER JOIN guix_revisions
ON guix_revision_package_derivations.revision_id = guix_revisions.id
WHERE guix_revisions.commit = $1
) )
AND package_metadata_tsvectors.synopsis_and_description @@ plainto_tsquery($2)
ORDER BY name, ORDER BY name,
CASE WHEN package_metadata_tsvectors.locale = 'en_US.UTF-8' THEN 2 CASE WHEN package_metadata_tsvectors.locale = 'en_US.UTF-8' THEN 2
WHEN package_metadata_tsvectors.locale = $3 THEN 1 WHEN package_metadata_tsvectors.locale = $3 THEN 1
@ -198,7 +205,7 @@ ORDER BY (
setweight(to_tsvector(name), 'A'), setweight(to_tsvector(name), 'A'),
plainto_tsquery($2), plainto_tsquery($2),
2 -- divide rank by the document length 2 -- divide rank by the document length
) + ) * 1.5 +
ts_rank_cd( ts_rank_cd(
synopsis_and_description, synopsis_and_description,
plainto_tsquery($2), plainto_tsquery($2),