NotificationsYou must be signed in to change notification settings
Fork56
Star472

Commita4991a0

committed

Arrange master with stable15

1 parent18e8789 commita4991a0Copy full SHA for a4991a0

File tree

15 files changed

+104

-111

lines changed

.github/workflows
- c-cpp.yml
aqo--1.4--1.5.sql
aqo.conf
aqo.c
aqo.h
aqo_master.patch
aqo_shared.h
auto_tuning.c
cardinality_hooks.c
expected
- aqo_CVE-2020-14350.out
- relocatable.out
sql
- aqo_CVE-2020-14350.sql
- relocatable.sql
storage.c
storage.h

15 files changed

+104

-111

lines changed

`‎.github/workflows/c-cpp.yml‎`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name:C/C++ CI for the master`
	`1`	`+name:'C/C++ CI for the master'`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`push:`
`@@ -7,7 +7,7 @@ on:`
`7`	`7`	`branches:[ master ]`
`8`	`8`
`9`	`9`	`env:`
`10`		`-BRANCH_NAME:${{ github.head_ref \|\| github.ref_name }}`
	`10`	`+BRANCH_NAME:${{ github.head_ref \|\| github.ref_name }}`
`11`	`11`
`12`	`12`	`jobs:`
`13`	`13`	`build:`
`@@ -18,18 +18,20 @@ jobs:`
`18`	`18`	`-name:pg`
`19`	`19`	`run:\|`
`20`	`20`	`sudo apt install libipc-run-perl`
	`21`	`+`
`21`	`22`	`echo "Deploying to production server on branch" $BRANCH_NAME`
`22`	`23`	`git config --global user.email "ci@postgrespro.ru"`
`23`	`24`	`git config --global user.name "CI PgPro admin"`
`24`	`25`	`export COPT=-Werror`
`25`	`26`	export CONFIGURE_OPTS="--prefix=`pwd`/tmp_install --enable-tap-tests --enable-cassert"
`26`	`27`	`git clone https://github.com/postgres/postgres.git pg`
`27`	`28`	`cd pg`
	`29`	`+`
`28`	`30`	`git checkout master`
`29`		`- ./configure $CONFIGURE_OPTS CFLAGS="-O3"`
`30`	`31`	`git clone https://github.com/postgrespro/aqo.git contrib/aqo`
`31`	`32`	`git -C contrib/aqo checkout $BRANCH_NAME`
`32`	`33`	`patch -p1 --no-backup-if-mismatch < contrib/aqo/aqo_master.patch`
	`34`	`+ ./configure $CONFIGURE_OPTS CFLAGS="-O3"`
`33`	`35`	`make -j4 > /dev/null && make -j4 -C contrib > /dev/null`
`34`	`36`	`env CLIENTS=50 THREADS=50 make -C contrib/aqo check`
`35`	`37`

`‎aqo--1.4--1.5.sql‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -77,14 +77,14 @@ CREATE VIEW aqo_queries AS SELECT * FROM aqo_queries();`
`77`	`77`	`/* UI functions*/`
`78`	`78`
`79`	`79`
`80`		`-CREATEFUNCTIONaqo_enable_class(queryidbigint)`
	`80`	`+CREATEFUNCTIONaqo_enable_query(queryidbigint)`
`81`	`81`	`RETURNS void`
`82`		`-AS'MODULE_PATHNAME','aqo_enable_class'`
	`82`	`+AS'MODULE_PATHNAME','aqo_enable_query'`
`83`	`83`	`LANGUAGE C STRICT VOLATILE;`
`84`	`84`
`85`		`-CREATEFUNCTIONaqo_disable_class(queryidbigint)`
	`85`	`+CREATEFUNCTIONaqo_disable_query(queryidbigint)`
`86`	`86`	`RETURNS void`
`87`		`-AS'MODULE_PATHNAME','aqo_disable_class'`
	`87`	`+AS'MODULE_PATHNAME','aqo_enable_query'`
`88`	`88`	`LANGUAGE C STRICT VOLATILE;`
`89`	`89`
`90`	`90`	`CREATEFUNCTIONaqo_queries_update(`

`‎aqo.c‎`

Lines changed: 13 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`
`15`	`15`	`#include"access/relation.h"`
`16`	`16`	`#include"access/table.h"`
	`17`	`+#include"catalog/objectaccess.h"`
`17`	`18`	`#include"catalog/pg_extension.h"`
`18`	`19`	`#include"commands/extension.h"`
`19`	`20`	`#include"miscadmin.h"`
`@@ -23,11 +24,10 @@`
`23`	`24`	`#include"aqo_shared.h"`
`24`	`25`	`#include"cardinality_hooks.h"`
`25`	`26`	`#include"path_utils.h"`
	`27`	`+#include"postmaster/bgworker.h"`
`26`	`28`	`#include"preprocessing.h"`
`27`	`29`	`#include"learn_cache.h"`
`28`	`30`	`#include"storage.h"`
`29`		`-#include"postmaster/bgworker.h"`
`30`		`-#include"catalog/objectaccess.h"`
`31`	`31`
`32`	`32`
`33`	`33`	`PG_MODULE_MAGIC;`
`@@ -118,6 +118,9 @@ ExplainOneNode_hook_typeprev_ExplainOneNode_hook;`
`118`	`118`	`staticshmem_request_hook_typeprev_shmem_request_hook=NULL;`
`119`	`119`	`object_access_hook_typeprev_object_access_hook;`
`120`	`120`
	`121`	`+PGDLLEXPORTvoidaqo_bgworker_cleanup(Datummain_arg);`
	`122`	`+staticvoidaqo_bgworker_startup(void);`
	`123`	`+`
