[PGPRO-7183] bring in line stable 13, 14, 15

Minor changes

Author: Andrey Kazarinov

Makefile

@@ -34,4 +34,4 @@ subdir = contrib/aqo
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
-endif
+endif

aqo.c

@@ -10,8 +10,6 @@
 
 #include "postgres.h"
 
-#include "aqo.h"
-
 #include "access/relation.h"
 #include "access/table.h"
 #include "catalog/pg_extension.h"
@@ -377,7 +375,7 @@ _PG_init(void)
 	 */
 	AQOLearnMemCtx = AllocSetContextCreate(AQOTopMemCtx,
 											 "AQOLearnMemoryContext",
- 											 ALLOCSET_DEFAULT_SIZES);
+											 ALLOCSET_DEFAULT_SIZES);
 	RegisterResourceReleaseCallback(aqo_free_callback, NULL);
 	RegisterAQOPlanNodeMethods();
 

aqo.conf

@@ -2,4 +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'
-compute_query_id = 'regress'
+compute_query_id = 'regress'

aqo.h

@@ -225,7 +225,6 @@ extern int njoins;
 /* AQO Memory contexts */
 extern MemoryContext AQOTopMemCtx;
 extern MemoryContext AQOCacheMemCtx;
-extern MemoryContext AQOUtilityMemCtx;
 extern MemoryContext AQOPredictMemCtx;
 extern MemoryContext AQOLearnMemCtx;