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

zilder · zilder · commit 1e5c3ef32ec4 · 2016-01-24T14:10:57.000+03:00
Conflicts:
	contrib/pg_pathman/init.c
diff --git a/contrib/pg_pathman/init.c b/contrib/pg_pathman/init.c
@@ -285,16 +285,16 @@ load_check_constraints(Oid parent_oid)
 			/* Copy oids to prel */
 			for(i=0; i < proc; i++)
 				children[i] = ranges[i].child_oid;
-		}
 
-		/* Check if some ranges overlap */
-		for(i=0; i < proc-1; i++)
-		{
-			if (ranges[i].max > ranges[i+1].min)
+			/* Check if some ranges overlap */
+			for(i=0; i < proc-1; i++)
 			{
-				elog(WARNING, "Partitions %u and %u overlap. Disabling pg_pathman for relation %u...",
-					 ranges[i].child_oid, ranges[i+1].child_oid, parent_oid);
-				hash_search(relations, (const void *) &parent_oid, HASH_REMOVE, &found);
+				if (ranges[i].max > ranges[i+1].min)
+				{
+					elog(WARNING, "Partitions %u and %u overlap. Disabling pathman for relation %u...",
+						 ranges[i].child_oid, ranges[i+1].child_oid, parent_oid);
+					hash_search(relations, (const void *) &parent_oid, HASH_REMOVE, &found);
+				}
 			}
 		}
 	}

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, (const void *) &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, (const void *) &parent_oid, HASH_REMOVE, &found);`
	`297`	`+ }`
`298`	`298`	`}`
`299`	`299`	`}`
`300`	`300`	`}`