Merge master

Author: funbringer

init.c

@@ -398,8 +398,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 | TYPECACHE_CMP_PROC_FINFO);
 			qsort_type_cmp_func = &tce->cmp_proc_finfo;
 			globalByVal = byVal;
 			qsort(ranges, proc, sizeof(RangeEntry), cmp_range_entries);
@@ -458,7 +457,7 @@ validate_range_constraint(Expr *expr, PartRelationInfo *prel, Datum *min, Datum
 	if (!and_clause((Node *) expr))
 		return false;
 
-	tce = lookup_type_cache(prel->atttype, TYPECACHE_EQ_OPR | TYPECACHE_LT_OPR | TYPECACHE_GT_OPR);
+	tce = lookup_type_cache(prel->atttype, TYPECACHE_BTREE_OPFAMILY);
 
 	/* check that left operand is >= operator */
 	opexpr = (OpExpr *) linitial(boolexpr->args);
@@ -517,7 +516,7 @@ validate_hash_constraint(Expr *expr, PartRelationInfo *prel, int *hash)
 	eqexpr = (OpExpr *) expr;
 
 	/* Is this an equality operator? */
-	tce = lookup_type_cache(prel->atttype, TYPECACHE_EQ_OPR);
+	tce = lookup_type_cache(prel->atttype, TYPECACHE_BTREE_OPFAMILY);
 	if (get_op_opfamily_strategy(eqexpr->opno, tce->btree_opf) != BTEqualStrategyNumber)
 		return false;
 

pg_pathman.c

@@ -222,8 +222,7 @@ get_cmp_func(Oid type1, Oid type2)
 
 	cmp_func = palloc(sizeof(FmgrInfo));
 	tce = lookup_type_cache(type1,
-							TYPECACHE_EQ_OPR | TYPECACHE_LT_OPR | TYPECACHE_GT_OPR |
-							TYPECACHE_CMP_PROC | TYPECACHE_CMP_PROC_FINFO);
+				TYPECACHE_BTREE_OPFAMILY | TYPECACHE_CMP_PROC | TYPECACHE_CMP_PROC_FINFO);
 	cmp_proc_oid = get_opfamily_proc(tce->btree_opf,
 									 type1,
 									 type2,
@@ -868,7 +867,9 @@ handle_binary_opexpr(const PartRelationInfo *prel, WrapperNode *result,
 	TypeCacheEntry	   *tce;
 
 	/* 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 | TYPECACHE_CMP_PROC | TYPECACHE_CMP_PROC_FINFO);
+
 	strategy = get_op_opfamily_strategy(expr->opno, tce->btree_opf);
 	cmp_proc_oid = get_opfamily_proc(tce->btree_opf,
 									 c->consttype,