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

zilder · zilder · commit 3488a71eb5f5 · 2016-02-18T17:32:29.000+03:00
diff --git a/contrib/Makefile b/contrib/Makefile
@@ -53,7 +53,8 @@ SUBDIRS = \
 		tsm_system_time \
 		tsearch2	\
 		unaccent	\
-		vacuumlo
+		vacuumlo    \
+		pg_pathman
 
 ifeq ($(with_openssl),yes)
 SUBDIRS += sslinfo
diff --git a/contrib/pg_pathman/pl_funcs.c b/contrib/pg_pathman/pl_funcs.c
@@ -101,7 +101,7 @@ find_or_create_range_partition(PG_FUNCTION_ARGS)
 	prel = get_pathman_relation_info(relid, NULL);
 	rangerel = get_pathman_range_relation(relid, NULL);
 
-	if (!prel || !rangerel || rangerel->ranges.length == 0)
+	if (!prel || !rangerel)
 		PG_RETURN_NULL();
 
 	cmp_proc_oid = get_opfamily_proc(tce->btree_opf,
@@ -135,6 +135,7 @@ find_or_create_range_partition(PG_FUNCTION_ARGS)
 		pos = range_binary_search(rangerel, &cmp_func, value, &found);
 		if (found)
 		{
+			LWLockRelease(edit_partitions_lock);
 			LWLockRelease(load_config_lock);
 			PG_RETURN_OID(ranges[pos].child_oid);
 		}

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ find_or_create_range_partition(PG_FUNCTION_ARGS)`
`101`	`101`	`prel = get_pathman_relation_info(relid, NULL);`
`102`	`102`	`rangerel = get_pathman_range_relation(relid, NULL);`
`103`	`103`
`104`		`- if (!prel \|\| !rangerel \|\| rangerel->ranges.length == 0)`
	`104`	`+ if (!prel \|\| !rangerel)`
`105`	`105`	`PG_RETURN_NULL();`
`106`	`106`
`107`	`107`	`cmp_proc_oid = get_opfamily_proc(tce->btree_opf,`
`@@ -135,6 +135,7 @@ find_or_create_range_partition(PG_FUNCTION_ARGS)`
`135`	`135`	`pos = range_binary_search(rangerel, &cmp_func, value, &found);`
`136`	`136`	`if (found)`
`137`	`137`	`{`
	`138`	`+ LWLockRelease(edit_partitions_lock);`
`138`	`139`	`LWLockRelease(load_config_lock);`
`139`	`140`	`PG_RETURN_OID(ranges[pos].child_oid);`
`140`	`141`	`}`