Commitde5a748

Andrey Kazarinov

authored and

committed

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

Minor changes

1 parente0f7994 commitde5a748Copy full SHA for de5a748

File tree

+148

-177

lines changed

+148

-177

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,4 @@ subdir = contrib/aqo`
`34`	`34`	`top_builddir = ../..`
`35`	`35`	`include$(top_builddir)/src/Makefile.global`
`36`	`36`	`include$(top_srcdir)/contrib/contrib-global.mk`
`37`		`-endif`
	`37`	`+endif`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@`
`10`	`10`
`11`	`11`	`#include"postgres.h"`
`12`	`12`
`13`		`-#include"aqo.h"`
`14`		`-`
`15`	`13`	`#include"access/relation.h"`
`16`	`14`	`#include"access/table.h"`
`17`	`15`	`#include"catalog/pg_extension.h"`
`@@ -377,7 +375,7 @@ _PG_init(void)`
`377`	`375`	`*/`
`378`	`376`	`AQOLearnMemCtx=AllocSetContextCreate(AQOTopMemCtx,`
`379`	`377`	`"AQOLearnMemoryContext",`
`380`		`-ALLOCSET_DEFAULT_SIZES);`
	`378`	`+ALLOCSET_DEFAULT_SIZES);`
`381`	`379`	`RegisterResourceReleaseCallback(aqo_free_callback,NULL);`
`382`	`380`	`RegisterAQOPlanNodeMethods();`
`383`	`381`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ autovacuum = off`
`2`	`2`	`shared_preload_libraries = 'postgres_fdw, aqo'`
`3`	`3`	`max_parallel_maintenance_workers = 1 # switch off parallel workers because of unsteadiness`
`4`	`4`	`aqo.wide_search = 'on'`
`5`		`-compute_query_id = 'regress'`
	`5`	`+compute_query_id = 'regress'`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,6 @@ extern int njoins;`
`225`	`225`	`/* AQO Memory contexts */`
`226`	`226`	`externMemoryContextAQOTopMemCtx;`
`227`	`227`	`externMemoryContextAQOCacheMemCtx;`
`228`		`-externMemoryContextAQOUtilityMemCtx;`
`229`	`228`	`externMemoryContextAQOPredictMemCtx;`
`230`	`229`	`externMemoryContextAQOLearnMemCtx;`
`231`	`230`

Comments

(0)