Commit3bd2bb3

committed

Slightly refactor patch on query max size.

1 parenta81afb6 commit3bd2bb3Copy full SHA for 3bd2bb3

File tree

+10

-7

lines changed

+10

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -253,10 +253,10 @@ _PG_init(void)`
`253`	`253`	`NULL`
`254`	`254`	`);`
`255`	`255`
`256`		`-DefineCustomIntVariable("aqo.max_size",`
	`256`	`+DefineCustomIntVariable("aqo.querytext_max_size",`
`257`	`257`	`"Query max size in aqo_query_texts.",`
`258`	`258`	`NULL,`
`259`		`-&max_size,`
	`259`	`+&querytext_max_size,`
`260`	`260`	`1000,`
`261`	`261`	`0,INT_MAX,`
`262`	`262`	`PGC_SUSET,`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ HTAB *fss_htab = NULL;`
`28`	`28`	`staticintaqo_htab_max_items=1000;`
`29`	`29`	`intfs_max_items=1;/* Max number of different feature spaces in ML model */`
`30`	`30`	`intfss_max_items=1;/* Max number of different feature subspaces in ML model */`
`31`		`-intmax_size=1000;`
`32`	`31`	`staticuint32temp_storage_size=1024102410;/* Storage size, in bytes */`
`33`	`32`	`staticdsm_segment*seg=NULL;`
`34`	`33`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ extern HTAB *fss_htab;`
`52`	`52`
`53`	`53`	`externintfs_max_items;/* Max number of feature spaces that AQO can operate */`
`54`	`54`	`externintfss_max_items;`
`55`		`-externintmax_size;`
	`55`	`+externintquerytext_max_size;`
`56`	`56`
`57`	`57`	`externSizeaqo_memsize(void);`
`58`	`58`	`externvoidreset_dsm_cache(void);`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,8 @@ typedef void* (form_record_t) (void ctx, size_t *size);`
`64`	`64`	`typedefvoid (deform_record_t) (voiddata,size_tsize);`
`65`	`65`
`66`	`66`
	`67`	`+intquerytext_max_size=1000;`
	`68`	`+`
`67`	`69`	`HTAB*stat_htab=NULL;`
`68`	`70`	`HTAB*queries_htab=NULL;`
`69`	`71`	`HTAB*qtexts_htab=NULL;`
`@@ -934,7 +936,7 @@ aqo_qtext_store(uint64 queryid, const char *query_string)`
`934`	`936`
`935`	`937`	`Assert(!LWLockHeldByMe(&aqo_state->qtexts_lock));`
`936`	`938`
`937`		`-if (query_string==NULL)`
	`939`	`+if (query_string==NULL\|\|querytext_max_size==0)`
`938`	`940`	`return false;`
`939`	`941`
`940`	`942`	`dsa_init();`
`@@ -969,7 +971,7 @@ aqo_qtext_store(uint64 queryid, const char *query_string)`
`969`	`971`	`}`
`970`	`972`
`971`	`973`	`entry->queryid=queryid;`
`972`		`-size=size>max_size ?max_size :size;`
	`974`	`+size=size>querytext_max_size ?querytext_max_size :size;`
`973`	`975`	`entry->qtext_dp=dsa_allocate(qtext_dsa,size);`
`974`	`976`	`Assert(DsaPointerIsValid(entry->qtext_dp));`
`975`	`977`	`strptr= (char*)dsa_get_address(qtext_dsa,entry->qtext_dp);`
`@@ -1641,7 +1643,7 @@ aqo_queries(PG_FUNCTION_ARGS)`
`1641`	`1643`	`while ((entry=hash_seq_search(&hash_seq))!=NULL)`
`1642`	`1644`	`{`
`1643`	`1645`	`memset(nulls,0,AQ_TOTAL_NCOLS+1);`
`1644`		`-`
	`1646`	`+`
`1645`	`1647`	`values[AQ_QUERYID]=Int64GetDatum(entry->queryid);`
`1646`	`1648`	`values[AQ_FS]=Int64GetDatum(entry->fs);`
`1647`	`1649`	`values[AQ_LEARN_AQO]=BoolGetDatum(entry->learn_aqo);`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,8 @@ typedef struct QueriesEntry`
`82`	`82`	`boolauto_tuning;`
`83`	`83`	`}QueriesEntry;`
`84`	`84`
	`85`	`+externintquerytext_max_size;`
	`86`	`+`
`85`	`87`	`externHTAB*stat_htab;`
`86`	`88`	`externHTAB*qtexts_htab;`
`87`	`89`	`externHTABqueries_htab;/ TODO */`

Comments

(0)