Commit4220415

committed

Fill CommonRdOptions with default values in extract_autovac_opts()

1 parent3dbd2ff commit4220415Copy full SHA for 4220415

File tree

+31

-20

lines changed

+31

-20

lines changed

Lines changed: 28 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2056,6 +2056,34 @@ view_reloptions(Datum reloptions, bool validate)`
`2056`	`2056`	`tab,lengthof(tab));`
`2057`	`2057`	`}`
`2058`	`2058`
	`2059`	`+/*`
	`2060`	`+ * Fill CommonRdOptions with the default values.`
	`2061`	`+ */`
	`2062`	`+void`
	`2063`	`+fill_default_common_reloptions(CommonRdOptions*common)`
	`2064`	`+{`
	`2065`	`+common->autovacuum.enabled= true;`
	`2066`	`+common->autovacuum.vacuum_threshold=-1;`
	`2067`	`+common->autovacuum.vacuum_ins_threshold=-2;`
	`2068`	`+common->autovacuum.analyze_threshold=-1;`
	`2069`	`+common->autovacuum.vacuum_cost_limit=-1;`
	`2070`	`+common->autovacuum.freeze_min_age=-1;`
	`2071`	`+common->autovacuum.freeze_max_age=-1;`
	`2072`	`+common->autovacuum.freeze_table_age=-1;`
	`2073`	`+common->autovacuum.multixact_freeze_min_age=-1;`
	`2074`	`+common->autovacuum.multixact_freeze_max_age=-1;`
	`2075`	`+common->autovacuum.multixact_freeze_table_age=-1;`
	`2076`	`+common->autovacuum.log_min_duration=-1;`
	`2077`	`+common->autovacuum.vacuum_cost_delay=-1;`
	`2078`	`+common->autovacuum.vacuum_scale_factor=-1;`
	`2079`	`+common->autovacuum.vacuum_ins_scale_factor=-1;`
	`2080`	`+common->autovacuum.analyze_scale_factor=-1;`
	`2081`	`+common->parallel_workers=-1;`
	`2082`	`+common->user_catalog_table= false;`
	`2083`	`+common->vacuum_index_cleanup=STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO;`
	`2084`	`+common->vacuum_truncate= true;`
	`2085`	`+}`
	`2086`	`+`
`2059`	`2087`	`/*`
`2060`	`2088`	`* Parse options for heaps, views and toast tables.`
`2061`	`2089`	`*/`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2681,6 +2681,7 @@ extract_autovac_opts(HeapTuple tup, TupleDesc pg_class_desc)`
`2681`	`2681`	`((Form_pg_class)GETSTRUCT(tup))->relkind==RELKIND_MATVIEW\|\|`
`2682`	`2682`	`((Form_pg_class)GETSTRUCT(tup))->relkind==RELKIND_TOASTVALUE);`
`2683`	`2683`
	`2684`	`+fill_default_common_reloptions(&common);`
`2684`	`2685`	`relopts=extractRelOptions(tup,pg_class_desc,`
`2685`	`2686`	`GetTableAmRoutineByAmOid(((Form_pg_class)GETSTRUCT(tup))->relam),`
`2686`	`2687`	`NULL,&common);`

Lines changed: 1 addition & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -480,26 +480,7 @@ RelationParseRelOptions(Relation relation, HeapTuple tuple)`
`480`	`480`	`{`
`481`	`481`	`common=MemoryContextAlloc(CacheMemoryContext,`
`482`	`482`	`sizeof(CommonRdOptions));`
`483`		`-common->autovacuum.enabled= true;`
`484`		`-common->autovacuum.vacuum_threshold=-1;`
`485`		`-common->autovacuum.vacuum_ins_threshold=-2;`
`486`		`-common->autovacuum.analyze_threshold=-1;`
`487`		`-common->autovacuum.vacuum_cost_limit=-1;`
`488`		`-common->autovacuum.freeze_min_age=-1;`
`489`		`-common->autovacuum.freeze_max_age=-1;`
`490`		`-common->autovacuum.freeze_table_age=-1;`
`491`		`-common->autovacuum.multixact_freeze_min_age=-1;`
`492`		`-common->autovacuum.multixact_freeze_max_age=-1;`
`493`		`-common->autovacuum.multixact_freeze_table_age=-1;`
`494`		`-common->autovacuum.log_min_duration=-1;`
`495`		`-common->autovacuum.vacuum_cost_delay=-1;`
`496`		`-common->autovacuum.vacuum_scale_factor=-1;`
`497`		`-common->autovacuum.vacuum_ins_scale_factor=-1;`
`498`		`-common->autovacuum.analyze_scale_factor=-1;`
`499`		`-common->parallel_workers=-1;`
`500`		`-common->user_catalog_table= false;`
`501`		`-common->vacuum_index_cleanup=STDRD_OPTION_VACUUM_INDEX_CLEANUP_AUTO;`
`502`		`-common->vacuum_truncate= true;`
	`483`	`+fill_default_common_reloptions(common);`
`503`	`484`	`relation->rd_common_options=common;`
`504`	`485`	`}`
`505`	`486`	`else`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -236,6 +236,7 @@ extern void *build_reloptions(Datum reloptions, bool validate,`
`236`	`236`	`externvoidbuild_local_reloptions(local_reloptsrelopts,Datumoptions,`
`237`	`237`	`boolvalidate);`
`238`	`238`
	`239`	`+externvoidfill_default_common_reloptions(CommonRdOptions*common);`
`239`	`240`	`externbytea*heap_reloptions(charrelkind,Datumreloptions,`
`240`	`241`	`CommonRdOptions*common,boolvalidate);`
`241`	`242`	`externbytea*view_reloptions(Datumreloptions,boolvalidate);`

Comments

(0)