Arrange AQO code with current changes in PostgreSQL core.

Author: danolivo

Diff for: aqo_master.patch

@@ -11,7 +11,7 @@ index bbf220407b..8225105893 100644
  		auth_delay	\
  		auto_explain	\
 diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
-index f86983c660..452633ab0e 100644
+index a0311ce9dc..a4fa160d5a 100644
 --- a/src/backend/commands/explain.c
 +++ b/src/backend/commands/explain.c
 @@ -24,6 +24,7 @@
@@ -35,7 +35,7 @@ index f86983c660..452633ab0e 100644
 
  /* OR-able flags for ExplainXMLTag() */
  #define X_OPENING 0
-@@ -676,6 +683,10 @@ ExplainOnePlan(PlannedStmt *plannedstmt, IntoClause *into, ExplainState *es,
+@@ -660,6 +667,10 @@ ExplainOnePlan(PlannedStmt *plannedstmt, IntoClause *into, ExplainState *es,
  		ExplainPropertyFloat("Execution Time", "ms", 1000.0 * totaltime, 3,
  							 es);
 
@@ -57,7 +57,7 @@ index f86983c660..452633ab0e 100644
  	if (es->format == EXPLAIN_FORMAT_TEXT)
  		appendStringInfoChar(es->str, '\n');
 diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
-index 89d3c4352c..611f320446 100644
+index 29ae32d960..d009b161da 100644
 --- a/src/backend/optimizer/path/costsize.c
 +++ b/src/backend/optimizer/path/costsize.c
 @@ -99,6 +99,11 @@
@@ -322,7 +322,7 @@ index 89d3c4352c..611f320446 100644
  {
  	double		parallel_divisor = path->parallel_workers;
 diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
-index 66139928e8..ae8eaff77e 100644
+index cd68942af0..ab782b47ab 100644
 --- a/src/backend/optimizer/plan/createplan.c
 +++ b/src/backend/optimizer/plan/createplan.c
 @@ -70,6 +70,7 @@
@@ -353,7 +353,7 @@ index 66139928e8..ae8eaff77e 100644
 
  /*
 diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
-index e21e72eb87..3ed0c5c1d2 100644
+index 05f44faf6e..082e47332d 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);
@@ -366,7 +366,7 @@ index e21e72eb87..3ed0c5c1d2 100644
  								   grouping_sets_data *gd,
  								   List *target_list);
  static RelOptInfo *create_grouping_paths(PlannerInfo *root,
-@@ -3443,7 +3444,8 @@ standard_qp_callback(PlannerInfo *root, void *extra)
+@@ -3544,7 +3545,8 @@ standard_qp_callback(PlannerInfo *root, void *extra)
   */
  static double
  get_number_of_groups(PlannerInfo *root,
@@ -376,7 +376,7 @@ index e21e72eb87..3ed0c5c1d2 100644
  					 grouping_sets_data *gd,
  					 List *target_list)
  {
-@@ -3480,7 +3482,7 @@ get_number_of_groups(PlannerInfo *root,
+@@ -3581,7 +3583,7 @@ get_number_of_groups(PlannerInfo *root,
  					GroupingSetData *gs = lfirst_node(GroupingSetData, lc3);
  					double		numGroups = estimate_num_groups(root,
  																groupExprs,
@@ -385,7 +385,7 @@ index e21e72eb87..3ed0c5c1d2 100644
  																&gset,
  																NULL);
 
-@@ -3506,7 +3508,7 @@ get_number_of_groups(PlannerInfo *root,
+@@ -3607,7 +3609,7 @@ get_number_of_groups(PlannerInfo *root,
  					GroupingSetData *gs = lfirst_node(GroupingSetData, lc2);
  					double		numGroups = estimate_num_groups(root,
  																groupExprs,
@@ -394,8 +394,8 @@ index e21e72eb87..3ed0c5c1d2 100644
  																&gset,
  																NULL);
 
-@@ -3523,8 +3525,8 @@ get_number_of_groups(PlannerInfo *root,
- 			groupExprs = get_sortgrouplist_exprs(parse->groupClause,
+@@ -3624,8 +3626,8 @@ get_number_of_groups(PlannerInfo *root,
+ 			groupExprs = get_sortgrouplist_exprs(root->processed_groupClause,
  												 target_list);
 
 -			dNumGroups = estimate_num_groups(root, groupExprs, path_rows,
@@ -405,7 +405,7 @@ index e21e72eb87..3ed0c5c1d2 100644
  		}
  	}
  	else if (parse->groupingSets)
-@@ -3911,7 +3913,8 @@ create_ordinary_grouping_paths(PlannerInfo *root, RelOptInfo *input_rel,
+@@ -4015,7 +4017,8 @@ create_ordinary_grouping_paths(PlannerInfo *root, RelOptInfo *input_rel,
  	 * Estimate number of groups.
  	 */
  	dNumGroups = get_number_of_groups(root,
@@ -415,7 +415,7 @@ index e21e72eb87..3ed0c5c1d2 100644
  									  gd,
  									  extra->targetList);
 
-@@ -6823,13 +6826,15 @@ create_partial_grouping_paths(PlannerInfo *root,
+@@ -7115,13 +7118,15 @@ create_partial_grouping_paths(PlannerInfo *root,
  	if (cheapest_total_path != NULL)
  		dNumPartialGroups =
  			get_number_of_groups(root,
@@ -434,7 +434,7 @@ index e21e72eb87..3ed0c5c1d2 100644
  								 extra->targetList);
 
 diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c
-index 7085cf3c41..6fcbea2a8e 100644
+index 18b92336be..d56fd933d8 100644
 --- a/src/backend/optimizer/util/relnode.c
 +++ b/src/backend/optimizer/util/relnode.c
 @@ -265,6 +265,7 @@ build_simple_rel(PlannerInfo *root, int relid, RelOptInfo *parent)
@@ -453,31 +453,31 @@ index 7085cf3c41..6fcbea2a8e 100644
  	elog(ERROR, "no relation entry for relid %d", relid);
 
  	return NULL;				/* keep compiler quiet */
-@@ -680,6 +680,7 @@ build_join_rel(PlannerInfo *root,
+@@ -679,6 +679,7 @@ build_join_rel(PlannerInfo *root,
  	joinrel->all_partrels = NULL;
  	joinrel->partexprs = NULL;
  	joinrel->nullable_partexprs = NULL;
 +	joinrel->ext_nodes = NULL;
 
  	/* Compute information relevant to the foreign relations. */
  	set_foreign_rel_properties(joinrel, outer_rel, inner_rel);
-@@ -862,6 +863,7 @@ build_child_join_rel(PlannerInfo *root, RelOptInfo *outer_rel,
+@@ -858,6 +859,7 @@ build_child_join_rel(PlannerInfo *root, RelOptInfo *outer_rel,
  	joinrel->all_partrels = NULL;
  	joinrel->partexprs = NULL;
  	joinrel->nullable_partexprs = NULL;
 +	joinrel->ext_nodes = NULL;
 
  	/* Compute information relevant to foreign relations. */
  	set_foreign_rel_properties(joinrel, outer_rel, inner_rel);
-@@ -1302,6 +1304,7 @@ find_childrel_parents(PlannerInfo *root, RelOptInfo *rel)
+@@ -1298,6 +1300,7 @@ find_childrel_parents(PlannerInfo *root, RelOptInfo *rel)
  }
 
 
 +set_parampathinfo_postinit_hook_type parampathinfo_postinit_hook = NULL;
  /*
   * get_baserel_parampathinfo
   *		Get the ParamPathInfo for a parameterized path for a base relation,
-@@ -1370,6 +1373,10 @@ get_baserel_parampathinfo(PlannerInfo *root, RelOptInfo *baserel,
+@@ -1366,6 +1369,10 @@ get_baserel_parampathinfo(PlannerInfo *root, RelOptInfo *baserel,
  	ppi->ppi_req_outer = required_outer;
  	ppi->ppi_rows = rows;
  	ppi->ppi_clauses = pclauses;
@@ -488,7 +488,7 @@ index 7085cf3c41..6fcbea2a8e 100644
  	baserel->ppilist = lappend(baserel->ppilist, ppi);
 
  	return ppi;
-@@ -1595,6 +1602,10 @@ get_joinrel_parampathinfo(PlannerInfo *root, RelOptInfo *joinrel,
+@@ -1591,6 +1598,10 @@ get_joinrel_parampathinfo(PlannerInfo *root, RelOptInfo *joinrel,
  	ppi->ppi_req_outer = required_outer;
  	ppi->ppi_rows = rows;
  	ppi->ppi_clauses = NIL;
@@ -500,18 +500,18 @@ index 7085cf3c41..6fcbea2a8e 100644
 
  	return ppi;
 diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
-index 48858a871a..a6615c5210 100644
+index 4e4888dde4..5b22f65012 100644
 --- a/src/backend/utils/adt/selfuncs.c
 +++ b/src/backend/utils/adt/selfuncs.c
-@@ -144,6 +144,7 @@
+@@ -145,6 +145,7 @@
  /* Hooks for plugins to get control when we ask for stats */
  get_relation_stats_hook_type get_relation_stats_hook = NULL;
  get_index_stats_hook_type get_index_stats_hook = NULL;
 +estimate_num_groups_hook_type estimate_num_groups_hook = NULL;
 
  static double eqsel_internal(PG_FUNCTION_ARGS, bool negate);
  static double eqjoinsel_inner(Oid opfuncoid, Oid collation,
-@@ -3310,6 +3311,20 @@ add_unique_group_var(PlannerInfo *root, List *varinfos,
+@@ -3311,6 +3312,20 @@ add_unique_group_var(PlannerInfo *root, List *varinfos,
  	return varinfos;
  }
 
@@ -533,7 +533,7 @@ index 48858a871a..a6615c5210 100644
   * estimate_num_groups		- Estimate number of groups in a grouped query
   *
 diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h
-index 9ebde089ae..1519e3e6b7 100644
+index 7c1071ddd1..72e954dd3e 100644
 --- a/src/include/commands/explain.h
 +++ b/src/include/commands/explain.h
 @@ -75,6 +75,18 @@ extern PGDLLIMPORT ExplainOneQuery_hook_type ExplainOneQuery_hook;
@@ -556,10 +556,10 @@ index 9ebde089ae..1519e3e6b7 100644
  extern void ExplainQuery(ParseState *pstate, ExplainStmt *stmt,
  						 ParamListInfo params, DestReceiver *dest);
 diff --git a/src/include/nodes/pathnodes.h b/src/include/nodes/pathnodes.h
-index 654dba61aa..c0ac86b1bc 100644
+index 2d1d8f4bcd..48d60559f5 100644
 --- a/src/include/nodes/pathnodes.h
 +++ b/src/include/nodes/pathnodes.h
-@@ -997,6 +997,16 @@ typedef struct RelOptInfo
+@@ -1025,6 +1025,16 @@ typedef struct RelOptInfo
  	List	  **partexprs pg_node_attr(read_write_ignore);
  	/* Nullable partition key expressions */
  	List	  **nullable_partexprs pg_node_attr(read_write_ignore);
@@ -576,7 +576,7 @@ index 654dba61aa..c0ac86b1bc 100644
  } RelOptInfo;
 
  /*
-@@ -1467,6 +1477,10 @@ typedef struct ParamPathInfo
+@@ -1495,6 +1505,10 @@ typedef struct ParamPathInfo
  	Relids		ppi_req_outer;	/* rels supplying parameters used by path */
  	Cardinality ppi_rows;		/* estimated number of result tuples */
  	List	   *ppi_clauses;	/* join clauses available from outer rels */
@@ -588,7 +588,7 @@ index 654dba61aa..c0ac86b1bc 100644
 
 
 diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
-index bddfe86191..bedda73792 100644
+index c1234fcf36..8c77da84aa 100644
 --- a/src/include/nodes/plannodes.h
 +++ b/src/include/nodes/plannodes.h
 @@ -173,6 +173,9 @@ typedef struct Plan
@@ -602,7 +602,7 @@ index bddfe86191..bedda73792 100644
 
  /* ----------------
 diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
-index b6cc2c9cd6..ce8de270e8 100644
+index 6cf49705d3..6a96baf130 100644
 --- a/src/include/optimizer/cost.h
 +++ b/src/include/optimizer/cost.h
 @@ -41,6 +41,37 @@ typedef enum
@@ -686,7 +686,7 @@ index b6cc2c9cd6..ce8de270e8 100644
 
  #endif							/* COST_H */
 diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h
-index 050f00e79a..15a1970744 100644
+index 02305ef902..5226ddc8e8 100644
 --- a/src/include/optimizer/pathnode.h
 +++ b/src/include/optimizer/pathnode.h
 @@ -18,6 +18,10 @@
@@ -701,7 +701,7 @@ index 050f00e79a..15a1970744 100644
   * prototypes for pathnode.c
   */
 diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
-index 9dffdcfd1e..78d58b7d45 100644
+index 95ecefdade..a732d24fb6 100644
 --- a/src/include/optimizer/planmain.h
 +++ b/src/include/optimizer/planmain.h
 @@ -24,6 +24,12 @@ extern PGDLLIMPORT double cursor_tuple_fraction;
@@ -718,7 +718,7 @@ index 9dffdcfd1e..78d58b7d45 100644
   * prototypes for plan/planmain.c
   */
 diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h
-index 8f3d73edfb..91537e2325 100644
+index 2f76c473db..98b9a95d0f 100644
 --- a/src/include/utils/selfuncs.h
 +++ b/src/include/utils/selfuncs.h
 @@ -144,6 +144,13 @@ typedef bool (*get_index_stats_hook_type) (PlannerInfo *root,

Diff for: expected/look_a_like.out

@@ -72,7 +72,6 @@ SELECT x, sum(x) FROM A,B WHERE y = 5 AND A.x = B.y group by(x);') AS str
  GroupAggregate (actual rows=1 loops=1)
    AQO not used
    Output: a.x, sum(a.x)
-   Group Key: a.x
    ->  Nested Loop (actual rows=10000 loops=1)
          AQO: rows=10000, error=0%
          Output: a.x
@@ -89,7 +88,7 @@ SELECT x, sum(x) FROM A,B WHERE y = 5 AND A.x = B.y group by(x);') AS str
  Using aqo: true
  AQO mode: LEARN
  JOINS: 1
-(20 rows)
+(19 rows)
 
 -- cardinality 100 in the first Seq Scan on a
 SELECT str AS result
@@ -100,7 +99,6 @@ SELECT x, sum(x) FROM A WHERE x = 5 group by(x);') AS str;
  GroupAggregate (actual rows=1 loops=1)
    AQO not used
    Output: x, sum(x)
-   Group Key: a.x
    ->  Seq Scan on public.a (actual rows=100 loops=1)
          AQO: rows=100, error=0%
          Output: x
@@ -109,7 +107,7 @@ SELECT x, sum(x) FROM A WHERE x = 5 group by(x);') AS str;
  Using aqo: true
  AQO mode: LEARN
  JOINS: 0
-(12 rows)
+(11 rows)
 
 -- no one predicted rows. we use knowledge cardinalities of the query
 -- in the next queries with the same fss_hash

Diff for: regress_schedule

@@ -12,8 +12,6 @@ test: unsupported
 test: clean_aqo_data
 test: parallel_workers
 test: plancache
-# Performance-dependent test. Can be ignored if executes in containers or on slow machines
-ignore: statement_timeout
 test: statement_timeout
 test: temp_tables
 test: top_queries

Diff for: t/002_pg_stat_statements_aqo.pl

@@ -100,7 +100,7 @@
 	SELECT count(*) FROM pg_stat_statements
 	WHERE queryid NOT IN (SELECT queryid FROM aqo_query_texts)
 "); # Trivial select and utility query to pg_stat_statements
-is($res, 2);
+is($res, 3);
 
 $node->safe_psql('postgres', "
 	SELECT * FROM trig WHERE sinx < 0.5 and cosx > -0.5
@@ -113,13 +113,13 @@
 	SELECT count(*) FROM aqo_query_texts aqt, pg_stat_statements pgss
 	WHERE aqt.queryid = pgss.queryid
 ");
-is($res, 4);
+is($res, 2);
 
 $res = $node->safe_psql('postgres', "
 	SELECT count(*) FROM pg_stat_statements
 	WHERE queryid NOT IN (SELECT queryid FROM aqo_query_texts)
 "); # pgss logs queries to AQO tables these AQO are skip
-is($res, 4);
+is($res, 6);
 $res = $node->safe_psql('postgres', "
 	SELECT count(*) FROM aqo_queries
 	WHERE queryid NOT IN (SELECT queryid FROM pg_stat_statements)
@@ -162,7 +162,7 @@
 	SELECT count(*) FROM aqo_query_texts aqt, pg_stat_statements pgss
 	WHERE aqt.queryid = pgss.queryid
 "); # Check, both extensions added the query with the same query ID.
-is($res, 8);
+is($res, 6);
 
 # Check query texts identity.
 # TODO: Maybe AQO should use parameterized query text too?
@@ -171,13 +171,13 @@
 	FROM aqo_query_texts aqt, pg_stat_statements pgss
 	WHERE aqt.queryid = pgss.queryid AND aqt.query_text != pgss.query
 "); # PGSS processes a query and generalizes it. So, some queries is diferent
-is($res, 6);
+is($res, 5);
 $res = $node->safe_psql('postgres', "
 	SELECT count(*)
 	FROM aqo_query_texts aqt, pg_stat_statements pgss
 	WHERE aqt.queryid = pgss.queryid AND aqt.query_text = pgss.query
 "); # Non-parameterized queries (without constants in a body of query) will have the same query text.
-is($res, 2);
+is($res, 1);
 
 # Check queries hasn't logged by another extension
 
@@ -186,7 +186,7 @@
 	WHERE queryid NOT IN (SELECT queryid FROM aqo_queries)
 		AND query NOT LIKE '%aqo_quer%'
 "); # PGSS logs all the same except queries with AQO-related objects.
-is($res, 1); # allow to find shifts in PGSS logic
+is($res, 3); # allow to find shifts in PGSS logic
 
 # TODO: why queries in EXPLAIN ANALYZE mode have different query ID in AQO
 # and PGSS extensions?