Commit5c551be

committed

Merge master

2 parents28c60fe +c9f7c99 commit5c551beCopy full SHA for 5c551be

File tree

-7

lines changed

-7

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -398,8 +398,7 @@ load_check_constraints(Oid parent_oid, Snapshot snapshot)`
`398`	`398`	`boolbyVal=rangerel->by_val;`
`399`	`399`
`400`	`400`	`/* Sort ascending */`
`401`		`-tce=lookup_type_cache(prel->atttype,`
`402`		`-TYPECACHE_CMP_PROC \|TYPECACHE_CMP_PROC_FINFO);`
	`401`	`+tce=lookup_type_cache(prel->atttype,TYPECACHE_CMP_PROC \|TYPECACHE_CMP_PROC_FINFO);`
`403`	`402`	`qsort_type_cmp_func=&tce->cmp_proc_finfo;`
`404`	`403`	`globalByVal=byVal;`
`405`	`404`	`qsort(ranges,proc,sizeof(RangeEntry),cmp_range_entries);`
`@@ -458,7 +457,7 @@ validate_range_constraint(Expr expr, PartRelationInfo prel, Datum *min, Datum`
`458`	`457`	`if (!and_clause((Node*)expr))`
`459`	`458`	`return false;`
`460`	`459`
`461`		`-tce=lookup_type_cache(prel->atttype,TYPECACHE_EQ_OPR \|TYPECACHE_LT_OPR \|TYPECACHE_GT_OPR);`
	`460`	`+tce=lookup_type_cache(prel->atttype,TYPECACHE_BTREE_OPFAMILY);`
`462`	`461`
`463`	`462`	`/* check that left operand is >= operator */`
`464`	`463`	`opexpr= (OpExpr*)linitial(boolexpr->args);`
`@@ -517,7 +516,7 @@ validate_hash_constraint(Expr expr, PartRelationInfo prel, int *hash)`
`517`	`516`	`eqexpr= (OpExpr*)expr;`
`518`	`517`
`519`	`518`	`/* Is this an equality operator? */`
`520`		`-tce=lookup_type_cache(prel->atttype,TYPECACHE_EQ_OPR);`
	`519`	`+tce=lookup_type_cache(prel->atttype,TYPECACHE_BTREE_OPFAMILY);`
`521`	`520`	`if (get_op_opfamily_strategy(eqexpr->opno,tce->btree_opf)!=BTEqualStrategyNumber)`
`522`	`521`	`return false;`
`523`	`522`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -222,8 +222,7 @@ get_cmp_func(Oid type1, Oid type2)`
`222`	`222`
`223`	`223`	`cmp_func=palloc(sizeof(FmgrInfo));`
`224`	`224`	`tce=lookup_type_cache(type1,`
`225`		`-TYPECACHE_EQ_OPR \|TYPECACHE_LT_OPR \|TYPECACHE_GT_OPR \|`
`226`		`-TYPECACHE_CMP_PROC \|TYPECACHE_CMP_PROC_FINFO);`
	`225`	`+TYPECACHE_BTREE_OPFAMILY \|TYPECACHE_CMP_PROC \|TYPECACHE_CMP_PROC_FINFO);`
`227`	`226`	`cmp_proc_oid=get_opfamily_proc(tce->btree_opf,`
`228`	`227`	`type1,`
`229`	`228`	`type2,`
`@@ -868,7 +867,9 @@ handle_binary_opexpr(const PartRelationInfo prel, WrapperNode result,`
`868`	`867`	`TypeCacheEntry*tce;`
`869`	`868`
`870`	`869`	`/* Determine operator type */`
`871`		`-tce=lookup_type_cache(v->vartype,TYPECACHE_BTREE_OPFAMILY \|TYPECACHE_CMP_PROC \|TYPECACHE_CMP_PROC_FINFO);`
	`870`	`+tce=lookup_type_cache(v->vartype,`
	`871`	`+TYPECACHE_BTREE_OPFAMILY \|TYPECACHE_CMP_PROC \|TYPECACHE_CMP_PROC_FINFO);`
	`872`	`+`
`872`	`873`	`strategy=get_op_opfamily_strategy(expr->opno,tce->btree_opf);`
`873`	`874`	`cmp_proc_oid=get_opfamily_proc(tce->btree_opf,`
`874`	`875`	`c->consttype,`

Comments

(0)