call fill_type_cmp_fmgr_info() in handle_binary_opexpr() only for RANGE part. cases, improve fill_type_cmp_fmgr_info()

funbringer · funbringer · commit dc86c76ddba6 · 2016-11-21T20:11:53.000+03:00
diff --git a/expected/pathman_basic.out b/expected/pathman_basic.out
@@ -1114,6 +1114,30 @@ EXPLAIN (COSTS OFF) SELECT * FROM test.sql_inline_func(1);
 DROP FUNCTION test.sql_inline_func(int);
 DROP TABLE test.sql_inline CASCADE;
 NOTICE:  drop cascades to 3 other objects
+/*
+ * Test by @baiyinqiqi (issue #60)
+ */
+CREATE TABLE test.hash_varchar(val VARCHAR(40) NOT NULL);
+INSERT INTO test.hash_varchar SELECT generate_series(1, 20);
+SELECT pathman.create_hash_partitions('test.hash_varchar', 'val', 4);
+ create_hash_partitions 
+------------------------
+                      4
+(1 row)
+
+SELECT * FROM test.hash_varchar WHERE val = 'a';
+ val 
+-----
+(0 rows)
+
+SELECT * FROM test.hash_varchar WHERE val = '12'::TEXT;
+ val 
+-----
+ 12
+(1 row)
+
+DROP TABLE test.hash_varchar CASCADE;
+NOTICE:  drop cascades to 4 other objects
 /*
  * Test CTE query
  */
diff --git a/sql/pathman_basic.sql b/sql/pathman_basic.sql
@@ -280,6 +280,18 @@ EXPLAIN (COSTS OFF) SELECT * FROM test.sql_inline_func(1);
 DROP FUNCTION test.sql_inline_func(int);
 DROP TABLE test.sql_inline CASCADE;
 
+/*
+ * Test by @baiyinqiqi (issue #60)
+ */
+CREATE TABLE test.hash_varchar(val VARCHAR(40) NOT NULL);
+INSERT INTO test.hash_varchar SELECT generate_series(1, 20);
+
+SELECT pathman.create_hash_partitions('test.hash_varchar', 'val', 4);
+SELECT * FROM test.hash_varchar WHERE val = 'a';
+SELECT * FROM test.hash_varchar WHERE val = '12'::TEXT;
+
+DROP TABLE test.hash_varchar CASCADE;
+
 /*
  * Test CTE query
  */
@@ -291,7 +303,6 @@ EXPLAIN (COSTS OFF)
 	WITH ttt AS (SELECT * FROM test.hash_rel WHERE value = 2)
 SELECT * FROM ttt;
 
-
 /*
  * Test CTE query - by @parihaaraka (add varno to WalkerContext)
  */
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -704,7 +704,6 @@ handle_binary_opexpr(WalkerContext *context, WrapperNode *result,
 {
 	int						strategy;
 	TypeCacheEntry		   *tce;
-	FmgrInfo				cmp_func;
 	Oid						vartype;
 	const OpExpr		   *expr = (const OpExpr *) result->orig;
 	const PartRelationInfo *prel = context->prel;
@@ -730,10 +729,6 @@ handle_binary_opexpr(WalkerContext *context, WrapperNode *result,
 	if (strategy == 0)
 		goto binary_opexpr_return;
 
-	fill_type_cmp_fmgr_info(&cmp_func,
-							getBaseType(c->consttype),
-							getBaseType(prel->atttype));
-
 	switch (prel->parttype)
 	{
 		case PT_HASH:
@@ -754,6 +749,12 @@ handle_binary_opexpr(WalkerContext *context, WrapperNode *result,
 
 		case PT_RANGE:
 			{
+				FmgrInfo cmp_func;
+
+				fill_type_cmp_fmgr_info(&cmp_func,
+										getBaseType(c->consttype),
+										getBaseType(prel->atttype));
+
 				select_range_partitions(c->constvalue,
 										&cmp_func,
 										PrelGetRangesArray(context->prel),
diff --git a/src/utils.c b/src/utils.c
@@ -64,28 +64,36 @@ void
 fill_type_cmp_fmgr_info(FmgrInfo *finfo, Oid type1, Oid type2)
 {
 	Oid				cmp_proc_oid;
-	TypeCacheEntry *tce;
+	TypeCacheEntry *tce_1,
+				   *tce_2;
 
 	if (IsBinaryCoercible(type1, type2))
 		type1 = type2;
 
 	else if (IsBinaryCoercible(type2, type1))
 		type2 = type1;
 
-	tce = lookup_type_cache(type1, TYPECACHE_BTREE_OPFAMILY);
+	tce_1 = lookup_type_cache(type1, TYPECACHE_BTREE_OPFAMILY);
+	tce_2 = lookup_type_cache(type2, TYPECACHE_BTREE_OPFAMILY);
 
-	cmp_proc_oid = get_opfamily_proc(tce->btree_opf,
-									 type1,
-									 type2,
+	if (tce_1->btree_opf != tce_2->btree_opf)
+		goto fill_type_cmp_fmgr_info_error;
+
+	cmp_proc_oid = get_opfamily_proc(tce_1->btree_opf,
+									 tce_1->btree_opintype,
+									 tce_2->btree_opintype,
 									 BTORDER_PROC);
 
 	if (cmp_proc_oid == InvalidOid)
-		elog(ERROR, "missing comparison function for types %s & %s",
-			 format_type_be(type1), format_type_be(type2));
+		goto fill_type_cmp_fmgr_info_error;
 
 	fmgr_info(cmp_proc_oid, finfo);
 
-	return;
+	return; /* exit safely */
+
+fill_type_cmp_fmgr_info_error:
+	elog(ERROR, "missing comparison function for types %s & %s",
+		 format_type_be(type1), format_type_be(type2));
 }
 
 List *
