Kouhei Sutou
null+****@clear*****
Tue May 2 10:56:43 JST 2017
Kouhei Sutou 2017-05-02 10:56:43 +0900 (Tue, 02 May 2017) New Revision: 34abff588f462c090f8ddaca6871d313fd0b8cf1 https://github.com/pgroonga/pgroonga/commit/34abff588f462c090f8ddaca6871d313fd0b8cf1 Message: test: remove costs from explain for stable output Modified files: expected/full-text-search/text-array/single/match-contain-v2/bitmapscan.out expected/full-text-search/text-array/single/match-contain-v2/indexscan.out expected/full-text-search/text-array/single/match-v2/bitmapscan.out expected/full-text-search/text-array/single/match-v2/indexscan.out expected/full-text-search/text-array/single/query-contain-v2/bitmapscan.out expected/full-text-search/text-array/single/query-contain-v2/indexscan.out expected/full-text-search/text-array/single/query-v2/bitmapscan.out expected/full-text-search/text-array/single/query-v2/indexscan.out expected/full-text-search/text-array/single/script-v2/bitmapscan.out expected/full-text-search/text-array/single/script-v2/indexscan.out expected/full-text-search/text-array/single/similar-v2/bitmapscan.out expected/full-text-search/text-array/single/similar-v2/indexscan.out expected/full-text-search/text/single/compatibility/v1/match-v2/bitmapscan.out expected/full-text-search/text/single/compatibility/v1/match-v2/indexscan.out expected/full-text-search/text/single/compatibility/v1/query-v2/bitmapscan.out expected/full-text-search/text/single/compatibility/v1/query-v2/indexscan.out expected/full-text-search/text/single/compatibility/v2/match-v1/bitmapscan.out expected/full-text-search/text/single/compatibility/v2/match-v1/indexscan.out expected/full-text-search/text/single/compatibility/v2/query-v1/bitmapscan.out expected/full-text-search/text/single/compatibility/v2/query-v1/indexscan.out sql/full-text-search/text-array/single/match-contain-v2/bitmapscan.sql sql/full-text-search/text-array/single/match-contain-v2/indexscan.sql sql/full-text-search/text-array/single/match-v2/bitmapscan.sql sql/full-text-search/text-array/single/match-v2/indexscan.sql sql/full-text-search/text-array/single/query-contain-v2/bitmapscan.sql sql/full-text-search/text-array/single/query-contain-v2/indexscan.sql sql/full-text-search/text-array/single/query-v2/bitmapscan.sql sql/full-text-search/text-array/single/query-v2/indexscan.sql sql/full-text-search/text-array/single/script-v2/bitmapscan.sql sql/full-text-search/text-array/single/script-v2/indexscan.sql sql/full-text-search/text-array/single/similar-v2/bitmapscan.sql sql/full-text-search/text-array/single/similar-v2/indexscan.sql sql/full-text-search/text/single/compatibility/v1/match-v2/bitmapscan.sql sql/full-text-search/text/single/compatibility/v1/match-v2/indexscan.sql sql/full-text-search/text/single/compatibility/v1/query-v2/bitmapscan.sql sql/full-text-search/text/single/compatibility/v1/query-v2/indexscan.sql sql/full-text-search/text/single/compatibility/v2/match-v1/bitmapscan.sql sql/full-text-search/text/single/compatibility/v2/match-v1/indexscan.sql sql/full-text-search/text/single/compatibility/v2/query-v1/bitmapscan.sql sql/full-text-search/text/single/compatibility/v2/query-v1/indexscan.sql src/pgroonga.c src/pgroonga.h Modified: expected/full-text-search/text-array/single/match-contain-v2/bitmapscan.out (+5 -5) =================================================================== --- expected/full-text-search/text-array/single/match-contain-v2/bitmapscan.out 2017-05-02 10:25:24 +0900 (3d5fe2f) +++ expected/full-text-search/text-array/single/match-contain-v2/bitmapscan.out 2017-05-02 10:56:43 +0900 (a7a80b0) @@ -18,15 +18,15 @@ CREATE INDEX pgroonga_memos_index ON memos SET enable_seqscan = off; SET enable_indexscan = off; SET enable_bitmapscan = on; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &@> Array['rdbms', 'engine']; - QUERY PLAN ------------------------------------------------------------------------------------ - Bitmap Heap Scan on memos (cost=0.00..4.01 rows=2 width=64) + QUERY PLAN +------------------------------------------------------------- + Bitmap Heap Scan on memos Recheck Cond: (contents &@> '{rdbms,engine}'::text[]) - -> Bitmap Index Scan on pgroonga_memos_index (cost=0.00..0.00 rows=1 width=0) + -> Bitmap Index Scan on pgroonga_memos_index Index Cond: (contents &@> '{rdbms,engine}'::text[]) (4 rows) Modified: expected/full-text-search/text-array/single/match-contain-v2/indexscan.out (+4 -4) =================================================================== --- expected/full-text-search/text-array/single/match-contain-v2/indexscan.out 2017-05-02 10:25:24 +0900 (59dcefa) +++ expected/full-text-search/text-array/single/match-contain-v2/indexscan.out 2017-05-02 10:56:43 +0900 (c60276d) @@ -18,13 +18,13 @@ CREATE INDEX pgroonga_memos_index ON memos SET enable_seqscan = off; SET enable_indexscan = on; SET enable_bitmapscan = off; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &@> Array['rdbms', 'engine']; - QUERY PLAN ------------------------------------------------------------------------------------ - Index Scan using pgroonga_memos_index on memos (cost=0.00..4.01 rows=2 width=64) + QUERY PLAN +------------------------------------------------------- + Index Scan using pgroonga_memos_index on memos Index Cond: (contents &@> '{rdbms,engine}'::text[]) (2 rows) Modified: expected/full-text-search/text-array/single/match-v2/bitmapscan.out (+5 -5) =================================================================== --- expected/full-text-search/text-array/single/match-v2/bitmapscan.out 2017-05-02 10:25:24 +0900 (23b0bd7) +++ expected/full-text-search/text-array/single/match-v2/bitmapscan.out 2017-05-02 10:56:43 +0900 (61d7628) @@ -18,15 +18,15 @@ CREATE INDEX pgroonga_memos_index ON memos SET enable_seqscan = off; SET enable_indexscan = off; SET enable_bitmapscan = on; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &@ 'Groonga'; - QUERY PLAN ------------------------------------------------------------------------------------ - Bitmap Heap Scan on memos (cost=0.00..4.01 rows=2 width=64) + QUERY PLAN +--------------------------------------------------- + Bitmap Heap Scan on memos Recheck Cond: (contents &@ 'Groonga'::text) - -> Bitmap Index Scan on pgroonga_memos_index (cost=0.00..0.00 rows=1 width=0) + -> Bitmap Index Scan on pgroonga_memos_index Index Cond: (contents &@ 'Groonga'::text) (4 rows) Modified: expected/full-text-search/text-array/single/match-v2/indexscan.out (+4 -4) =================================================================== --- expected/full-text-search/text-array/single/match-v2/indexscan.out 2017-05-02 10:25:24 +0900 (564e2b8) +++ expected/full-text-search/text-array/single/match-v2/indexscan.out 2017-05-02 10:56:43 +0900 (a5323c9) @@ -18,13 +18,13 @@ CREATE INDEX pgroonga_memos_index ON memos SET enable_seqscan = off; SET enable_indexscan = on; SET enable_bitmapscan = off; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &@ 'Groonga'; - QUERY PLAN ------------------------------------------------------------------------------------ - Index Scan using pgroonga_memos_index on memos (cost=0.00..4.01 rows=2 width=64) + QUERY PLAN +------------------------------------------------ + Index Scan using pgroonga_memos_index on memos Index Cond: (contents &@ 'Groonga'::text) (2 rows) Modified: expected/full-text-search/text-array/single/query-contain-v2/bitmapscan.out (+5 -5) =================================================================== --- expected/full-text-search/text-array/single/query-contain-v2/bitmapscan.out 2017-05-02 10:25:24 +0900 (f138e33) +++ expected/full-text-search/text-array/single/query-contain-v2/bitmapscan.out 2017-05-02 10:56:43 +0900 (265bf72) @@ -18,15 +18,15 @@ CREATE INDEX pgroonga_memos_index ON memos SET enable_seqscan = off; SET enable_indexscan = off; SET enable_bitmapscan = on; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &?> Array['rdbms', 'groonga engine']; - QUERY PLAN ------------------------------------------------------------------------------------ - Bitmap Heap Scan on memos (cost=0.00..4.01 rows=2 width=64) + QUERY PLAN +----------------------------------------------------------------------- + Bitmap Heap Scan on memos Recheck Cond: (contents &?> '{rdbms,"groonga engine"}'::text[]) - -> Bitmap Index Scan on pgroonga_memos_index (cost=0.00..0.00 rows=1 width=0) + -> Bitmap Index Scan on pgroonga_memos_index Index Cond: (contents &?> '{rdbms,"groonga engine"}'::text[]) (4 rows) Modified: expected/full-text-search/text-array/single/query-contain-v2/indexscan.out (+4 -4) =================================================================== --- expected/full-text-search/text-array/single/query-contain-v2/indexscan.out 2017-05-02 10:25:24 +0900 (bcd63fb) +++ expected/full-text-search/text-array/single/query-contain-v2/indexscan.out 2017-05-02 10:56:43 +0900 (8ab3fd5) @@ -18,13 +18,13 @@ CREATE INDEX pgroonga_memos_index ON memos SET enable_seqscan = off; SET enable_indexscan = on; SET enable_bitmapscan = off; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &?> Array['rdbms', 'groonga engine']; - QUERY PLAN ------------------------------------------------------------------------------------ - Index Scan using pgroonga_memos_index on memos (cost=0.00..4.01 rows=2 width=64) + QUERY PLAN +----------------------------------------------------------------- + Index Scan using pgroonga_memos_index on memos Index Cond: (contents &?> '{rdbms,"groonga engine"}'::text[]) (2 rows) Modified: expected/full-text-search/text-array/single/query-v2/bitmapscan.out (+5 -5) =================================================================== --- expected/full-text-search/text-array/single/query-v2/bitmapscan.out 2017-05-02 10:25:24 +0900 (6b290cc) +++ expected/full-text-search/text-array/single/query-v2/bitmapscan.out 2017-05-02 10:56:43 +0900 (99b16c7) @@ -18,15 +18,15 @@ CREATE INDEX pgroonga_memos_index ON memos SET enable_seqscan = off; SET enable_indexscan = off; SET enable_bitmapscan = on; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &? 'rdbms OR engine'; - QUERY PLAN ------------------------------------------------------------------------------------ - Bitmap Heap Scan on memos (cost=0.00..4.01 rows=2 width=64) + QUERY PLAN +----------------------------------------------------------- + Bitmap Heap Scan on memos Recheck Cond: (contents &? 'rdbms OR engine'::text) - -> Bitmap Index Scan on pgroonga_memos_index (cost=0.00..0.00 rows=1 width=0) + -> Bitmap Index Scan on pgroonga_memos_index Index Cond: (contents &? 'rdbms OR engine'::text) (4 rows) Modified: expected/full-text-search/text-array/single/query-v2/indexscan.out (+4 -4) =================================================================== --- expected/full-text-search/text-array/single/query-v2/indexscan.out 2017-05-02 10:25:24 +0900 (fdadccf) +++ expected/full-text-search/text-array/single/query-v2/indexscan.out 2017-05-02 10:56:43 +0900 (cc9f907) @@ -18,13 +18,13 @@ CREATE INDEX pgroonga_memos_index ON memos SET enable_seqscan = off; SET enable_indexscan = on; SET enable_bitmapscan = off; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &? 'rdbms OR engine'; - QUERY PLAN ------------------------------------------------------------------------------------ - Index Scan using pgroonga_memos_index on memos (cost=0.00..4.01 rows=2 width=64) + QUERY PLAN +----------------------------------------------------- + Index Scan using pgroonga_memos_index on memos Index Cond: (contents &? 'rdbms OR engine'::text) (2 rows) Modified: expected/full-text-search/text-array/single/script-v2/bitmapscan.out (+3 -3) =================================================================== --- expected/full-text-search/text-array/single/script-v2/bitmapscan.out 2017-05-02 10:25:24 +0900 (38eb7d3) +++ expected/full-text-search/text-array/single/script-v2/bitmapscan.out 2017-05-02 10:56:43 +0900 (03ba3fd) @@ -18,15 +18,15 @@ CREATE INDEX pgroonga_memos_index ON memos SET enable_seqscan = off; SET enable_indexscan = off; SET enable_bitmapscan = on; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &` 'contents @ "rdbms" || contents @ "engine"'; QUERY PLAN ------------------------------------------------------------------------------------- - Bitmap Heap Scan on memos (cost=0.00..4.01 rows=2 width=64) + Bitmap Heap Scan on memos Recheck Cond: (contents &` 'contents @ "rdbms" || contents @ "engine"'::text) - -> Bitmap Index Scan on pgroonga_memos_index (cost=0.00..0.00 rows=1 width=0) + -> Bitmap Index Scan on pgroonga_memos_index Index Cond: (contents &` 'contents @ "rdbms" || contents @ "engine"'::text) (4 rows) Modified: expected/full-text-search/text-array/single/script-v2/indexscan.out (+4 -4) =================================================================== --- expected/full-text-search/text-array/single/script-v2/indexscan.out 2017-05-02 10:25:24 +0900 (7eff521) +++ expected/full-text-search/text-array/single/script-v2/indexscan.out 2017-05-02 10:56:43 +0900 (8451781) @@ -18,13 +18,13 @@ CREATE INDEX pgroonga_memos_index ON memos SET enable_seqscan = off; SET enable_indexscan = on; SET enable_bitmapscan = off; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &` 'contents @ "rdbms" || contents @ "engine"'; - QUERY PLAN ------------------------------------------------------------------------------------ - Index Scan using pgroonga_memos_index on memos (cost=0.00..4.01 rows=2 width=64) + QUERY PLAN +------------------------------------------------------------------------------- + Index Scan using pgroonga_memos_index on memos Index Cond: (contents &` 'contents @ "rdbms" || contents @ "engine"'::text) (2 rows) Modified: expected/full-text-search/text-array/single/similar-v2/bitmapscan.out (+3 -3) =================================================================== --- expected/full-text-search/text-array/single/similar-v2/bitmapscan.out 2017-05-02 10:25:24 +0900 (738379d) +++ expected/full-text-search/text-array/single/similar-v2/bitmapscan.out 2017-05-02 10:56:43 +0900 (258fdf2) @@ -18,15 +18,15 @@ CREATE INDEX pgroonga_memos_index ON memos SET enable_seqscan = off; SET enable_indexscan = off; SET enable_bitmapscan = on; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &~? 'Mroonga is a MySQL plugin that uses Groonga.'; QUERY PLAN ----------------------------------------------------------------------------------------- - Bitmap Heap Scan on memos (cost=0.00..4.01 rows=2 width=64) + Bitmap Heap Scan on memos Recheck Cond: (contents &~? 'Mroonga is a MySQL plugin that uses Groonga.'::text) - -> Bitmap Index Scan on pgroonga_memos_index (cost=0.00..0.00 rows=1 width=0) + -> Bitmap Index Scan on pgroonga_memos_index Index Cond: (contents &~? 'Mroonga is a MySQL plugin that uses Groonga.'::text) (4 rows) Modified: expected/full-text-search/text-array/single/similar-v2/indexscan.out (+2 -2) =================================================================== --- expected/full-text-search/text-array/single/similar-v2/indexscan.out 2017-05-02 10:25:24 +0900 (1b67197) +++ expected/full-text-search/text-array/single/similar-v2/indexscan.out 2017-05-02 10:56:43 +0900 (a53a6c9) @@ -18,13 +18,13 @@ CREATE INDEX pgroonga_memos_index ON memos SET enable_seqscan = off; SET enable_indexscan = on; SET enable_bitmapscan = off; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &~? 'Mroonga is a MySQL plugin that uses Groonga.'; QUERY PLAN ----------------------------------------------------------------------------------- - Index Scan using pgroonga_memos_index on memos (cost=0.00..4.01 rows=2 width=64) + Index Scan using pgroonga_memos_index on memos Index Cond: (contents &~? 'Mroonga is a MySQL plugin that uses Groonga.'::text) (2 rows) Modified: expected/full-text-search/text/single/compatibility/v1/match-v2/bitmapscan.out (+5 -5) =================================================================== --- expected/full-text-search/text/single/compatibility/v1/match-v2/bitmapscan.out 2017-05-02 10:25:24 +0900 (88ea35b) +++ expected/full-text-search/text/single/compatibility/v1/match-v2/bitmapscan.out 2017-05-02 10:56:43 +0900 (5d0944c) @@ -10,15 +10,15 @@ CREATE INDEX grnindex ON memos SET enable_seqscan = off; SET enable_indexscan = off; SET enable_bitmapscan = on; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT id, content FROM memos WHERE content &@ 'Groonga'; - QUERY PLAN ------------------------------------------------------------------------ - Bitmap Heap Scan on memos (cost=0.00..4.01 rows=2 width=36) + QUERY PLAN +-------------------------------------------------- + Bitmap Heap Scan on memos Recheck Cond: (content &@ 'Groonga'::text) - -> Bitmap Index Scan on grnindex (cost=0.00..0.00 rows=1 width=0) + -> Bitmap Index Scan on grnindex Index Cond: (content &@ 'Groonga'::text) (4 rows) Modified: expected/full-text-search/text/single/compatibility/v1/match-v2/indexscan.out (+4 -4) =================================================================== --- expected/full-text-search/text/single/compatibility/v1/match-v2/indexscan.out 2017-05-02 10:25:24 +0900 (de4734f) +++ expected/full-text-search/text/single/compatibility/v1/match-v2/indexscan.out 2017-05-02 10:56:43 +0900 (6de8fd4) @@ -10,13 +10,13 @@ CREATE INDEX grnindex ON memos SET enable_seqscan = off; SET enable_indexscan = on; SET enable_bitmapscan = off; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT id, content FROM memos WHERE content &@ 'Groonga'; - QUERY PLAN ------------------------------------------------------------------------ - Index Scan using grnindex on memos (cost=0.00..4.01 rows=2 width=36) + QUERY PLAN +-------------------------------------------- + Index Scan using grnindex on memos Index Cond: (content &@ 'Groonga'::text) (2 rows) Modified: expected/full-text-search/text/single/compatibility/v1/query-v2/bitmapscan.out (+5 -5) =================================================================== --- expected/full-text-search/text/single/compatibility/v1/query-v2/bitmapscan.out 2017-05-02 10:25:24 +0900 (28e3c88) +++ expected/full-text-search/text/single/compatibility/v1/query-v2/bitmapscan.out 2017-05-02 10:56:43 +0900 (09d1a76) @@ -10,15 +10,15 @@ CREATE INDEX grnindex ON memos SET enable_seqscan = off; SET enable_indexscan = off; SET enable_bitmapscan = on; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT id, content FROM memos WHERE content &? 'rdbms OR engine'; - QUERY PLAN ------------------------------------------------------------------------ - Bitmap Heap Scan on memos (cost=0.00..4.01 rows=2 width=36) + QUERY PLAN +---------------------------------------------------------- + Bitmap Heap Scan on memos Recheck Cond: (content &? 'rdbms OR engine'::text) - -> Bitmap Index Scan on grnindex (cost=0.00..0.00 rows=1 width=0) + -> Bitmap Index Scan on grnindex Index Cond: (content &? 'rdbms OR engine'::text) (4 rows) Modified: expected/full-text-search/text/single/compatibility/v1/query-v2/indexscan.out (+4 -4) =================================================================== --- expected/full-text-search/text/single/compatibility/v1/query-v2/indexscan.out 2017-05-02 10:25:24 +0900 (15436e3) +++ expected/full-text-search/text/single/compatibility/v1/query-v2/indexscan.out 2017-05-02 10:56:43 +0900 (ac40d2c) @@ -10,13 +10,13 @@ CREATE INDEX grnindex ON memos SET enable_seqscan = off; SET enable_indexscan = on; SET enable_bitmapscan = off; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT id, content FROM memos WHERE content &? 'rdbms OR engine'; - QUERY PLAN ------------------------------------------------------------------------ - Index Scan using grnindex on memos (cost=0.00..4.01 rows=2 width=36) + QUERY PLAN +---------------------------------------------------- + Index Scan using grnindex on memos Index Cond: (content &? 'rdbms OR engine'::text) (2 rows) Modified: expected/full-text-search/text/single/compatibility/v2/match-v1/bitmapscan.out (+5 -5) =================================================================== --- expected/full-text-search/text/single/compatibility/v2/match-v1/bitmapscan.out 2017-05-02 10:25:24 +0900 (6554bcf) +++ expected/full-text-search/text/single/compatibility/v2/match-v1/bitmapscan.out 2017-05-02 10:56:43 +0900 (8a1f03e) @@ -10,15 +10,15 @@ CREATE INDEX grnindex ON memos SET enable_seqscan = off; SET enable_indexscan = off; SET enable_bitmapscan = on; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT id, content FROM memos WHERE content %% 'Groonga'; - QUERY PLAN ------------------------------------------------------------------------ - Bitmap Heap Scan on memos (cost=0.00..4.01 rows=2 width=36) + QUERY PLAN +-------------------------------------------------- + Bitmap Heap Scan on memos Recheck Cond: (content %% 'Groonga'::text) - -> Bitmap Index Scan on grnindex (cost=0.00..0.00 rows=1 width=0) + -> Bitmap Index Scan on grnindex Index Cond: (content %% 'Groonga'::text) (4 rows) Modified: expected/full-text-search/text/single/compatibility/v2/match-v1/indexscan.out (+4 -4) =================================================================== --- expected/full-text-search/text/single/compatibility/v2/match-v1/indexscan.out 2017-05-02 10:25:24 +0900 (f4ded27) +++ expected/full-text-search/text/single/compatibility/v2/match-v1/indexscan.out 2017-05-02 10:56:43 +0900 (8c606e9) @@ -10,13 +10,13 @@ CREATE INDEX grnindex ON memos SET enable_seqscan = off; SET enable_indexscan = on; SET enable_bitmapscan = off; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT id, content FROM memos WHERE content %% 'Groonga'; - QUERY PLAN ------------------------------------------------------------------------ - Index Scan using grnindex on memos (cost=0.00..4.01 rows=2 width=36) + QUERY PLAN +-------------------------------------------- + Index Scan using grnindex on memos Index Cond: (content %% 'Groonga'::text) (2 rows) Modified: expected/full-text-search/text/single/compatibility/v2/query-v1/bitmapscan.out (+5 -5) =================================================================== --- expected/full-text-search/text/single/compatibility/v2/query-v1/bitmapscan.out 2017-05-02 10:25:24 +0900 (8156288) +++ expected/full-text-search/text/single/compatibility/v2/query-v1/bitmapscan.out 2017-05-02 10:56:43 +0900 (a11a233) @@ -10,15 +10,15 @@ CREATE INDEX grnindex ON memos SET enable_seqscan = off; SET enable_indexscan = off; SET enable_bitmapscan = on; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT id, content FROM memos WHERE content @@ 'rdbms OR engine'; - QUERY PLAN ------------------------------------------------------------------------ - Bitmap Heap Scan on memos (cost=0.00..4.26 rows=1 width=36) + QUERY PLAN +---------------------------------------------------------- + Bitmap Heap Scan on memos Recheck Cond: (content @@ 'rdbms OR engine'::text) - -> Bitmap Index Scan on grnindex (cost=0.00..0.00 rows=1 width=0) + -> Bitmap Index Scan on grnindex Index Cond: (content @@ 'rdbms OR engine'::text) (4 rows) Modified: expected/full-text-search/text/single/compatibility/v2/query-v1/indexscan.out (+4 -4) =================================================================== --- expected/full-text-search/text/single/compatibility/v2/query-v1/indexscan.out 2017-05-02 10:25:24 +0900 (058379c) +++ expected/full-text-search/text/single/compatibility/v2/query-v1/indexscan.out 2017-05-02 10:56:43 +0900 (97931ca) @@ -10,13 +10,13 @@ CREATE INDEX grnindex ON memos SET enable_seqscan = off; SET enable_indexscan = on; SET enable_bitmapscan = off; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT id, content FROM memos WHERE content @@ 'rdbms OR engine'; - QUERY PLAN ------------------------------------------------------------------------ - Index Scan using grnindex on memos (cost=0.00..4.01 rows=1 width=36) + QUERY PLAN +---------------------------------------------------- + Index Scan using grnindex on memos Index Cond: (content @@ 'rdbms OR engine'::text) (2 rows) Modified: sql/full-text-search/text-array/single/match-contain-v2/bitmapscan.sql (+1 -1) =================================================================== --- sql/full-text-search/text-array/single/match-contain-v2/bitmapscan.sql 2017-05-02 10:25:24 +0900 (c391008) +++ sql/full-text-search/text-array/single/match-contain-v2/bitmapscan.sql 2017-05-02 10:56:43 +0900 (c5fbb98) @@ -22,7 +22,7 @@ SET enable_seqscan = off; SET enable_indexscan = off; SET enable_bitmapscan = on; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &@> Array['rdbms', 'engine']; Modified: sql/full-text-search/text-array/single/match-contain-v2/indexscan.sql (+1 -1) =================================================================== --- sql/full-text-search/text-array/single/match-contain-v2/indexscan.sql 2017-05-02 10:25:24 +0900 (73fa764) +++ sql/full-text-search/text-array/single/match-contain-v2/indexscan.sql 2017-05-02 10:56:43 +0900 (2f5eb6c) @@ -22,7 +22,7 @@ SET enable_seqscan = off; SET enable_indexscan = on; SET enable_bitmapscan = off; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &@> Array['rdbms', 'engine']; Modified: sql/full-text-search/text-array/single/match-v2/bitmapscan.sql (+1 -1) =================================================================== --- sql/full-text-search/text-array/single/match-v2/bitmapscan.sql 2017-05-02 10:25:24 +0900 (d3d2203) +++ sql/full-text-search/text-array/single/match-v2/bitmapscan.sql 2017-05-02 10:56:43 +0900 (a52e35d) @@ -22,7 +22,7 @@ SET enable_seqscan = off; SET enable_indexscan = off; SET enable_bitmapscan = on; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &@ 'Groonga'; Modified: sql/full-text-search/text-array/single/match-v2/indexscan.sql (+1 -1) =================================================================== --- sql/full-text-search/text-array/single/match-v2/indexscan.sql 2017-05-02 10:25:24 +0900 (e93e31c) +++ sql/full-text-search/text-array/single/match-v2/indexscan.sql 2017-05-02 10:56:43 +0900 (31aee4c) @@ -22,7 +22,7 @@ SET enable_seqscan = off; SET enable_indexscan = on; SET enable_bitmapscan = off; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &@ 'Groonga'; Modified: sql/full-text-search/text-array/single/query-contain-v2/bitmapscan.sql (+1 -1) =================================================================== --- sql/full-text-search/text-array/single/query-contain-v2/bitmapscan.sql 2017-05-02 10:25:24 +0900 (953a1d0) +++ sql/full-text-search/text-array/single/query-contain-v2/bitmapscan.sql 2017-05-02 10:56:43 +0900 (9e9b667) @@ -22,7 +22,7 @@ SET enable_seqscan = off; SET enable_indexscan = off; SET enable_bitmapscan = on; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &?> Array['rdbms', 'groonga engine']; Modified: sql/full-text-search/text-array/single/query-contain-v2/indexscan.sql (+1 -1) =================================================================== --- sql/full-text-search/text-array/single/query-contain-v2/indexscan.sql 2017-05-02 10:25:24 +0900 (43d0f99) +++ sql/full-text-search/text-array/single/query-contain-v2/indexscan.sql 2017-05-02 10:56:43 +0900 (57846f5) @@ -22,7 +22,7 @@ SET enable_seqscan = off; SET enable_indexscan = on; SET enable_bitmapscan = off; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &?> Array['rdbms', 'groonga engine']; Modified: sql/full-text-search/text-array/single/query-v2/bitmapscan.sql (+1 -1) =================================================================== --- sql/full-text-search/text-array/single/query-v2/bitmapscan.sql 2017-05-02 10:25:24 +0900 (70c6ec9) +++ sql/full-text-search/text-array/single/query-v2/bitmapscan.sql 2017-05-02 10:56:43 +0900 (d7a7907) @@ -22,7 +22,7 @@ SET enable_seqscan = off; SET enable_indexscan = off; SET enable_bitmapscan = on; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &? 'rdbms OR engine'; Modified: sql/full-text-search/text-array/single/query-v2/indexscan.sql (+1 -1) =================================================================== --- sql/full-text-search/text-array/single/query-v2/indexscan.sql 2017-05-02 10:25:24 +0900 (606f87f) +++ sql/full-text-search/text-array/single/query-v2/indexscan.sql 2017-05-02 10:56:43 +0900 (e0fa59d) @@ -22,7 +22,7 @@ SET enable_seqscan = off; SET enable_indexscan = on; SET enable_bitmapscan = off; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &? 'rdbms OR engine'; Modified: sql/full-text-search/text-array/single/script-v2/bitmapscan.sql (+1 -1) =================================================================== --- sql/full-text-search/text-array/single/script-v2/bitmapscan.sql 2017-05-02 10:25:24 +0900 (277e499) +++ sql/full-text-search/text-array/single/script-v2/bitmapscan.sql 2017-05-02 10:56:43 +0900 (da70efe) @@ -22,7 +22,7 @@ SET enable_seqscan = off; SET enable_indexscan = off; SET enable_bitmapscan = on; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &` 'contents @ "rdbms" || contents @ "engine"'; Modified: sql/full-text-search/text-array/single/script-v2/indexscan.sql (+1 -1) =================================================================== --- sql/full-text-search/text-array/single/script-v2/indexscan.sql 2017-05-02 10:25:24 +0900 (9b14e25) +++ sql/full-text-search/text-array/single/script-v2/indexscan.sql 2017-05-02 10:56:43 +0900 (d3ac074) @@ -22,7 +22,7 @@ SET enable_seqscan = off; SET enable_indexscan = on; SET enable_bitmapscan = off; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &` 'contents @ "rdbms" || contents @ "engine"'; Modified: sql/full-text-search/text-array/single/similar-v2/bitmapscan.sql (+1 -1) =================================================================== --- sql/full-text-search/text-array/single/similar-v2/bitmapscan.sql 2017-05-02 10:25:24 +0900 (f2ffef0) +++ sql/full-text-search/text-array/single/similar-v2/bitmapscan.sql 2017-05-02 10:56:43 +0900 (efcdace) @@ -22,7 +22,7 @@ SET enable_seqscan = off; SET enable_indexscan = off; SET enable_bitmapscan = on; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &~? 'Mroonga is a MySQL plugin that uses Groonga.'; Modified: sql/full-text-search/text-array/single/similar-v2/indexscan.sql (+1 -1) =================================================================== --- sql/full-text-search/text-array/single/similar-v2/indexscan.sql 2017-05-02 10:25:24 +0900 (8eab213) +++ sql/full-text-search/text-array/single/similar-v2/indexscan.sql 2017-05-02 10:56:43 +0900 (0e9f22a) @@ -22,7 +22,7 @@ SET enable_seqscan = off; SET enable_indexscan = on; SET enable_bitmapscan = off; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT title, contents FROM memos WHERE contents &~? 'Mroonga is a MySQL plugin that uses Groonga.'; Modified: sql/full-text-search/text/single/compatibility/v1/match-v2/bitmapscan.sql (+1 -1) =================================================================== --- sql/full-text-search/text/single/compatibility/v1/match-v2/bitmapscan.sql 2017-05-02 10:25:24 +0900 (3567350) +++ sql/full-text-search/text/single/compatibility/v1/match-v2/bitmapscan.sql 2017-05-02 10:56:43 +0900 (8a85eaf) @@ -14,7 +14,7 @@ SET enable_seqscan = off; SET enable_indexscan = off; SET enable_bitmapscan = on; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT id, content FROM memos WHERE content &@ 'Groonga'; Modified: sql/full-text-search/text/single/compatibility/v1/match-v2/indexscan.sql (+1 -1) =================================================================== --- sql/full-text-search/text/single/compatibility/v1/match-v2/indexscan.sql 2017-05-02 10:25:24 +0900 (55537d5) +++ sql/full-text-search/text/single/compatibility/v1/match-v2/indexscan.sql 2017-05-02 10:56:43 +0900 (b4c4f4e) @@ -14,7 +14,7 @@ SET enable_seqscan = off; SET enable_indexscan = on; SET enable_bitmapscan = off; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT id, content FROM memos WHERE content &@ 'Groonga'; Modified: sql/full-text-search/text/single/compatibility/v1/query-v2/bitmapscan.sql (+1 -1) =================================================================== --- sql/full-text-search/text/single/compatibility/v1/query-v2/bitmapscan.sql 2017-05-02 10:25:24 +0900 (2c5b744) +++ sql/full-text-search/text/single/compatibility/v1/query-v2/bitmapscan.sql 2017-05-02 10:56:43 +0900 (ac40485) @@ -14,7 +14,7 @@ SET enable_seqscan = off; SET enable_indexscan = off; SET enable_bitmapscan = on; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT id, content FROM memos WHERE content &? 'rdbms OR engine'; Modified: sql/full-text-search/text/single/compatibility/v1/query-v2/indexscan.sql (+1 -1) =================================================================== --- sql/full-text-search/text/single/compatibility/v1/query-v2/indexscan.sql 2017-05-02 10:25:24 +0900 (01fadf5) +++ sql/full-text-search/text/single/compatibility/v1/query-v2/indexscan.sql 2017-05-02 10:56:43 +0900 (20b06c6) @@ -14,7 +14,7 @@ SET enable_seqscan = off; SET enable_indexscan = on; SET enable_bitmapscan = off; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT id, content FROM memos WHERE content &? 'rdbms OR engine'; Modified: sql/full-text-search/text/single/compatibility/v2/match-v1/bitmapscan.sql (+1 -1) =================================================================== --- sql/full-text-search/text/single/compatibility/v2/match-v1/bitmapscan.sql 2017-05-02 10:25:24 +0900 (01f7211) +++ sql/full-text-search/text/single/compatibility/v2/match-v1/bitmapscan.sql 2017-05-02 10:56:43 +0900 (5608fd6) @@ -14,7 +14,7 @@ SET enable_seqscan = off; SET enable_indexscan = off; SET enable_bitmapscan = on; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT id, content FROM memos WHERE content %% 'Groonga'; Modified: sql/full-text-search/text/single/compatibility/v2/match-v1/indexscan.sql (+1 -1) =================================================================== --- sql/full-text-search/text/single/compatibility/v2/match-v1/indexscan.sql 2017-05-02 10:25:24 +0900 (f30f4e8) +++ sql/full-text-search/text/single/compatibility/v2/match-v1/indexscan.sql 2017-05-02 10:56:43 +0900 (48b93ee) @@ -14,7 +14,7 @@ SET enable_seqscan = off; SET enable_indexscan = on; SET enable_bitmapscan = off; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT id, content FROM memos WHERE content %% 'Groonga'; Modified: sql/full-text-search/text/single/compatibility/v2/query-v1/bitmapscan.sql (+1 -1) =================================================================== --- sql/full-text-search/text/single/compatibility/v2/query-v1/bitmapscan.sql 2017-05-02 10:25:24 +0900 (3757dbf) +++ sql/full-text-search/text/single/compatibility/v2/query-v1/bitmapscan.sql 2017-05-02 10:56:43 +0900 (449710b) @@ -14,7 +14,7 @@ SET enable_seqscan = off; SET enable_indexscan = off; SET enable_bitmapscan = on; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT id, content FROM memos WHERE content @@ 'rdbms OR engine'; Modified: sql/full-text-search/text/single/compatibility/v2/query-v1/indexscan.sql (+1 -1) =================================================================== --- sql/full-text-search/text/single/compatibility/v2/query-v1/indexscan.sql 2017-05-02 10:25:24 +0900 (c579536) +++ sql/full-text-search/text/single/compatibility/v2/query-v1/indexscan.sql 2017-05-02 10:56:43 +0900 (44d267f) @@ -14,7 +14,7 @@ SET enable_seqscan = off; SET enable_indexscan = on; SET enable_bitmapscan = off; -EXPLAIN +EXPLAIN (COSTS OFF) SELECT id, content FROM memos WHERE content @@ 'rdbms OR engine'; Modified: src/pgroonga.c (+14 -14) =================================================================== --- src/pgroonga.c 2017-05-02 10:25:24 +0900 (d952dfb) +++ src/pgroonga.c 2017-05-02 10:56:43 +0900 (7a8bcc9) @@ -744,7 +744,7 @@ PGrnIsQueryStrategyIndex(Relation index, int nthAttribute) } static bool -PGrnIsQueryContainStrategyIndex(Relation index, int nthAttribute) +PGrnIsQueryInStrategyIndex(Relation index, int nthAttribute) { Oid strategyOID; Oid leftType; @@ -768,7 +768,7 @@ PGrnIsQueryContainStrategyIndex(Relation index, int nthAttribute) strategyOID = get_opfamily_member(index->rd_opfamily[nthAttribute], leftType, rightType, - PGrnQueryContainStrategyV2Number); + PGrnQueryInStrategyV2Number); return OidIsValid(strategyOID); } @@ -810,7 +810,7 @@ PGrnIsForFullTextSearchIndex(Relation index, int nthAttribute) if (PGrnIsQueryStrategyIndex(index, nthAttribute)) return true; - if (PGrnIsQueryContainStrategyIndex(index, nthAttribute)) + if (PGrnIsQueryInStrategyIndex(index, nthAttribute)) return true; if (PGrnIsScriptStrategyIndex(index, nthAttribute)) @@ -839,7 +839,7 @@ static bool PGrnIsForPrefixSearchIndex(Relation index, int nthAttribute) { Oid prefixStrategyOID; - Oid prefixContainStrategyOID; + Oid prefixInStrategyOID; Oid leftType; Oid rightType; @@ -865,12 +865,12 @@ PGrnIsForPrefixSearchIndex(Relation index, int nthAttribute) if (OidIsValid(prefixStrategyOID)) return true; - prefixContainStrategyOID = + prefixInStrategyOID = get_opfamily_member(index->rd_opfamily[nthAttribute], leftType, rightType, - PGrnPrefixContainStrategyV2Number); - if (OidIsValid(prefixContainStrategyOID)) + PGrnPrefixInStrategyV2Number); + if (OidIsValid(prefixInStrategyOID)) return true; return false; @@ -3057,17 +3057,17 @@ PGrnSearchBuildCondition(Relation index, case PGrnScriptStrategyV2Number: break; case PGrnPrefixStrategyV2Number: - case PGrnPrefixContainStrategyV2Number: + case PGrnPrefixInStrategyV2Number: operator = GRN_OP_PREFIX; break; case PGrnPrefixRKStrategyV2Number: - case PGrnPrefixRKContainStrategyV2Number: + case PGrnPrefixRKInStrategyV2Number: break; case PGrnRegexpStrategyNumber: operator = GRN_OP_REGEXP; break; - case PGrnQueryContainStrategyV2Number: - case PGrnMatchContainStrategyV2Number: + case PGrnQueryInStrategyV2Number: + case PGrnMatchInStrategyV2Number: switch (attribute->atttypid) { case TEXTOID: @@ -3117,13 +3117,13 @@ PGrnSearchBuildCondition(Relation index, GRN_TEXT_LEN(&(buffers->general))); break; case PGrnPrefixRKStrategyV2Number: - case PGrnPrefixRKContainStrategyV2Number: + case PGrnPrefixRKInStrategyV2Number: PGrnSearchBuildConditionPrefixRK(data, targetColumn, GRN_TEXT_VALUE(&(buffers->general)), GRN_TEXT_LEN(&(buffers->general))); break; - case PGrnQueryContainStrategyV2Number: + case PGrnQueryInStrategyV2Number: { grn_obj *queries = &(buffers->general); unsigned int i, n; @@ -3145,7 +3145,7 @@ PGrnSearchBuildCondition(Relation index, } break; } - case PGrnMatchContainStrategyV2Number: + case PGrnMatchInStrategyV2Number: { grn_obj *keywords = &(buffers->general); grn_obj keywordBuffer; Modified: src/pgroonga.h (+5 -5) =================================================================== --- src/pgroonga.h 2017-05-02 10:25:24 +0900 (3cb4674) +++ src/pgroonga.h 2017-05-02 10:56:43 +0900 (0a4418a) @@ -30,12 +30,12 @@ #define PGrnScriptStrategyV2Number 15 /* operator &` (script in Groonga) */ #define PGrnPrefixStrategyV2Number 16 /* operator &^ (prefix search) */ #define PGrnPrefixRKStrategyV2Number 17 /* operator &^~ (prefix RK search) */ -#define PGrnMatchContainStrategyV2Number 18 /* operator &@> (@ in Groonga) */ -#define PGrnQueryContainStrategyV2Number 19 /* operator &?> (query in Groonga) */ -#define PGrnPrefixContainStrategyV2Number 20 /* operator &^> (prefix search) */ -#define PGrnPrefixRKContainStrategyV2Number 21 /* operator &^~> (prefix RK search) */ +#define PGrnMatchInStrategyV2Number 18 /* operator &@> (@ in Groonga) */ +#define PGrnQueryInStrategyV2Number 19 /* operator &?> (query in Groonga) */ +#define PGrnPrefixInStrategyV2Number 20 /* operator &^> (prefix search) */ +#define PGrnPrefixRKInStrategyV2Number 21 /* operator &^~> (prefix RK search) */ -#define PGRN_N_STRATEGIES PGrnPrefixRKContainStrategyV2Number +#define PGRN_N_STRATEGIES PGrnPrefixRKInStrategyV2Number /* file and table names */ #define PGrnLogPathDefault "pgroonga.log" -------------- next part -------------- HTML����������������������������...Download
