Arrange master with stable15

Author: danolivo

.github/workflows/c-cpp.yml

@@ -1,4 +1,4 @@
-name: C/C++ CI for the master
+name: 'C/C++ CI for the master'
 
 on:
   push:
@@ -7,7 +7,7 @@ on:
     branches: [ master ]
 
 env:
- BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
 jobs:
   build:
@@ -18,18 +18,20 @@ jobs:
     - name: pg
       run: |
         sudo apt install libipc-run-perl
+
         echo "Deploying to production server on branch" $BRANCH_NAME
         git config --global user.email "ci@postgrespro.ru"
         git config --global user.name "CI PgPro admin"
         export COPT=-Werror
         export CONFIGURE_OPTS="--prefix=`pwd`/tmp_install --enable-tap-tests --enable-cassert"
         git clone https://github.com/postgres/postgres.git pg
         cd pg
+
         git checkout master
-        ./configure $CONFIGURE_OPTS CFLAGS="-O3"
         git clone https://github.com/postgrespro/aqo.git contrib/aqo
         git -C contrib/aqo checkout $BRANCH_NAME
         patch -p1 --no-backup-if-mismatch < contrib/aqo/aqo_master.patch
+        ./configure $CONFIGURE_OPTS CFLAGS="-O3"
         make -j4 > /dev/null && make -j4 -C contrib > /dev/null
         env CLIENTS=50 THREADS=50 make -C contrib/aqo check
 

aqo--1.4--1.5.sql

@@ -77,14 +77,14 @@ CREATE VIEW aqo_queries AS SELECT * FROM aqo_queries();
 /* UI functions */
 
 
-CREATE FUNCTION aqo_enable_class(queryid bigint)
+CREATE FUNCTION aqo_enable_query(queryid bigint)
 RETURNS void
-AS 'MODULE_PATHNAME', 'aqo_enable_class'
+AS 'MODULE_PATHNAME', 'aqo_enable_query'
 LANGUAGE C STRICT VOLATILE;
 
-CREATE FUNCTION aqo_disable_class(queryid bigint)
+CREATE FUNCTION aqo_disable_query(queryid bigint)
 RETURNS void
-AS 'MODULE_PATHNAME', 'aqo_disable_class'
+AS 'MODULE_PATHNAME', 'aqo_enable_query'
 LANGUAGE C STRICT VOLATILE;
 
 CREATE FUNCTION aqo_queries_update(

aqo.c

@@ -14,6 +14,7 @@
 
 #include "access/relation.h"
 #include "access/table.h"
+#include "catalog/objectaccess.h"
 #include "catalog/pg_extension.h"
 #include "commands/extension.h"
 #include "miscadmin.h"
@@ -23,11 +24,10 @@
 #include "aqo_shared.h"
 #include "cardinality_hooks.h"
 #include "path_utils.h"
+#include "postmaster/bgworker.h"
 #include "preprocessing.h"
 #include "learn_cache.h"
 #include "storage.h"
-#include "postmaster/bgworker.h"
-#include "catalog/objectaccess.h"
 
 
 PG_MODULE_MAGIC;
@@ -118,6 +118,9 @@ ExplainOneNode_hook_type					prev_ExplainOneNode_hook;
 static shmem_request_hook_type				prev_shmem_request_hook = NULL;
 object_access_hook_type						prev_object_access_hook;
 
+PGDLLEXPORT void aqo_bgworker_cleanup(Datum main_arg);
+static void aqo_bgworker_startup(void);
+
 /*****************************************************************************
  *
  *	CREATE/DROP EXTENSION FUNCTIONS
@@ -156,18 +159,18 @@ aqo_shmem_request(void)
  * Entry point for CleanupWorker's process.
  */
 void
-aqo_bgworker_cleanup(void)
+aqo_bgworker_cleanup(Datum main_arg)
 {
 	int	fs_num;
 	int	fss_num;
 
 	cleanup_aqo_database(true, &fs_num, &fss_num);
 }
 
-/* 
+/*
  * Object access hook
  */
-void
+static void
 aqo_drop_access_hook(ObjectAccessType access,
 					 Oid classId,
 					 Oid objectId,
@@ -198,7 +201,7 @@ aqo_drop_access_hook(ObjectAccessType access,
 	}
 }
 
-void
+static void
 aqo_bgworker_startup(void)
 {
 	BackgroundWorker		worker;
@@ -355,7 +358,7 @@ _PG_init(void)
 							&fs_max_items,
 							10000,
 							1, INT_MAX,
-							PGC_SUSET,
+							PGC_POSTMASTER,
 							0,
 							NULL,
 							NULL,
@@ -368,7 +371,7 @@ _PG_init(void)
 							&fss_max_items,
 							100000,
 							0, INT_MAX,
-							PGC_SUSET,
+							PGC_POSTMASTER,
 							0,
 							NULL,
 							NULL,
@@ -406,7 +409,7 @@ _PG_init(void)
 							 NULL,
 							 &cleanup_bgworker,
 							 false,
-							 PGC_USERSET,
+							 PGC_SUSET,
 							 0,
 							 NULL,
 							 NULL,
@@ -484,7 +487,7 @@ _PG_init(void)
 	 */
 	AQOLearnMemCtx = AllocSetContextCreate(AQOTopMemCtx,
 											 "AQOLearnMemoryContext",
- 											 ALLOCSET_DEFAULT_SIZES);
+											 ALLOCSET_DEFAULT_SIZES);
 	RegisterResourceReleaseCallback(aqo_free_callback, NULL);
 	RegisterAQOPlanNodeMethods();
 

aqo.conf

@@ -1,4 +1,5 @@
 autovacuum = off
 shared_preload_libraries = 'postgres_fdw, aqo'
 max_parallel_maintenance_workers = 1 # switch off parallel workers because of unsteadiness
-aqo.wide_search = 'on'
+aqo.wide_search = 'on'
+compute_query_id = 'regress'

aqo.h

@@ -142,7 +142,6 @@
 #include "utils/rel.h"
 #include "utils/fmgroids.h"
 #include "utils/snapmgr.h"
-#include "catalog/objectaccess.h"
 
 #include "machine_learning.h"
 //#include "storage.h"
@@ -226,7 +225,6 @@ extern int njoins;
 /* AQO Memory contexts */
 extern MemoryContext AQOTopMemCtx;
 extern MemoryContext AQOCacheMemCtx;
-extern MemoryContext AQOUtilityMemCtx;
 extern MemoryContext AQOPredictMemCtx;
 extern MemoryContext AQOLearnMemCtx;
 
@@ -300,10 +298,5 @@ extern void selectivity_cache_clear(void);
 
 extern bool IsQueryDisabled(void);
 
-extern void aqo_drop_access_hook(ObjectAccessType access, Oid classId, 
-								 Oid objectId, int subId, void *arg);
-extern void aqo_bgworker_startup(void);
-extern PGDLLEXPORT void aqo_bgworker_cleanup(void);
-
 extern List *cur_classes;
 #endif