Add GIN support for pg_trgm. From Guillaume Smet <guillaume.smet@gmail.com>

with minor editorization by me.

Hstore improvements
* add operation hstore ? text - excat equivalent of exist()
* remove undocumented behaviour of contains operation with NULL value
* now 'key'::text=>NULL returns '"key"=>NULL' instead of NULL
* Add GIN support for contains and exist operations
* Add GiST support for exist operatiion
* improve regression tests

Author: feodor

contrib/hstore/Makefile

@@ -1,11 +1,11 @@
-# $PostgreSQL: pgsql/contrib/hstore/Makefile,v 1.4 2007/02/09 17:24:33 petere Exp $
+# $PostgreSQL: pgsql/contrib/hstore/Makefile,v 1.5 2007/03/14 14:21:52 teodor Exp $
 
 subdir = contrib/hstore
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
 MODULE_big = hstore
-OBJS = hstore_io.o hstore_op.o hstore_gist.o crc32.o
+OBJS = hstore_io.o hstore_op.o hstore_gist.o hstore_gin.o crc32.o
 
 DATA_built = hstore.sql
 DATA = uninstall_hstore.sql

contrib/hstore/README.hstore

@@ -117,13 +117,14 @@ regression=# select * from each('a=>1,b=>2');
  a   | 1
  b   | 2
 
-    * exist (hstore,text) - returns 'true if key is exists in hstore and 
-	false otherwise. 
+    * exist (hstore,text) 
+	* hstore ? text 
+	  - returns 'true if key is exists in hstore and false otherwise. 
 
-regression=# select exist('a=>1','a');
- exist 
-----------
- t
+regression=# select exist('a=>1','a'), 'a=>1' ? 'a';
+ exist | ?column? 
+-------+----------
+ t     | t
 
     * defined (hstore,text) - returns true if key is exists in hstore and 
 	  its value is not NULL. 
@@ -135,9 +136,10 @@ regression=# select defined('a=>NULL','a');
 
 Indices
 
-Module provides index support for '@>' and '<@' operations.
+Module provides index support for '@>' and '?' operations.
 
 create index hidx on testhstore using gist(h);
+create index hidx on testhstore using gin(h);
 
 Note
 

contrib/hstore/data/hstore.data

@@ -998,3 +998,4 @@ auth=>BC, title=>CAC, subtitle=>BA, line=>997, date=>BAA
 wait=>AB, user=>ABC, line=>998, pos=>41, node=>CAC
 state=>4, title=>AC, bad=>t, status=>59, line=>999, disabled=>t
 user=>BC, line=>1000
+wait=>NULL, line=>1000

contrib/hstore/expected/hstore.out

@@ -272,6 +272,12 @@ select ('aa=>NULL, c=>d , b=>16'::hstore->'aa') is null;
  t
 (1 row)
 
+select ('aa=>"NULL", c=>d , b=>16'::hstore->'aa') is null;
+ ?column? 
+----------
+ f
+(1 row)
+
 -- exists/defined
 select exist('a=>NULL, b=>qq', 'a');
  exist 
@@ -291,6 +297,12 @@ select exist('a=>NULL, b=>qq', 'c');
  f
 (1 row)
 
+select exist('a=>"NULL", b=>qq', 'a');
+ exist 
+-------
+ t
+(1 row)
+
 select defined('a=>NULL, b=>qq', 'a');
  defined 
 ---------
@@ -309,6 +321,12 @@ select defined('a=>NULL, b=>qq', 'c');
  f
 (1 row)
 
+select defined('a=>"NULL", b=>qq', 'a');
+ defined 
+---------
+ t
+(1 row)
+
 -- delete 
 select delete('a=>1 , b=>2, c=>3'::hstore, 'a');
        delete       
@@ -384,6 +402,18 @@ select 'a=>g, b=>c'::hstore || ( 'b'=>'gf' );
  "a"=>"g", "b"=>"gf"
 (1 row)
 
+select 'a=>g, b=>c'::hstore || ( 'b'=>'NULL' );
+       ?column?        
+-----------------------
+ "a"=>"g", "b"=>"NULL"
+(1 row)
+
+select 'a=>g, b=>c'::hstore || ( 'b'=>NULL );
+      ?column?       
+---------------------
+ "a"=>"g", "b"=>NULL
+(1 row)
+
 -- keys/values
 select akeys('aa=>1 , b=>2, cq=>3'::hstore || 'cq=>l, b=>g, fg=>f');
     akeys     
@@ -485,19 +515,19 @@ select * from each('aaa=>bq, b=>NULL, ""=>1 ');
 (3 rows)
 
 -- @>
-select 'a=>b, b=>1, c=>NULL'::hstore @> 'a=>NULL';
+select 'a=>b, b=>1, c=>NULL'::hstore @> 'a=>b';
  ?column? 
 ----------
  t
 (1 row)
 
-select 'a=>b, b=>1, c=>NULL'::hstore @> 'a=>NULL, c=>NULL';
+select 'a=>b, b=>1, c=>NULL'::hstore @> 'a=>b, c=>NULL';
  ?column? 
 ----------
  t
 (1 row)
 
-select 'a=>b, b=>1, c=>NULL'::hstore @> 'a=>NULL, g=>NULL';
+select 'a=>b, b=>1, c=>NULL'::hstore @> 'a=>b, g=>NULL';
  ?column? 
 ----------
  f
@@ -521,12 +551,6 @@ select 'a=>b, b=>1, c=>NULL'::hstore @> 'a=>b';
  t
 (1 row)
 
