Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7d6d2c4

Browse files
committed
Drop opcintype from index AM strategy translation API
The type argument wasn't actually really necessary. It was a remnantof converting the API of the gist strategy translation from usingopclass to using opfamily+opcintype (commitsc09e5a6,622f678). For looking up the gist translation function, we usedthe convention "amproclefttype = amprocrighttype = opclass'sopcintype" (see pg_amproc.h). But each operator family should onlyhave one translation function, and getting the right type for thelookup is sometimes cumbersome and fragile, so this is allunnecessarily complicated.To simplify this, change the gist stategy support procedure to take"any", "any" as argument. (This is arbitrary but seems intuitive.The alternative of using InvalidOid as argument(s) upsets various DDLcommands, so it's not practical.) Then we don't need opcintype forthe lookup, and we can remove it from all the API layers introduced bycommitc09e5a6.This also adds some more documentation about the correct signature ofthe gist support function and adds more checks in gistvalidate().This was previously underspecified. (It relied implicitly onconvention mentioned above.)Discussion:https://www.postgresql.org/message-id/flat/E72EAA49-354D-4C2E-8EB9-255197F55330@enterprisedb.com
1 parent7202d72 commit7d6d2c4

File tree

18 files changed

+72
-67
lines changed

18 files changed

+72
-67
lines changed

‎contrib/btree_gist/btree_gist--1.7--1.8.sql‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,79 +9,79 @@ AS 'MODULE_PATHNAME'
99
LANGUAGE C IMMUTABLE PARALLEL SAFE STRICT;
1010

1111
ALTEROPERATOR FAMILY gist_oid_ops USING gist ADD
12-
FUNCTION12 (oid,oid) gist_stratnum_btree (int) ;
12+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
1313

1414
ALTEROPERATOR FAMILY gist_int2_ops USING gist ADD
15-
FUNCTION12 (int2, int2) gist_stratnum_btree (int) ;
15+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
1616

1717
ALTEROPERATOR FAMILY gist_int4_ops USING gist ADD
18-
FUNCTION12 (int4, int4) gist_stratnum_btree (int) ;
18+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
1919

2020
ALTEROPERATOR FAMILY gist_int8_ops USING gist ADD
21-
FUNCTION12 (int8, int8) gist_stratnum_btree (int) ;
21+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
2222

2323
ALTEROPERATOR FAMILY gist_float4_ops USING gist ADD
24-
FUNCTION12 (float4, float4) gist_stratnum_btree (int) ;
24+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
2525

2626
ALTEROPERATOR FAMILY gist_float8_ops USING gist ADD
27-
FUNCTION12 (float8, float8) gist_stratnum_btree (int) ;
27+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
2828

2929
ALTEROPERATOR FAMILY gist_timestamp_ops USING gist ADD
30-
FUNCTION12 (timestamp,timestamp) gist_stratnum_btree (int) ;
30+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
3131

3232
ALTEROPERATOR FAMILY gist_timestamptz_ops USING gist ADD
33-
FUNCTION12 (timestamptz,timestamptz) gist_stratnum_btree (int) ;
33+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
3434

3535
ALTEROPERATOR FAMILY gist_time_ops USING gist ADD
36-
FUNCTION12 (time,time) gist_stratnum_btree (int) ;
36+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
3737

3838
ALTEROPERATOR FAMILY gist_date_ops USING gist ADD
39-
FUNCTION12 (date,date) gist_stratnum_btree (int) ;
39+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
4040

4141
ALTEROPERATOR FAMILY gist_interval_ops USING gist ADD
42-
FUNCTION12 (interval, interval) gist_stratnum_btree (int) ;
42+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
4343

4444
ALTEROPERATOR FAMILY gist_cash_ops USING gist ADD
45-
FUNCTION12 (money,money) gist_stratnum_btree (int) ;
45+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
4646

4747
ALTEROPERATOR FAMILY gist_macaddr_ops USING gist ADD
48-
FUNCTION12 (macaddr,macaddr) gist_stratnum_btree (int) ;
48+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
4949

5050
ALTEROPERATOR FAMILY gist_text_ops USING gist ADD
51-
FUNCTION12 (text,text) gist_stratnum_btree (int) ;
51+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
5252

5353
ALTEROPERATOR FAMILY gist_bpchar_ops USING gist ADD
54-
FUNCTION12 (bpchar, bpchar) gist_stratnum_btree (int) ;
54+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
5555

5656
ALTEROPERATOR FAMILY gist_bytea_ops USING gist ADD
57-
FUNCTION12 (bytea,bytea) gist_stratnum_btree (int) ;
57+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
5858

5959
ALTEROPERATOR FAMILY gist_numeric_ops USING gist ADD
60-
FUNCTION12 (numeric,numeric) gist_stratnum_btree (int) ;
60+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
6161

