jcoffey-dev
fb5049a747
Replaces the separate SQL-only /query and text-only /search endpoints with one pipe-syntax query language (plus raw SQL escape hatch) that compiles to a single IR and execution plan across both backends, so a query like `message:"connection refused" | stats count by host` runs as one request instead of two disjoint tools. - api/internal/querylang: lexer -> ast -> parser -> ir -> planner -> executor, each layer independently tested. - Execution generalizes Phase 1's proven Tantivy-prefilter pattern into a 4-way routing table (pure ClickHouse / text-only / text + aggregation / raw SQL passthrough). - Unified web query page and `sentryctl query`, both hitting the same POST /query endpoint. - Benchmarked against a real 1,022,000-row dataset (hack/benchmark-fixture); caught and fixed a real bug where the Tantivy prefilter cap (10,000) produced an IN-clause exceeding ClickHouse's default max_query_size -- lowered to 5,000, documented in docs/query-language-design.md and docs/phase-2-runbook.md. - docs/query-language-reference.md: customer-facing syntax reference.
59 lines
1.5 KiB
Go
59 lines
1.5 KiB
Go
package executor
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"reflect"
|
|
|
|
"github.com/ClickHouse/clickhouse-go/v2/lib/driver"
|
|
)
|
|
|
|
// ChRunner runs arbitrary (pre-validated) SELECT statements against
|
|
// ClickHouse and shapes the result into JSON-friendly columns/rows,
|
|
// discovering the result's column set at query time via reflection since
|
|
// the query itself is arbitrary. Ported from Phase 0/1's
|
|
// api/internal/queryapi.Executor, which this replaces (see task 4) --
|
|
// same logic, moved here since it's the query-execution layer's
|
|
// plumbing, not specific to the old placeholder /query handler.
|
|
type ChRunner struct {
|
|
conn driver.Conn
|
|
}
|
|
|
|
func NewChRunner(conn driver.Conn) *ChRunner {
|
|
return &ChRunner{conn: conn}
|
|
}
|
|
|
|
func (r *ChRunner) RunSQL(ctx context.Context, sql string) (*Result, error) {
|
|
rows, err := r.conn.Query(ctx, sql)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("executing query: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
columnTypes := rows.ColumnTypes()
|
|
result := &Result{
|
|
Columns: rows.Columns(),
|
|
Rows: [][]any{},
|
|
}
|
|
|
|
for rows.Next() {
|
|
dest := make([]any, len(columnTypes))
|
|
for i, ct := range columnTypes {
|
|
dest[i] = reflect.New(ct.ScanType()).Interface()
|
|
}
|
|
if err := rows.Scan(dest...); err != nil {
|
|
return nil, fmt.Errorf("scanning row: %w", err)
|
|
}
|
|
row := make([]any, len(dest))
|
|
for i, d := range dest {
|
|
row[i] = reflect.ValueOf(d).Elem().Interface()
|
|
}
|
|
result.Rows = append(result.Rows, row)
|
|
}
|
|
if err := rows.Err(); err != nil {
|
|
return nil, fmt.Errorf("iterating rows: %w", err)
|
|
}
|
|
|
|
return result, nil
|
|
}
|