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

Commit0cbe1ca

Browse files
committed
Merge branch 'PGPRO_pg_trgm' into PGPRO9_5
Merge new state ofpg_trgm extension
2 parents6113c83 +1bb730d commit0cbe1ca

File tree

11 files changed

+222
-190
lines changed

11 files changed

+222
-190
lines changed

‎contrib/pg_trgm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ EXTENSION = pg_trgm
77
DATA = pg_trgm--1.2.sql pg_trgm--1.0--1.1.sql pg_trgm--1.1--1.2.sql pg_trgm--unpackaged--1.0.sql
88
PGFILEDESC = "pg_trgm - trigram matching"
99

10-
REGRESS = pg_trgmpg_subword_trgm
10+
REGRESS = pg_trgmpg_word_trgm
1111

1212
ifdefUSE_PGXS
1313
PG_CONFIG = pg_config

‎contrib/pg_trgm/expected/pg_subword_trgm.outrenamed to‎contrib/pg_trgm/expected/pg_word_trgm.out

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CREATE TABLE test_trgm2(t text COLLATE "C");
22
\copy test_trgm2 from 'data/trgm2.data'
3-
select t,subword_similarity('Baykal',t) as sml from test_trgm2 where 'Baykal' <% t order by sml desc, t;
3+
select t,word_similarity('Baykal',t) as sml from test_trgm2 where 'Baykal' <% t order by sml desc, t;
44
t | sml
55
-------------------------------------+----------
66
Baykal | 1
@@ -25,7 +25,7 @@ select t,subword_similarity('Baykal',t) as sml from test_trgm2 where 'Baykal' <%
2525
Zabaykal | 0.714286
2626
(20 rows)
2727

28-
select t,subword_similarity('Kabankala',t) as sml from test_trgm2 where 'Kabankala' <% t order by sml desc, t;
28+
select t,word_similarity('Kabankala',t) as sml from test_trgm2 where 'Kabankala' <% t order by sml desc, t;
2929
t | sml
3030
------------------------------+-----
3131
Kabankala | 1
@@ -34,7 +34,7 @@ select t,subword_similarity('Kabankala',t) as sml from test_trgm2 where 'Kabanka
3434
Ntombankala School | 0.6
3535
(4 rows)
3636

37-
select t,subword_similarity('Baykal',t) as sml from test_trgm2 where t %> 'Baykal' order by sml desc, t;
37+
select t,word_similarity('Baykal',t) as sml from test_trgm2 where t %> 'Baykal' order by sml desc, t;
3838
t | sml
3939
-------------------------------------+----------
4040
Baykal | 1
@@ -59,7 +59,7 @@ select t,subword_similarity('Baykal',t) as sml from test_trgm2 where t %> 'Bayka
5959
Zabaykal | 0.714286
6060
(20 rows)
6161

62-
select t,subword_similarity('Kabankala',t) as sml from test_trgm2 where t %> 'Kabankala' order by sml desc, t;
62+
select t,word_similarity('Kabankala',t) as sml from test_trgm2 where t %> 'Kabankala' order by sml desc, t;
6363
t | sml
6464
------------------------------+-----
6565
Kabankala | 1
@@ -82,7 +82,7 @@ select t <->> 'Kabankala', t from test_trgm2 order by t <->> 'Kabankala' limit 7
8282

8383
create index trgm_idx2 on test_trgm2 using gist (t gist_trgm_ops);
8484
set enable_seqscan=off;
85-
select t,subword_similarity('Baykal',t) as sml from test_trgm2 where 'Baykal' <% t order by sml desc, t;
85+
select t,word_similarity('Baykal',t) as sml from test_trgm2 where 'Baykal' <% t order by sml desc, t;
8686
t | sml
8787
-------------------------------------+----------
8888
Baykal | 1
@@ -107,7 +107,7 @@ select t,subword_similarity('Baykal',t) as sml from test_trgm2 where 'Baykal' <%
107107
Zabaykal | 0.714286
108108
(20 rows)
109109

