Commit1e5c3ef

committed

Merge branch 'pathman_pgpro9_5' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into pathman_pgpro9_5

Conflicts:contrib/pg_pathman/init.c

2 parents9eb7fea +9a6a147 commit1e5c3efCopy full SHA for 1e5c3ef

File tree

-8

lines changed

-8

lines changed

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -285,16 +285,16 @@ load_check_constraints(Oid parent_oid)`
`285`	`285`	`/* Copy oids to prel */`
`286`	`286`	`for(i=0;i<proc;i++)`
`287`	`287`	`children[i]=ranges[i].child_oid;`
`288`		`-}`
`289`	`288`
`290`		`-/* Check if some ranges overlap */`
`291`		`-for(i=0;i<proc-1;i++)`
`292`		`-{`
`293`		`-if (ranges[i].max>ranges[i+1].min)`
	`289`	`+/* Check if some ranges overlap */`
	`290`	`+for(i=0;i<proc-1;i++)`
`294`	`291`	`{`
`295`		`-elog(WARNING,"Partitions %u and %u overlap. Disabling pg_pathman for relation %u...",`
`296`		`-ranges[i].child_oid,ranges[i+1].child_oid,parent_oid);`
`297`		`-hash_search(relations, (constvoid*)&parent_oid,HASH_REMOVE,&found);`
	`292`	`+if (ranges[i].max>ranges[i+1].min)`
	`293`	`+{`
	`294`	`+elog(WARNING,"Partitions %u and %u overlap. Disabling pathman for relation %u...",`
	`295`	`+ranges[i].child_oid,ranges[i+1].child_oid,parent_oid);`
	`296`	`+hash_search(relations, (constvoid*)&parent_oid,HASH_REMOVE,&found);`
	`297`	`+}`
`298`	`298`	`}`
`299`	`299`	`}`
`300`	`300`	`}`

Comments

(0)