(cloudberry) 13/22: Fix another flaky aggregates ICW test (#15895)

[yjhjstz]

This is an automated email from the ASF dual-hosted git repository.

yjhjstz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry.git

commit b6c7dbd5caca56420e9b4c2efa72fa2f78f4b319
Author: Chris Hajas <cha...@vmware.com>
AuthorDate: Fri Jun 30 11:50:19 2023 -0700

    Fix another flaky aggregates ICW test (#15895)
    
    Sometimes these prepared statements would be replanned and log ORCA
    fallbacks, which are expected and ok. However, to make this more
    deterministic, reset the plan cache in the test. Hopefully this is the
    last one...
    
    This uses the same approach as dee8ee04909f03e0aaa1e3def7c6fea4ab11778a
    and 8fa789e0cde3d6a6c158d6420fdd9c95603b2fd4
---
 src/test/regress/expected/aggregates.out           | 1 +
 src/test/regress/expected/aggregates_optimizer.out | 1 +
 src/test/regress/sql/aggregates.sql                | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/test/regress/expected/aggregates.out 
b/src/test/regress/expected/aggregates.out
index b14f0c25ae..e37086c15f 100644
--- a/src/test/regress/expected/aggregates.out
+++ b/src/test/regress/expected/aggregates.out
@@ -2834,6 +2834,7 @@ create aggregate my_half_sum(int4)
    sfunc = sum_transfn,
    finalfunc = halfsum_finalfn
 );
+discard plans;
 -- Agg state should be shared even though my_sum has no finalfn
 select my_sum(one),my_half_sum(one) from (values(1),(2),(3),(4)) t(one);
 NOTICE:  sum_transfn called with 1
diff --git a/src/test/regress/expected/aggregates_optimizer.out 
b/src/test/regress/expected/aggregates_optimizer.out
index b3cdac99b4..706baf06ec 100644
--- a/src/test/regress/expected/aggregates_optimizer.out
+++ b/src/test/regress/expected/aggregates_optimizer.out
@@ -3123,6 +3123,7 @@ create aggregate my_half_sum(int4)
    sfunc = sum_transfn,
    finalfunc = halfsum_finalfn
 );
+discard plans;
 -- Agg state should be shared even though my_sum has no finalfn
 select my_sum(one),my_half_sum(one) from (values(1),(2),(3),(4)) t(one);
 INFO:  GPORCA failed to produce a plan, falling back to planner
diff --git a/src/test/regress/sql/aggregates.sql 
b/src/test/regress/sql/aggregates.sql
index 3462ccd532..e376c0681d 100644
--- a/src/test/regress/sql/aggregates.sql
+++ b/src/test/regress/sql/aggregates.sql
@@ -1168,6 +1168,7 @@ create aggregate my_half_sum(int4)
    finalfunc = halfsum_finalfn
 );
 
+discard plans;
 -- Agg state should be shared even though my_sum has no finalfn
 select my_sum(one),my_half_sum(one) from (values(1),(2),(3),(4)) t(one);
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cloudberry.apache.org
For additional commands, e-mail: commits-h...@cloudberry.apache.org