mirror of
https://github.com/milvus-io/milvus.git
synced 2026-07-21 10:15:43 +00:00
issue: #47420 ## What this PR does Project-wide migration of raw `fmt.Errorf` / `errors.New` in function bodies onto the `merr` framework, plus the Sys-vs-Input error classification and the machinery it drives (retriability, fine-grained metrics, segcore unification), plus the convention docs and a linter that keeps it from regressing. Scope: storage, proxy, coordinators (root/data/query), query node, data node, `pkg/util` & `internal/util`, expression parser, message queue, streaming, and misc packages. Bare raw-error usages went from ~3000 to a ~340 allowlist (package-level sentinels / build-tag / test sites). --- ## How to review this PR It is large but the vast majority is mechanical. Changes fall into three tiers; spend review budget on Part 2 and Part 3. ### Part 1 — Mechanical standardization (low risk, verify by rule) Each converted call follows one of a small fixed set of rules. To review, check that each site obeys the matching rule rather than reading every line: | Pattern | Rule | |---|---| | `fmt.Errorf("...")` originating a new error | → `merr.WrapErrXxxMsg("...")` with a code matching the failure's meaning | | Adding context to an existing typed error | → `merr.Wrap(err, "...")` / `merr.Wrapf(...)` — **preserves** the inner code (never `WrapErr*Err`, which overwrites it) | | Errors inside the streaming subsystem | → `status.New*` factories (StreamingError), **not** merr — this is the component-internal dialect (see `docs/dev/error_handling_guide.md`) | | Low-level / control-flow signal caught by `errors.Is` | → kept as a package-level `errors.New` sentinel (lowercase, same-package) | Conventions are documented in `docs/dev/error_handling_guide.md` (how-to) and `docs/dev/error_sentinel_convention.md` (rules + audit). A `gocritic`/`ruleguard` rule (`rawmerrerror`, in `rules.go`) enforces "no raw `return errors.New/fmt.Errorf`" under `make verifiers`. ### Part 2 — Behavior changes (review these closely) These are the sites where the wire contract or runtime behavior changes, not just the source text. Listed by category; representative locations given, full set in the diff. **A. gRPC wire-code shifts: `UnexpectedError(1)/Code 65535` → typed code.** Where a handler previously returned a raw error (collapsed to `Code=65535` on the wire), it now returns a typed merr, so the client sees a real code. The most common shift is to `IllegalArgument(5)/Code 1100` (ParameterInvalid). Touch points include datanode task handlers (CreateTask/Query/Drop), proxy Upsert, querynode GetMetrics, datacoord CreateIndex, httpserver query-response builder, and typeutil schema validation. One code refinement: an index-param validation moved `1100` → `1101` (ParameterMissing). **Client/SDK assertions and any code that switched on `Code=65535` for these paths must be re-checked** (the go_client e2e assertions were already aligned in this PR). **B. Prometheus `status` label contract change (externally visible).** The proxy metric's coarse `fail` / `rejected` values are split into `fail_input` / `fail_system` and `rejected_user` / `rejected_system` (in `requestutil.ParseMetricLabel`; auth/privilege rejections count as `rejected_user`), so dashboards can attribute a failure to caller vs operator. **Dashboards/alerts querying `status="fail"` must migrate to `status=~"fail_.*"`, and `status="rejected"` to `status=~"rejected_.*"`.** The in-repo Grafana dashboard is already migrated; external dashboards built on the old values silently go empty after upgrade. This is the one change that requires an ops-side migration. **C. Retriability semantics.** - C1: `merr.Status(err)` now forces `Retriable=false` when the error is an `InputError` — a malformed request can never succeed on blind retry, so clients never get the self-contradictory "your input is wrong but you may retry". - C2: `retry.Do` short-circuits an `InputError` (non-retriable) — **but only when the caller did not pass a `RetryErr` predicate**. The check is an `if c.isRetryErr != nil { ... } else if InputError { ... }` *mutually exclusive* branch (`pkg/util/retry/retry.go`): an explicit `RetryErr` takes precedence and bypasses the InputError abort. `retry.Handle` deliberately does **not** apply the InputError abort (its callers signal abort via `shouldRetry=false`). Four flusher startup callsites that must retry through transient "not ready" errors were given explicit `RetryErr` escape hatches. **D. segcore (C++→Go) error classification.** A single shared Go-side table (`pkg/util/merr/segcore.go`) maps each segcore code to a merr sentinel + InputError/signal category, replacing scattered hand-written `if errorCode == ...` switches in the cgo wrappers. **Wire `Code` values change for every segcore pass-through error, not just the remapped ones.** Named sentinels remap (C++ `2003` → merr `2001`, `2033` → `2002`, Folly/Knowhere codes likewise); **all remaining pass-through codes (`2004`–`2043`, previously surfaced to clients as raw C++ enum values) now serialize as `2000`** (`ErrSegcore`), with the original C++ code preserved in the `Reason` text (`segcoreCode=...`); unknown/future codes collapse to `2000` as well (pinned by the `wire_code_projection` test). Transient segcore classes (object storage / file IO / OOM / mmap / FieldNotLoaded — 11 codes) now report `Retriable=true`. **Any client switching on raw segcore codes in the `2004`–`2043` range must be re-checked**; the in-Reason code remains available for diagnostics. Signal codes (PretendFinished / FollyCancel) are recognized centrally. `errors.Is`-based control flow on these (e.g. scheduler skip/retry) is preserved. **E. InputError classification (25 sentinels + dynamic marks).** 25 sentinels in `errors.go` carry `WithErrorType(InputError)` (the Collection / ResourceGroup / Database families, `ErrIndexDuplicate`, `ErrParameterInvalid`, `ErrPrivilegeNotAuthenticated`, `ErrImportFailed`, `ErrQueryPlan`, ...), plus dynamic marks for the 8 segcore input codes (ExprInvalid, DimNotMatch, MetricTypeInvalid, FieldIDInvalid, ...) and `WrapErrAsInputError`. The widest blast radius is `ErrParameterInvalid` (1100): ~2335 `WrapErrParameterInvalid*` callsites now classify as input / non-retriable. Because of C1/C2 this changes retriability for any path that returns these. **The audit to confirm no transient path was mis-marked is the single most important review item** (see Part 3). One reverse correction: storage field-stats parsing moved from `ErrParameterInvalid` (input) to `ErrDataIntegrity` — a corrupted stored stat is data corruption, not user input. ### Part 3 — Known risks & traps (called out proactively) 1. **`merr.Wrap` vs `WrapErr*Err` (code-masking).** `WrapErr*Err` builds a `wrappedMilvusError{sentinel: ErrServiceInternal}` whose `code()` returns the *outer* sentinel — it overwrites the inner typed code and hides the `errors.Is` chain. This is intentional (use it to *deliberately* downgrade), but it was a recurring conversion defect; the rule "add context with `merr.Wrap`, downgrade with `WrapErr*Err`" is enforced by convention and reviewed across the diff. 2. **InputError × `retry.Do` blast radius.** Marking a sentinel `InputError` makes any `retry.Do(...)` without a `RetryErr` predicate stop retrying it. Reviewers should sanity-check that no transient use of the 19 newly-marked sentinels (especially `ErrParameterInvalid`) sits inside a retry loop that needed to keep spinning. The known flusher cases were handled (see C2). 3. **The ~340 raw-error allowlist.** What remains as bare `errors.New` is, by design: package-level sentinels (caught by `errors.Is`), `//go:build test` sites, and out-of-band trees (`cmd/`, `tests/`, codegen, walimpls). The linter only bans the *direct-return* form; assignment-then-return escapes and the full no-exceptions ban are deferred to an AST-based linter (Tier 2, documented). 4. **segcore C++ second step deferred.** This PR unifies classification on the Go side; splitting the dual-semantic C++ codes at the source is a follow-up. --- ## Validation - `make verifiers`: Go side clean (gofmt + static-check across modules, including the new `rawmerrerror` rule with a 0-hit baseline repo-wide). - `make test-go`: passing; the one real regression introduced (a datanode `invalid_task_type` assertion shifting `1` → `5` from a ParameterInvalid conversion) was fixed in-tree. - go_client e2e CreateIndex assertions aligned to the new merr messages. --------- Signed-off-by: zhenshan.cao <zhenshan.cao@zilliz.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
291 lines
8.0 KiB
Go
291 lines
8.0 KiB
Go
package agg
|
|
|
|
import (
|
|
"fmt"
|
|
"reflect"
|
|
"regexp"
|
|
"strings"
|
|
|
|
"github.com/milvus-io/milvus-proto/go-api/v3/schemapb"
|
|
"github.com/milvus-io/milvus/pkg/v3/proto/planpb"
|
|
"github.com/milvus-io/milvus/pkg/v3/util/merr"
|
|
)
|
|
|
|
const (
|
|
kSum = "sum"
|
|
kCount = "count"
|
|
kAvg = "avg"
|
|
kMin = "min"
|
|
kMax = "max"
|
|
)
|
|
|
|
var (
|
|
// Define the regular expression pattern once to avoid repeated concatenation.
|
|
aggregationTypes = kSum + `|` + kCount + `|` + kAvg + `|` + kMin + `|` + kMax
|
|
aggregationPattern = regexp.MustCompile(`(?i)^(` + aggregationTypes + `)\s*\(\s*([\w\*]*)\s*\)$`)
|
|
)
|
|
|
|
// MatchAggregationExpression return isAgg, operator name, operator parameter
|
|
func MatchAggregationExpression(expression string) (bool, string, string) {
|
|
// FindStringSubmatch returns the full match and submatches.
|
|
matches := aggregationPattern.FindStringSubmatch(expression)
|
|
if len(matches) > 0 {
|
|
// Return true, the operator, and the captured parameter.
|
|
return true, strings.ToLower(matches[1]), strings.TrimSpace(matches[2])
|
|
}
|
|
return false, "", ""
|
|
}
|
|
|
|
type AggregateBase interface {
|
|
Name() string
|
|
Update(target *FieldValue, new *FieldValue) error
|
|
NewState() []*FieldValue
|
|
UpdateState(slots []*FieldValue, new *FieldValue) error
|
|
Terminate(slots []*FieldValue) (any, error)
|
|
ToPB() *planpb.Aggregate
|
|
FieldID() int64
|
|
OriginalName() string
|
|
}
|
|
|
|
func isSupportedAggregateName(aggregateName string) bool {
|
|
switch aggregateName {
|
|
case kCount, kSum, kAvg, kMin, kMax:
|
|
return true
|
|
default:
|
|
return false
|
|
}
|
|
}
|
|
|
|
func NewAggregate(aggregateName string, aggFieldID int64, originalName string, fieldType schemapb.DataType) ([]AggregateBase, error) {
|
|
if !isSupportedAggregateName(aggregateName) {
|
|
return nil, merr.WrapErrParameterInvalidMsg("invalid Aggregation operator %s", aggregateName)
|
|
}
|
|
|
|
if err := ValidateAggFieldType(aggregateName, fieldType); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
switch aggregateName {
|
|
case kCount:
|
|
return []AggregateBase{&CountAggregate{fieldID: aggFieldID, originalName: originalName, isAvg: false}}, nil
|
|
case kSum:
|
|
return []AggregateBase{&SumAggregate{fieldID: aggFieldID, originalName: originalName, isAvg: false}}, nil
|
|
case kAvg:
|
|
avg := NewAvgAggregate(aggFieldID, originalName)
|
|
return []AggregateBase{avg.sum, avg.count}, nil
|
|
case kMin:
|
|
return []AggregateBase{&MinAggregate{fieldID: aggFieldID, originalName: originalName}}, nil
|
|
case kMax:
|
|
return []AggregateBase{&MaxAggregate{fieldID: aggFieldID, originalName: originalName}}, nil
|
|
default:
|
|
// should never happen due to isSupportedAggregateName check
|
|
return nil, merr.WrapErrParameterInvalidMsg("invalid Aggregation operator %s", aggregateName)
|
|
}
|
|
}
|
|
|
|
func FromPB(pb *planpb.Aggregate) (AggregateBase, error) {
|
|
switch pb.Op {
|
|
case planpb.AggregateOp_count:
|
|
return &CountAggregate{fieldID: pb.GetFieldId(), isAvg: false}, nil
|
|
case planpb.AggregateOp_sum:
|
|
return &SumAggregate{fieldID: pb.GetFieldId(), isAvg: false}, nil
|
|
case planpb.AggregateOp_min:
|
|
return &MinAggregate{fieldID: pb.GetFieldId()}, nil
|
|
case planpb.AggregateOp_max:
|
|
return &MaxAggregate{fieldID: pb.GetFieldId()}, nil
|
|
default:
|
|
return nil, merr.WrapErrParameterInvalidMsg("invalid Aggregation operator %d", pb.Op)
|
|
}
|
|
}
|
|
|
|
func AccumulateFieldValue(target *FieldValue, new *FieldValue) error {
|
|
if target == nil || new == nil {
|
|
return merr.WrapErrServiceInternalMsg("target or new field value is nil")
|
|
}
|
|
|
|
// Skip null values during accumulation
|
|
if new.IsNull() {
|
|
return nil
|
|
}
|
|
|
|
// If target is null and new is not null, initialize target with new value
|
|
if target.IsNull() {
|
|
target.val = new.val
|
|
target.isNull = false
|
|
return nil
|
|
}
|
|
|
|
// Handle nil `val` for initialization (backward compatibility)
|
|
if target.val == nil {
|
|
target.val = new.val
|
|
return nil
|
|
}
|
|
// Verify types match
|
|
if reflect.TypeOf(target.val) != reflect.TypeOf(new.val) {
|
|
return merr.WrapErrParameterInvalidMsg("type mismatch: target is %T, new is %T", target.val, new.val)
|
|
}
|
|
|
|
switch target.val.(type) {
|
|
case int:
|
|
target.val = target.val.(int) + new.val.(int)
|
|
case int32:
|
|
target.val = target.val.(int32) + new.val.(int32)
|
|
case int64:
|
|
target.val = target.val.(int64) + new.val.(int64)
|
|
case float32:
|
|
target.val = target.val.(float32) + new.val.(float32)
|
|
case float64:
|
|
target.val = target.val.(float64) + new.val.(float64)
|
|
default:
|
|
return merr.WrapErrParameterInvalidMsg("unsupported type: %T", target.val)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func AggregatesToPB(aggregates []AggregateBase) []*planpb.Aggregate {
|
|
ret := make([]*planpb.Aggregate, len(aggregates))
|
|
for idx, agg := range aggregates {
|
|
ret[idx] = agg.ToPB()
|
|
}
|
|
return ret
|
|
}
|
|
|
|
type FieldValue struct {
|
|
val interface{}
|
|
isNull bool
|
|
}
|
|
|
|
func NewFieldValue(v interface{}) *FieldValue {
|
|
return &FieldValue{val: v, isNull: false}
|
|
}
|
|
|
|
func NewNullFieldValue() *FieldValue {
|
|
return &FieldValue{val: nil, isNull: true}
|
|
}
|
|
|
|
func (fv *FieldValue) IsNull() bool {
|
|
return fv.isNull
|
|
}
|
|
|
|
// Value returns the underlying accumulated value (nil when null). Added so
|
|
// external callers (proxy-side search aggregation) can finalize metric results
|
|
// without reimplementing accumulator state. Read-only; does not mutate fv.
|
|
func (fv *FieldValue) Value() any {
|
|
return fv.val
|
|
}
|
|
|
|
func (fv *FieldValue) SetNull() {
|
|
fv.isNull = true
|
|
fv.val = nil
|
|
}
|
|
|
|
type Row struct {
|
|
fieldValues []*FieldValue
|
|
}
|
|
|
|
func (r *Row) ColumnCount() int {
|
|
return len(r.fieldValues)
|
|
}
|
|
|
|
func (r *Row) ValAt(col int) interface{} {
|
|
return r.fieldValues[col].val
|
|
}
|
|
|
|
func (r *Row) FieldValueAt(col int) *FieldValue {
|
|
return r.fieldValues[col]
|
|
}
|
|
|
|
func (r *Row) Equal(other *Row, keyCount int) bool {
|
|
// Ensure both rows have enough fields for key comparison
|
|
if len(r.fieldValues) < keyCount || len(other.fieldValues) < keyCount || len(r.fieldValues) != len(other.fieldValues) {
|
|
return false
|
|
}
|
|
// Compare each field value for equality
|
|
// For grouping: null == null is considered equal
|
|
for i := 0; i < keyCount; i++ {
|
|
rIsNull := r.fieldValues[i].IsNull()
|
|
otherIsNull := other.fieldValues[i].IsNull()
|
|
if rIsNull && otherIsNull {
|
|
// Both are null, considered equal for grouping
|
|
continue
|
|
}
|
|
if rIsNull != otherIsNull {
|
|
// One is null, the other is not
|
|
return false
|
|
}
|
|
// Both are not null, compare values
|
|
if r.fieldValues[i].val != other.fieldValues[i].val {
|
|
return false
|
|
}
|
|
}
|
|
return true
|
|
}
|
|
|
|
func (r *Row) UpdateFieldValue(newRow *Row, col int, agg AggregateBase) {
|
|
agg.Update(r.fieldValues[col], newRow.fieldValues[col])
|
|
}
|
|
|
|
func (r *Row) ToString() string {
|
|
var builder strings.Builder
|
|
builder.WriteString("agg-row:")
|
|
for _, fv := range r.fieldValues {
|
|
fmt.Fprintf(&builder, "%v,", fv.val)
|
|
}
|
|
return builder.String()
|
|
}
|
|
|
|
func NewRow(fieldValues []*FieldValue) *Row {
|
|
return &Row{fieldValues: fieldValues}
|
|
}
|
|
|
|
type Bucket struct {
|
|
rows []*Row
|
|
}
|
|
|
|
func (bucket *Bucket) AddRow(row *Row) {
|
|
bucket.rows = append(bucket.rows, row)
|
|
}
|
|
|
|
func (bucket *Bucket) RowAt(idx int) *Row {
|
|
return bucket.rows[idx]
|
|
}
|
|
|
|
func (bucket *Bucket) RowCount() int {
|
|
return len(bucket.rows)
|
|
}
|
|
|
|
func (bucket *Bucket) Accumulate(row *Row, idx int, keyCount int, aggs []AggregateBase) error {
|
|
if idx >= len(bucket.rows) || idx < 0 {
|
|
return merr.WrapErrParameterInvalidMsg("wrong idx:%d for bucket", idx)
|
|
}
|
|
targetRow := bucket.rows[idx]
|
|
if targetRow == nil {
|
|
return merr.WrapErrServiceInternalMsg("nil row at the target idx:%d, cannot accumulate the row", idx)
|
|
}
|
|
if row.ColumnCount() != targetRow.ColumnCount() {
|
|
return merr.WrapErrParameterInvalidMsg("column count:%d in the row must be equal to the target row:%d", row.ColumnCount(), bucket.rows[idx].ColumnCount())
|
|
}
|
|
if row.ColumnCount() != keyCount+len(aggs) {
|
|
return merr.WrapErrParameterInvalidMsg("column count:%d in the row must be sum of keyCount:%d and the number of aggs:%d", row.ColumnCount(), keyCount, len(aggs))
|
|
}
|
|
for col := keyCount; col < row.ColumnCount(); col++ {
|
|
targetRow.UpdateFieldValue(row, col, aggs[col-keyCount])
|
|
}
|
|
return nil
|
|
}
|
|
|
|
const NONE int = -1
|
|
|
|
func (bucket *Bucket) Find(row *Row, keyCount int) int {
|
|
for idx, existingRow := range bucket.rows {
|
|
if existingRow.Equal(row, keyCount) {
|
|
return idx
|
|
}
|
|
}
|
|
return NONE
|
|
}
|
|
|
|
func NewBucket() *Bucket {
|
|
return &Bucket{rows: make([]*Row, 0, 1)}
|
|
}
|