Skip to content

Commit 36c03a9

Browse files
ildusildus
committed
Add gist support
1 parent d0be593 commit 36c03a9

File tree

5 files changed

+180
-631
lines changed

5 files changed

+180
-631
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MODULE_big = tsvector2
22
OBJS = src/tsvector2.o src/tsvector2_op.o src/tsvector2_rank.o \
3-
src/tsvector2_conv.o src/tsvector2_gin.o
3+
src/tsvector2_conv.o src/tsvector2_gin.o src/tsvector2_gist.o
44

55
EXTENSION = tsvector2
66
EXTVERSION = 1.0

‎expected/search.out‎

Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,155 @@ SELECT count(*) FROM test_tsvector2 WHERE a @@ '!no_such_lexeme';
5858
-------
5959
508
6060
(1 row)
61+
62+
create index wowidx on test_tsvector2 using gist (a);
63+
SET enable_seqscan=OFF;
64+
SET enable_indexscan=ON;
65+
SET enable_bitmapscan=OFF;
66+
explain (costs off) SELECT count(*) FROM test_tsvector2 WHERE a @@ 'wr|qh';
67+
QUERY PLAN
68+
-------------------------------------------------------
69+
Aggregate
70+
-> Index Scan using wowidx on test_tsvector2
71+
Index Cond: (a @@ '''wr'' | ''qh'''::tsquery)
72+
(3 rows)
73+
74+
SELECT count(*) FROM test_tsvector2 WHERE a @@ 'wr|qh';
75+
count
76+
-------
77+
158
78+
(1 row)
79+
80+
SELECT count(*) FROM test_tsvector2 WHERE a @@ 'wr&qh';
81+
count
82+
-------
83+
17
84+
(1 row)
85+
86+
SELECT count(*) FROM test_tsvector2 WHERE a @@ 'eq&yt';
87+
count
88+
-------
89+
6
90+
(1 row)
91+
92+
SELECT count(*) FROM test_tsvector2 WHERE a @@ 'eq|yt';
93+
count
94+
-------
95+
98
96+
(1 row)
97+
98+
SELECT count(*) FROM test_tsvector2 WHERE a @@ '(eq&yt)|(wr&qh)';
99+
count
100+
-------
101+
23
102+
(1 row)
103+
104+
SELECT count(*) FROM test_tsvector2 WHERE a @@ '(eq|yt)&(wr|qh)';
105+
count
106+
-------
107+
39
108+
(1 row)
109+
110+
SELECT count(*) FROM test_tsvector2 WHERE a @@ 'w:*|q:*';
111+
count
112+
-------
113+
494
114+
(1 row)
115+
116+
SELECT count(*) FROM test_tsvector2 WHERE a @@ any ('{wr,qh}');
117+
count
118+
-------
119+
158
120+
(1 row)
121+
122+
SELECT count(*) FROM test_tsvector2 WHERE a @@ 'no_such_lexeme';
123+
count
124+
-------
125+
0
126+
(1 row)
127+
128+
SELECT count(*) FROM test_tsvector2 WHERE a @@ '!no_such_lexeme';
129+
count
130+
-------
131+
508
132+
(1 row)
133+
134+
SET enable_indexscan=OFF;
135+
SET enable_bitmapscan=ON;
136+
explain (costs off) SELECT count(*) FROM test_tsvector2 WHERE a @@ 'wr|qh';
137+
QUERY PLAN
138+
-------------------------------------------------------------
139+
Aggregate
140+
-> Bitmap Heap Scan on test_tsvector2
141+
Recheck Cond: (a @@ '''wr'' | ''qh'''::tsquery)
142+
-> Bitmap Index Scan on wowidx
143+
Index Cond: (a @@ '''wr'' | ''qh'''::tsquery)
144+
(5 rows)
145+
146+
SELECT count(*) FROM test_tsvector2 WHERE a @@ 'wr|qh';
147+
count
148+
-------
149+
158
150+
(1 row)
151+
152+
SELECT count(*) FROM test_tsvector2 WHERE a @@ 'wr&qh';
153+
count
154+
-------
155+
17
156+
(1 row)
157+
158+
SELECT count(*) FROM test_tsvector2 WHERE a @@ 'eq&yt';
159+
count
160+
-------
161+
6
162+
(1 row)
163+
164+
SELECT count(*) FROM test_tsvector2 WHERE a @@ 'eq|yt';
165+
count
166+
-------
167+
98
168+
(1 row)
169+
170+
SELECT count(*) FROM test_tsvector2 WHERE a @@ '(eq&yt)|(wr&qh)';
171+
count
172+
-------
173+
23
174+
(1 row)
175+
176+
SELECT count(*) FROM test_tsvector2 WHERE a @@ '(eq|yt)&(wr|qh)';
177+
count
178+
-------
179+
39
180+
(1 row)
181+
182+
SELECT count(*) FROM test_tsvector2 WHERE a @@ 'w:*|q:*';
183+
count
184+
-------
185+
494
186+
(1 row)
187+
188+
SELECT count(*) FROM test_tsvector2 WHERE a @@ any ('{wr,qh}');
189+
count
190+
-------
191+
158
192+
(1 row)
193+
194+
SELECT count(*) FROM test_tsvector2 WHERE a @@ 'no_such_lexeme';
195+
count
196+
-------
197+
0
198+
(1 row)
199+
200+
SELECT count(*) FROM test_tsvector2 WHERE a @@ '!no_such_lexeme';
201+
count
202+
-------
203+
508
204+
(1 row)
205+
206+
RESET enable_seqscan;
207+
RESET enable_indexscan;
208+
RESET enable_bitmapscan;
209+
DROP INDEX wowidx;
61210
SET enable_seqscan=OFF;
62211
CREATE INDEX wowidx ON test_tsvector2 USING btree(a);
63212
SELECT count(*) FROM test_tsvector2 WHERE a > 'lq d7 i4 7w y0 qt gw ch o6 eo';

