Add supported query plan version properly

Author: fionaliao

pkg/streamingpromql/operators/functions/factories.go

@@ -561,11 +561,6 @@ type FunctionMetadata struct {
 	SplittableOperatorFactory SplittableOperatorFactory
 }
 
-type SplittableMetadata struct {
-	Definition     FunctionOverRangeVectorDefinition
-	OperatorFactor SplittableOperatorFactory
-}
-
 func RegisterFunction(function Function, name string, returnType parser.ValueType, factory FunctionOperatorFactory) error {
 	return RegisterFunctionWithSplitFactory(function, name, returnType, factory, nil)
 }

pkg/streamingpromql/operators/functions/split_operator.go

@@ -468,6 +468,7 @@ func (m *FunctionOverRangeVectorSplit[T]) Finalize(ctx context.Context) error {
 		"inner_cache_key", m.innerCacheKey,
 		"query_start_ms", m.queryTimeRange.StartT,
 		"query_end_ms", m.queryTimeRange.EndT,
+		"inner_describe", m.innerNode.Describe(),
 		"splits_total", len(m.splits),
 		"splits_cached", cachedCount,
 		"splits_uncached", uncachedCount,

pkg/streamingpromql/optimize/plan/querysplitting/node.go

@@ -129,7 +129,8 @@ func (s *SplittableFunctionCall) ExpressionPosition() (posrange.PositionRange, e
 }
 
 func (s *SplittableFunctionCall) MinimumRequiredPlanVersion() planning.QueryPlanVersion {
-	return s.Inner.MinimumRequiredPlanVersion()
+	// Query splitting with intermediate result caching requires QueryPlanV5
+	return planning.QueryPlanV5
 }
 
 type Materializer struct {

pkg/streamingpromql/optimize/plan/querysplitting/optimization_pass.go

@@ -65,6 +65,10 @@ func (o *OptimizationPass) Name() string {
 }
 
 func (o *OptimizationPass) Apply(ctx context.Context, plan *planning.QueryPlan, maximumSupportedQueryPlanVersion planning.QueryPlanVersion) (*planning.QueryPlan, error) {
+	if maximumSupportedQueryPlanVersion < planning.QueryPlanV5 {
+		return plan, nil
+	}
+
 	var err error
 	plan.Root, err = o.wrapSplittableRangeVectorFunctions(plan.Root, plan.Parameters.TimeRange)
 	if err != nil {

pkg/streamingpromql/planning/plan.go

@@ -29,7 +29,7 @@ func (v QueryPlanVersion) String() string {
 	return strconv.FormatUint(uint64(v), 10)
 }
 
-var MaximumSupportedQueryPlanVersion = QueryPlanV4
+var MaximumSupportedQueryPlanVersion = QueryPlanV5
 
 // IMPORTANT:
 // Do not change the value or meaning of these constants once they have been merged.
@@ -52,6 +52,9 @@ const QueryPlanV3 = QueryPlanVersion(3)
 // QueryPlanV4 introduces support for evaluating smoothed and anchored extended range modifiers.
 const QueryPlanV4 = QueryPlanVersion(4)
 
+// QueryPlanV5 introduces support for query splitting with intermediate result caching.
+const QueryPlanV5 = QueryPlanVersion(5)
+
 type QueryPlan struct {
 	Root       Node
 	Parameters *QueryParameters