110-
select t,subword_similarity('Kabankala',t) as sml from test_trgm2 where 'Kabankala' <% t order by sml desc, t;
110+
select t,word_similarity('Kabankala',t) as sml from test_trgm2 where 'Kabankala' <% t order by sml desc, t;
111111
t | sml
112112
------------------------------+-----
113113
Kabankala | 1
@@ -116,7 +116,7 @@ select t,subword_similarity('Kabankala',t) as sml from test_trgm2 where 'Kabanka
116116
Ntombankala School | 0.6
117117
(4 rows)
118118

119-
select t,subword_similarity('Baykal',t) as sml from test_trgm2 where t %> 'Baykal' order by sml desc, t;
119+
select t,word_similarity('Baykal',t) as sml from test_trgm2 where t %> 'Baykal' order by sml desc, t;
120120
t | sml
121121
-------------------------------------+----------
122122
Baykal | 1
@@ -141,7 +141,7 @@ select t,subword_similarity('Baykal',t) as sml from test_trgm2 where t %> 'Bayka
141141
Zabaykal | 0.714286
142142
(20 rows)
143143

144-
select t,subword_similarity('Kabankala',t) as sml from test_trgm2 where t %> 'Kabankala' order by sml desc, t;
144+
select t,word_similarity('Kabankala',t) as sml from test_trgm2 where t %> 'Kabankala' order by sml desc, t;
145145
t | sml
146146
------------------------------+-----
147147
Kabankala | 1
@@ -174,7 +174,7 @@ select t <->> 'Kabankala', t from test_trgm2 order by t <->> 'Kabankala' limit 7
174174
drop index trgm_idx2;
175175
create index trgm_idx2 on test_trgm2 using gin (t gin_trgm_ops);
176176
set enable_seqscan=off;
177-
select t,subword_similarity('Baykal',t) as sml from test_trgm2 where 'Baykal' <% t order by sml desc, t;
177+
select t,word_similarity('Baykal',t) as sml from test_trgm2 where 'Baykal' <% t order by sml desc, t;
178178
t | sml
179179
-------------------------------------+----------
180180
Baykal | 1
@@ -199,7 +199,7 @@ select t,subword_similarity('Baykal',t) as sml from test_trgm2 where 'Baykal' <%
199199
Zabaykal | 0.714286
200200
(20 rows)
201201

202-
select t,subword_similarity('Kabankala',t) as sml from test_trgm2 where 'Kabankala' <% t order by sml desc, t;
202+
select t,word_similarity('Kabankala',t) as sml from test_trgm2 where 'Kabankala' <% t order by sml desc, t;
203203
t | sml
204204
------------------------------+-----
205205
Kabankala | 1
@@ -208,7 +208,7 @@ select t,subword_similarity('Kabankala',t) as sml from test_trgm2 where 'Kabanka
208208
Ntombankala School | 0.6
209209
(4 rows)
210210

211-
select t,subword_similarity('Baykal',t) as sml from test_trgm2 where t %> 'Baykal' order by sml desc, t;
211+
select t,word_similarity('Baykal',t) as sml from test_trgm2 where t %> 'Baykal' order by sml desc, t;
212212
t | sml
213213
-------------------------------------+----------
214214
Baykal | 1
@@ -233,7 +233,7 @@ select t,subword_similarity('Baykal',t) as sml from test_trgm2 where t %> 'Bayka
233233
Zabaykal | 0.714286
234234
(20 rows)
235235

236-
select t,subword_similarity('Kabankala',t) as sml from test_trgm2 where t %> 'Kabankala' order by sml desc, t;
236+
select t,word_similarity('Kabankala',t) as sml from test_trgm2 where t %> 'Kabankala' order by sml desc, t;
237237
t | sml
238238
------------------------------+-----
239239
Kabankala | 1
@@ -242,8 +242,8 @@ select t,subword_similarity('Kabankala',t) as sml from test_trgm2 where t %> 'Ka
242242
Ntombankala School | 0.6
243243
(4 rows)
244244

