Add compute_query_id parameter in aqo configure with value as regress.

It is necessary for avoiding output Query Identifier while vanille's test are running.

(Look at more in explain.c:612.
We can get fail condition if only query identifier is not null)

Where clause 'NOT LIKE '%Query Identifier%'' is throwed away due to being necessary any more.
This addition parameter is appeared if we set compute_query_id parameter with value as 'auto'.
Appearance of the parameter is checked in only gucs test.

a.lepikhov: cherry-picked this commit down to stable13 just to have as
synchronized as possible versions of the branches.

Author: Alena Rybakina

aqo.conf

@@ -2,3 +2,4 @@ autovacuum = off
 shared_preload_libraries = 'postgres_fdw, aqo'
 max_parallel_maintenance_workers = 1 # switch off parallel workers because of unsteadiness
 aqo.wide_search = 'on'
+

aqo_pg13.patch

@@ -57,7 +57,7 @@ index bc05c96b4c..b6a3abe0d2 100644
  	if (es->format == EXPLAIN_FORMAT_TEXT)
  		appendStringInfoChar(es->str, '\n');
 diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
-index 682b28ed72..3a5c615deb 100644
+index 692b6c1559..580d04d784 100644
 --- a/src/backend/nodes/copyfuncs.c
 +++ b/src/backend/nodes/copyfuncs.c
 @@ -132,6 +132,7 @@ CopyPlanFields(const Plan *from, Plan *newnode)
