diff options
Diffstat (limited to 'contrib/intarray')
| -rw-r--r-- | contrib/intarray/_int.sql.in | 12 | ||||
| -rw-r--r-- | contrib/intarray/_int_gin.c | 6 | ||||
| -rw-r--r-- | contrib/intarray/uninstall__int.sql | 6 |
3 files changed, 13 insertions, 11 deletions
diff --git a/contrib/intarray/_int.sql.in b/contrib/intarray/_int.sql.in index c681626dc9b..9f91a65eec7 100644 --- a/contrib/intarray/_int.sql.in +++ b/contrib/intarray/_int.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/intarray/_int.sql.in,v 1.28 2008/04/14 17:05:32 tgl Exp $ */ +/* $PostgreSQL: pgsql/contrib/intarray/_int.sql.in,v 1.29 2009/03/25 22:19:01 tgl Exp $ */ -- Adjust this setting to control where the objects get created. SET search_path = public; @@ -458,13 +458,13 @@ AS --GIN -CREATE OR REPLACE FUNCTION ginint4_queryextract(internal, internal, int2) +CREATE OR REPLACE FUNCTION ginint4_queryextract(internal, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE; -CREATE OR REPLACE FUNCTION ginint4_consistent(internal, int2, internal, internal) -RETURNS internal +CREATE OR REPLACE FUNCTION ginint4_consistent(internal, int2, internal, int4, internal, internal) +RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE; @@ -480,6 +480,6 @@ AS OPERATOR 20 @@ (_int4, query_int), FUNCTION 1 btint4cmp (int4, int4), FUNCTION 2 ginarrayextract (anyarray, internal), - FUNCTION 3 ginint4_queryextract (internal, internal, int2), - FUNCTION 4 ginint4_consistent (internal, int2, internal, internal), + FUNCTION 3 ginint4_queryextract (internal, internal, int2, internal, internal), + FUNCTION 4 ginint4_consistent (internal, int2, internal, int4, internal, internal), STORAGE int4; diff --git a/contrib/intarray/_int_gin.c b/contrib/intarray/_int_gin.c index 0edb686df2e..598cdeca570 100644 --- a/contrib/intarray/_int_gin.c +++ b/contrib/intarray/_int_gin.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/intarray/_int_gin.c,v 1.8 2008/05/17 01:28:19 adunstan Exp $ + * $PostgreSQL: pgsql/contrib/intarray/_int_gin.c,v 1.9 2009/03/25 22:19:01 tgl Exp $ */ #include "postgres.h" @@ -90,7 +90,9 @@ ginint4_consistent(PG_FUNCTION_ARGS) { bool *check = (bool *) PG_GETARG_POINTER(0); StrategyNumber strategy = PG_GETARG_UINT16(1); - bool *recheck = (bool *) PG_GETARG_POINTER(3); + /* int32 nkeys = PG_GETARG_INT32(3); */ + /* Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4); */ + bool *recheck = (bool *) PG_GETARG_POINTER(5); bool res = FALSE; /* diff --git a/contrib/intarray/uninstall__int.sql b/contrib/intarray/uninstall__int.sql index 59ef2afc0f0..5346bddc752 100644 --- a/contrib/intarray/uninstall__int.sql +++ b/contrib/intarray/uninstall__int.sql @@ -1,13 +1,13 @@ -/* $PostgreSQL: pgsql/contrib/intarray/uninstall__int.sql,v 1.9 2008/04/14 17:05:32 tgl Exp $ */ +/* $PostgreSQL: pgsql/contrib/intarray/uninstall__int.sql,v 1.10 2009/03/25 22:19:01 tgl Exp $ */ -- Adjust this setting to control where the objects get created. SET search_path = public; DROP OPERATOR CLASS gin__int_ops USING gin; -DROP FUNCTION ginint4_queryextract(internal, internal, int2); +DROP FUNCTION ginint4_queryextract(internal, internal, int2, internal, internal); -DROP FUNCTION ginint4_consistent(internal, int2, internal, internal); +DROP FUNCTION ginint4_consistent(internal, int2, internal, int4, internal, internal); DROP OPERATOR CLASS gist__intbig_ops USING gist; |