feat(06-03): migrate lookupChunk to sqlc-generated LookupTrackMetaByPaths query

- Add LookupTrackMetaByPaths sqlc query using track_metadata VIEW with sqlc.slice()
- Replace hand-crafted fmt.Sprintf IN clause in lookupChunk with sqlc-generated call
- Preserve lookupTrackMetaBatch chunking at maxSQLiteVars (900)
- All queue tests pass with -race
This commit is contained in:
2026-03-04 19:31:52 -05:00
parent 30579e950e
commit 2221a68459
3 changed files with 76 additions and 56 deletions
@@ -58,6 +58,7 @@ JOIN artist_credit ac ON r.artist_credit_id = ac.id;
-- name: GetTrackMetadataByPath :one -- name: GetTrackMetadataByPath :one
SELECT SELECT
af.file_path, af.file_path,
af.length_milliseconds,
COALESCE(r.name, '') AS title, COALESCE(r.name, '') AS title,
COALESCE(ac.text, '') AS artist, COALESCE(ac.text, '') AS artist,
COALESCE(rg.name, '') AS album, COALESCE(rg.name, '') AS album,
@@ -121,6 +122,11 @@ LEFT JOIN release_groups rg ON rgr.release_group_id = rg.id
WHERE af.basename = ? WHERE af.basename = ?
LIMIT ?; LIMIT ?;
-- name: LookupTrackMetaByPaths :many
SELECT id, file_path, title, artist_name
FROM track_metadata
WHERE file_path IN (sqlc.slice('paths'));
-- name: DeleteAllAudioFiles :exec -- name: DeleteAllAudioFiles :exec
DELETE FROM audio_files; DELETE FROM audio_files;
@@ -8,6 +8,7 @@ package sqlcgen
import ( import (
"context" "context"
"database/sql" "database/sql"
"strings"
) )
const countAudioFiles = `-- name: CountAudioFiles :one const countAudioFiles = `-- name: CountAudioFiles :one
@@ -464,6 +465,7 @@ func (q *Queries) GetRandomAudioFilePath(ctx context.Context) (string, error) {
const getTrackMetadataByPath = `-- name: GetTrackMetadataByPath :one const getTrackMetadataByPath = `-- name: GetTrackMetadataByPath :one
SELECT SELECT
af.file_path, af.file_path,
af.length_milliseconds,
COALESCE(r.name, '') AS title, COALESCE(r.name, '') AS title,
COALESCE(ac.text, '') AS artist, COALESCE(ac.text, '') AS artist,
COALESCE(rg.name, '') AS album, COALESCE(rg.name, '') AS album,
@@ -479,11 +481,12 @@ LIMIT 1
` `
type GetTrackMetadataByPathRow struct { type GetTrackMetadataByPathRow struct {
FilePath string FilePath string
Title string LengthMilliseconds int64
Artist string Title string
Album string Artist string
CoverArtPath string Album string
CoverArtPath string
} }
func (q *Queries) GetTrackMetadataByPath(ctx context.Context, filePath string) (GetTrackMetadataByPathRow, error) { func (q *Queries) GetTrackMetadataByPath(ctx context.Context, filePath string) (GetTrackMetadataByPathRow, error) {
@@ -491,6 +494,7 @@ func (q *Queries) GetTrackMetadataByPath(ctx context.Context, filePath string) (
var i GetTrackMetadataByPathRow var i GetTrackMetadataByPathRow
err := row.Scan( err := row.Scan(
&i.FilePath, &i.FilePath,
&i.LengthMilliseconds,
&i.Title, &i.Title,
&i.Artist, &i.Artist,
&i.Album, &i.Album,
@@ -499,6 +503,57 @@ func (q *Queries) GetTrackMetadataByPath(ctx context.Context, filePath string) (
return i, err return i, err
} }
const lookupTrackMetaByPaths = `-- name: LookupTrackMetaByPaths :many
SELECT id, file_path, title, artist_name
FROM track_metadata
WHERE file_path IN (/*SLICE:paths*/?)
`
type LookupTrackMetaByPathsRow struct {
ID int64
FilePath string
Title string
ArtistName string
}
func (q *Queries) LookupTrackMetaByPaths(ctx context.Context, paths []string) ([]LookupTrackMetaByPathsRow, error) {
query := lookupTrackMetaByPaths
var queryParams []interface{}
if len(paths) > 0 {
for _, v := range paths {
queryParams = append(queryParams, v)
}
query = strings.Replace(query, "/*SLICE:paths*/?", strings.Repeat(",?", len(paths))[1:], 1)
} else {
query = strings.Replace(query, "/*SLICE:paths*/?", "NULL", 1)
}
rows, err := q.db.QueryContext(ctx, query, queryParams...)
if err != nil {
return nil, err
}
defer rows.Close()
var items []LookupTrackMetaByPathsRow
for rows.Next() {
var i LookupTrackMetaByPathsRow
if err := rows.Scan(
&i.ID,
&i.FilePath,
&i.Title,
&i.ArtistName,
); err != nil {
return nil, err
}
items = append(items, i)
}
if err := rows.Close(); err != nil {
return nil, err
}
if err := rows.Err(); err != nil {
return nil, err
}
return items, nil
}
const searchAudioFilesByBasename = `-- name: SearchAudioFilesByBasename :many const searchAudioFilesByBasename = `-- name: SearchAudioFilesByBasename :many
SELECT SELECT
af.file_path, af.file_path,
+10 -51
View File
@@ -44,7 +44,9 @@ func (q *Queue) lookupTrackMetaBatch(
return result return result
} }
// lookupChunk executes a single batch query for a chunk of file paths. // lookupChunk executes a single batch query for a chunk of file paths
// using the sqlc-generated LookupTrackMetaByPaths query against the
// track_metadata VIEW.
func (q *Queue) lookupChunk( func (q *Queue) lookupChunk(
paths []string, paths []string,
result map[string]trackMeta, result map[string]trackMeta,
@@ -53,63 +55,20 @@ func (q *Queue) lookupChunk(
return return
} }
placeholders := make([]string, len(paths)) rows, err := q.db.Queries.LookupTrackMetaByPaths(q.db.Ctx, paths)
args := make([]any, len(paths))
for i, fp := range paths {
placeholders[i] = "?"
args[i] = fp
}
query := fmt.Sprintf(
`SELECT af.id, af.file_path,
COALESCE(r.name, '') AS title,
COALESCE(ac.text, '') AS artist
FROM audio_files af
LEFT JOIN recordings r ON af.recording_id = r.id
LEFT JOIN artist_credit ac ON r.artist_credit_id = ac.id
WHERE af.file_path IN (%s)`,
strings.Join(placeholders, ","),
)
rows, err := q.db.QueryContext(query, args...)
if err != nil { if err != nil {
q.logger.Error("Batch metadata lookup failed", "err", err) q.logger.Error("Batch metadata lookup failed", "err", err)
return return
} }
defer func() { for _, row := range rows {
if closeErr := rows.Close(); closeErr != nil { result[row.FilePath] = trackMeta{
q.logger.Error( AudioFileID: row.ID,
"Failed to close rows", FilePath: row.FilePath,
"err", closeErr, Title: row.Title,
) Artist: row.ArtistName,
} }
}()
for rows.Next() {
var m trackMeta
if scanErr := rows.Scan(
&m.AudioFileID, &m.FilePath, &m.Title, &m.Artist,
); scanErr != nil {
q.logger.Error(
"Failed to scan batch metadata row",
"err", scanErr,
)
continue
}
result[m.FilePath] = m
}
if rowsErr := rows.Err(); rowsErr != nil {
q.logger.Error(
"Error iterating batch metadata rows",
"err", rowsErr,
)
} }
} }