fix

Author: akuzm

tsl/src/nodes/vector_agg/exec.c

@@ -544,7 +544,7 @@ vector_slot_evaluate_case(DecompressContext *dcontext, TupleTableSlot *slot,
 											slot,
 											branch_filter,
 											value_expression,
-											branch_filter == batch_state->vector_qual_result ?
+											branch_filter == top_filter ?
 												expr_cache :
 												NULL);
 
@@ -665,8 +665,6 @@ vector_slot_evaluate_expression(DecompressContext *dcontext, TupleTableSlot *slo
 		 * broader result is safe to cache, because it has the correct values
 		 * for all rows of a narrower result.
 		 */
-		Assert(filter == ((const DecompressBatchState *) slot)->vector_qual_result);
-
 		cache_entry = expr_cache_lookup(expr_cache, (Expr *) argument);
 	}
 

tsl/test/expected/vector_agg_expr.out

@@ -2114,6 +2114,12 @@ select sum((b = (i > 0))::int), count(b = (i > 0)) from aggexpr;
 -----+-------
  814 |  5421
 
+-- Multiple qual evaluation with caching.
+select sum(abs(v - 500)), count(abs(v - 500)) from aggexpr where abs(v) > 3 AND abs(v) < 9;
+  sum  | count 
+-------+-------
+ 14820 |    30
+
 reset timescaledb.debug_require_vector_agg;
 reset timescaledb.enable_vectorized_aggregation;
 -- Some CASE statements are vectorized.

tsl/test/sql/vector_agg_expr.sql

@@ -222,6 +222,9 @@ select sum(abs(v - 500)), count(abs(v - 500)), min(abs(v - 500)) from aggexpr;
 -- the int4 cast consumes it via compressed_columns_to_postgres_data.
 select sum((b = (i > 0))::int), count(b = (i > 0)) from aggexpr;
 
+-- Multiple qual evaluation with caching.
+select sum(abs(v - 500)), count(abs(v - 500)) from aggexpr where abs(v) > 3 AND abs(v) < 9;
+
 reset timescaledb.debug_require_vector_agg;
 reset timescaledb.enable_vectorized_aggregation;