Move all pure SQL-text builders shared by issueops (classic) and domain/db (proxied) into one package; both stacks now delegate, so ready/filter/counts query semantics can no longer drift (Seam A). Execution orchestration stays per-stack per the extract-don't-unify decision. Canonical SQL text is classic's; the only proxied-side text deltas are IN-list whitespace. Adversarial re-review (bd-6dnrw.47) verified all 10 attack items with no production divergence, and adds an import-boundary test pinning the layering (domain must never import issueops/sqlbuild) plus a single-use constraint note on LabelSearchPlan.MergeInto. Follow-ups filed: bd-emrs2 (+1-overfetch convention), bd-kzeme (IN-helper consolidation). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
75 lines
2.5 KiB
Go
75 lines
2.5 KiB
Go
package sqlbuild
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/steveyegge/beads/internal/types"
|
|
)
|
|
|
|
// LabelSearchPlan rewrites label predicates (Labels AND-set, LabelsAny) from
|
|
// IN-subqueries into JOINs against the labels table, which the optimizer
|
|
// handles far better on large corpora. Filter is the input filter with the
|
|
// rewritten label fields cleared; callers pass it (not the original) to
|
|
// BuildIssueFilterClauses and then merge Where/Args via MergeInto.
|
|
type LabelSearchPlan struct {
|
|
FromSQL string
|
|
Where []string
|
|
Args []any
|
|
Distinct bool
|
|
Filter types.IssueFilter
|
|
}
|
|
|
|
// MergeInto prepends the plan's label clauses to filter-built clauses,
|
|
// preserving the historical clause and arg ordering of both stacks.
|
|
// Single-use: the result shares the plan's backing arrays, so merging one
|
|
// plan into two clause sets could clobber the first result's tail.
|
|
func (p LabelSearchPlan) MergeInto(where []string, args []any) ([]string, []any) {
|
|
if len(p.Where) == 0 {
|
|
return where, args
|
|
}
|
|
return append(p.Where, where...), append(p.Args, args...)
|
|
}
|
|
|
|
// BuildLabelDrivenSearch produces the FROM clause (with label JOINs when label
|
|
// predicates are present) and the residual filter for a table family.
|
|
func BuildLabelDrivenSearch(filter types.IssueFilter, tables FilterTables) LabelSearchPlan {
|
|
labels := CompactNonEmptyStrings(filter.Labels)
|
|
labelsAny := CompactNonEmptyStrings(filter.LabelsAny)
|
|
if len(labels) == 0 && len(labelsAny) == 0 {
|
|
return LabelSearchPlan{FromSQL: tables.Main, Filter: filter}
|
|
}
|
|
|
|
filterForClauses := filter
|
|
filterForClauses.Labels = nil
|
|
filterForClauses.LabelsAny = nil
|
|
|
|
var joins, where []string
|
|
var args []any
|
|
|
|
for i, label := range labels {
|
|
alias := fmt.Sprintf("label_filter_%d", i)
|
|
joins = append(joins, fmt.Sprintf("JOIN %s %s ON %s.issue_id = %s.id", tables.Labels, alias, alias, tables.Main))
|
|
where = append(where, fmt.Sprintf("%s.label = ?", alias))
|
|
args = append(args, label)
|
|
}
|
|
|
|
if len(labelsAny) > 0 {
|
|
alias := "label_filter_any"
|
|
joins = append(joins, fmt.Sprintf("JOIN %s %s ON %s.issue_id = %s.id", tables.Labels, alias, alias, tables.Main))
|
|
placeholders := make([]string, len(labelsAny))
|
|
for i, label := range labelsAny {
|
|
placeholders[i] = "?"
|
|
args = append(args, label)
|
|
}
|
|
where = append(where, fmt.Sprintf("%s.label IN (%s)", alias, strings.Join(placeholders, ", ")))
|
|
}
|
|
|
|
return LabelSearchPlan{
|
|
FromSQL: tables.Main + " " + strings.Join(joins, " "),
|
|
Where: where,
|
|
Args: args,
|
|
Distinct: true,
|
|
Filter: filterForClauses,
|
|
}
|
|
}
|