Commit67ff4a8

committed

Merge branch 'merge_concurrent' of github.com:postgrespro/pg_pathman into merge_concurrent

2 parentsfe96482 +ed154fc commit67ff4a8Copy full SHA for 67ff4a8

File tree

+12

-6

lines changed

+12

-6

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -623,6 +623,7 @@ pathman_config_contains_relation(Oid relid, Datum values, bool isnull,`
`623`	`623`
`624`	`624`	`/*`
`625`	`625`	`* Loads additional pathman parameters like 'enable_parent' or 'auto'`
	`626`	`+ * from PATHMAN_CONFIG_PARAMS`
`626`	`627`	`*/`
`627`	`628`	`bool`
`628`	`629`	`read_pathman_params(Oidrelid,Datumvalues,boolisnull)`
`@@ -632,7 +633,7 @@ read_pathman_params(Oid relid, Datum values, bool isnull)`
`632`	`633`	`ScanKeyDatakey[1];`
`633`	`634`	`Snapshotsnapshot;`
`634`	`635`	`HeapTuplehtup;`
`635`		`-boolresult= false;`
	`636`	`+boolrow_found= false;`
`636`	`637`
`637`	`638`	`ScanKeyInit(&key[0],`
`638`	`639`	`Anum_pathman_config_params_partrel,`
`@@ -643,19 +644,20 @@ read_pathman_params(Oid relid, Datum values, bool isnull)`
`643`	`644`	`snapshot=RegisterSnapshot(GetLatestSnapshot());`
`644`	`645`	`scan=heap_beginscan(rel,snapshot,1,key);`
`645`	`646`
	`647`	`+/* There should be just 1 row */`
`646`	`648`	`if ((htup=heap_getnext(scan,ForwardScanDirection))!=NULL)`
`647`	`649`	`{`
`648`	`650`	`/* Extract data if necessary */`
`649`	`651`	`heap_deform_tuple(htup,RelationGetDescr(rel),values,isnull);`
`650`		`-result= true;`
	`652`	`+row_found= true;`
`651`	`653`	`}`
`652`	`654`
`653`	`655`	`/* Clean resources */`
`654`	`656`	`heap_endscan(scan);`
`655`	`657`	`UnregisterSnapshot(snapshot);`
`656`	`658`	`heap_close(rel,AccessShareLock);`
`657`	`659`
`658`		`-returnresult;`
	`660`	`+returnrow_found;`
`659`	`661`	`}`
`660`	`662`
`661`	`663`	`/*`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -160,14 +160,18 @@ refresh_pathman_relation_info(Oid relid,`
`160`	`160`
`161`	`161`	`pfree(prel_children);`
`162`	`162`
`163`		`-/*`
`164`		`- * Read additional parameters ('enable_parent' and 'auto' at the moment)`
`165`		`- */`
	`163`	`+/* Read additional parameters ('enable_parent' and 'auto' at the moment) */`
`166`	`164`	`if (read_pathman_params(relid,param_values,param_isnull))`
`167`	`165`	`{`
`168`	`166`	`prel->enable_parent=param_values[Anum_pathman_config_params_enable_parent-1];`
`169`	`167`	`prel->auto_partition=param_values[Anum_pathman_config_params_auto-1];`
`170`	`168`	`}`
	`169`	`+/* Else set default values if they cannot be found */`
	`170`	`+else`
	`171`	`+{`
	`172`	`+prel->enable_parent= false;`
	`173`	`+prel->auto_partition= true;`
	`174`	`+}`
`171`	`175`
`172`	`176`	`/* We've successfully built a cache entry */`
`173`	`177`	`prel->valid= true;`

Comments

(0)