Use "match" for "%%" and "query" for "@@"

pgroonga · Oct 28, 2015 · 7122994 · 7122994
1 parent 61afdbf
commit 7122994
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 24 deletions.
diff --git a/...arch/text/multiple/contain/bitmapscan.out → ...search/text/multiple/match/bitmapscan.out b/...arch/text/multiple/contain/bitmapscan.out → ...search/text/multiple/match/bitmapscan.out
diff --git a/...earch/text/multiple/contain/indexscan.out → ...-search/text/multiple/match/indexscan.out b/...earch/text/multiple/contain/indexscan.out → ...-search/text/multiple/match/indexscan.out
diff --git a/...-search/text/multiple/contain/seqscan.out → ...xt-search/text/multiple/match/seqscan.out b/...-search/text/multiple/contain/seqscan.out → ...xt-search/text/multiple/match/seqscan.out
diff --git a/expected/full-text-search/text/single/match/bitmapscan.out b/expected/full-text-search/text/single/match/bitmapscan.out
@@ -11,10 +11,11 @@ SET enable_indexscan = off;
 SET enable_bitmapscan = on;
 SELECT id, content
   FROM memos
- WHERE content @@ 'groonga postgresql';
+ WHERE content %% 'Groonga';
  id |                        content                        
 ----+-------------------------------------------------------
+  2 | Groonga is fast full text search engine.
   3 | PGroonga is a PostgreSQL extension that uses Groonga.
-(1 row)
+(2 rows)
 
 DROP TABLE memos;
diff --git a/expected/full-text-search/text/single/match/indexscan.out b/expected/full-text-search/text/single/match/indexscan.out
@@ -11,10 +11,11 @@ SET enable_indexscan = on;
 SET enable_bitmapscan = off;
 SELECT id, content
   FROM memos
- WHERE content @@ 'groonga postgresql';
+ WHERE content %% 'Groonga';
  id |                        content                        
 ----+-------------------------------------------------------
+  2 | Groonga is fast full text search engine.
   3 | PGroonga is a PostgreSQL extension that uses Groonga.
-(1 row)
+(2 rows)
 
 DROP TABLE memos;
