ThanosEngine: Only enable default optimizers (#6776)

harry671003 · web-flow · commit e8891e24a00a · 2025-06-02T12:44:18.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## master / unreleased
+* [BUGFIX] ThanosEngine: Only enable default optimizers. #6776
 * [ENHANCEMENT] Distributor: Add min/max schema validation for NativeHistograms. #6766
 * [ENHANCEMENT] Ingester: Handle runtime errors in query path #6769
 * [CHANGE] Ingester: Remove EnableNativeHistograms config flag and instead gate keep through new per-tenant limit at ingestion. #6718
diff --git a/pkg/querier/engine_factory.go b/pkg/querier/engine_factory.go
@@ -26,7 +26,7 @@ func NewEngineFactory(opts promql.EngineOpts, enableThanosEngine bool, reg prome
 	if enableThanosEngine {
 		thanosEngine = engine.New(engine.Opts{
 			EngineOpts:        opts,
-			LogicalOptimizers: logicalplan.AllOptimizers,
+			LogicalOptimizers: logicalplan.DefaultOptimizers,
 			EnableAnalysis:    true,
 		})
 	}

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func NewEngineFactory(opts promql.EngineOpts, enableThanosEngine bool, reg prome`
`26`	`26`	`if enableThanosEngine {`
`27`	`27`	`thanosEngine = engine.New(engine.Opts{`
`28`	`28`	`EngineOpts: opts,`
`29`		`- LogicalOptimizers: logicalplan.AllOptimizers,`
	`29`	`+ LogicalOptimizers: logicalplan.DefaultOptimizers,`
`30`	`30`	`EnableAnalysis: true,`
`31`	`31`	`})`
`32`	`32`	`}`