6262
ALTEROPERATOR FAMILY gist_bit_ops USING gist ADD
63-
FUNCTION12 (bit,bit) gist_stratnum_btree (int) ;
63+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
6464

6565
ALTEROPERATOR FAMILY gist_vbit_ops USING gist ADD
66-
FUNCTION12 (varbit, varbit) gist_stratnum_btree (int) ;
66+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
6767

6868
ALTEROPERATOR FAMILY gist_inet_ops USING gist ADD
69-
FUNCTION12 (inet,inet) gist_stratnum_btree (int) ;
69+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
7070

7171
ALTEROPERATOR FAMILY gist_cidr_ops USING gist ADD
72-
FUNCTION12 (cidr,cidr) gist_stratnum_btree (int) ;
72+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
7373

7474
ALTEROPERATOR FAMILY gist_timetz_ops USING gist ADD
75-
FUNCTION12 (timetz, timetz) gist_stratnum_btree (int) ;
75+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
7676

7777
ALTEROPERATOR FAMILY gist_uuid_ops USING gist ADD
78-
FUNCTION12 (uuid, uuid) gist_stratnum_btree (int) ;
78+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
7979

8080
ALTEROPERATOR FAMILY gist_macaddr8_ops USING gist ADD
81-
FUNCTION12 (macaddr8, macaddr8) gist_stratnum_btree (int) ;
81+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
8282

8383
ALTEROPERATOR FAMILY gist_enum_ops USING gist ADD
84-
FUNCTION12 (anyenum, anyenum) gist_stratnum_btree (int) ;
84+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;
8585

8686
ALTEROPERATOR FAMILY gist_bool_ops USING gist ADD
87-
FUNCTION12 (bool, bool) gist_stratnum_btree (int) ;
87+
FUNCTION12 ("any","any") gist_stratnum_btree (int) ;

‎doc/src/sgml/gist.sgml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,6 +1197,12 @@ CREATE OR REPLACE FUNCTION my_stratnum(integer)
11971197
RETURNS smallint
11981198
AS 'MODULE_PATHNAME'
11991199
LANGUAGE C STRICT;
1200+
</programlisting>
1201+
1202+
And the operator family registration must look like this:
1203+
<programlisting>
1204+
ALTER OPERATOR FAMILY my_opfamily USING gist ADD
1205+
FUNCTION 12 ("any", "any") my_stratnum(int);
12001206
</programlisting>
12011207
</para>
12021208

