Arrange the code with current PG master - 2

Author: danolivo

aqo.h

@@ -282,9 +282,8 @@ extern double predict_for_relation(List *restrict_clauses, List *selectivities,
 								   List *relsigns, int *fss);
 
 /* Query execution statistics collecting hooks */
-void aqo_ExecutorStart(QueryDesc *queryDesc, int eflags);
-void aqo_ExecutorRun(QueryDesc *queryDesc, ScanDirection direction,
-					 uint64 count, bool execute_once);
+bool aqo_ExecutorStart(QueryDesc *queryDesc, int eflags);
+void aqo_ExecutorRun(QueryDesc *queryDesc, ScanDirection direction, uint64 count);
 void aqo_ExecutorEnd(QueryDesc *queryDesc);
 
 /* Automatic query tuning */

aqo_master.patch

@@ -1,16 +1,16 @@
 diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
-index 18a5af6b91..18c2ed3bfd 100644
+index 19ffcc2cacb..93934d42e30 100644
 --- a/src/backend/commands/explain.c
 +++ b/src/backend/commands/explain.c
-@@ -25,6 +25,7 @@
+@@ -27,6 +27,7 @@
  #include "nodes/extensible.h"
  #include "nodes/makefuncs.h"
  #include "nodes/nodeFuncs.h"
 +#include "optimizer/cost.h"
  #include "parser/analyze.h"
  #include "parser/parsetree.h"
  #include "rewrite/rewriteHandler.h"
-@@ -48,6 +49,12 @@ ExplainOneQuery_hook_type ExplainOneQuery_hook = NULL;
+@@ -50,6 +51,12 @@ ExplainOneQuery_hook_type ExplainOneQuery_hook = NULL;
  /* Hook for plugins to get control in explain_get_index_name() */
  explain_get_index_name_hook_type explain_get_index_name_hook = NULL;
 
@@ -21,9 +21,9 @@ index 18a5af6b91..18c2ed3bfd 100644
 +ExplainOneNode_hook_type ExplainOneNode_hook = NULL;
 +
 
- /* Instrumentation data for SERIALIZE option */
- typedef struct SerializeMetrics
-@@ -805,6 +812,10 @@ ExplainOnePlan(PlannedStmt *plannedstmt, IntoClause *into, ExplainState *es,
+ /*
+  * Various places within need to convert bytes to kilobytes.  Round these up
+@@ -815,6 +822,10 @@ ExplainOnePlan(PlannedStmt *plannedstmt, CachedPlan *cplan,
  		ExplainPropertyFloat("Execution Time", "ms", 1000.0 * totaltime, 3,
  							 es);
 
@@ -34,7 +34,7 @@ index 18a5af6b91..18c2ed3bfd 100644
  	ExplainCloseGroup("Query", NULL, true, es);
  }
 
-@@ -2001,6 +2012,9 @@ ExplainNode(PlanState *planstate, List *ancestors,
+@@ -2009,6 +2020,9 @@ ExplainNode(PlanState *planstate, List *ancestors,
  		}
  	}
 
@@ -45,7 +45,7 @@ index 18a5af6b91..18c2ed3bfd 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 2bb6db1df7..ac95740598 100644
+index 256568d05a2..914f6124e67 100644
 --- a/src/backend/optimizer/path/costsize.c
 +++ b/src/backend/optimizer/path/costsize.c
 @@ -109,6 +109,11 @@
@@ -68,7 +68,7 @@ index 2bb6db1df7..ac95740598 100644
 
 
  /*
-@@ -5309,6 +5313,58 @@ approx_tuple_count(PlannerInfo *root, JoinPath *path, List *quals)
+@@ -5318,6 +5322,58 @@ approx_tuple_count(PlannerInfo *root, JoinPath *path, List *quals)
  }
 
 
@@ -127,7 +127,7 @@ index 2bb6db1df7..ac95740598 100644
  /*
   * set_baserel_size_estimates
   *		Set the size estimates for the given base relation.
-@@ -5325,19 +5381,10 @@ approx_tuple_count(PlannerInfo *root, JoinPath *path, List *quals)
+@@ -5334,19 +5390,10 @@ approx_tuple_count(PlannerInfo *root, JoinPath *path, List *quals)
  void
  set_baserel_size_estimates(PlannerInfo *root, RelOptInfo *rel)
  {
@@ -148,7 +148,7 @@ index 2bb6db1df7..ac95740598 100644
 
  	cost_qual_eval(&rel->baserestrictcost, rel->baserestrictinfo, root);
 
-@@ -5348,13 +5395,33 @@ set_baserel_size_estimates(PlannerInfo *root, RelOptInfo *rel)
+@@ -5357,13 +5404,33 @@ set_baserel_size_estimates(PlannerInfo *root, RelOptInfo *rel)
   * get_parameterized_baserel_size
   *		Make a size estimate for a parameterized scan of a base relation.
   *
@@ -184,7 +184,7 @@ index 2bb6db1df7..ac95740598 100644
  {
  	List	   *allclauses;
  	double		nrows;
-@@ -5383,6 +5450,36 @@ get_parameterized_baserel_size(PlannerInfo *root, RelOptInfo *rel,
+@@ -5392,6 +5459,36 @@ get_parameterized_baserel_size(PlannerInfo *root, RelOptInfo *rel,
   * set_joinrel_size_estimates
   *		Set the size estimates for the given join relation.
   *
@@ -221,7 +221,7 @@ index 2bb6db1df7..ac95740598 100644
   * The rel's targetlist must have been constructed already, and a
   * restriction clause list that matches the given component rels must
   * be provided.
-@@ -5402,11 +5499,11 @@ get_parameterized_baserel_size(PlannerInfo *root, RelOptInfo *rel,
+@@ -5411,11 +5508,11 @@ get_parameterized_baserel_size(PlannerInfo *root, RelOptInfo *rel,
   * build_joinrel_tlist, and baserestrictcost is not used for join rels.
   */
  void
@@ -238,7 +238,7 @@ index 2bb6db1df7..ac95740598 100644
  {
  	rel->rows = calc_joinrel_size_estimate(root,
  										   rel,
-@@ -5422,6 +5519,35 @@ set_joinrel_size_estimates(PlannerInfo *root, RelOptInfo *rel,
+@@ -5431,6 +5528,35 @@ set_joinrel_size_estimates(PlannerInfo *root, RelOptInfo *rel,
   * get_parameterized_joinrel_size
   *		Make a size estimate for a parameterized scan of a join relation.
   *
@@ -274,7 +274,7 @@ index 2bb6db1df7..ac95740598 100644
   * 'rel' is the joinrel under consideration.
   * 'outer_path', 'inner_path' are (probably also parameterized) Paths that
   *		produce the relations being joined.
-@@ -5434,11 +5560,11 @@ set_joinrel_size_estimates(PlannerInfo *root, RelOptInfo *rel,
+@@ -5443,11 +5569,11 @@ set_joinrel_size_estimates(PlannerInfo *root, RelOptInfo *rel,
   * set_joinrel_size_estimates must have been applied already.
   */
  double
@@ -291,7 +291,7 @@ index 2bb6db1df7..ac95740598 100644
  {
  	double		nrows;
 
-@@ -6153,7 +6279,7 @@ set_foreign_size_estimates(PlannerInfo *root, RelOptInfo *rel)
+@@ -6162,7 +6288,7 @@ set_foreign_size_estimates(PlannerInfo *root, RelOptInfo *rel)
  	/* Should only be applied to base relations */
  	Assert(rel->relid > 0);
 
@@ -300,7 +300,7 @@ index 2bb6db1df7..ac95740598 100644
 
  	cost_qual_eval(&rel->baserestrictcost, rel->baserestrictinfo, root);
 
-@@ -6446,7 +6572,7 @@ page_size(double tuples, int width)
+@@ -6455,7 +6581,7 @@ page_size(double tuples, int width)
   * Estimate the fraction of the work that each worker will do given the
   * number of workers budgeted for the path.
   */
@@ -310,7 +310,7 @@ index 2bb6db1df7..ac95740598 100644
  {
  	double		parallel_divisor = path->parallel_workers;
 diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
-index c13586c537..2f889570de 100644
+index 75e2b0b9036..8641c0c594a 100644
 --- a/src/backend/optimizer/plan/createplan.c
 +++ b/src/backend/optimizer/plan/createplan.c
 @@ -72,6 +72,7 @@
@@ -321,7 +321,7 @@ index c13586c537..2f889570de 100644
 
  static Plan *create_plan_recurse(PlannerInfo *root, Path *best_path,
  								 int flags);
-@@ -551,6 +552,10 @@ create_plan_recurse(PlannerInfo *root, Path *best_path, int flags)
+@@ -548,6 +549,10 @@ create_plan_recurse(PlannerInfo *root, Path *best_path, int flags)
  			break;
  	}
 
@@ -332,7 +332,7 @@ index c13586c537..2f889570de 100644
  	return plan;
  }
 
-@@ -5458,6 +5463,7 @@ copy_generic_path_info(Plan *dest, Path *src)
+@@ -5451,6 +5456,7 @@ copy_generic_path_info(Plan *dest, Path *src)
  	dest->plan_width = src->pathtarget->width;
  	dest->parallel_aware = src->parallel_aware;
  	dest->parallel_safe = src->parallel_safe;
@@ -341,10 +341,10 @@ index c13586c537..2f889570de 100644
 
  /*
 diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
-index 0f423e9684..8cd228baa1 100644
+index a4d523dcb0f..ed5cd3651f5 100644
 --- a/src/backend/optimizer/plan/planner.c
 +++ b/src/backend/optimizer/plan/planner.c
-@@ -144,7 +144,8 @@ static List *extract_rollup_sets(List *groupingSets);
+@@ -143,7 +143,8 @@ static List *extract_rollup_sets(List *groupingSets);
  static List *reorder_grouping_sets(List *groupingSets, List *sortclause);
  static void standard_qp_callback(PlannerInfo *root, void *extra);
  static double get_number_of_groups(PlannerInfo *root,
@@ -354,7 +354,7 @@ index 0f423e9684..8cd228baa1 100644
  								   grouping_sets_data *gd,
  								   List *target_list);
  static RelOptInfo *create_grouping_paths(PlannerInfo *root,
-@@ -3697,7 +3698,8 @@ standard_qp_callback(PlannerInfo *root, void *extra)
+@@ -3552,7 +3553,8 @@ standard_qp_callback(PlannerInfo *root, void *extra)
   */
  static double
  get_number_of_groups(PlannerInfo *root,
@@ -364,7 +364,7 @@ index 0f423e9684..8cd228baa1 100644
  					 grouping_sets_data *gd,
  					 List *target_list)
  {
-@@ -3734,7 +3736,7 @@ get_number_of_groups(PlannerInfo *root,
+@@ -3589,7 +3591,7 @@ get_number_of_groups(PlannerInfo *root,
  					GroupingSetData *gs = lfirst_node(GroupingSetData, lc3);
  					double		numGroups = estimate_num_groups(root,
  																groupExprs,
@@ -373,7 +373,7 @@ index 0f423e9684..8cd228baa1 100644
  																&gset,
  																NULL);
 
-@@ -3760,7 +3762,7 @@ get_number_of_groups(PlannerInfo *root,
+@@ -3615,7 +3617,7 @@ get_number_of_groups(PlannerInfo *root,
  					GroupingSetData *gs = lfirst_node(GroupingSetData, lc2);
  					double		numGroups = estimate_num_groups(root,
  																groupExprs,
@@ -382,7 +382,7 @@ index 0f423e9684..8cd228baa1 100644
  																&gset,
  																NULL);
 
-@@ -3777,8 +3779,8 @@ get_number_of_groups(PlannerInfo *root,
+@@ -3632,8 +3634,8 @@ get_number_of_groups(PlannerInfo *root,
  			groupExprs = get_sortgrouplist_exprs(root->processed_groupClause,
  												 target_list);
 
@@ -393,7 +393,7 @@ index 0f423e9684..8cd228baa1 100644
  		}
  	}
  	else if (parse->groupingSets)
-@@ -4168,7 +4170,8 @@ create_ordinary_grouping_paths(PlannerInfo *root, RelOptInfo *input_rel,
+@@ -4024,7 +4026,8 @@ create_ordinary_grouping_paths(PlannerInfo *root, RelOptInfo *input_rel,
  	 * Estimate number of groups.
  	 */
  	dNumGroups = get_number_of_groups(root,
@@ -403,7 +403,7 @@ index 0f423e9684..8cd228baa1 100644
  									  gd,
  									  extra->targetList);
 
-@@ -7405,13 +7408,15 @@ create_partial_grouping_paths(PlannerInfo *root,
+@@ -7308,13 +7311,15 @@ create_partial_grouping_paths(PlannerInfo *root,
  	if (cheapest_total_path != NULL)
  		dNumPartialGroups =
  			get_number_of_groups(root,
@@ -422,7 +422,7 @@ index 0f423e9684..8cd228baa1 100644
  								 extra->targetList);
 
 diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c
-index d7266e4cdb..7e5b771d9f 100644
+index ff507331a06..068b63b9b47 100644
 --- a/src/backend/optimizer/util/relnode.c
 +++ b/src/backend/optimizer/util/relnode.c
 @@ -286,6 +286,7 @@ build_simple_rel(PlannerInfo *root, int relid, RelOptInfo *parent)
@@ -488,18 +488,18 @@ index d7266e4cdb..7e5b771d9f 100644
 
  	return ppi;
 diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
-index 08fa6774d9..034b434773 100644
+index 5b35debc8ff..06a7bebe4f8 100644
 --- a/src/backend/utils/adt/selfuncs.c
 +++ b/src/backend/utils/adt/selfuncs.c
-@@ -146,6 +146,7 @@
+@@ -147,6 +147,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,
-@@ -3345,6 +3346,20 @@ add_unique_group_var(PlannerInfo *root, List *varinfos,
+@@ -3355,6 +3356,20 @@ add_unique_group_var(PlannerInfo *root, List *varinfos,
  	return varinfos;
  }
 
@@ -521,7 +521,7 @@ index 08fa6774d9..034b434773 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 3ab0aae78f..5a257cdb0a 100644
+index 64547bd9b9c..74792f1a8cf 100644
 --- a/src/include/commands/explain.h
 +++ b/src/include/commands/explain.h
 @@ -87,6 +87,18 @@ extern PGDLLIMPORT ExplainOneQuery_hook_type ExplainOneQuery_hook;
@@ -544,10 +544,10 @@ index 3ab0aae78f..5a257cdb0a 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 07e2415398..1413fbf03c 100644
+index fbf05322c75..8fcb1fadda6 100644
 --- a/src/include/nodes/pathnodes.h
 +++ b/src/include/nodes/pathnodes.h
-@@ -1049,6 +1049,16 @@ typedef struct RelOptInfo
+@@ -1073,6 +1073,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);
@@ -564,7 +564,7 @@ index 07e2415398..1413fbf03c 100644
  } RelOptInfo;
 
  /*
-@@ -1586,6 +1596,10 @@ typedef struct ParamPathInfo
+@@ -1615,6 +1625,10 @@ typedef struct ParamPathInfo
  	Cardinality ppi_rows;		/* estimated number of result tuples */
  	List	   *ppi_clauses;	/* join clauses available from outer rels */
  	Bitmapset  *ppi_serials;	/* set of rinfo_serial for enforced quals */
@@ -576,10 +576,10 @@ index 07e2415398..1413fbf03c 100644
 
 
 diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
-index 62cd6a6666..bb47a51ba7 100644
+index 22841211f48..7a247fa8de8 100644
 --- a/src/include/nodes/plannodes.h
 +++ b/src/include/nodes/plannodes.h
-@@ -170,6 +170,9 @@ typedef struct Plan
+@@ -218,6 +218,9 @@ typedef struct Plan
  	 */
  	Bitmapset  *extParam;
  	Bitmapset  *allParam;
@@ -590,7 +590,7 @@ index 62cd6a6666..bb47a51ba7 100644
 
  /* ----------------
 diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
-index 854a782944..9e8cde176f 100644
+index 3aa3c16e442..cf39af9a974 100644
 --- a/src/include/optimizer/cost.h
 +++ b/src/include/optimizer/cost.h
 @@ -41,6 +41,37 @@ typedef enum
@@ -674,7 +674,7 @@ index 854a782944..9e8cde176f 100644
 
  #endif							/* COST_H */
 diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h
-index 1035e6560c..27e42b2679 100644
+index 719be3897f6..dddc76fcefd 100644
 --- a/src/include/optimizer/pathnode.h
 +++ b/src/include/optimizer/pathnode.h
 @@ -18,6 +18,10 @@
@@ -689,10 +689,10 @@ index 1035e6560c..27e42b2679 100644
   * prototypes for pathnode.c
   */
 diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
-index 93137261e4..0621c27595 100644
+index 5a930199611..69d4668b801 100644
 --- a/src/include/optimizer/planmain.h
 +++ b/src/include/optimizer/planmain.h
-@@ -24,6 +24,12 @@ extern PGDLLIMPORT double cursor_tuple_fraction;
+@@ -25,6 +25,12 @@ extern PGDLLIMPORT bool enable_self_join_elimination;
  /* query_planner callback to compute query_pathkeys */
  typedef void (*query_pathkeys_callback) (PlannerInfo *root, void *extra);
 
@@ -706,10 +706,10 @@ index 93137261e4..0621c27595 100644
   * prototypes for plan/planmain.c
   */
 diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h
-index f2563ad1cb..0beac5f313 100644
+index 82ac8c6d9da..bc168ff691d 100644
 --- a/src/include/utils/selfuncs.h
 +++ b/src/include/utils/selfuncs.h
-@@ -147,6 +147,13 @@ typedef bool (*get_index_stats_hook_type) (PlannerInfo *root,
+@@ -148,6 +148,13 @@ typedef bool (*get_index_stats_hook_type) (PlannerInfo *root,
  										   AttrNumber indexattnum,
  										   VariableStatData *vardata);
  extern PGDLLIMPORT get_index_stats_hook_type get_index_stats_hook;
@@ -723,7 +723,7 @@ index f2563ad1cb..0beac5f313 100644
 
  /* Functions in selfuncs.c */
 
-@@ -213,6 +220,9 @@ extern void mergejoinscansel(PlannerInfo *root, Node *clause,
+@@ -214,6 +221,9 @@ extern void mergejoinscansel(PlannerInfo *root, Node *clause,
  							 Selectivity *leftstart, Selectivity *leftend,
  							 Selectivity *rightstart, Selectivity *rightend);