composite promql.QueryEngine interface (#6956)

yeya24 · web-flow · commit a9a827f9eda6 · 2025-08-08T17:44:11.000-07:00
Signed-off-by: yeya24 &lt;benye@amazon.com&gt;
diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
@@ -45,8 +45,7 @@ func GetEngineType(ctx context.Context) Type {
 }
 
 type QueryEngine interface {
-	NewInstantQuery(ctx context.Context, q storage.Queryable, opts promql.QueryOpts, qs string, ts time.Time) (promql.Query, error)
-	NewRangeQuery(ctx context.Context, q storage.Queryable, opts promql.QueryOpts, qs string, start, end time.Time, interval time.Duration) (promql.Query, error)
+	promql.QueryEngine
 	MakeInstantQueryFromPlan(ctx context.Context, q storage.Queryable, opts promql.QueryOpts, root logicalplan.Node, ts time.Time, qs string) (promql.Query, error)
 	MakeRangeQueryFromPlan(ctx context.Context, q storage.Queryable, opts promql.QueryOpts, root logicalplan.Node, start time.Time, end time.Time, interval time.Duration, qs string) (promql.Query, error)
 }

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,7 @@ func GetEngineType(ctx context.Context) Type {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`type QueryEngine interface {`
`48`		`- NewInstantQuery(ctx context.Context, q storage.Queryable, opts promql.QueryOpts, qs string, ts time.Time) (promql.Query, error)`
`49`		`- NewRangeQuery(ctx context.Context, q storage.Queryable, opts promql.QueryOpts, qs string, start, end time.Time, interval time.Duration) (promql.Query, error)`
	`48`	`+ promql.QueryEngine`
`50`	`49`	`MakeInstantQueryFromPlan(ctx context.Context, q storage.Queryable, opts promql.QueryOpts, root logicalplan.Node, ts time.Time, qs string) (promql.Query, error)`
`51`	`50`	`MakeRangeQueryFromPlan(ctx context.Context, q storage.Queryable, opts promql.QueryOpts, root logicalplan.Node, start time.Time, end time.Time, interval time.Duration, qs string) (promql.Query, error)`
`52`	`51`	`}`