cleanup

Author: akuzm

tsl/src/nodes/vector_agg/exec.c

@@ -738,7 +738,8 @@ vector_slot_evaluate_expression(DecompressContext *dcontext, TupleTableSlot *slo
 		case T_CaseExpr:
 		{
 			CaseExpr const *c = (CaseExpr const *) argument;
-			return vector_slot_evaluate_case(dcontext, slot, filter, c, expr_cache);
+			result = vector_slot_evaluate_case(dcontext, slot, filter, c, expr_cache);
+			break;
 		}
 		default:
 			Ensure(false,

tsl/test/expected/vector_agg_expr.out

@@ -2120,25 +2120,6 @@ select sum(abs(v - 500)), count(abs(v - 500)) from aggexpr where abs(v) > 3 AND
 -------+-------
  14820 |    30
 
--- CASE statement with cached parts
-select sum(case when i > 0 then abs(v)::int2 else length(x)::int4 end)
-from aggexpr
-where abs(v) < 10 and length(x) < 10
-;
- sum 
------
- 120
-
--- CASE statement that is itself cached
-select sum(x) from (
-    select (case when i > 0 then abs(v)::int2 else length(x)::int4 end) as x
-    from aggexpr) t
-where x > 0
-;
-   sum   
----------
- 3321885
-
 reset timescaledb.debug_require_vector_agg;
 reset timescaledb.enable_vectorized_aggregation;
 -- Some CASE statements are vectorized.
@@ -2193,6 +2174,26 @@ select count(*), case when v > 503 then x else 'something-else' end from aggexpr
      1 | 141016
      1 | 141018
 
+-- CASE statement with different types and common subexpressions. They can't
+-- actually be cached, because the evaluation context is different.
+select sum(case when i > 0 then abs(v)::int2 else length(x)::int4 end)
+from aggexpr
+where abs(v) < 10 and length(x) < 10
+;
+ sum 
+-----
+ 120
+
+-- CASE statement that is itself a common subexpression.
+select sum(x) from (
+    select (case when i > 0 then abs(v)::int2 else length(x)::int4 end) as x
+    from aggexpr) t
+where x > 0
+;
+   sum   
+---------
+ 3321885
+
 -- The short circuit semantics for CASE is not implemented at the moment.
 \set ON_ERROR_STOP 0
 select count(*), case when i = 12 then 12 else throw_on_twelve(i) end from aggexpr group by 2 order by 1, 2 limit 10;

tsl/test/sql/vector_agg_expr.sql

@@ -225,19 +225,6 @@ 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;
 
--- CASE statement with cached parts
-select sum(case when i > 0 then abs(v)::int2 else length(x)::int4 end)
-from aggexpr
-where abs(v) < 10 and length(x) < 10
-;
-
--- CASE statement that is itself cached
-select sum(x) from (
-    select (case when i > 0 then abs(v)::int2 else length(x)::int4 end) as x
-    from aggexpr) t
-where x > 0
-;
-
 reset timescaledb.debug_require_vector_agg;
 reset timescaledb.enable_vectorized_aggregation;
 
@@ -255,6 +242,20 @@ select avg(case when v > 500 then v - 500 else 500 - v end) from aggexpr group b
 
 select count(*), case when v > 503 then x else 'something-else' end from aggexpr group by 2 order by 1, 2 limit 10;
 
+-- CASE statement with different types and common subexpressions. They can't
+-- actually be cached, because the evaluation context is different.
+select sum(case when i > 0 then abs(v)::int2 else length(x)::int4 end)
+from aggexpr
+where abs(v) < 10 and length(x) < 10
+;
+
+-- CASE statement that is itself a common subexpression.
+select sum(x) from (
+    select (case when i > 0 then abs(v)::int2 else length(x)::int4 end) as x
+    from aggexpr) t
+where x > 0
+;
+
 -- The short circuit semantics for CASE is not implemented at the moment.
 \set ON_ERROR_STOP 0
 select count(*), case when i = 12 then 12 else throw_on_twelve(i) end from aggexpr group by 2 order by 1, 2 limit 10;