improve lookup_type_cache() usage

funbringer · funbringer · commit 421b2eda92e2 · 2016-06-02T19:21:31.000+03:00
diff --git a/range.sql b/range.sql
@@ -1134,9 +1134,9 @@ BEGIN
 	SELECT * INTO schema, relname
 	FROM @extschema@.get_plain_schema_and_relname(relation);
 
-	EXECUTE format('DROP TRIGGER IF EXISTS %s ON %s CASCADE'
-				   , format('"%s_%s_insert_trigger"', schema, relname)
-				   , relation::TEXT);
+	--EXECUTE format('DROP TRIGGER IF EXISTS %s ON %s CASCADE'
+	--			   , format('"%s_%s_insert_trigger"', schema, relname)
+	--			   , relation::TEXT);
 END
 $$ LANGUAGE plpgsql;
 
diff --git a/src/init.c b/src/init.c
@@ -395,7 +395,7 @@ load_check_constraints(Oid parent_oid, Snapshot snapshot)
 			bool byVal = rangerel->by_val;
 
 			/* Sort ascending */
-			tce = lookup_type_cache(prel->atttype, TYPECACHE_CMP_PROC | TYPECACHE_CMP_PROC_FINFO);
+			tce = lookup_type_cache(prel->atttype, TYPECACHE_CMP_PROC_FINFO);
 			qsort_type_cmp_func = &tce->cmp_proc_finfo;
 			globalByVal = byVal;
 			qsort(ranges, proc, sizeof(RangeEntry), cmp_range_entries);
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -1038,20 +1038,12 @@ handle_binary_opexpr(WalkerContext *context, WrapperNode *result,
 							strategy;
 	TypeCacheEntry		   *tce;
 	FmgrInfo				cmp_func;
-	Oid						cmp_proc_oid;
 	const OpExpr		   *expr = (const OpExpr *) result->orig;
 	const PartRelationInfo *prel = context->prel;
 
-	/* Determine operator type */
-	tce = lookup_type_cache(v->vartype,
-							TYPECACHE_BTREE_OPFAMILY | TYPECACHE_CMP_PROC | TYPECACHE_CMP_PROC_FINFO);
-
+	tce = lookup_type_cache(v->vartype, TYPECACHE_BTREE_OPFAMILY);
 	strategy = get_op_opfamily_strategy(expr->opno, tce->btree_opf);
-	cmp_proc_oid = get_opfamily_proc(tce->btree_opf,
-									 c->consttype,
-									 prel->atttype,
-									 BTORDER_PROC);
-	fmgr_info(cmp_proc_oid, &cmp_func);
+	fill_type_cmp_fmgr_info(&cmp_func, c->consttype, prel->atttype);
 
 	switch (prel->parttype)
 	{
@@ -1237,23 +1229,16 @@ handle_const(const Const *c, WalkerContext *context)
 
 		case PT_RANGE:
 			{
-				Oid				cmp_proc_oid;
-				FmgrInfo		cmp_func;
 				TypeCacheEntry *tce;
 
-				tce = lookup_type_cache(c->consttype, 0);
-				cmp_proc_oid = get_opfamily_proc(tce->btree_opf,
-												 c->consttype,
-												 c->consttype,
-												 BTORDER_PROC);
-				fmgr_info(cmp_proc_oid, &cmp_func);
+				tce = lookup_type_cache(c->consttype, TYPECACHE_CMP_PROC_FINFO);
 
 				if (!context->ranges)
 					refresh_walker_context_ranges(context);
 
 				select_range_partitions(c->constvalue,
 										c->constbyval,
-										&cmp_func,
+										&tce->cmp_proc_finfo,
 										context->ranges,
 										context->nranges,
 										BTEqualStrategyNumber,
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -92,28 +92,18 @@ find_or_create_range_partition(PG_FUNCTION_ARGS)
 	Datum				value = PG_GETARG_DATUM(1);
 	Oid					value_type = get_fn_expr_argtype(fcinfo->flinfo, 1);
 	RangeRelation	   *rangerel;
-	TypeCacheEntry	   *tce;
 	PartRelationInfo   *prel;
-	Oid					cmp_proc_oid;
 	FmgrInfo			cmp_func;
 	search_rangerel_result search_state;
 	RangeEntry			found_re;
 
-	tce = lookup_type_cache(value_type,
-		TYPECACHE_EQ_OPR | TYPECACHE_LT_OPR | TYPECACHE_GT_OPR |
-		TYPECACHE_CMP_PROC | TYPECACHE_CMP_PROC_FINFO);
-
 	prel = get_pathman_relation_info(relid, NULL);
 	rangerel = get_pathman_range_relation(relid, NULL);
 
 	if (!prel || !rangerel)
 		PG_RETURN_NULL();
 
-	cmp_proc_oid = get_opfamily_proc(tce->btree_opf,
-									 value_type,
-									 prel->atttype,
-									 BTORDER_PROC);
-	fmgr_info(cmp_proc_oid, &cmp_func);
+	fill_type_cmp_fmgr_info(&cmp_func, value_type, prel->atttype);
 
 	search_state = search_range_partition_eq(value, &cmp_func,
 											 rangerel, &found_re);
diff --git a/src/utils.c b/src/utils.c
@@ -258,10 +258,7 @@ fill_type_cmp_fmgr_info(FmgrInfo *finfo, Oid type1, Oid type2)
 	Oid				cmp_proc_oid;
 	TypeCacheEntry *tce;
 
-	tce = lookup_type_cache(type1,
-							TYPECACHE_BTREE_OPFAMILY |
-								TYPECACHE_CMP_PROC |
-								TYPECACHE_CMP_PROC_FINFO);
+	tce = lookup_type_cache(type1, TYPECACHE_BTREE_OPFAMILY);
 
 	cmp_proc_oid = get_opfamily_proc(tce->btree_opf,
 									 type1,
