Skip to content

Commit 011dae9

Browse files
ildusildus
committed
Add gin index support
1 parent 2ca4a46 commit 011dae9

File tree

5 files changed

+68
-11
lines changed

5 files changed

+68
-11
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
MODULE_big = tsvector2
22
OBJS = src/tsvector2.o src/tsvector2_op.o src/tsvector2_rank.o \
3-
src/tsvector2_conv.o
3+
src/tsvector2_conv.o src/tsvector2_gin.o
44

55
EXTENSION = tsvector2
66
EXTVERSION = 1.0
77
DATA_built = tsvector2--$(EXTVERSION).sql
88

9-
REGRESS = operators functions match rank json btree
9+
REGRESS = operators functions match rank json indexes
1010

1111
EXTRA_CLEAN = tsvector2--$(EXTVERSION).sql
1212

expected/btree.out renamed to expected/indexes.out

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ CREATE EXTENSION tsvector2 SCHEMA test;
33
ERROR: extension "tsvector2" must be installed in schema "public"
44
CREATE EXTENSION tsvector2;
55
CREATE TABLE test.t1(a tsvector2);
6+
-- use only indexes if possible
7+
SET enable_seqscan = off;
68
CREATE OR REPLACE FUNCTION test.insert_records()
79
RETURNS VOID AS $$
810
DECLARE
@@ -12,9 +14,9 @@ BEGIN
1214
SELECT i FROM generate_series(1, 1000) i
1315
LOOP
1416
INSERT INTO test.t1(a)
15-
SELECT array_to_tsvector2(array_agg(repeat(letter, floor(random() * count + 1)::int)))
17+
SELECT array_to_tsvector2(array_agg(repeat(letter, letters_count)))
1618
FROM (
17-
SELECT chr(i) AS letter, b AS count
19+
SELECT chr(i) AS letter, b AS letters_count
1820
FROM generate_series(ascii('a'), ascii('z')) i
1921
FULL OUTER JOIN
2022
(SELECT b FROM generate_series(3, 12) b) t2
@@ -29,8 +31,8 @@ SELECT test.insert_records();
2931

3032
(1 row)
3133

34+
-- btree
3235
CREATE INDEX i1 ON test.t1 USING btree(a);
33-
SET enable_seqscan = off;
3436
EXPLAIN (COSTS OFF) SELECT * FROM test.t1 WHERE a >= 'a:1 b:2'::tsvector2;
3537
QUERY PLAN
3638
---------------------------------------------------------
@@ -40,6 +42,31 @@ EXPLAIN (COSTS OFF) SELECT * FROM test.t1 WHERE a >= 'a:1 b:2'::tsvector2;
4042
Index Cond: (a >= '''a'':1 ''b'':2'::tsvector2)
4143
(4 rows)
4244

45+
SELECT sum(length(a)) FROM test.t1 WHERE a >= 'a:1 b:2'::tsvector2;
46+
sum
47+
--------
48+
260000
49+
(1 row)
50+
51+
DROP INDEX test.i1;
52+
-- gin
53+
CREATE INDEX i2 ON test.t1 USING gin(a);
54+
EXPLAIN (COSTS OFF) SELECT * FROM test.t1 WHERE a @@ 'zzz';
55+
QUERY PLAN
56+
-----------------------------------------------
57+
Bitmap Heap Scan on t1
58+
Recheck Cond: (a @@ '''zzz'''::tsquery)
59+
-> Bitmap Index Scan on i2
60+
Index Cond: (a @@ '''zzz'''::tsquery)
61+
(4 rows)
62+
63+
SELECT sum(length(a)) FROM test.t1 WHERE a @@ 'zzz';
64+
sum
65+
--------
66+
260000
67+
(1 row)
68+
69+
DROP INDEX test.i2;
4370
DROP SCHEMA test CASCADE;
4471
NOTICE: drop cascades to 2 other objects
4572
DETAIL: drop cascades to table test.t1

‎init.sql‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,11 +291,29 @@ CREATE OPERATOR FAMILY tsvector2_ops USING gist;
291291
CREATE OPERATOR FAMILY tsvector2_ops USING gin;
292292

293293
-- btree support
294-
CREATE OPERATOR CLASS tsvector2_ops DEFAULT
294+
CREATE OPERATOR CLASS bt_tsvector2_ops DEFAULT
295295
FOR TYPE tsvector2 USING btree FAMILY tsvector2_ops AS
296296
OPERATOR 1 <,
297297
OPERATOR 2 <=,
298298
OPERATOR 3 =,
299299
OPERATOR 4 >=,
300300
OPERATOR 5 >,
301301
FUNCTION 1 tsvector2_cmp(tsvector2, tsvector2);
302+
303+
-- gin support
304+
CREATE FUNCTION gin_extract_tsvector2(tsvector2, internal, internal)
305+
RETURNS internal
306+
AS 'MODULE_PATHNAME'
307+
LANGUAGE C STRICT IMMUTABLE;
308+
309+
CREATE OPERATOR CLASS gin_tsvector2_ops DEFAULT
310+
FOR TYPE tsvector2 USING gin FAMILY tsvector2_ops AS
311+
OPERATOR 1 @@ (tsvector2, tsquery),
312+
FUNCTION 1 gin_cmp_tslexeme(text,text),
313+
FUNCTION 2 gin_extract_tsvector2(tsvector2,internal,internal),
314+
FUNCTION 3 gin_extract_tsquery(tsquery,internal,int2,internal,internal,internal,internal),
315+
FUNCTION 4 gin_tsquery_consistent(internal,int2,tsquery,int4,internal,internal,internal,internal),
316+
FUNCTION 5 gin_cmp_prefix(text,text,int2,internal),
317+
FUNCTION 6 gin_tsquery_triconsistent;
318+
319+
-- gist support

sql/btree.sql renamed to sql/indexes.sql

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ CREATE EXTENSION tsvector2 SCHEMA test;
33
CREATE EXTENSION tsvector2;
44
CREATE TABLE test.t1(a tsvector2);
55

6+
-- use only indexes if possible
7+
SET enable_seqscan = off;
8+
69
CREATE OR REPLACE FUNCTION test.insert_records()
710
RETURNS VOID AS $$
811
DECLARE
@@ -12,9 +15,9 @@ BEGIN
1215
SELECT i FROM generate_series(1, 1000) i
1316
LOOP
1417
INSERT INTO test.t1(a)
15-
SELECT array_to_tsvector2(array_agg(repeat(letter, floor(random() * count + 1)::int)))
18+
SELECT array_to_tsvector2(array_agg(repeat(letter, letters_count)))
1619
FROM (
17-
SELECT chr(i) AS letter, b AS count
20+
SELECT chr(i) AS letter, b AS letters_count
1821
FROM generate_series(ascii('a'), ascii('z')) i
1922
FULL OUTER JOIN
2023
(SELECT b FROM generate_series(3, 12) b) t2
@@ -25,9 +28,18 @@ END
2528
$$ LANGUAGE plpgsql;
2629

2730
SELECT test.insert_records();
28-
CREATE INDEX i1 ON test.t1 USING btree(a);
2931

30-
SET enable_seqscan = off;
32+
-- btree
33+
CREATE INDEX i1 ON test.t1 USING btree(a);
3134
EXPLAIN (COSTS OFF) SELECT * FROM test.t1 WHERE a >= 'a:1 b:2'::tsvector2;
35+
SELECT sum(length(a)) FROM test.t1 WHERE a >= 'a:1 b:2'::tsvector2;
36+
DROP INDEX test.i1;
37+
38+
-- gin
39+
CREATE INDEX i2 ON test.t1 USING gin(a);
40+
EXPLAIN (COSTS OFF) SELECT * FROM test.t1 WHERE a @@ 'zzz';
41+
SELECT sum(length(a)) FROM test.t1 WHERE a @@ 'zzz';
42+
DROP INDEX test.i2;
43+
3244
DROP SCHEMA test CASCADE;
3345
DROP EXTENSION tsvector2 CASCADE;

‎src/tsvector2_gin.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include "tsvector2.h"
2121

22-
22+
PG_FUNCTION_INFO_V1(gin_extract_tsvector2);
2323
Datum
2424
gin_extract_tsvector2(PG_FUNCTION_ARGS)
2525
{

0 commit comments

Comments
 (0)