Commit1610066

committed

Merge branch 'master' into picky_nodes

2 parents5c551be +d759c1b commit1610066Copy full SHA for 1610066

File tree

+12

-10

lines changed

+12

-10

lines changed

Lines changed: 4 additions & 1 deletion

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ resize_dsm_array(DsmArray *arr, size_t entry_size, size_t length)`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`void*`
`293`		`-dsm_array_get_pointer(constDsmArray*arr)`
	`293`	`+dsm_array_get_pointer(constDsmArray*arr)`
`294`	`294`	`{`
`295`	`295`	`return (char*)dsm_segment_address(segment)+arr->offset+sizeof(BlockHeader);`
`296`	`296`	`}`

Lines changed: 1 addition & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -159,11 +159,6 @@ find_or_create_range_partition(PG_FUNCTION_ARGS)`
`159`	`159`	`/* Start background worker to create new partitions */`
`160`	`160`	`child_oid=create_partitions_bg_worker(relid,value,value_type,&crashed);`
`161`	`161`
`162`		`-// SPI_connect();`
`163`		`-// child_oid = create_partitions(relid, value, value_type, &crashed);`
`164`		`-// SPI_finish();`
`165`		`-// elog(WARNING, "Worker finished");`
`166`		`-`
`167`	`162`	`/* Release locks */`
`168`	`163`	`if (!crashed)`
`169`	`164`	`{`
`@@ -172,8 +167,7 @@ find_or_create_range_partition(PG_FUNCTION_ARGS)`
`172`	`167`	`}`
`173`	`168`
`174`	`169`	`/* Repeat binary search */`
`175`		`-ranges=dsm_array_get_pointer(&rangerel->ranges);`
`176`		`-pos=range_binary_search(rangerel,&cmp_func,value,&found);`
	`170`	`+(void)range_binary_search(rangerel,&cmp_func,value,&found);`
`177`	`171`	`if (found)`
`178`	`172`	`PG_RETURN_OID(child_oid);`
`179`	`173`	`}`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,12 @@ create_partitions_bg_worker(Oid relid, Datum value, Oid value_type, bool *crashe`
`99`	`99`
`100`	`100`	`/* Wait till the worker finishes its job */`
`101`	`101`	`status=WaitForBackgroundWorkerShutdown(worker_handle);`
	`102`	`+if (status==BGWH_POSTMASTER_DIED)`
	`103`	`+{`
	`104`	`+ereport(WARNING,`
	`105`	`+ (errmsg("Postmaster died during the pg_pathman background worker process"),`
	`106`	`+errhint("More details may be available in the server log.")));`
	`107`	`+}`
`102`	`108`	`*crashed=args->crashed;`
`103`	`109`	`child_oid=args->result;`
`104`	`110`
`@@ -170,7 +176,6 @@ create_partitions(Oid relid, Datum value, Oid value_type, bool *crashed)`
`170`	`176`
`171`	`177`	`prel=get_pathman_relation_info(relid,NULL);`
`172`	`178`	`rangerel=get_pathman_range_relation(relid,NULL);`
`173`		`-ranges=dsm_array_get_pointer(&rangerel->ranges);`
`174`	`179`
`175`	`180`	`/* Comparison function */`
`176`	`181`	`cmp_func=*get_cmp_func(value_type,prel->atttype);`

Comments

(0)