245-
set "pg_trgm.subword_limit" to 0.5;
246-
select t,subword_similarity('Baykal',t) as sml from test_trgm2 where 'Baykal' <% t order by sml desc, t;
245+
set "pg_trgm.word_similarity_threshold" to 0.5;
246+
select t,word_similarity('Baykal',t) as sml from test_trgm2 where 'Baykal' <% t order by sml desc, t;
247247
t | sml
248248
-------------------------------------+----------
249249
Baykal | 1
@@ -271,7 +271,7 @@ select t,subword_similarity('Baykal',t) as sml from test_trgm2 where 'Baykal' <%
271271
Zabaykalovskiy | 0.571429
272272
(23 rows)
273273

274-
select t,subword_similarity('Kabankala',t) as sml from test_trgm2 where 'Kabankala' <% t order by sml desc, t;
274+
select t,word_similarity('Kabankala',t) as sml from test_trgm2 where 'Kabankala' <% t order by sml desc, t;
275275
t | sml
276276
----------------------------------+----------
277277
Kabankala | 1
@@ -282,7 +282,7 @@ select t,subword_similarity('Kabankala',t) as sml from test_trgm2 where 'Kabanka
282282
Nehalla Bankalah Reserved Forest | 0.5
283283
(6 rows)
284284

285-
select t,subword_similarity('Baykal',t) as sml from test_trgm2 where t %> 'Baykal' order by sml desc, t;
285+
select t,word_similarity('Baykal',t) as sml from test_trgm2 where t %> 'Baykal' order by sml desc, t;
286286
t | sml
287287
-------------------------------------+----------
288288
Baykal | 1
@@ -310,7 +310,7 @@ select t,subword_similarity('Baykal',t) as sml from test_trgm2 where t %> 'Bayka
310310
Zabaykalovskiy | 0.571429
311311
(23 rows)
312312

313-
select t,subword_similarity('Kabankala',t) as sml from test_trgm2 where t %> 'Kabankala' order by sml desc, t;
313+
select t,word_similarity('Kabankala',t) as sml from test_trgm2 where t %> 'Kabankala' order by sml desc, t;
314314
t | sml
315315
----------------------------------+----------
316316
Kabankala | 1
@@ -321,8 +321,8 @@ select t,subword_similarity('Kabankala',t) as sml from test_trgm2 where t %> 'Ka
321321
Nehalla Bankalah Reserved Forest | 0.5
322322
(6 rows)
323323

324-
set "pg_trgm.subword_limit" to 0.3;
325-
select t,subword_similarity('Baykal',t) as sml from test_trgm2 where 'Baykal' <% t order by sml desc, t;
324+
set "pg_trgm.word_similarity_threshold" to 0.3;
325+
select t,word_similarity('Baykal',t) as sml from test_trgm2 where 'Baykal' <% t order by sml desc, t;
326326
t | sml
327327
-----------------------------------------------------------+----------
328328
Baykal | 1
@@ -588,7 +588,7 @@ select t,subword_similarity('Baykal',t) as sml from test_trgm2 where 'Baykal' <%
588588
Urochishche Batkali | 0.3
589589
(261 rows)
590590

591-
select t,subword_similarity('Kabankala',t) as sml from test_trgm2 where 'Kabankala' <% t order by sml desc, t;
591+
select t,word_similarity('Kabankala',t) as sml from test_trgm2 where 'Kabankala' <% t order by sml desc, t;
592592
t | sml
593593
----------------------------------+----------
594594
Kabankala | 1
@@ -682,7 +682,7 @@ select t,subword_similarity('Kabankala',t) as sml from test_trgm2 where 'Kabanka
682682
Waikala | 0.3
683683
(89 rows)
684684

685-
select t,subword_similarity('Baykal',t) as sml from test_trgm2 where t %> 'Baykal' order by sml desc, t;
685+
select t,word_similarity('Baykal',t) as sml from test_trgm2 where t %> 'Baykal' order by sml desc, t;
686686
t | sml
687687
-----------------------------------------------------------+----------
688688
Baykal | 1
@@ -948,7 +948,7 @@ select t,subword_similarity('Baykal',t) as sml from test_trgm2 where t %> 'Bayka
948948
Urochishche Batkali | 0.3
949949
(261 rows)
950950

