Skip to content

Commit 6cc3a18

Browse files
za-arthurza-arthur
committed
Fix update script
1 parent 003785c commit 6cc3a18

File tree

3 files changed

+110
-44
lines changed

3 files changed

+110
-44
lines changed

‎gen_rum_sql--1.1--1.2.pl

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
my $opclass_distance_template=<<EOT;
1313
1414
ALTER OPERATOR FAMILY rum_TYPEIDENT_ops USING rum ADD
15-
FUNCTION 8 rum_TYPEIDENT_key_distance(internal,smallint,TYPENAME,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
15+
FUNCTION 8 (TYPENAME,TYPENAME) rum_TYPEIDENT_key_distance(internal,smallint,TYPENAME,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
1616
1717
EOT
1818

@@ -64,22 +64,44 @@
6464
* RUM version 1.2
6565
*/
6666
67-
ALTER OPERATOR FAMILY rum_tsvector_ops USING rum DROP
68-
FUNCTION 8 (internal,smallint,tsvector,int,internal,internal,internal,internal,internal);
69-
70-
ALTER OPERATOR FAMILY rum_tsvector_hash_ops USING rum DROP
71-
FUNCTION 8 (internal,smallint,tsvector,int,internal,internal,internal,internal,internal);
67+
DROP OPERATOR CLASS rum_tsvector_ops USING rum;
68+
DROP OPERATOR CLASS rum_tsvector_hash_ops USING rum;
7269
7370
CREATE OR REPLACE FUNCTION rum_tsquery_distance(internal,smallint,internal,smallint,tsvector,int,internal,internal,internal,internal,internal,internal)
7471
RETURNS float8
7572
AS 'MODULE_PATHNAME'
7673
LANGUAGE C IMMUTABLE STRICT;
7774
78-
ALTER OPERATOR FAMILY rum_tsvector_ops USING rum ADD
79-
FUNCTION 8 rum_tsquery_distance(internal,smallint,internal,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
80-
81-
ALTER OPERATOR FAMILY rum_tsvector_hash_ops USING rum ADD
82-
FUNCTION 8 rum_tsquery_distance(internal,smallint,internal,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
75+
CREATE OPERATOR CLASS rum_tsvector_ops
76+
DEFAULT FOR TYPE tsvector USING rum
77+
AS
78+
OPERATOR 1 @@ (tsvector, tsquery),
79+
OPERATOR 2 <=> (tsvector, tsquery) FOR ORDER BY pg_catalog.float_ops,
80+
FUNCTION 1 gin_cmp_tslexeme(text, text),
81+
FUNCTION 2 rum_extract_tsvector(tsvector,internal,internal,internal,internal),
82+
FUNCTION 3 rum_extract_tsquery(tsquery,internal,smallint,internal,internal,internal,internal),
83+
FUNCTION 4 rum_tsquery_consistent(internal,smallint,tsvector,int,internal,internal,internal,internal),
84+
FUNCTION 5 gin_cmp_prefix(text,text,smallint,internal),
85+
FUNCTION 6 rum_tsvector_config(internal),
86+
FUNCTION 7 rum_tsquery_pre_consistent(internal,smallint,tsvector,int,internal,internal,internal,internal),
87+
FUNCTION 8 rum_tsquery_distance(internal,smallint,internal,smallint,tsvector,int,internal,internal,internal,internal,internal,internal),
88+
FUNCTION 10 rum_ts_join_pos(internal, internal),
89+
STORAGE text;
90+
91+
CREATE OPERATOR CLASS rum_tsvector_hash_ops
92+
FOR TYPE tsvector USING rum
93+
AS
94+
OPERATOR 1 @@ (tsvector, tsquery),
95+
OPERATOR 2 <=> (tsvector, tsquery) FOR ORDER BY pg_catalog.float_ops,
96+
FUNCTION 1 btint4cmp(integer, integer),
97+
FUNCTION 2 rum_extract_tsvector_hash(tsvector,internal,internal,internal,internal),
98+
FUNCTION 3 rum_extract_tsquery_hash(tsquery,internal,smallint,internal,internal,internal,internal),
99+
FUNCTION 4 rum_tsquery_consistent(internal,smallint,tsvector,int,internal,internal,internal,internal),
100+
FUNCTION 6 rum_tsvector_config(internal),
101+
FUNCTION 7 rum_tsquery_pre_consistent(internal,smallint,tsvector,int,internal,internal,internal,internal),
102+
FUNCTION 8 rum_tsquery_distance(internal,smallint,internal,smallint,tsvector,int,internal,internal,internal,internal,internal,internal),
103+
FUNCTION 10 rum_ts_join_pos(internal, internal),
104+
STORAGE integer;
83105
84106
EOT
85107

‎rum--1.1--1.2.sql

Lines changed: 39 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,44 @@
22
* RUM version 1.2
33
*/
44

5-
ALTER OPERATOR FAMILY rum_tsvector_ops USING rum DROP
6-
FUNCTION 8 (internal,smallint,tsvector,int,internal,internal,internal,internal,internal);
7-
8-
ALTER OPERATOR FAMILY rum_tsvector_hash_ops USING rum DROP
9-
FUNCTION 8 (internal,smallint,tsvector,int,internal,internal,internal,internal,internal);
5+
DROP OPERATOR CLASS rum_tsvector_ops USING rum;
6+
DROP OPERATOR CLASS rum_tsvector_hash_ops USING rum;
107

118
CREATE OR REPLACE FUNCTION rum_tsquery_distance(internal,smallint,internal,smallint,tsvector,int,internal,internal,internal,internal,internal,internal)
129
RETURNS float8
1310
AS 'MODULE_PATHNAME'
1411
LANGUAGE C IMMUTABLE STRICT;
1512

16-
ALTER OPERATOR FAMILY rum_tsvector_ops USING rum ADD
17-
FUNCTION 8 rum_tsquery_distance(internal,smallint,internal,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
18-
19-
ALTER OPERATOR FAMILY rum_tsvector_hash_ops USING rum ADD
20-
FUNCTION 8 rum_tsquery_distance(internal,smallint,internal,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
13+
CREATE OPERATOR CLASS rum_tsvector_ops
14+
DEFAULT FOR TYPE tsvector USING rum
15+
AS
16+
OPERATOR 1 @@ (tsvector, tsquery),
17+
OPERATOR 2 <=> (tsvector, tsquery) FOR ORDER BY pg_catalog.float_ops,
18+
FUNCTION 1 gin_cmp_tslexeme(text, text),
19+
FUNCTION 2 rum_extract_tsvector(tsvector,internal,internal,internal,internal),
20+
FUNCTION 3 rum_extract_tsquery(tsquery,internal,smallint,internal,internal,internal,internal),
21+
FUNCTION 4 rum_tsquery_consistent(internal,smallint,tsvector,int,internal,internal,internal,internal),
22+
FUNCTION 5 gin_cmp_prefix(text,text,smallint,internal),
23+
FUNCTION 6 rum_tsvector_config(internal),
24+
FUNCTION 7 rum_tsquery_pre_consistent(internal,smallint,tsvector,int,internal,internal,internal,internal),
25+
FUNCTION 8 rum_tsquery_distance(internal,smallint,internal,smallint,tsvector,int,internal,internal,internal,internal,internal,internal),
26+
FUNCTION 10 rum_ts_join_pos(internal, internal),
27+
STORAGE text;
28+
29+
CREATE OPERATOR CLASS rum_tsvector_hash_ops
30+
FOR TYPE tsvector USING rum
31+
AS
32+
OPERATOR 1 @@ (tsvector, tsquery),
33+
OPERATOR 2 <=> (tsvector, tsquery) FOR ORDER BY pg_catalog.float_ops,
34+
FUNCTION 1 btint4cmp(integer, integer),
35+
FUNCTION 2 rum_extract_tsvector_hash(tsvector,internal,internal,internal,internal),
36+
FUNCTION 3 rum_extract_tsquery_hash(tsquery,internal,smallint,internal,internal,internal,internal),
37+
FUNCTION 4 rum_tsquery_consistent(internal,smallint,tsvector,int,internal,internal,internal,internal),
38+
FUNCTION 6 rum_tsvector_config(internal),
39+
FUNCTION 7 rum_tsquery_pre_consistent(internal,smallint,tsvector,int,internal,internal,internal,internal),
40+
FUNCTION 8 rum_tsquery_distance(internal,smallint,internal,smallint,tsvector,int,internal,internal,internal,internal,internal,internal),
41+
FUNCTION 10 rum_ts_join_pos(internal, internal),
42+
STORAGE integer;
2143

2244
/*--------------------int2-----------------------*/
2345

@@ -28,7 +50,7 @@ LANGUAGE C IMMUTABLE STRICT;
2850

2951

3052
ALTER OPERATOR FAMILY rum_int2_ops USING rum ADD
31-
FUNCTION 8 rum_int2_key_distance(internal,smallint,int2,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
53+
FUNCTION 8 (int2,int2) rum_int2_key_distance(internal,smallint,int2,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
3254

3355
/*--------------------int4-----------------------*/
3456

@@ -39,7 +61,7 @@ LANGUAGE C IMMUTABLE STRICT;
3961

4062

4163
ALTER OPERATOR FAMILY rum_int4_ops USING rum ADD
42-
FUNCTION 8 rum_int4_key_distance(internal,smallint,int4,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
64+
FUNCTION 8 (int4,int4) rum_int4_key_distance(internal,smallint,int4,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
4365

4466
/*--------------------int8-----------------------*/
4567

@@ -50,7 +72,7 @@ LANGUAGE C IMMUTABLE STRICT;
5072

5173

5274
ALTER OPERATOR FAMILY rum_int8_ops USING rum ADD
53-
FUNCTION 8 rum_int8_key_distance(internal,smallint,int8,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
75+
FUNCTION 8 (int8,int8) rum_int8_key_distance(internal,smallint,int8,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
5476

5577
/*--------------------float4-----------------------*/
5678

@@ -61,7 +83,7 @@ LANGUAGE C IMMUTABLE STRICT;
6183

6284

6385
ALTER OPERATOR FAMILY rum_float4_ops USING rum ADD
64-
FUNCTION 8 rum_float4_key_distance(internal,smallint,float4,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
86+
FUNCTION 8 (float4,float4) rum_float4_key_distance(internal,smallint,float4,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
6587

6688
/*--------------------float8-----------------------*/
6789

@@ -72,7 +94,7 @@ LANGUAGE C IMMUTABLE STRICT;
7294

7395

7496
ALTER OPERATOR FAMILY rum_float8_ops USING rum ADD
75-
FUNCTION 8 rum_float8_key_distance(internal,smallint,float8,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
97+
FUNCTION 8 (float8,float8) rum_float8_key_distance(internal,smallint,float8,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
7698

7799
/*--------------------money-----------------------*/
78100

@@ -83,7 +105,7 @@ LANGUAGE C IMMUTABLE STRICT;
83105

84106

85107
ALTER OPERATOR FAMILY rum_money_ops USING rum ADD
86-
FUNCTION 8 rum_money_key_distance(internal,smallint,money,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
108+
FUNCTION 8 (money,money) rum_money_key_distance(internal,smallint,money,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
87109

88110
/*--------------------oid-----------------------*/
89111

@@ -94,5 +116,5 @@ LANGUAGE C IMMUTABLE STRICT;
94116

95117

96118
ALTER OPERATOR FAMILY rum_oid_ops USING rum ADD
97-
FUNCTION 8 rum_oid_key_distance(internal,smallint,oid,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
119+
FUNCTION 8 (oid,oid) rum_oid_key_distance(internal,smallint,oid,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
98120

‎rum--1.2.sql

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1519,22 +1519,44 @@ STORAGE numeric;
15191519
* RUM version 1.2
15201520
*/
15211521

1522-
ALTER OPERATOR FAMILY rum_tsvector_ops USING rum DROP
1523-
FUNCTION 8 (internal,smallint,tsvector,int,internal,internal,internal,internal,internal);
1524-
1525-
ALTER OPERATOR FAMILY rum_tsvector_hash_ops USING rum DROP
1526-
FUNCTION 8 (internal,smallint,tsvector,int,internal,internal,internal,internal,internal);
1522+
DROP OPERATOR CLASS rum_tsvector_ops USING rum;
1523+
DROP OPERATOR CLASS rum_tsvector_hash_ops USING rum;
15271524

15281525
CREATE OR REPLACE FUNCTION rum_tsquery_distance(internal,smallint,internal,smallint,tsvector,int,internal,internal,internal,internal,internal,internal)
15291526
RETURNS float8
15301527
AS 'MODULE_PATHNAME'
15311528
LANGUAGE C IMMUTABLE STRICT;
15321529

1533-
ALTER OPERATOR FAMILY rum_tsvector_ops USING rum ADD
1534-
FUNCTION 8 rum_tsquery_distance(internal,smallint,internal,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
1530+
CREATE OPERATOR CLASS rum_tsvector_ops
1531+
DEFAULT FOR TYPE tsvector USING rum
1532+
AS
1533+
OPERATOR 1 @@ (tsvector, tsquery),
1534+
OPERATOR 2 <=> (tsvector, tsquery) FOR ORDER BY pg_catalog.float_ops,
1535+
FUNCTION 1 gin_cmp_tslexeme(text, text),
1536+
FUNCTION 2 rum_extract_tsvector(tsvector,internal,internal,internal,internal),
1537+
FUNCTION 3 rum_extract_tsquery(tsquery,internal,smallint,internal,internal,internal,internal),
1538+
FUNCTION 4 rum_tsquery_consistent(internal,smallint,tsvector,int,internal,internal,internal,internal),
1539+
FUNCTION 5 gin_cmp_prefix(text,text,smallint,internal),
1540+
FUNCTION 6 rum_tsvector_config(internal),
1541+
FUNCTION 7 rum_tsquery_pre_consistent(internal,smallint,tsvector,int,internal,internal,internal,internal),
1542+
FUNCTION 8 rum_tsquery_distance(internal,smallint,internal,smallint,tsvector,int,internal,internal,internal,internal,internal,internal),
1543+
FUNCTION 10 rum_ts_join_pos(internal, internal),
1544+
STORAGE text;
15351545

1536-
ALTER OPERATOR FAMILY rum_tsvector_hash_ops USING rum ADD
1537-
FUNCTION 8 rum_tsquery_distance(internal,smallint,internal,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
1546+
CREATE OPERATOR CLASS rum_tsvector_hash_ops
1547+
FOR TYPE tsvector USING rum
1548+
AS
1549+
OPERATOR 1 @@ (tsvector, tsquery),
1550+
OPERATOR 2 <=> (tsvector, tsquery) FOR ORDER BY pg_catalog.float_ops,
1551+
FUNCTION 1 btint4cmp(integer, integer),
1552+
FUNCTION 2 rum_extract_tsvector_hash(tsvector,internal,internal,internal,internal),
1553+
FUNCTION 3 rum_extract_tsquery_hash(tsquery,internal,smallint,internal,internal,internal,internal),
1554+
FUNCTION 4 rum_tsquery_consistent(internal,smallint,tsvector,int,internal,internal,internal,internal),
1555+
FUNCTION 6 rum_tsvector_config(internal),
1556+
FUNCTION 7 rum_tsquery_pre_consistent(internal,smallint,tsvector,int,internal,internal,internal,internal),
1557+
FUNCTION 8 rum_tsquery_distance(internal,smallint,internal,smallint,tsvector,int,internal,internal,internal,internal,internal,internal),
1558+
FUNCTION 10 rum_ts_join_pos(internal, internal),
1559+
STORAGE integer;
15381560

15391561
/*--------------------int2-----------------------*/
15401562

@@ -1545,7 +1567,7 @@ LANGUAGE C IMMUTABLE STRICT;
15451567

15461568

15471569
ALTER OPERATOR FAMILY rum_int2_ops USING rum ADD
1548-
FUNCTION 8 rum_int2_key_distance(internal,smallint,int2,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
1570+
FUNCTION 8 (int2,int2) rum_int2_key_distance(internal,smallint,int2,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
15491571

15501572
/*--------------------int4-----------------------*/
15511573

@@ -1556,7 +1578,7 @@ LANGUAGE C IMMUTABLE STRICT;
15561578

15571579

15581580
ALTER OPERATOR FAMILY rum_int4_ops USING rum ADD
1559-
FUNCTION 8 rum_int4_key_distance(internal,smallint,int4,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
1581+
FUNCTION 8 (int4,int4) rum_int4_key_distance(internal,smallint,int4,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
15601582

15611583
/*--------------------int8-----------------------*/
15621584

@@ -1567,7 +1589,7 @@ LANGUAGE C IMMUTABLE STRICT;
15671589

15681590

15691591
ALTER OPERATOR FAMILY rum_int8_ops USING rum ADD
1570-
FUNCTION 8 rum_int8_key_distance(internal,smallint,int8,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
1592+
FUNCTION 8 (int8,int8) rum_int8_key_distance(internal,smallint,int8,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
15711593

15721594
/*--------------------float4-----------------------*/
15731595

@@ -1578,7 +1600,7 @@ LANGUAGE C IMMUTABLE STRICT;
15781600

15791601

15801602
ALTER OPERATOR FAMILY rum_float4_ops USING rum ADD
1581-
FUNCTION 8 rum_float4_key_distance(internal,smallint,float4,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
1603+
FUNCTION 8 (float4,float4) rum_float4_key_distance(internal,smallint,float4,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
15821604

15831605
/*--------------------float8-----------------------*/
15841606

@@ -1589,7 +1611,7 @@ LANGUAGE C IMMUTABLE STRICT;
15891611

15901612

15911613
ALTER OPERATOR FAMILY rum_float8_ops USING rum ADD
1592-
FUNCTION 8 rum_float8_key_distance(internal,smallint,float8,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
1614+
FUNCTION 8 (float8,float8) rum_float8_key_distance(internal,smallint,float8,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
15931615

15941616
/*--------------------money-----------------------*/
15951617

@@ -1600,7 +1622,7 @@ LANGUAGE C IMMUTABLE STRICT;
16001622

16011623

16021624
ALTER OPERATOR FAMILY rum_money_ops USING rum ADD
1603-
FUNCTION 8 rum_money_key_distance(internal,smallint,money,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
1625+
FUNCTION 8 (money,money) rum_money_key_distance(internal,smallint,money,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
16041626

16051627
/*--------------------oid-----------------------*/
16061628

@@ -1611,5 +1633,5 @@ LANGUAGE C IMMUTABLE STRICT;
16111633

16121634

16131635
ALTER OPERATOR FAMILY rum_oid_ops USING rum ADD
1614-
FUNCTION 8 rum_oid_key_distance(internal,smallint,oid,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
1636+
FUNCTION 8 (oid,oid) rum_oid_key_distance(internal,smallint,oid,smallint,tsvector,int,internal,internal,internal,internal,internal,internal);
16151637

0 commit comments

Comments
 (0)