diff options
Diffstat (limited to 'src/backend/access')
| -rw-r--r-- | src/backend/access/gist/gistutil.c | 4 | ||||
| -rw-r--r-- | src/backend/access/gist/gistvalidate.c | 4 | ||||
| -rw-r--r-- | src/backend/access/hash/hash.c | 4 | ||||
| -rw-r--r-- | src/backend/access/index/amapi.c | 8 | ||||
| -rw-r--r-- | src/backend/access/nbtree/nbtree.c | 4 |
5 files changed, 13 insertions, 11 deletions
diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c index dbc4ac639a2..a6b701943d3 100644 --- a/src/backend/access/gist/gistutil.c +++ b/src/backend/access/gist/gistutil.c @@ -1095,13 +1095,13 @@ gist_stratnum_common(PG_FUNCTION_ARGS) * Returns InvalidStrategy if the function is not defined. */ StrategyNumber -gisttranslatecmptype(CompareType cmptype, Oid opfamily, Oid opcintype) +gisttranslatecmptype(CompareType cmptype, Oid opfamily) { Oid funcid; Datum result; /* Check whether the function is provided. */ - funcid = get_opfamily_proc(opfamily, opcintype, opcintype, GIST_STRATNUM_PROC); + funcid = get_opfamily_proc(opfamily, ANYOID, ANYOID, GIST_STRATNUM_PROC); if (!OidIsValid(funcid)) return InvalidStrategy; diff --git a/src/backend/access/gist/gistvalidate.c b/src/backend/access/gist/gistvalidate.c index ffefa12d97a..2a49e6d20f0 100644 --- a/src/backend/access/gist/gistvalidate.c +++ b/src/backend/access/gist/gistvalidate.c @@ -140,7 +140,9 @@ gistvalidate(Oid opclassoid) break; case GIST_STRATNUM_PROC: ok = check_amproc_signature(procform->amproc, INT2OID, true, - 1, 1, INT4OID); + 1, 1, INT4OID) && + procform->amproclefttype == ANYOID && + procform->amprocrighttype == ANYOID; break; default: ereport(INFO, diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c index 02ec1126a4c..b24aae415ea 100644 --- a/src/backend/access/hash/hash.c +++ b/src/backend/access/hash/hash.c @@ -927,7 +927,7 @@ hashbucketcleanup(Relation rel, Bucket cur_bucket, Buffer bucket_buf, } CompareType -hashtranslatestrategy(StrategyNumber strategy, Oid opfamily, Oid opcintype) +hashtranslatestrategy(StrategyNumber strategy, Oid opfamily) { if (strategy == HTEqualStrategyNumber) return COMPARE_EQ; @@ -935,7 +935,7 @@ hashtranslatestrategy(StrategyNumber strategy, Oid opfamily, Oid opcintype) } StrategyNumber -hashtranslatecmptype(CompareType cmptype, Oid opfamily, Oid opcintype) +hashtranslatecmptype(CompareType cmptype, Oid opfamily) { if (cmptype == COMPARE_EQ) return HTEqualStrategyNumber; diff --git a/src/backend/access/index/amapi.c b/src/backend/access/index/amapi.c index 5f53f49ec32..d6b8dad4d52 100644 --- a/src/backend/access/index/amapi.c +++ b/src/backend/access/index/amapi.c @@ -115,14 +115,14 @@ GetIndexAmRoutineByAmId(Oid amoid, bool noerror) * true, just return COMPARE_INVALID. */ CompareType -IndexAmTranslateStrategy(StrategyNumber strategy, Oid amoid, Oid opfamily, Oid opcintype, bool missing_ok) +IndexAmTranslateStrategy(StrategyNumber strategy, Oid amoid, Oid opfamily, bool missing_ok) { CompareType result; IndexAmRoutine *amroutine; amroutine = GetIndexAmRoutineByAmId(amoid, false); if (amroutine->amtranslatestrategy) - result = amroutine->amtranslatestrategy(strategy, opfamily, opcintype); + result = amroutine->amtranslatestrategy(strategy, opfamily); else result = COMPARE_INVALID; @@ -140,14 +140,14 @@ IndexAmTranslateStrategy(StrategyNumber strategy, Oid amoid, Oid opfamily, Oid o * to the given cmptype. If true, just return InvalidStrategy. */ StrategyNumber -IndexAmTranslateCompareType(CompareType cmptype, Oid amoid, Oid opfamily, Oid opcintype, bool missing_ok) +IndexAmTranslateCompareType(CompareType cmptype, Oid amoid, Oid opfamily, bool missing_ok) { StrategyNumber result; IndexAmRoutine *amroutine; amroutine = GetIndexAmRoutineByAmId(amoid, false); if (amroutine->amtranslatecmptype) - result = amroutine->amtranslatecmptype(cmptype, opfamily, opcintype); + result = amroutine->amtranslatecmptype(cmptype, opfamily); else result = InvalidStrategy; diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index dc244ae24c7..411d5ac0b5f 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -1513,7 +1513,7 @@ btgettreeheight(Relation rel) } CompareType -bttranslatestrategy(StrategyNumber strategy, Oid opfamily, Oid opcintype) +bttranslatestrategy(StrategyNumber strategy, Oid opfamily) { switch (strategy) { @@ -1533,7 +1533,7 @@ bttranslatestrategy(StrategyNumber strategy, Oid opfamily, Oid opcintype) } StrategyNumber -bttranslatecmptype(CompareType cmptype, Oid opfamily, Oid opcintype) +bttranslatecmptype(CompareType cmptype, Oid opfamily) { switch (cmptype) { |