‎src/backend/access/gist/gistutil.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,13 +1095,13 @@ gist_stratnum_common(PG_FUNCTION_ARGS)
10951095
* Returns InvalidStrategy if the function is not defined.
10961096
*/
10971097
StrategyNumber
1098-
gisttranslatecmptype(CompareTypecmptype,Oidopfamily,Oidopcintype)
1098+
gisttranslatecmptype(CompareTypecmptype,Oidopfamily)
10991099
{
11001100
Oidfuncid;
11011101
Datumresult;
11021102

11031103
/* Check whether the function is provided. */
1104-
funcid=get_opfamily_proc(opfamily,opcintype,opcintype,GIST_STRATNUM_PROC);
1104+
funcid=get_opfamily_proc(opfamily,ANYOID,ANYOID,GIST_STRATNUM_PROC);
11051105
if (!OidIsValid(funcid))
11061106
returnInvalidStrategy;
11071107

‎src/backend/access/gist/gistvalidate.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,9 @@ gistvalidate(Oid opclassoid)
140140
break;
141141
caseGIST_STRATNUM_PROC:
142142
ok=check_amproc_signature(procform->amproc,INT2OID, true,
143-
1,1,INT4OID);
143+
1,1,INT4OID)&&
144+
procform->amproclefttype==ANYOID&&
145+
procform->amprocrighttype==ANYOID;
144146
break;
145147
default:
146148
ereport(INFO,

‎src/backend/access/hash/hash.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -927,15 +927,15 @@ hashbucketcleanup(Relation rel, Bucket cur_bucket, Buffer bucket_buf,
927927
}
928928

929929
CompareType
930-
hashtranslatestrategy(StrategyNumberstrategy,Oidopfamily,Oidopcintype)
930+
hashtranslatestrategy(StrategyNumberstrategy,Oidopfamily)
931931
{
932932
if (strategy==HTEqualStrategyNumber)
933933
returnCOMPARE_EQ;
934934
returnCOMPARE_INVALID;
935935
}
936936

937937
StrategyNumber
938-
hashtranslatecmptype(CompareTypecmptype,Oidopfamily,Oidopcintype)
938+
hashtranslatecmptype(CompareTypecmptype,Oidopfamily)
939939
{
940940
if (cmptype==COMPARE_EQ)
941941
returnHTEqualStrategyNumber;

‎src/backend/access/index/amapi.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,14 @@ GetIndexAmRoutineByAmId(Oid amoid, bool noerror)
115115
* true, just return COMPARE_INVALID.
116116
*/
117117
CompareType
118-
IndexAmTranslateStrategy(StrategyNumberstrategy,Oidamoid,Oidopfamily,Oidopcintype,boolmissing_ok)
118+
IndexAmTranslateStrategy(StrategyNumberstrategy,Oidamoid,Oidopfamily,boolmissing_ok)
119119
{
120120
CompareTyperesult;
121121
IndexAmRoutine*amroutine;
122122

123123
amroutine=GetIndexAmRoutineByAmId(amoid, false);
124124
if (amroutine->amtranslatestrategy)
125-
result=amroutine->amtranslatestrategy(strategy,opfamily,opcintype);
125+
result=amroutine->amtranslatestrategy(strategy,opfamily);
126126
else
127127
result=COMPARE_INVALID;
128128

@@ -140,14 +140,14 @@ IndexAmTranslateStrategy(StrategyNumber strategy, Oid amoid, Oid opfamily, Oid o
140140
* to the given cmptype. If true, just return InvalidStrategy.
141141
*/
142142
StrategyNumber
143-
IndexAmTranslateCompareType(CompareTypecmptype,Oidamoid,Oidopfamily,Oidopcintype,boolmissing_ok)
143+
IndexAmTranslateCompareType(CompareTypecmptype,Oidamoid,Oidopfamily,boolmissing_ok)
144144
{
145145
StrategyNumberresult;
146146
IndexAmRoutine*amroutine;
147147

148148
amroutine=GetIndexAmRoutineByAmId(amoid, false);
149149
if (amroutine->amtranslatecmptype)
150-
result=amroutine->amtranslatecmptype(cmptype,opfamily,opcintype);
150+
result=amroutine->amtranslatecmptype(cmptype,opfamily);
151151
else
152152
result=InvalidStrategy;
153153

‎src/backend/access/nbtree/nbtree.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1513,7 +1513,7 @@ btgettreeheight(Relation rel)
15131513
}
15141514

15151515
CompareType
1516-
bttranslatestrategy(StrategyNumberstrategy,Oidopfamily,Oidopcintype)
1516+
bttranslatestrategy(StrategyNumberstrategy,Oidopfamily)
15171517
{
15181518
switch (strategy)
15191519
{
@@ -1533,7 +1533,7 @@ bttranslatestrategy(StrategyNumber strategy, Oid opfamily, Oid opcintype)
15331533
}
15341534

15351535
StrategyNumber
1536-
bttranslatecmptype(CompareTypecmptype,Oidopfamily,Oidopcintype)
1536+
bttranslatecmptype(CompareTypecmptype,Oidopfamily)
15371537
{
15381538
switch (cmptype)
15391539
{

‎src/backend/catalog/index.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2692,7 +2692,6 @@ BuildSpeculativeIndexInfo(Relation index, IndexInfo *ii)
26922692
IndexAmTranslateCompareType(COMPARE_EQ,
26932693
index->rd_rel->relam,
26942694
index->rd_opfamily[i],
2695-
index->rd_opcintype[i],
26962695
false);
26972696
ii->ii_UniqueOps[i]=
26982697
get_opfamily_member(index->rd_opfamily[i],

‎src/backend/commands/indexcmds.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2468,7 +2468,7 @@ GetOperatorFromCompareType(Oid opclass, Oid rhstype, CompareType cmptype,
24682468
/*
24692469
* Ask the index AM to translate to its internal stratnum
24702470
*/
2471-
*strat=IndexAmTranslateCompareType(cmptype,amid,opfamily,opcintype,true);
2471+
*strat=IndexAmTranslateCompareType(cmptype,amid,opfamily, true);
24722472
if (*strat==InvalidStrategy)
24732473
ereport(ERROR,
24742474
errcode(ERRCODE_UNDEFINED_OBJECT),

‎src/backend/commands/tablecmds.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10113,7 +10113,7 @@ ATAddForeignKeyConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel,
1011310113
*/
1011410114
for_overlaps = with_period && i == numpks - 1;
1011510115
cmptype = for_overlaps ? COMPARE_OVERLAP : COMPARE_EQ;
10116-
eqstrategy = IndexAmTranslateCompareType(cmptype, amid, opfamily,opcintype,true);
10116+
eqstrategy = IndexAmTranslateCompareType(cmptype, amid, opfamily, true);
1011710117
if (eqstrategy == InvalidStrategy)
1011810118
ereport(ERROR,
1011910119
errcode(ERRCODE_UNDEFINED_OBJECT),

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp