Set aqo_show_details and aqo_show_hash to true as default; add additional checks for compute_query_id to not print details in regress mode

Author: Alexandra Pervushina

aqo.c

@@ -167,7 +167,7 @@ _PG_init(void)
 							 "Show query and node hash on explain.",
 							 "Hash value depend on each instance and is not good to enable it in regression or TAP tests.",
 							 &aqo_show_hash,
-							 false,
+							 true,
 							 PGC_USERSET,
 							 0,
 							 NULL,
@@ -180,7 +180,7 @@ _PG_init(void)
 							 "Show AQO state on a query.",
 							 NULL,
 							 &aqo_show_details,
-							 false,
+							 true,
 							 PGC_USERSET,
 							 0,
 							 NULL,

postprocessing.c

@@ -314,7 +314,7 @@ should_learn(PlanState *ps, AQOPlanNode *node, aqo_obj_stat *ctx,
 		if (ctx->learn && nrows > predicted * 1.2)
 		{
 			/* This node s*/
-			if (aqo_show_details)
+			if (aqo_show_details && compute_query_id != COMPUTE_QUERY_ID_REGRESS)
 				elog(NOTICE,
 					 "[AQO] Learn on a plan node ("UINT64_FORMAT", %d), "
 					"predicted rows: %.0lf, updated prediction: %.0lf",
@@ -330,7 +330,8 @@ should_learn(PlanState *ps, AQOPlanNode *node, aqo_obj_stat *ctx,
 		{
 			/* This is much more reliable data. So we can correct our prediction. */
 			if (ctx->learn && aqo_show_details &&
-				fabs(nrows - predicted) / predicted > 0.2)
+				fabs(nrows - predicted) / predicted > 0.2 &&
+				compute_query_id != COMPUTE_QUERY_ID_REGRESS)
 				elog(NOTICE,
 					 "[AQO] Learn on a finished plan node ("UINT64_FORMAT", %d), "
 					 "predicted rows: %.0lf, updated prediction: %.0lf",
@@ -985,7 +986,7 @@ print_into_explain(PlannedStmt *plannedstmt, IntoClause *into,
 		(*aqo_ExplainOnePlan_next)(plannedstmt, into, es, queryString,
 									 params, planduration, queryEnv);
 
-	if (IsQueryDisabled() || !aqo_show_details)
+	if (IsQueryDisabled() || !aqo_show_details || compute_query_id == COMPUTE_QUERY_ID_REGRESS)
 		return;
 
 	/* Report to user about aqo state only in verbose mode */
@@ -1022,7 +1023,7 @@ print_into_explain(PlannedStmt *plannedstmt, IntoClause *into,
 	 */
 	if (aqo_mode != AQO_MODE_DISABLED || force_collect_stat)
 	{
-		if (aqo_show_hash)
+		if (aqo_show_hash && compute_query_id != COMPUTE_QUERY_ID_REGRESS)
 			ExplainPropertyInteger("Query hash", NULL,
 									query_context.query_hash, es);
 		ExplainPropertyInteger("JOINS", NULL, njoins, es);
@@ -1046,7 +1047,7 @@ print_node_explain(ExplainState *es, PlanState *ps, Plan *plan)
 	if ((aqo_node = get_aqo_plan_node(plan, false)) == NULL)
 		return;
 
-	if (!aqo_show_details || !ps)
+	if (!aqo_show_details || !ps || compute_query_id == COMPUTE_QUERY_ID_REGRESS)
 		goto explain_end;
 
 	if (!ps->instrument)
@@ -1092,7 +1093,7 @@ print_node_explain(ExplainState *es, PlanState *ps, Plan *plan)
 
 explain_end:
 	/* XXX: Do we really have situations when the plan is a NULL pointer? */
-	if (plan && aqo_show_hash)
+	if (plan && aqo_show_hash && compute_query_id != COMPUTE_QUERY_ID_REGRESS)
 		appendStringInfo(es->str, ", fss=%d", aqo_node->fss);
 }
 

sql/aqo_CVE-2020-14350.sql

@@ -6,6 +6,7 @@
 SET client_min_messages = 'warning';
 DROP ROLE IF EXISTS regress_hacker;
 SET client_min_messages = 'notice';
+SET compute_query_id = on;
 
 CREATE ROLE regress_hacker LOGIN;
 

sql/aqo_controlled.sql

@@ -1,5 +1,6 @@
 CREATE EXTENSION IF NOT EXISTS aqo;
 SELECT true AS success FROM aqo_reset();
+SET compute_query_id = on;
 
 CREATE TABLE aqo_test0(a int, b int, c int, d int);
 WITH RECURSIVE t(a, b, c, d)

sql/aqo_disabled.sql

@@ -2,6 +2,7 @@
 -- previous pass (repeated installcheck as an example).
 CREATE EXTENSION IF NOT EXISTS aqo;
 SELECT true AS success FROM aqo_reset();
+SET compute_query_id = on;
 
 CREATE TABLE aqo_test0(a int, b int, c int, d int);
 WITH RECURSIVE t(a, b, c, d)

sql/aqo_fdw.sql

@@ -7,6 +7,7 @@
 CREATE EXTENSION IF NOT EXISTS aqo;
 CREATE EXTENSION IF NOT EXISTS postgres_fdw;
 SELECT true AS success FROM aqo_reset();
+SET compute_query_id = on;
 
 SET aqo.mode = 'learn';
 SET aqo.show_details = 'true'; -- show AQO info for each node and entire query.