diff --git a/expected/full-text-search/text/single/match/seqscan.out b/expected/full-text-search/text/single/match/seqscan.out
@@ -1,4 +1,3 @@
-SET search_path = "$user",public,pgroonga,pg_catalog;
 CREATE TABLE memos (
   id integer,
   content text
@@ -12,10 +11,11 @@ SET enable_indexscan = off;
 SET enable_bitmapscan = off;
 SELECT id, content
   FROM memos
- WHERE content @@ 'groonga postgresql';
+ WHERE content %% 'Groonga';
  id |                        content                        
 ----+-------------------------------------------------------
+  2 | Groonga is fast full text search engine.
   3 | PGroonga is a PostgreSQL extension that uses Groonga.
-(1 row)
+(2 rows)
 
 DROP TABLE memos;
diff --git a/...search/text/single/contain/bitmapscan.out → ...t-search/text/single/query/bitmapscan.out b/...search/text/single/contain/bitmapscan.out → ...t-search/text/single/query/bitmapscan.out
@@ -11,11 +11,10 @@ SET enable_indexscan = off;
 SET enable_bitmapscan = on;
 SELECT id, content
   FROM memos
- WHERE content %% 'Groonga';
+ WHERE content @@ 'groonga postgresql';
  id |                        content                        
 ----+-------------------------------------------------------
-  2 | Groonga is fast full text search engine.
   3 | PGroonga is a PostgreSQL extension that uses Groonga.
-(2 rows)
+(1 row)
 
 DROP TABLE memos;
diff --git a/...-search/text/single/contain/indexscan.out → ...xt-search/text/single/query/indexscan.out b/...-search/text/single/contain/indexscan.out → ...xt-search/text/single/query/indexscan.out
@@ -11,11 +11,10 @@ SET enable_indexscan = on;
 SET enable_bitmapscan = off;
 SELECT id, content
   FROM memos
- WHERE content %% 'Groonga';
+ WHERE content @@ 'groonga postgresql';
  id |                        content                        
 ----+-------------------------------------------------------
-  2 | Groonga is fast full text search engine.
   3 | PGroonga is a PostgreSQL extension that uses Groonga.
-(2 rows)
+(1 row)
 
 DROP TABLE memos;
diff --git a/...xt-search/text/single/contain/seqscan.out → ...text-search/text/single/query/seqscan.out b/...xt-search/text/single/contain/seqscan.out → ...text-search/text/single/query/seqscan.out
@@ -1,3 +1,4 @@
+SET search_path = "$user",public,pgroonga,pg_catalog;
 CREATE TABLE memos (
   id integer,
   content text
@@ -11,11 +12,10 @@ SET enable_indexscan = off;
 SET enable_bitmapscan = off;
 SELECT id, content
   FROM memos
- WHERE content %% 'Groonga';
+ WHERE content @@ 'groonga postgresql';
  id |                        content                        
 ----+-------------------------------------------------------
-  2 | Groonga is fast full text search engine.
   3 | PGroonga is a PostgreSQL extension that uses Groonga.
-(2 rows)
+(1 row)
 
 DROP TABLE memos;
diff --git a/...arch/text/multiple/contain/bitmapscan.sql → ...search/text/multiple/match/bitmapscan.sql b/...arch/text/multiple/contain/bitmapscan.sql → ...search/text/multiple/match/bitmapscan.sql
diff --git a/...earch/text/multiple/contain/indexscan.sql → ...-search/text/multiple/match/indexscan.sql b/...earch/text/multiple/contain/indexscan.sql → ...-search/text/multiple/match/indexscan.sql
diff --git a/...-search/text/multiple/contain/seqscan.sql → ...xt-search/text/multiple/match/seqscan.sql b/...-search/text/multiple/contain/seqscan.sql → ...xt-search/text/multiple/match/seqscan.sql
diff --git a/sql/full-text-search/text/single/match/bitmapscan.sql b/sql/full-text-search/text/single/match/bitmapscan.sql
@@ -15,6 +15,6 @@ SET enable_bitmapscan = on;
 
 SELECT id, content
   FROM memos
- WHERE content @@ 'groonga postgresql';
+ WHERE content %% 'Groonga';
 
 DROP TABLE memos;
diff --git a/sql/full-text-search/text/single/match/indexscan.sql b/sql/full-text-search/text/single/match/indexscan.sql
@@ -15,6 +15,6 @@ SET enable_bitmapscan = off;
 
 SELECT id, content
   FROM memos
- WHERE content @@ 'groonga postgresql';
+ WHERE content %% 'Groonga';
 
 DROP TABLE memos;
diff --git a/sql/full-text-search/text/single/match/seqscan.sql b/sql/full-text-search/text/single/match/seqscan.sql
@@ -1,5 +1,3 @@
-SET search_path = "$user",public,pgroonga,pg_catalog;
-
 CREATE TABLE memos (
   id integer,
   content text
@@ -17,6 +15,6 @@ SET enable_bitmapscan = off;
 
 SELECT id, content
   FROM memos
- WHERE content @@ 'groonga postgresql';
+ WHERE content %% 'Groonga';
 
 DROP TABLE memos;
diff --git a/...search/text/single/contain/bitmapscan.sql → ...t-search/text/single/query/bitmapscan.sql b/...search/text/single/contain/bitmapscan.sql → ...t-search/text/single/query/bitmapscan.sql
@@ -15,6 +15,6 @@ SET enable_bitmapscan = on;
 
 SELECT id, content
   FROM memos
- WHERE content %% 'Groonga';
+ WHERE content @@ 'groonga postgresql';
 
 DROP TABLE memos;
diff --git a/...-search/text/single/contain/indexscan.sql → ...xt-search/text/single/query/indexscan.sql b/...-search/text/single/contain/indexscan.sql → ...xt-search/text/single/query/indexscan.sql
@@ -15,6 +15,6 @@ SET enable_bitmapscan = off;
 
 SELECT id, content
   FROM memos
- WHERE content %% 'Groonga';
+ WHERE content @@ 'groonga postgresql';
 
 DROP TABLE memos;
diff --git a/...xt-search/text/single/contain/seqscan.sql → ...text-search/text/single/query/seqscan.sql b/...xt-search/text/single/contain/seqscan.sql → ...text-search/text/single/query/seqscan.sql
@@ -1,3 +1,5 @@
+SET search_path = "$user",public,pgroonga,pg_catalog;
+
 CREATE TABLE memos (
   id integer,
   content text
@@ -15,6 +17,6 @@ SET enable_bitmapscan = off;
 
 SELECT id, content
   FROM memos
- WHERE content %% 'Groonga';
+ WHERE content @@ 'groonga postgresql';
 
 DROP TABLE memos;