`121`	`124`	`/*****************************************************************************`
`122`	`125`	`*`
`123`	`126`	`*CREATE/DROP EXTENSION FUNCTIONS`
`@@ -156,18 +159,18 @@ aqo_shmem_request(void)`
`156`	`159`	`* Entry point for CleanupWorker's process.`
`157`	`160`	`*/`
`158`	`161`	`void`
`159`		`-aqo_bgworker_cleanup(void)`
	`162`	`+aqo_bgworker_cleanup(Datummain_arg)`
`160`	`163`	`{`
`161`	`164`	`intfs_num;`
`162`	`165`	`intfss_num;`
`163`	`166`
`164`	`167`	`cleanup_aqo_database(true,&fs_num,&fss_num);`
`165`	`168`	`}`
`166`	`169`
`167`		`-/*`
	`170`	`+/*`
`168`	`171`	`* Object access hook`
`169`	`172`	`*/`
`170`		`-void`
	`173`	`+staticvoid`
`171`	`174`	`aqo_drop_access_hook(ObjectAccessTypeaccess,`
`172`	`175`	`OidclassId,`
`173`	`176`	`OidobjectId,`
`@@ -198,7 +201,7 @@ aqo_drop_access_hook(ObjectAccessType access,`
`198`	`201`	`}`
`199`	`202`	`}`
`200`	`203`
`201`		`-void`
	`204`	`+staticvoid`
`202`	`205`	`aqo_bgworker_startup(void)`
`203`	`206`	`{`
`204`	`207`	`BackgroundWorkerworker;`
`@@ -355,7 +358,7 @@ _PG_init(void)`
`355`	`358`	`&fs_max_items,`
`356`	`359`	`10000,`
`357`	`360`	`1,INT_MAX,`
`358`		`-PGC_SUSET,`
	`361`	`+PGC_POSTMASTER,`
`359`	`362`	`0,`
`360`	`363`	`NULL,`
`361`	`364`	`NULL,`
`@@ -368,7 +371,7 @@ _PG_init(void)`
`368`	`371`	`&fss_max_items,`
`369`	`372`	`100000,`
`370`	`373`	`0,INT_MAX,`
`371`		`-PGC_SUSET,`
	`374`	`+PGC_POSTMASTER,`
`372`	`375`	`0,`
`373`	`376`	`NULL,`
`374`	`377`	`NULL,`
`@@ -406,7 +409,7 @@ _PG_init(void)`
`406`	`409`	`NULL,`
`407`	`410`	`&cleanup_bgworker,`
`408`	`411`	`false,`
`409`		`-PGC_USERSET,`
	`412`	`+PGC_SUSET,`
`410`	`413`	`0,`
`411`	`414`	`NULL,`
`412`	`415`	`NULL,`
`@@ -484,7 +487,7 @@ _PG_init(void)`
`484`	`487`	`*/`
`485`	`488`	`AQOLearnMemCtx=AllocSetContextCreate(AQOTopMemCtx,`
`486`	`489`	`"AQOLearnMemoryContext",`
`487`		`-ALLOCSET_DEFAULT_SIZES);`
	`490`	`+ALLOCSET_DEFAULT_SIZES);`
`488`	`491`	`RegisterResourceReleaseCallback(aqo_free_callback,NULL);`
`489`	`492`	`RegisterAQOPlanNodeMethods();`
`490`	`493`

`‎aqo.conf‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`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`		`-aqo.wide_search = 'on'`
	`4`	`+aqo.wide_search = 'on'`
	`5`	`+compute_query_id = 'regress'`

`‎aqo.h‎`

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,6 @@`
`142`	`142`	`#include"utils/rel.h"`
`143`	`143`	`#include"utils/fmgroids.h"`
`144`	`144`	`#include"utils/snapmgr.h"`
`145`		`-#include"catalog/objectaccess.h"`
`146`	`145`
`147`	`146`	`#include"machine_learning.h"`
`148`	`147`	`//#include "storage.h"`
`@@ -226,7 +225,6 @@ extern int njoins;`
`226`	`225`	`/* AQO Memory contexts */`
`227`	`226`	`externMemoryContextAQOTopMemCtx;`
`228`	`227`	`externMemoryContextAQOCacheMemCtx;`
`229`		`-externMemoryContextAQOUtilityMemCtx;`
`230`	`228`	`externMemoryContextAQOPredictMemCtx;`
`231`	`229`	`externMemoryContextAQOLearnMemCtx;`
`232`	`230`
`@@ -300,10 +298,5 @@ extern void selectivity_cache_clear(void);`
`300`	`298`
`301`	`299`	`externboolIsQueryDisabled(void);`
`302`	`300`
`303`		`-externvoidaqo_drop_access_hook(ObjectAccessTypeaccess,OidclassId,`
`304`		`-OidobjectId,intsubId,void*arg);`
`305`		`-externvoidaqo_bgworker_startup(void);`
`306`		`-externPGDLLEXPORTvoidaqo_bgworker_cleanup(void);`
`307`		`-`
`308`	`301`	`externList*cur_classes;`
`309`	`302`	`#endif`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita4991a0

File tree

15 files changed

15 files changed

`‎.github/workflows/c-cpp.yml‎`

`‎aqo--1.4--1.5.sql‎`

`‎aqo.c‎`

`‎aqo.conf‎`

`‎aqo.h‎`

0 commit comments