@@ -69,7 +69,7 @@ index 682b28ed72..3a5c615deb 100644
 
  /*
 diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
-index 7237b52e96..5e2ee2732a 100644
+index 21ececf0c2..a0e7a7ebca 100644
 --- a/src/backend/nodes/outfuncs.c
 +++ b/src/backend/nodes/outfuncs.c
 @@ -342,6 +342,7 @@ _outPlanInfo(StringInfo str, const Plan *node)
@@ -81,7 +81,7 @@ index 7237b52e96..5e2ee2732a 100644
 
  /*
 diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
-index 62c945b6c5..a39046ca56 100644
+index 7976b369ba..604314e0b3 100644
 --- a/src/backend/nodes/readfuncs.c
 +++ b/src/backend/nodes/readfuncs.c
 @@ -1580,6 +1580,11 @@ ReadCommonPlan(Plan *local_node)
@@ -394,7 +394,7 @@ index 917713c163..5b7bf1cec6 100644
 
  /*
 diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
-index 60e7fda6a9..5732c7a685 100644
+index 27c665ac12..f599fba755 100644
 --- a/src/backend/optimizer/plan/planner.c
 +++ b/src/backend/optimizer/plan/planner.c
 @@ -145,7 +145,8 @@ static List *extract_rollup_sets(List *groupingSets);
@@ -407,7 +407,7 @@ index 60e7fda6a9..5732c7a685 100644
  								   grouping_sets_data *gd,
  								   List *target_list);
  static RelOptInfo *create_grouping_paths(PlannerInfo *root,
-@@ -3682,7 +3683,8 @@ standard_qp_callback(PlannerInfo *root, void *extra)
+@@ -3686,7 +3687,8 @@ standard_qp_callback(PlannerInfo *root, void *extra)
   */
  static double
  get_number_of_groups(PlannerInfo *root,
@@ -417,7 +417,7 @@ index 60e7fda6a9..5732c7a685 100644
  					 grouping_sets_data *gd,
  					 List *target_list)
  {
-@@ -3719,7 +3721,7 @@ get_number_of_groups(PlannerInfo *root,
+@@ -3723,7 +3725,7 @@ get_number_of_groups(PlannerInfo *root,
  					GroupingSetData *gs = lfirst_node(GroupingSetData, lc2);
  					double		numGroups = estimate_num_groups(root,
  																groupExprs,
@@ -426,7 +426,7 @@ index 60e7fda6a9..5732c7a685 100644
  																&gset);
 
  					gs->numGroups = numGroups;
-@@ -3744,7 +3746,7 @@ get_number_of_groups(PlannerInfo *root,
+@@ -3748,7 +3750,7 @@ get_number_of_groups(PlannerInfo *root,
  					GroupingSetData *gs = lfirst_node(GroupingSetData, lc2);
  					double		numGroups = estimate_num_groups(root,
  																groupExprs,
@@ -435,7 +435,7 @@ index 60e7fda6a9..5732c7a685 100644
  																&gset);
 
  					gs->numGroups = numGroups;
-@@ -3760,8 +3762,8 @@ get_number_of_groups(PlannerInfo *root,
+@@ -3764,8 +3766,8 @@ get_number_of_groups(PlannerInfo *root,
  			groupExprs = get_sortgrouplist_exprs(parse->groupClause,
  												 target_list);
 
@@ -446,7 +446,7 @@ index 60e7fda6a9..5732c7a685 100644
  		}
  	}
  	else if (parse->groupingSets)
-@@ -4147,7 +4149,8 @@ create_ordinary_grouping_paths(PlannerInfo *root, RelOptInfo *input_rel,
+@@ -4151,7 +4153,8 @@ create_ordinary_grouping_paths(PlannerInfo *root, RelOptInfo *input_rel,
  	 * Estimate number of groups.
  	 */
  	dNumGroups = get_number_of_groups(root,
@@ -456,7 +456,7 @@ index 60e7fda6a9..5732c7a685 100644
  									  gd,
  									  extra->targetList);
 
-@@ -6931,13 +6934,15 @@ create_partial_grouping_paths(PlannerInfo *root,
+@@ -6935,13 +6938,15 @@ create_partial_grouping_paths(PlannerInfo *root,
  	if (cheapest_total_path != NULL)
  		dNumPartialGroups =
  			get_number_of_groups(root,
@@ -541,7 +541,7 @@ index a203e6f1ff..d31bf5bae6 100644
 
  	return ppi;
 diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
-index 821844ada3..85b2482114 100644
+index 37458da096..248a1875a1 100644
 --- a/src/backend/utils/adt/selfuncs.c
 +++ b/src/backend/utils/adt/selfuncs.c
 @@ -147,6 +147,7 @@
@@ -635,18 +635,15 @@ index 5ebf070979..5b2acd7de2 100644
 
 
 diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
-index 90f02ce6fd..f3e2138ee2 100644
+index 90f02ce6fd..88c332164d 100644
 --- a/src/include/nodes/plannodes.h
 +++ b/src/include/nodes/plannodes.h
-@@ -159,6 +159,12 @@ typedef struct Plan
+@@ -159,6 +159,9 @@ typedef struct Plan
  	 */
  	Bitmapset  *extParam;
  	Bitmapset  *allParam;
 +
-+	/*
-+	 * Additional fields for an extension purposes.
-+	 * TODO: allow to serialize/deserialize this list.
-+	 */
++	/* Additional field for an extension purposes. */
 +	List		*ext_nodes;
  } Plan;
 

expected/aqo_fdw.out

@@ -54,14 +54,11 @@ SELECT x FROM frgn;
 (5 rows)
 
 -- Push down base filters. Use verbose mode to see filters.
-EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, VERBOSE))
-SELECT x FROM frgn WHERE x < 10;
-ERROR:  syntax error at or near ")"
-LINE 1: ...LAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, VERBOSE))
-                                                                      ^
-EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, VERBOSE)
-SELECT x FROM frgn WHERE x < 10;
-                        QUERY PLAN                         
+SELECT str FROM expln('
+  EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, VERBOSE)
+    SELECT x FROM frgn WHERE x < 10;
+') AS str;
+                            str                            
 -----------------------------------------------------------
  Foreign Scan on public.frgn (actual rows=1 loops=1)
    AQO not used
@@ -72,6 +69,21 @@ SELECT x FROM frgn WHERE x < 10;
  JOINS: 0
 (7 rows)
 
+SELECT str FROM expln('
+  EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, VERBOSE)
+    SELECT x FROM frgn WHERE x < 10;
+') AS str;
+                            str                            
+-----------------------------------------------------------
+ Foreign Scan on public.frgn (actual rows=1 loops=1)
+   AQO: rows=1, error=0%
+   Output: x
+   Remote SQL: SELECT x FROM public.local WHERE ((x < 10))
+ Using aqo: true
+ AQO mode: LEARN
+ JOINS: 0
+(7 rows)
+
 EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF)
 SELECT x FROM frgn WHERE x < -10; -- AQO ignores constants
                   QUERY PLAN                  
@@ -98,10 +110,12 @@ SELECT str FROM expln('
  JOINS: 0
 (6 rows)
 
--- TODO: Should learn on postgres_fdw nodes
-EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, VERBOSE)
-  SELECT * FROM frgn AS a, frgn AS b WHERE a.x=b.x;
-                                               QUERY PLAN                                               
+-- Should learn on postgres_fdw nodes
+SELECT str FROM expln('
+  EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, VERBOSE)
+    SELECT * FROM frgn AS a, frgn AS b WHERE a.x=b.x;
+') AS str;
+                                                  str                                                   
 --------------------------------------------------------------------------------------------------------
  Foreign Scan (actual rows=1 loops=1)
    AQO: rows=1, error=0%
@@ -246,9 +260,11 @@ SELECT * FROM frgn AS a, frgn AS b WHERE a.x<b.x;
  JOINS: 0
 (6 rows)
 
-EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, VERBOSE)
-SELECT * FROM frgn AS a, frgn AS b WHERE a.x<b.x;
-                                               QUERY PLAN                                               
+SELECT str FROM expln('
+  EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, VERBOSE)
+    SELECT * FROM frgn AS a, frgn AS b WHERE a.x<b.x;
+') AS str;
+                                                  str                                                   
 --------------------------------------------------------------------------------------------------------
  Foreign Scan (actual rows=0 loops=1)
    AQO: rows=1, error=100%

expected/gucs.out

@@ -1,4 +1,12 @@
 CREATE EXTENSION aqo;
+-- Utility tool. Allow to filter system-dependent strings from an explain output.
+CREATE OR REPLACE FUNCTION expln(query_string text) RETURNS SETOF text AS $$
+BEGIN
+    RETURN QUERY
+        EXECUTE format('%s', query_string);
+    RETURN;
+END;
+$$ LANGUAGE PLPGSQL;
 SET aqo.join_threshold = 0;
 SET aqo.mode = 'learn';
 SET aqo.show_details = true;
@@ -12,9 +20,12 @@ SELECT true FROM aqo_reset(); -- Remember! DROP EXTENSION doesn't remove any AQO
 (1 row)
 
 -- Check AQO addons to explain (the only stable data)
-EXPLAIN (ANALYZE, VERBOSE, COSTS OFF, TIMING OFF, SUMMARY OFF)
-	SELECT x FROM t;
-                   QUERY PLAN                   
+SELECT regexp_replace(
+        str,'Query Identifier: -?\m\d+\M','Query Identifier: N','g') as str FROM expln('
+  EXPLAIN (ANALYZE, VERBOSE, COSTS OFF, TIMING OFF, SUMMARY OFF)
+    SELECT x FROM t;
+') AS str;
+                      str                       
 ------------------------------------------------
  Seq Scan on public.t (actual rows=100 loops=1)
    AQO not used
@@ -24,9 +35,12 @@ EXPLAIN (ANALYZE, VERBOSE, COSTS OFF, TIMING OFF, SUMMARY OFF)
  JOINS: 0
 (6 rows)
 
-EXPLAIN (ANALYZE, VERBOSE, COSTS OFF, TIMING OFF, SUMMARY OFF)
-	SELECT x FROM t;
-                   QUERY PLAN                   
+SELECT regexp_replace(
+        str,'Query Identifier: -?\m\d+\M','Query Identifier: N','g') as str FROM expln('
+  EXPLAIN (ANALYZE, VERBOSE, COSTS OFF, TIMING OFF, SUMMARY OFF)
+    SELECT x FROM t;
+') AS str;
+                      str                       
 ------------------------------------------------
  Seq Scan on public.t (actual rows=100 loops=1)
    AQO: rows=100, error=0%

expected/unsupported.out

@@ -1,4 +1,12 @@
 CREATE EXTENSION aqo;
+-- Utility tool. Allow to filter system-dependent strings from an explain output.
+CREATE OR REPLACE FUNCTION expln(query_string text) RETURNS SETOF text AS $$
+BEGIN
+  RETURN QUERY
+    EXECUTE format('%s', query_string);
+  RETURN;
+END;
+$$ LANGUAGE PLPGSQL;
 SET aqo.join_threshold = 0;
 SET aqo.mode = 'learn';
 SET aqo.show_details = 'on';
@@ -484,17 +492,6 @@ SELECT * FROM
 -- any prediction on number of fetched tuples.
 -- So, if selectivity was wrong we could make bad choice of Scan operation.
 -- For example, we could choose suboptimal index.
---
--- Returns string-by-string explain of a query. Made for removing some strings
--- from the explain output.
---
-CREATE OR REPLACE FUNCTION expln(query_string text) RETURNS SETOF text AS $$
-BEGIN
-    RETURN QUERY
-        EXECUTE format('EXPLAIN (ANALYZE, VERBOSE, COSTS OFF, TIMING OFF, SUMMARY OFF) %s', query_string);
-    RETURN;
-END;
-$$ LANGUAGE PLPGSQL;
 -- Turn off statistics gathering for simple demonstration of filtering problem.
 ALTER TABLE t SET (autovacuum_enabled = 'false');
 CREATE INDEX ind1 ON t(x);
@@ -530,10 +527,11 @@ SELECT count(*) FROM t WHERE x < 3 AND mod(x,3) = 1;
     50
 (1 row)
 
-SELECT str AS result
-FROM expln('SELECT count(*) FROM t WHERE x < 3 AND mod(x,3) = 1') AS str
+SELECT str FROM expln('
+  EXPLAIN (ANALYZE, VERBOSE, COSTS OFF, SUMMARY OFF, TIMING OFF)
+    SELECT count(*) FROM t WHERE x < 3 AND mod(x,3) = 1') AS str
 WHERE str NOT LIKE '%Heap Blocks%';
-                             result                              
+                               str                               
 -----------------------------------------------------------------
  Aggregate (actual rows=1 loops=1)
    AQO not used

preprocessing.c

@@ -67,7 +67,6 @@
 #include "preprocessing.h"
 #include "storage.h"
 
-
 /* List of feature spaces, that are processing in this backend. */
 List *cur_classes = NIL;
 

sql/aqo_fdw.sql

@@ -44,10 +44,14 @@ EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF)
 SELECT x FROM frgn;
 
 -- Push down base filters. Use verbose mode to see filters.
-EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, VERBOSE))
-SELECT x FROM frgn WHERE x < 10;
-EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, VERBOSE)
-SELECT x FROM frgn WHERE x < 10;
+SELECT str FROM expln('
+  EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, VERBOSE)
+    SELECT x FROM frgn WHERE x < 10;
+') AS str;
+SELECT str FROM expln('
+  EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, VERBOSE)
+    SELECT x FROM frgn WHERE x < 10;
+') AS str;
 EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF)
 SELECT x FROM frgn WHERE x < -10; -- AQO ignores constants
 