951-
select t,subword_similarity('Kabankala',t) as sml from test_trgm2 where t %> 'Kabankala' order by sml desc, t;
951+
select t,word_similarity('Kabankala',t) as sml from test_trgm2 where t %> 'Kabankala' order by sml desc, t;
952952
t | sml
953953
----------------------------------+----------
954954
Kabankala | 1

‎contrib/pg_trgm/pg_trgm--1.1--1.2.sql

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,35 @@
33
-- complain if script is sourced in psql, rather than via ALTER EXTENSION
44
\echo Use"ALTER EXTENSION pg_trgm UPDATE TO '1.2'" to load this file. \quit
55

6-
CREATEFUNCTIONsubword_similarity(text,text)
6+
CREATEFUNCTIONword_similarity(text,text)
77
RETURNS float4
88
AS'MODULE_PATHNAME'
99
LANGUAGE C STRICT IMMUTABLE;
1010

11-
CREATEFUNCTIONsubword_similarity_op(text,text)
11+
CREATEFUNCTIONword_similarity_op(text,text)
1212
RETURNS bool
1313
AS'MODULE_PATHNAME'
14-
LANGUAGE C STRICT STABLE;-- stable because depends on pg_trgm.subword_limit
14+
LANGUAGE C STRICT STABLE;-- stable because depends on pg_trgm.word_similarity_threshold
1515

16-
CREATEFUNCTIONsubword_similarity_commutator_op(text,text)
16+
CREATEFUNCTIONword_similarity_commutator_op(text,text)
1717
RETURNS bool
1818
AS'MODULE_PATHNAME'
19-
LANGUAGE C STRICT STABLE;-- stable because depends on pg_trgm.subword_limit
19+
LANGUAGE C STRICT STABLE;-- stable because depends on pg_trgm.word_similarity_threshold
2020

21-
CREATEFUNCTIONsubword_similarity_dist_op(text,text)
21+
CREATEFUNCTIONword_similarity_dist_op(text,text)
2222
RETURNS float4
2323
AS'MODULE_PATHNAME'
2424
LANGUAGE C STRICT IMMUTABLE;
2525

26-
CREATEFUNCTIONsubword_similarity_dist_commutator_op(text,text)
26+
CREATEFUNCTIONword_similarity_dist_commutator_op(text,text)
2727
RETURNS float4
2828
AS'MODULE_PATHNAME'
2929
LANGUAGE C STRICT IMMUTABLE;
3030

