Resolve a problem with gathering of instrumentation data

danolivo · danolivo · commit 6c92fb7b57c8 · 2022-04-07T15:06:48.000+03:00
on a partially executed query plan. Fix some issues.
diff --git a/postprocessing.c b/postprocessing.c
@@ -279,13 +279,24 @@ learn_subplan_recurse(PlanState *p, aqo_obj_stat *ctx)
 	if (!p->instrument)
 		return true;
 
-	if (!INSTR_TIME_IS_ZERO(p->instrument->starttime))
+	if (!ctx->isTimedOut)
+		InstrEndLoop(p->instrument);
+	else if (p->instrument->running)
 	{
-		Assert(ctx->isTimedOut);
-		InstrStopNode(p->instrument, 0);
-	}
+		/*
+		 * We can't use node instrumentation functions because after the end
+		 * of this timeout handler query can work for some time.
+		 * We change ntuples and nloops to unify walking logic and because we
+		 * know that the query execution results meaningless.
+		 */
+		p->instrument->ntuples += p->instrument->tuplecount;
+		p->instrument->nloops += 1;
 
-	InstrEndLoop(p->instrument);
+		/*
+		 * TODO: can we simply use ExecParallelCleanup to implement gathering of
+		 * instrument data in the case of parallel workers?
+		 */
+	}
 
 	saved_subplan_list = p->subPlan;
 	saved_initplan_list = p->initPlan;
@@ -328,7 +339,7 @@ should_learn(aqo_obj_stat *ctx, double predicted, double *nrows)
 	{
 		if (ctx->learn && *nrows > predicted * 1.2)
 		{
-			*nrows += (*nrows - predicted) * 3.;
+			*nrows += (*nrows - predicted) * 10.;
 			return true;
 		}
 	}
@@ -500,8 +511,8 @@ learnOnPlanState(PlanState *p, void *context)
 
 				if (should_learn(ctx, predicted, &learn_rows))
 				{
-					if (ctx->isTimedOut)
-						elog(DEBUG1, "[AQO] Learn on partially executed plan node. fs: %lu, fss: %d, predicted rows: %.0lf, updated prediction: %.0lf",
+					if (ctx->isTimedOut && aqo_show_details)
+						elog(NOTICE, "[AQO] Learn on partially executed plan node. fs: %lu, fss: %d, predicted rows: %.0lf, updated prediction: %.0lf",
 							 query_context.query_hash, aqo_node->fss, predicted, learn_rows);
 
 					if (IsA(p, AggState))
@@ -664,7 +675,7 @@ aqo_timeout_handler(void)
 	ctx.learn = query_context.learn_aqo;
 	ctx.isTimedOut = true;
 
-	elog(DEBUG1, "AQO timeout was expired. Try to learn on partial data.");
+	elog(NOTICE, "[AQO] Time limit for execution of the statement was expired. Try to learn on partial data.");
 	learnOnPlanState(timeoutCtl.queryDesc->planstate, (void *) &ctx);
 }
 