@@ -57,9 +61,11 @@ SELECT str FROM expln('
   SELECT * FROM frgn AS a, frgn AS b WHERE a.x=b.x;
 ') AS str WHERE str NOT LIKE '%Sort Method%';
 
--- TODO: Should learn on postgres_fdw nodes
-EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, VERBOSE)
-  SELECT * FROM frgn AS a, frgn AS b WHERE a.x=b.x;
+-- Should learn on postgres_fdw nodes
+SELECT str FROM expln('
+  EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, VERBOSE)
+    SELECT * FROM frgn AS a, frgn AS b WHERE a.x=b.x;
+') AS str;
 
 CREATE TABLE local_a(aid int primary key, aval text);
 CREATE TABLE local_b(bid int primary key, aid int references local_a(aid), bval text);
@@ -130,8 +136,10 @@ reset enable_partitionwise_join;
 -- TODO: Non-mergejoinable join condition.
 EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF)
 SELECT * FROM frgn AS a, frgn AS b WHERE a.x<b.x;
-EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, VERBOSE)
-SELECT * FROM frgn AS a, frgn AS b WHERE a.x<b.x;
+SELECT str FROM expln('
+  EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF, VERBOSE)
+    SELECT * FROM frgn AS a, frgn AS b WHERE a.x<b.x;
+') AS str;
 
 DROP EXTENSION aqo CASCADE;
 DROP EXTENSION postgres_fdw CASCADE;

