From 5da8cadb1ad4c14bba1e98ec4e994f439b907703 Mon Sep 17 00:00:00 2001 From: ssw Date: Thu, 2 Jul 2026 16:47:56 +0800 Subject: [PATCH] auto(854d697c05d0): session end @ 2026-07-02T16:47:56 (+2f) --- docs/.DS_Store | Bin 6148 -> 6148 bytes src/commands/kb/_schema.ts | 5 +++ src/commands/kb/_search.ts | 70 +++++++++++++++++++++++++------------ 3 files changed, 53 insertions(+), 22 deletions(-) diff --git a/docs/.DS_Store b/docs/.DS_Store index f800cb977bca560b60ceb7a105124cf057c2a10c..b761e10464e8f95de0eac5c036aa771d41bc12ef 100644 GIT binary patch delta 291 zcmZoMXfc=|#>B!ku~2NHo+2aP#(>?7iv?Ji82L8yFarD%)-jX&cV*X%@G@%kzXEMl2}q&?37p(4dR95=jSBB*ojGDnW^RR0wT`& zc_oRNd8tKU4VfvaKqWEZnRzMsvU>wtif5kfQYLTMP)GdYi0YH}R&%*ln! x;yh)+MR_^-dFdb>8w>duH?wo_a{z;2Gb77)=E?jbjvPR9m_T|rM~JLp1^~IZOUVEL delta 68 zcmZoMXfc=|#>B)qu~2NHo+2a9#(>?7j69opSb`WQ+p^8vEXpCkvYDNOp9837vmnQJ W=E?jbjvNd?z{tSBvN=Lz4Kn~X4i3@) diff --git a/src/commands/kb/_schema.ts b/src/commands/kb/_schema.ts index cc70a6d..9d6b31b 100644 --- a/src/commands/kb/_schema.ts +++ b/src/commands/kb/_schema.ts @@ -13,6 +13,9 @@ import { SCHEMA } from './_client'; export const SCHEMA_DDL = [ `CREATE SCHEMA IF NOT EXISTS ${SCHEMA}`, + // pg_trgm 扩展 (字符 trigram, 用于 CJK 检索 + 模糊匹配) + `CREATE EXTENSION IF NOT EXISTS pg_trgm`, + // 1. 域 `CREATE TABLE IF NOT EXISTS ${SCHEMA}.domains ( id BIGSERIAL PRIMARY KEY, @@ -62,6 +65,8 @@ export const SCHEMA_DDL = [ `CREATE INDEX IF NOT EXISTS idx_entries_status ON ${SCHEMA}.entries(status)`, `CREATE INDEX IF NOT EXISTS idx_entries_expires ON ${SCHEMA}.entries(expires_on)`, `CREATE INDEX IF NOT EXISTS idx_entries_search ON ${SCHEMA}.entries USING GIN(search_vector)`, + `CREATE INDEX IF NOT EXISTS idx_entries_content_trgm ON ${SCHEMA}.entries USING GIN(content gin_trgm_ops)`, + `CREATE INDEX IF NOT EXISTS idx_entries_section_trgm ON ${SCHEMA}.entries USING GIN(section gin_trgm_ops)`, `CREATE UNIQUE INDEX IF NOT EXISTS idx_domains_domain ON ${SCHEMA}.domains(domain)`, // tsvector 触发器函数 diff --git a/src/commands/kb/_search.ts b/src/commands/kb/_search.ts index 4f0ea7c..c3032da 100644 --- a/src/commands/kb/_search.ts +++ b/src/commands/kb/_search.ts @@ -1,10 +1,15 @@ /** - * _search.ts — tsvector 检索 + 访问计数 + * _search.ts — tsvector + trigram 双路径检索 + 访问计数 * * 自动: * - 默认仅返回 active (status='active' AND 未过期) * - 命中后自动更新 access_count + last_accessed - * - ts_headline 生成 高亮 snippet + * - ASCII/数字查询 → tsvector (BM25-like rank) + 高亮 + * - CJK (中文字符) → pg_trgm similarity (字符 trigram) + snippet 切片 + * + * 设计: 双路径 (混合 query 时走 trigram, tsvector 对 CJK 退化) + * - ASCII path: to_tsquery('simple', $1) + search_vector @@ query + * - CJK path: similarity(content, $1) + content % $1 (gin_trgm_ops 索引) */ import { query, trackAccess, SCHEMA } from './_client'; @@ -24,33 +29,54 @@ export interface SearchResult { snippet: string; } +const CJK_RE = /[一-鿿]/; +const ASCII_RE = /^[a-zA-Z0-9\s\-_.]+$/; + export async function search(opts: SearchOptions): Promise { const limit = opts.limit ?? 10; - const tsquery = opts.query - .split(/\s+/) - .filter(Boolean) - .map(t => t.replace(/[^\w一-龥-]/g, '')) - .filter(Boolean) - .join(' & '); - - if (!tsquery) return []; + const q = opts.query.trim(); + if (!q) return []; const useActiveView = !opts.includeAll; const source = useActiveView ? `${SCHEMA}.active_entries` : `${SCHEMA}.entries`; - let sql = ` - SELECT e.id, d.domain, e.section, e.content, - ts_rank(e.search_vector, query) AS rank, - ts_headline('simple', e.content, query, - 'StartSel=, StopSel=, MaxFragments=2, MaxWords=20, MinWords=5') AS snippet - FROM ${source} e - JOIN ${SCHEMA}.domains d ON d.id = e.domain_id, - to_tsquery('simple', $1) query - WHERE e.search_vector @@ query - `; - const params: any[] = [tsquery]; + const useAsciiPath = ASCII_RE.test(q) && !CJK_RE.test(q); + + let sql: string; + let params: any[]; + + if (useAsciiPath) { + // ASCII path: tsvector + const tsquery = q.split(/\s+/).filter(Boolean).join(' & '); + sql = ` + SELECT e.id, d.domain, e.section, e.content, + ts_rank(e.search_vector, query) AS rank, + ts_headline('simple', e.content, query, + 'StartSel=, StopSel=, MaxFragments=2, MaxWords=20, MinWords=5') AS snippet + FROM ${source} e + JOIN ${SCHEMA}.domains d ON d.id = e.domain_id, + to_tsquery('simple', $1) query + WHERE e.search_vector @@ query + `; + params = [tsquery]; + } else { + // CJK path: pg_trgm + sql = ` + SELECT e.id, d.domain, e.section, e.content, + similarity(e.content, $1) AS rank, + COALESCE( + substring(e.content from greatest(1, position($1 in e.content) - 30) for 100), + substring(e.content from 1 for 100) + ) AS snippet + FROM ${source} e + JOIN ${SCHEMA}.domains d ON d.id = e.domain_id + WHERE e.content % $1 OR e.section % $1 + `; + params = [q]; + } + if (opts.domain) { - sql += ` AND d.domain = $2`; + sql += ` AND d.domain = $${params.length + 1}`; params.push(opts.domain); } sql += ` ORDER BY rank DESC LIMIT $${params.length + 1}`;