Commitb496441

committed

Fix the two stupid bugs. Intro AQO memory context for long-live data.

1 parentaf99598 commitb496441Copy full SHA for b496441

File tree

+26

-6

lines changed

+26

-6

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,12 @@ boolexplain_aqo;`
`50`	`50`	`instr_timequery_starttime;`
`51`	`51`	`doublequery_planning_time;`
`52`	`52`
	`53`	`+/*`
	`54`	`+ * Currently we use it only to store query_text string which is initialized`
	`55`	`+ * after a query parsing and is used during the query planning.`
	`56`	`+ */`
	`57`	`+MemoryContextAQOMemoryContext;`
	`58`	`+`
`53`	`59`	`/* Saved hook values */`
`54`	`60`	`post_parse_analyze_hook_typeprev_post_parse_analyze_hook;`
`55`	`61`	`planner_hook_typeprev_planner_hook;`
`@@ -105,6 +111,8 @@ _PG_init(void)`
`105`	`111`	`ExplainOnePlan_hook=print_into_explain;`
`106`	`112`
`107`	`113`	`init_deactivated_queries_storage();`
	`114`	`+`
	`115`	`+AQOMemoryContext=AllocSetContextCreate(TopMemoryContext,"AQOMemoryContext",ALLOCSET_DEFAULT_SIZES);`
`108`	`116`	`}`
`109`	`117`
`110`	`118`	`PG_FUNCTION_INFO_V1(invalidate_deactivated_queries_cache);`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,7 @@`
`142`	`142`	`#include"utils/builtins.h"`
`143`	`143`	`#include"utils/guc.h"`
`144`	`144`	`#include"utils/hsearch.h"`
	`145`	`+#include"utils/memutils.h"`
`145`	`146`	`#include"utils/rel.h"`
`146`	`147`	`#include"utils/tqual.h"`
`147`	`148`	`#include"utils/fmgroids.h"`
`@@ -217,6 +218,9 @@ extern bool explain_aqo;`
`217`	`218`	`externinstr_timequery_starttime;`
`218`	`219`	`externdoublequery_planning_time;`
`219`	`220`
	`221`	`+/* Memory context for long-live data */`
	`222`	`+externMemoryContextAQOMemoryContext;`
	`223`	`+`
`220`	`224`	`/* Saved hook values in case of unload */`
`221`	`225`	`externpost_parse_analyze_hook_typeprev_post_parse_analyze_hook;`
`222`	`226`	`externplanner_hook_typeprev_planner_hook;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ is_in_infinite_loop_cq(double *elems, int nelems)`
`106`	`106`	`* we cannot execute queries on our own wish, so the tuning now is in setting`
`107`	`107`	`* use_aqo and learn_aqo parameters for the query type.`
`108`	`108`	`*`
`109`		`- * Now the workflow is quitesimlple:`
	`109`	`+ * Now the workflow is quitesimple:`
`110`	`110`	`*`
`111`	`111`	`* Firstly, we run a new query type auto_tuning_window_size times without our`
`112`	`112`	`* method to have an execution time statistics for such type of queries.`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -116,14 +116,14 @@ OkNNr_predict(int matrix_rows, int matrix_cols,`
`116`	`116`	`if (idx[i]!=-1)`
`117`	`117`	`result+=targets[idx[i]]*w[i] /w_sum;`
`118`	`118`
`119`		`-pfree(distances);`
`120`		`-pfree(idx);`
`121`		`-pfree(w);`
`122`		`-`
`123`	`119`	`/* this should never happen */`
`124`	`120`	`if (idx[0]==-1)`
`125`	`121`	`return-1;`
`126`	`122`
	`123`	`+pfree(distances);`
	`124`	`+pfree(idx);`
	`125`	`+pfree(w);`
	`126`	`+`
`127`	`127`	`if (result<0)`
`128`	`128`	`result=0;`
`129`	`129`	`returnresult;`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,16 @@ static bool isQueryUsingSystemRelation_walker(Node node, void context);`
`67`	`67`	`void`
`68`	`68`	`get_query_text(ParseStatepstate,Queryquery)`
`69`	`69`	`{`
	`70`	`+MemoryContextoldCxt;`
	`71`	`+`
	`72`	`+/*`
	`73`	`+ * Duplicate query string into private AQO memory context for guard`
	`74`	`+ * from possible memory context switching.`
	`75`	`+ */`
	`76`	`+oldCxt=MemoryContextSwitchTo(AQOMemoryContext);`
`70`	`77`	`if (pstate)`
`71`		`-Assert((query_text=strdup(pstate->p_sourcetext))!=NULL);`
	`78`	`+query_text=pstrdup(pstate->p_sourcetext);`
	`79`	`+MemoryContextSwitchTo(oldCxt);`
`72`	`80`
`73`	`81`	`if (prev_post_parse_analyze_hook)`
`74`	`82`	`prev_post_parse_analyze_hook(pstate,query);`

Comments

(0)