Commit95de10e

committed

Add commit for smooth transition to file-based AQO storage.

1 parentce94043 commit95de10eCopy full SHA for 95de10e

File tree

+55

-2

lines changed

+55

-2

lines changed

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`#include"path_utils.h"`
`24`	`24`	`#include"preprocessing.h"`
`25`	`25`	`#include"learn_cache.h"`
	`26`	`+#include"storage.h"`
`26`	`27`
`27`	`28`
`28`	`29`	`PG_MODULE_MAGIC;`
`@@ -199,6 +200,18 @@ _PG_init(void)`
`199`	`200`	`NULL`
`200`	`201`	`);`
`201`	`202`
	`203`	`+DefineCustomBoolVariable(`
	`204`	`+"aqo.use_file_storage",`
	`205`	`+"Used for smooth transition from table storage",`
	`206`	`+NULL,`
	`207`	`+&aqo_use_file_storage,`
	`208`	`+ false,`
	`209`	`+PGC_USERSET,`
	`210`	`+0,`
	`211`	`+NULL,`
	`212`	`+NULL,`
	`213`	`+NULL`
	`214`	`+);`
`202`	`215`	`DefineCustomIntVariable("aqo.join_threshold",`
`203`	`216`	`"Sets the threshold of number of JOINs in query beyond which AQO is used.",`
`204`	`217`	`NULL,`

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`#include"machine_learning.h"`
`30`	`30`	`#include"preprocessing.h"`
`31`	`31`	`#include"learn_cache.h"`
	`32`	`+#include"storage.h"`
`32`	`33`
`33`	`34`
`34`	`35`	`typedefstruct`
`@@ -823,7 +824,12 @@ aqo_ExecutorEnd(QueryDesc *queryDesc)`
`823`	`824`	`}`
`824`	`825`
`825`	`826`	`if (query_context.collect_stat)`
`826`		`-stat=get_aqo_stat(query_context.query_hash);`
	`827`	`+{`
	`828`	`+if (!aqo_use_file_storage)`
	`829`	`+stat=get_aqo_stat(query_context.query_hash);`
	`830`	`+else`
	`831`	`+stat=aqo_load_stat(query_context.query_hash);`
	`832`	`+}`
`827`	`833`
`828`	`834`	`{`
`829`	`835`	`/* Calculate execution time. */`
`@@ -873,7 +879,10 @@ aqo_ExecutorEnd(QueryDesc *queryDesc)`
`873`	`879`	`automatical_query_tuning(query_context.query_hash,stat);`
`874`	`880`
`875`	`881`	`/* Write AQO statistics to the aqo_query_stat table */`
`876`		`-update_aqo_stat(query_context.query_hash,stat);`
	`882`	`+if (!aqo_use_file_storage)`
	`883`	`+update_aqo_stat(query_context.query_hash,stat);`
	`884`	`+else`
	`885`	`+aqo_store_stat(query_context.query_hash,stat);`
`877`	`886`	`pfree_query_stat(stat);`
`878`	`887`	`}`
`879`	`888`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@`
`65`	`65`	`#include"aqo.h"`
`66`	`66`	`#include"hash.h"`
`67`	`67`	`#include"preprocessing.h"`
	`68`	`+#include"storage.h"`
`68`	`69`
`69`	`70`
`70`	`71`	`/* List of feature spaces, that are processing in this backend. */`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`#include"machine_learning.h"`
`29`	`29`	`#include"preprocessing.h"`
`30`	`30`	`#include"learn_cache.h"`
	`31`	`+#include"storage.h"`
`31`	`32`
`32`	`33`	`#defineAQO_DATA_COLUMNS(7)`
`33`	`34`	`HTAB*deactivated_queries=NULL;`
`@@ -1104,3 +1105,22 @@ add_deactivated_query(uint64 query_hash)`
`1104`	`1105`	`{`
`1105`	`1106`	`hash_search(deactivated_queries,&query_hash,HASH_ENTER,NULL);`
`1106`	`1107`	`}`
	`1108`	`+`
	`1109`	`+/* *****************************************************************************`
	`1110`	`+ *`
	`1111`	`+ * Implement AQO file storage below`
	`1112`	`+ *`
	`1113`	`+ **************************************************************************** */`
	`1114`	`+`
	`1115`	`+boolaqo_use_file_storage;`
	`1116`	`+`
	`1117`	`+void`
	`1118`	`+aqo_store_stat(uint64queryid,QueryStat*stat)`
	`1119`	`+{`
	`1120`	`+}`
	`1121`	`+`
	`1122`	`+QueryStat*`
	`1123`	`+aqo_load_stat(uint64queryid)`
	`1124`	`+{`
	`1125`	`+returnNULL;`
	`1126`	`+}`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,10 @@`
	`1`	`+#ifndefSTORAGE_H`
	`2`	`+#defineSTORAGE_H`
	`3`	`+`
	`4`	`+#include"aqo.h"`
	`5`	`+`
	`6`	`+externboolaqo_use_file_storage;`
	`7`	`+`
	`8`	`+externvoidaqo_store_stat(uint64queryid,QueryStat*stat);`
	`9`	`+externQueryStat*aqo_load_stat(uint64queryid);`
	`10`	`+#endif/* STORAGE_H */`

Comments

(0)