‎init.sql‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,3 +317,19 @@ CREATE OPERATOR CLASS gin_tsvector2_ops DEFAULT
317317
FUNCTION 6 gin_tsquery_triconsistent;
318318

319319
-- gist support
320+
CREATE FUNCTION gist_tsvector2_compress(internal,tsquery,int2,oid,internal)
321+
RETURNS internal
322+
AS 'MODULE_PATHNAME'
323+
LANGUAGE C STRICT IMMUTABLE;
324+
325+
-- don't mind tsvector mentioning, it's actually expecting tsquery anyway
326+
CREATE OPERATOR CLASS gist_tsvector2_ops DEFAULT
327+
FOR TYPE tsvector2 USING gist FAMILY tsvector2_ops AS
328+
OPERATOR 1 @@ (tsvector2, tsquery),
329+
FUNCTION 1 gtsvector_consistent(internal,tsvector,int2,oid,internal),
330+
FUNCTION 2 gtsvector_union,
331+
FUNCTION 3 gist_tsvector2_compress,
332+
FUNCTION 4 gtsvector_decompress,
333+
FUNCTION 5 gtsvector_penalty,
334+
FUNCTION 6 gtsvector_picksplit,
335+
FUNCTION 7 gtsvector_same;

‎src/tsvector2.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ do { \
129129
(w)++; \
130130
Assert(!y->hasoff); \
131131
(p) += SHORTALIGN(y->len) + y->npos * sizeof(WordEntryPos); \
132-
if ((w) - ARRPTR(x) < x->size && w->hasoff) \
132+
if ((w) - tsvector2_entries(x) < x->size && w->hasoff) \
133133
(p) = INTALIGN(p) + sizeof(WordEntry2); \
134134
} while (0);
135135

0 commit comments

Comments
 (0)