-select 'a=>b, b=>1, c=>NULL'::hstore @> 'a=>b, c=>NULL';
- ?column? 
-----------
- t
-(1 row)
-
 select 'a=>b, b=>1, c=>NULL'::hstore @> 'a=>b, c=>q';
  ?column? 
 ----------
@@ -538,7 +562,7 @@ CREATE TABLE testhstore (h hstore);
 select count(*) from testhstore where h @> 'wait=>NULL';
  count 
 -------
-   189
+     1
 (1 row)
 
 select count(*) from testhstore where h @> 'wait=>CC';
@@ -553,12 +577,18 @@ select count(*) from testhstore where h @> 'wait=>CC, public=>t';
      2
 (1 row)
 
+select count(*) from testhstore where h ? 'public';
+ count 
+-------
+   194
+(1 row)
+
 create index hidx on testhstore using gist(h);
 set enable_seqscan=off;
 select count(*) from testhstore where h @> 'wait=>NULL';
  count 
 -------
-   189
+     1
 (1 row)
 
 select count(*) from testhstore where h @> 'wait=>CC';
@@ -573,26 +603,59 @@ select count(*) from testhstore where h @> 'wait=>CC, public=>t';
      2
 (1 row)
 
+select count(*) from testhstore where h ? 'public';
+ count 
+-------
+   194
+(1 row)
+
+drop index hidx;
+create index hidx on testhstore using gin (h);
+set enable_seqscan=off;
+select count(*) from testhstore where h @> 'wait=>NULL';
+ count 
+-------
+     1
+(1 row)
+
+select count(*) from testhstore where h @> 'wait=>CC';
+ count 
+-------
+    15
+(1 row)
+
+select count(*) from testhstore where h @> 'wait=>CC, public=>t';
+ count 
+-------
+     2
+(1 row)
+
+select count(*) from testhstore where h ? 'public';
+ count 
+-------
+   194
+(1 row)
+
 select count(*) from (select (each(h)).key from testhstore) as wow ;
  count 
 -------
-  4779
+  4781
 (1 row)
 
 select key, count(*) from (select (each(h)).key from testhstore) as wow group by key order by count desc, key;
     key    | count 
 -----------+-------
- line      |   883
+ line      |   884
  query     |   207
  pos       |   203
  node      |   202
  space     |   197
  status    |   195
  public    |   194
  title     |   190
+ wait      |   190
  org       |   189
  user      |   189
- wait      |   189
  coauthors |   188
  disabled  |   185
  indexed   |   184

contrib/hstore/hstore.h

@@ -50,4 +50,7 @@ typedef struct
 int			comparePairs(const void *a, const void *b);
 int			uniquePairs(Pairs * a, int4 l, int4 *buflen);
 
+#define HStoreContainsStrategyNumber    7
+#define HStoreExistsStrategyNumber      9
+
 #endif

contrib/hstore/hstore.sql.in

@@ -40,6 +40,14 @@ RETURNS bool
 AS 'MODULE_PATHNAME','exists'
 LANGUAGE 'C' with (isstrict,iscachable);
 
+CREATE OPERATOR ? (
+	LEFTARG = hstore,
+	RIGHTARG = text,
+	PROCEDURE = exist,
+	RESTRICT = contsel,
+	JOIN = contjoinsel
+);
+
 CREATE FUNCTION isdefined(hstore,text)
 RETURNS bool
 AS 'MODULE_PATHNAME','defined'
@@ -116,7 +124,7 @@ CREATE OPERATOR ~ (
 CREATE FUNCTION tconvert(text,text)
 RETURNS hstore
 AS 'MODULE_PATHNAME'
-LANGUAGE 'C' with (isstrict,iscachable);
+LANGUAGE 'C' with (iscachable);
 
 CREATE OPERATOR => (
 	LEFTARG = text,
@@ -210,7 +218,8 @@ LANGUAGE 'C';
 CREATE OPERATOR CLASS gist_hstore_ops
 DEFAULT FOR TYPE hstore USING gist
 AS
-        OPERATOR        7       @>       RECHECK,
+       	OPERATOR        7       @>       RECHECK,
+       	OPERATOR        9       ?(hstore,text)       RECHECK,
         --OPERATOR        8       <@       RECHECK,
         OPERATOR        13      @       RECHECK,
         --OPERATOR        14      ~       RECHECK,
@@ -223,4 +232,33 @@ AS
         FUNCTION        7       ghstore_same (internal, internal, internal),
         STORAGE         ghstore;
 
+-- define the GIN support methods
+
+CREATE FUNCTION gin_extract_hstore(internal, internal)
+RETURNS internal
+AS 'MODULE_PATHNAME'
+LANGUAGE C;
+
+CREATE FUNCTION gin_extract_hstore_query(internal, internal, int2)
+RETURNS internal
+AS 'MODULE_PATHNAME'
+LANGUAGE C;
+
+CREATE FUNCTION gin_consistent_hstore(internal, int2, internal)
+RETURNS internal
+AS 'MODULE_PATHNAME'
+LANGUAGE C;
+
+CREATE OPERATOR CLASS gin_hstore_ops
+DEFAULT FOR TYPE hstore USING gin
+AS
+	OPERATOR        7       @> RECHECK,
+    OPERATOR        9       ?(hstore,text),
+	FUNCTION        1       bttextcmp(text,text),
+	FUNCTION        2       gin_extract_hstore(internal, internal),
+	FUNCTION        3       gin_extract_hstore_query(internal, internal, int2),
+	FUNCTION        4       gin_consistent_hstore(internal, int2, internal),
+STORAGE         text;
+
+
 END;