change signature of function build_hash_condition(), more tests

funbringer · funbringer · commit dc0a854698cc · 2016-11-29T18:06:33.000+03:00
diff --git a/expected/pathman_calamity.out b/expected/pathman_calamity.out
@@ -12,6 +12,44 @@ SELECT debug_capture();
 set client_min_messages = NOTICE;
 /* create table to be partitioned */
 CREATE TABLE calamity.part_test(val serial);
+/* check function build_hash_condition() */
+SELECT build_hash_condition('int4', 'val', 10, 1);
+              build_hash_condition               
+-------------------------------------------------
+ public.get_hash_part_idx(hashint4(val), 10) = 1
+(1 row)
+
+SELECT build_hash_condition('text', 'val', 10, 1);
+              build_hash_condition               
+-------------------------------------------------
+ public.get_hash_part_idx(hashtext(val), 10) = 1
+(1 row)
+
+SELECT build_hash_condition('int4', 'val', 1, 1);
+ERROR:  'partition_index' must be lower than 'partitions_count'
+SELECT build_hash_condition('int4', 'val', 10, 20);
+ERROR:  'partition_index' must be lower than 'partitions_count'
+SELECT build_hash_condition('text', 'val', 10, NULL) IS NULL;
+ ?column? 
+----------
+ t
+(1 row)
+
+SELECT build_hash_condition('calamity.part_test', 'val', 10, 1);
+ERROR:  no hash function for type calamity.part_test
+/* check function build_range_condition() */
+SELECT build_range_condition('val', 10, 20);
+   build_range_condition    
+----------------------------
+ val >= '10' AND val < '20'
+(1 row)
+
+SELECT build_range_condition('val', 10, NULL) IS NULL;
+ ?column? 
+----------
+ t
+(1 row)
+
 /* check function validate_relname() */
 SELECT validate_relname('calamity.part_test');
  validate_relname 
diff --git a/hash.sql b/hash.sql
@@ -289,9 +289,9 @@ LANGUAGE C STRICT;
  * Build hash condition for a CHECK CONSTRAINT
  */
 CREATE OR REPLACE FUNCTION @extschema@.build_hash_condition(
-	parent_relid		REGCLASS,
+	attribute_type		REGTYPE,
 	attribute			TEXT,
-	part_count			INT4,
-	part_idx			INT4)
+	partitions_count	INT4,
+	partitions_index	INT4)
 RETURNS TEXT AS 'pg_pathman', 'build_hash_condition'
 LANGUAGE C STRICT;
diff --git a/range.sql b/range.sql
@@ -1228,11 +1228,11 @@ SET client_min_messages = WARNING;
  * Construct CHECK constraint condition for a range partition.
  */
 CREATE OR REPLACE FUNCTION @extschema@.build_range_condition(
-	p_attname		TEXT,
+	attribute		TEXT,
 	start_value		ANYELEMENT,
 	end_value		ANYELEMENT)
 RETURNS TEXT AS 'pg_pathman', 'build_range_condition'
-LANGUAGE C;
+LANGUAGE C STRICT;
 
 CREATE OR REPLACE FUNCTION @extschema@.build_sequence_name(
 	parent_relid	REGCLASS)
diff --git a/sql/pathman_calamity.sql b/sql/pathman_calamity.sql
@@ -14,6 +14,18 @@ set client_min_messages = NOTICE;
 CREATE TABLE calamity.part_test(val serial);
 
 
+/* check function build_hash_condition() */
+SELECT build_hash_condition('int4', 'val', 10, 1);
+SELECT build_hash_condition('text', 'val', 10, 1);
+SELECT build_hash_condition('int4', 'val', 1, 1);
+SELECT build_hash_condition('int4', 'val', 10, 20);
+SELECT build_hash_condition('text', 'val', 10, NULL) IS NULL;
+SELECT build_hash_condition('calamity.part_test', 'val', 10, 1);
+
+/* check function build_range_condition() */
+SELECT build_range_condition('val', 10, 20);
+SELECT build_range_condition('val', 10, NULL) IS NULL;
+
 /* check function validate_relname() */
 SELECT validate_relname('calamity.part_test');
 SELECT validate_relname(1::REGCLASS);
diff --git a/src/pl_hash_funcs.c b/src/pl_hash_funcs.c
@@ -91,28 +91,24 @@ get_hash_part_idx(PG_FUNCTION_ARGS)
 Datum
 build_hash_condition(PG_FUNCTION_ARGS)
 {
-	Oid				parent = PG_GETARG_OID(0);
+	Oid				atttype = PG_GETARG_OID(0);
 	text		   *attname = PG_GETARG_TEXT_P(1);
-	uint32			part_count = PG_GETARG_UINT32(2);
-	uint32			part_idx = PG_GETARG_UINT32(3);
+	uint32			part_count = PG_GETARG_UINT32(2),
+					part_idx = PG_GETARG_UINT32(3);
 
 	TypeCacheEntry *tce;
-	Oid				attype;
 	char		   *attname_cstring = text_to_cstring(attname);
 
 	char		   *result;
 
 	if (part_idx >= part_count)
-		elog(ERROR, "'part_idx' must be lower than 'part_count'");
+		elog(ERROR, "'partition_index' must be lower than 'partitions_count'");
 
-	/* Get attribute type and its hash function oid */
-	attype = get_attribute_type(parent, attname_cstring, false);
-	if (attype == InvalidOid)
-		elog(ERROR, "relation \"%s\" has no attribute \"%s\"",
-					get_rel_name(parent),
-					attname_cstring);
+	tce = lookup_type_cache(atttype, TYPECACHE_HASH_PROC);
 
-	tce = lookup_type_cache(attype, TYPECACHE_HASH_PROC);
+	/* Check that HASH function exists */
+	if (!OidIsValid(tce->hash_proc))
+		elog(ERROR, "no hash function for type %s", format_type_be(atttype));
 
 	/* Create hash condition CSTRING */
 	result = psprintf("%s.get_hash_part_idx(%s(%s), %u) = %u",
