postgrespro
diff --git a/‎contrib/pathman/pathman.c
Lines changed: 57 additions & 5 deletions b/‎contrib/pathman/pathman.c
Lines changed: 57 additions & 5 deletions
diff --git a/‎contrib/pathman/results/pathman.out
Lines changed: 0 additions & 239 deletions b/‎contrib/pathman/results/pathman.out
Lines changed: 0 additions & 239 deletions
@@ -75,6 +75,7 @@ PG_FUNCTION_INFO_V1( on_partitions_created );
 PG_FUNCTION_INFO_V1( on_partitions_updated );
 PG_FUNCTION_INFO_V1( on_partitions_removed );
 PG_FUNCTION_INFO_V1( find_range_partition );
+PG_FUNCTION_INFO_V1( get_range_by_idx );
 PG_FUNCTION_INFO_V1( get_partition_range );
 
 
@@ -1162,8 +1163,8 @@ find_range_partition(PG_FUNCTION_ARGS)
 /*
  * Returns range (min, max) as output parameters
  *
- * first argument is parent relid
- * second is partition relid
+ * first argument is the parent relid
+ * second is the partition relid
  * third and forth are MIN and MAX output parameters
  */
 Datum
@@ -1172,16 +1173,17 @@ get_partition_range(PG_FUNCTION_ARGS)
 	int		parent_oid = DatumGetInt32(PG_GETARG_DATUM(0));
 	int		child_oid = DatumGetInt32(PG_GETARG_DATUM(1));
 	int nelems = 2;
-	Datum *elems = palloc(nelems * sizeof(Datum));
+	Datum *elems;
 	Oid elemtype = INT4OID;
 	PartRelationInfo   *prel;
 	RangeRelation	   *rangerel;
 	RangeEntry		   *ranges;
+	TypeCacheEntry	   *tce;
 	bool	found;
 	int 	i;
 
 	prel = (PartRelationInfo *)
-		hash_search(relations, (const void *) &parent_oid, HASH_FIND, 0);
+		hash_search(relations, (const void *) &parent_oid, HASH_FIND, NULL);
 
 	rangerel = (RangeRelation *)
 		hash_search(range_restrictions, (const void *) &parent_oid, HASH_FIND, NULL);
@@ -1190,6 +1192,9 @@ get_partition_range(PG_FUNCTION_ARGS)
 		PG_RETURN_NULL();
 
 	ranges = dsm_array_get_pointer(&rangerel->ranges);
+	tce = lookup_type_cache(prel->atttype, 0);
+
+	/* looking for specified partition */
 	for(i=0; i<rangerel->ranges.length; i++)
 		if (ranges[i].child_oid == child_oid)
 		{
@@ -1199,13 +1204,60 @@ get_partition_range(PG_FUNCTION_ARGS)
 
 	if (found)
 	{
+		elems = palloc(nelems * sizeof(Datum));
 		elems[0] = ranges[i].min;
 		elems[1] = ranges[i].max;
 
 		ArrayType *arr =
-			construct_array(elems, nelems, prel->atttype, sizeof(Oid), true, 'i');
+			construct_array(elems, nelems, prel->atttype,
+							tce->typlen, tce->typbyval, tce->typalign);
 		PG_RETURN_ARRAYTYPE_P(arr);
 	}
 
 	PG_RETURN_NULL();
 }
+
+
+/*
+ * Returns N-th range (in form of array)
+ *
+ * First argument is the parent relid.
+ * Second argument is the index of the range (if it is negative then the last
+ * range will be returned).
+ */
+Datum
+get_range_by_idx(PG_FUNCTION_ARGS)
+{
+	int parent_oid = DatumGetInt32(PG_GETARG_DATUM(0));
+	int idx = DatumGetInt32(PG_GETARG_DATUM(1));
+	PartRelationInfo *prel;
+	RangeRelation	*rangerel;
+	RangeEntry		*ranges;
+	RangeEntry		*re;
+	Datum			*elems;
+	TypeCacheEntry	*tce;
+
+	prel = (PartRelationInfo *)
+		hash_search(relations, (const void *) &parent_oid, HASH_FIND, NULL);
+
+	rangerel = (RangeRelation *)
+		hash_search(range_restrictions, (const void *) &parent_oid, HASH_FIND, NULL);
+
+	if (!prel || !rangerel || idx >= (int)rangerel->ranges.length)
+		PG_RETURN_NULL();
+
+	tce = lookup_type_cache(prel->atttype, 0);
+	ranges = dsm_array_get_pointer(&rangerel->ranges);
+	if (idx >= 0)
+		re = &ranges[idx];
+	else
+		re = &ranges[rangerel->ranges.length - 1];
+
+	elems = palloc(2 * sizeof(Datum));
+	elems[0] = re->min;
+	elems[1] = re->max;
+
+	PG_RETURN_ARRAYTYPE_P(
+		construct_array(elems, 2, prel->atttype,
+						tce->typlen, tce->typbyval, tce->typalign));
+}