sql/gucs.sql

@@ -1,6 +1,15 @@
 CREATE EXTENSION aqo;
-SET aqo.join_threshold = 0;
 
+-- Utility tool. Allow to filter system-dependent strings from an explain output.
+CREATE OR REPLACE FUNCTION expln(query_string text) RETURNS SETOF text AS $$
+BEGIN
+    RETURN QUERY
+        EXECUTE format('%s', query_string);
+    RETURN;
+END;
+$$ LANGUAGE PLPGSQL;
+
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'learn';
 SET aqo.show_details = true;
 
@@ -10,10 +19,16 @@ ANALYZE t;
 
 SELECT true FROM aqo_reset(); -- Remember! DROP EXTENSION doesn't remove any AQO data gathered.
 -- Check AQO addons to explain (the only stable data)
-EXPLAIN (ANALYZE, VERBOSE, COSTS OFF, TIMING OFF, SUMMARY OFF)
-	SELECT x FROM t;
-EXPLAIN (ANALYZE, VERBOSE, COSTS OFF, TIMING OFF, SUMMARY OFF)
-	SELECT x FROM t;
+SELECT regexp_replace(
+        str,'Query Identifier: -?\m\d+\M','Query Identifier: N','g') as str FROM expln('
+  EXPLAIN (ANALYZE, VERBOSE, COSTS OFF, TIMING OFF, SUMMARY OFF)
+    SELECT x FROM t;
+') AS str;
+SELECT regexp_replace(
+        str,'Query Identifier: -?\m\d+\M','Query Identifier: N','g') as str FROM expln('
+  EXPLAIN (ANALYZE, VERBOSE, COSTS OFF, TIMING OFF, SUMMARY OFF)
+    SELECT x FROM t;
+') AS str;
 SET aqo.mode = 'disabled';
 
 -- Check existence of the interface functions.