3131
CREATE OPERATOR<% (
3232
LEFTARG=text,
3333
RIGHTARG=text,
34-
PROCEDURE=subword_similarity_op,
34+
PROCEDURE=word_similarity_op,
3535
COMMUTATOR='%>',
3636
RESTRICT= contsel,
3737
JOIN= contjoinsel
@@ -40,7 +40,7 @@ CREATE OPERATOR <% (
4040
CREATE OPERATOR %> (
4141
LEFTARG=text,
4242
RIGHTARG=text,
43-
PROCEDURE=subword_similarity_commutator_op,
43+
PROCEDURE=word_similarity_commutator_op,
4444
COMMUTATOR='<%',
4545
RESTRICT= contsel,
4646
JOIN= contjoinsel
@@ -49,14 +49,14 @@ CREATE OPERATOR %> (
4949
CREATE OPERATOR<<-> (
5050
LEFTARG=text,
5151
RIGHTARG=text,
52-
PROCEDURE=subword_similarity_dist_op,
52+
PROCEDURE=word_similarity_dist_op,
5353
COMMUTATOR='<->>'
5454
);
5555

5656
CREATE OPERATOR<->> (
5757
LEFTARG=text,
5858
RIGHTARG=text,
59-
PROCEDURE=subword_similarity_dist_commutator_op,
59+
PROCEDURE=word_similarity_dist_commutator_op,
6060
COMMUTATOR='<<->'
6161
);
6262

‎contrib/pg_trgm/pg_trgm--1.2.sql

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ LANGUAGE C STRICT IMMUTABLE;
2828
CREATEFUNCTIONsimilarity_op(text,text)
2929
RETURNS bool
3030
AS'MODULE_PATHNAME'
31-
LANGUAGE C STRICT STABLE;-- stable because depends on pg_trgm.sml_limit
31+
LANGUAGE C STRICT STABLE;-- stable because depends on pg_trgm.similarity_threshold
3232

3333
CREATE OPERATOR % (
3434
LEFTARG=text,
@@ -39,25 +39,25 @@ CREATE OPERATOR % (
3939
JOIN= contjoinsel
4040
);
4141

42-
CREATEFUNCTIONsubword_similarity(text,text)
42+
CREATEFUNCTIONword_similarity(text,text)
4343
RETURNS float4
4444
AS'MODULE_PATHNAME'
4545
LANGUAGE C STRICT IMMUTABLE;
4646

47-
CREATEFUNCTIONsubword_similarity_op(text,text)
47+
CREATEFUNCTIONword_similarity_op(text,text)
4848
RETURNS bool
4949
AS'MODULE_PATHNAME'
50-
LANGUAGE C STRICT STABLE;-- stable because depends on pg_trgm.subword_limit
50+
LANGUAGE C STRICT STABLE;-- stable because depends on pg_trgm.word_similarity_threshold
5151

52-
CREATEFUNCTIONsubword_similarity_commutator_op(text,text)
52+
CREATEFUNCTIONword_similarity_commutator_op(text,text)
5353
RETURNS bool
5454
AS'MODULE_PATHNAME'
55-
LANGUAGE C STRICT STABLE;-- stable because depends on pg_trgm.subword_limit
55+
LANGUAGE C STRICT STABLE;-- stable because depends on pg_trgm.word_similarity_threshold
5656

5757
CREATE OPERATOR<% (
5858
LEFTARG=text,
5959
RIGHTARG=text,
60-
PROCEDURE=subword_similarity_op,
60+
PROCEDURE=word_similarity_op,
6161
COMMUTATOR='%>',
6262
RESTRICT= contsel,
6363
JOIN= contjoinsel
@@ -66,7 +66,7 @@ CREATE OPERATOR <% (
6666
CREATE OPERATOR %> (
6767
LEFTARG=text,
6868
RIGHTARG=text,
69-
PROCEDURE=subword_similarity_commutator_op,
69+
PROCEDURE=word_similarity_commutator_op,
7070
COMMUTATOR='<%',
7171
RESTRICT= contsel,
7272
JOIN= contjoinsel
@@ -84,27 +84,27 @@ CREATE OPERATOR <-> (
8484
COMMUTATOR='<->'
8585
);
8686

87-
CREATEFUNCTIONsubword_similarity_dist_op(text,text)
87+
CREATEFUNCTIONword_similarity_dist_op(text,text)
8888
RETURNS float4
8989
AS'MODULE_PATHNAME'
9090
LANGUAGE C STRICT IMMUTABLE;
9191

92-
CREATEFUNCTIONsubword_similarity_dist_commutator_op(text,text)
92+
CREATEFUNCTIONword_similarity_dist_commutator_op(text,text)
9393
RETURNS float4
9494
AS'MODULE_PATHNAME'
9595
LANGUAGE C STRICT IMMUTABLE;
9696

9797
CREATE OPERATOR<<-> (
9898
LEFTARG=text,
9999
RIGHTARG=text,
100-
PROCEDURE=subword_similarity_dist_op,
100+
PROCEDURE=word_similarity_dist_op,
101101
COMMUTATOR='<->>'
102102
);
103103

104104
CREATE OPERATOR<->> (
105105
LEFTARG=text,
106106
RIGHTARG=text,
107-
PROCEDURE=subword_similarity_dist_commutator_op,
107+
PROCEDURE=word_similarity_dist_commutator_op,
108108
COMMUTATOR='<<->'
109109
);
110110

‎contrib/pg_trgm/sql/pg_subword_trgm.sql

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

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