NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit13923be

committed

1. null-safe interface to GiST

(as proposed inhttp://fts.postgresql.org/db/mw/msg.html?mid=1028327)2. support for 'pass-by-value' arguments - to test this we used special opclass for int4 with values in range [0-2^15] More testing will be done after resolving problem with index_formtuple and implementation of B-tree using GiST3. small patch to contrib modules (seg,cube,rtree_gist,intarray) - mark functions as 'isstrict' where needed.Oleg Bartunov

1 parent77a69a2 commit13923beCopy full SHA for 13923be

File tree

7 files changed

+475

-370

lines changed

contrib
- cube
  - cube.sql.in
- intarray
  - _int.sql.in
- rtree_gist
  - rtree_gist.sql.in
- seg
  - seg.sql.in
src
- backend/access/gist
  - gist.c
  - gistget.c
- include/access
  - gist.h

7 files changed

+475

-370

lines changed

`‎contrib/cube/cube.sql.in`

Lines changed: 16 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,25 +28,25 @@ COMMENT ON TYPE cube IS`
`28`	`28`	`-- Left/Right methods`
`29`	`29`
`30`	`30`	`CREATE FUNCTION cube_over_left(cube, cube) RETURNS bool`
`31`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`31`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`32`	`32`
`33`	`33`	`COMMENT ON FUNCTION cube_over_left(cube, cube) IS`
`34`	`34`	`'is over and left of (NOT IMPLEMENTED)';`
`35`	`35`
`36`	`36`	`CREATE FUNCTION cube_over_right(cube, cube) RETURNS bool`
`37`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`37`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`38`	`38`
`39`	`39`	`COMMENT ON FUNCTION cube_over_right(cube, cube) IS`
`40`	`40`	`'is over and right of (NOT IMPLEMENTED)';`
`41`	`41`
`42`	`42`	`CREATE FUNCTION cube_left(cube, cube) RETURNS bool`
`43`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`43`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`44`	`44`
`45`	`45`	`COMMENT ON FUNCTION cube_left(cube, cube) IS`
`46`	`46`	`'is left of (NOT IMPLEMENTED)';`
`47`	`47`
`48`	`48`	`CREATE FUNCTION cube_right(cube, cube) RETURNS bool`
`49`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`49`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`50`	`50`
`51`	`51`	`COMMENT ON FUNCTION cube_right(cube, cube) IS`
`52`	`52`	`'is right of (NOT IMPLEMENTED)';`
`@@ -55,65 +55,65 @@ COMMENT ON FUNCTION cube_right(cube, cube) IS`
`55`	`55`	`-- Comparison methods`
`56`	`56`
`57`	`57`	`CREATE FUNCTION cube_lt(cube, cube) RETURNS bool`
`58`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`58`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`59`	`59`
`60`	`60`	`COMMENT ON FUNCTION cube_lt(cube, cube) IS`
`61`	`61`	`'lower than';`
`62`	`62`
`63`	`63`	`CREATE FUNCTION cube_gt(cube, cube) RETURNS bool`
`64`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`64`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`65`	`65`
`66`	`66`	`COMMENT ON FUNCTION cube_gt(cube, cube) IS`
`67`	`67`	`'greater than';`
`68`	`68`
`69`	`69`	`CREATE FUNCTION cube_contains(cube, cube) RETURNS bool`
`70`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`70`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`71`	`71`
`72`	`72`	`COMMENT ON FUNCTION cube_contains(cube, cube) IS`
`73`	`73`	`'contains';`
`74`	`74`
`75`	`75`	`CREATE FUNCTION cube_contained(cube, cube) RETURNS bool`
`76`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`76`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`77`	`77`
`78`	`78`	`COMMENT ON FUNCTION cube_contained(cube, cube) IS`
`79`	`79`	`'contained in';`
`80`	`80`
`81`	`81`	`CREATE FUNCTION cube_overlap(cube, cube) RETURNS bool`
`82`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`82`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`83`	`83`
`84`	`84`	`COMMENT ON FUNCTION cube_overlap(cube, cube) IS`
`85`	`85`	`'overlaps';`
`86`	`86`
`87`	`87`	`CREATE FUNCTION cube_same(cube, cube) RETURNS bool`
`88`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`88`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`89`	`89`
`90`	`90`	`COMMENT ON FUNCTION cube_same(cube, cube) IS`
`91`	`91`	`'same as';`
`92`	`92`
`93`	`93`	`CREATE FUNCTION cube_different(cube, cube) RETURNS bool`
`94`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`94`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`95`	`95`
`96`	`96`	`COMMENT ON FUNCTION cube_different(cube, cube) IS`
`97`	`97`	`'different';`
`98`	`98`
`99`	`99`	`-- support routines for indexing`
`100`	`100`
`101`	`101`	`CREATE FUNCTION cube_union(cube, cube) RETURNS cube`
`102`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`102`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`103`	`103`
`104`	`104`	`CREATE FUNCTION cube_inter(cube, cube) RETURNS cube`
`105`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`105`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`106`	`106`
`107`	`107`	`CREATE FUNCTION cube_size(cube) RETURNS float4`
`108`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`108`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`109`	`109`
`110`	`110`
`111`	`111`	`-- Misc N-dimensional functions`
`112`	`112`
`113`	`113`	`-- proximity routines`
`114`	`114`
`115`	`115`	`CREATE FUNCTION cube_distance(cube, cube) RETURNS float4`
`116`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`116`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`117`	`117`
`118`	`118`
`119`	`119`	`--`
`@@ -199,7 +199,7 @@ CREATE FUNCTION g_cube_decompress(opaque) RETURNS opaque`
`199`	`199`	`AS 'MODULE_PATHNAME' LANGUAGE 'c';`
`200`	`200`
`201`	`201`	`CREATE FUNCTION g_cube_penalty(opaque,opaque,opaque) RETURNS opaque`
`202`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`202`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`203`	`203`
`204`	`204`	`CREATE FUNCTION g_cube_picksplit(opaque, opaque) RETURNS opaque`
`205`	`205`	`AS 'MODULE_PATHNAME' LANGUAGE 'c';`

`‎contrib/intarray/_int.sql.in`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,39 +9,39 @@ BEGIN TRANSACTION;`
`9`	`9`	`-- Comparison methods`
`10`	`10`
`11`	`11`	`CREATE FUNCTION _int_contains(_int4, _int4) RETURNS bool`
`12`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`12`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`13`	`13`
`14`	`14`	`INSERT INTO pg_description (objoid, description)`
`15`	`15`	`SELECT oid, 'contains'::text`
`16`	`16`	`FROM pg_proc`
`17`	`17`	`WHERE proname = '_int_contains'::name;`
`18`	`18`
`19`	`19`	`CREATE FUNCTION _int_contained(_int4, _int4) RETURNS bool`
`20`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`20`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`21`	`21`
`22`	`22`	`INSERT INTO pg_description (objoid, description)`
`23`	`23`	`SELECT oid, 'contained in'::text`
`24`	`24`	`FROM pg_proc`
`25`	`25`	`WHERE proname = '_int_contained'::name;`
`26`	`26`
`27`	`27`	`CREATE FUNCTION _int_overlap(_int4, _int4) RETURNS bool`
`28`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`28`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`29`	`29`
`30`	`30`	`INSERT INTO pg_description (objoid, description)`
`31`	`31`	`SELECT oid, 'overlaps'::text`
`32`	`32`	`FROM pg_proc`
`33`	`33`	`WHERE proname = '_int_overlap'::name;`
`34`	`34`
`35`	`35`	`CREATE FUNCTION _int_same(_int4, _int4) RETURNS bool`
`36`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`36`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`37`	`37`
`38`	`38`	`INSERT INTO pg_description (objoid, description)`
`39`	`39`	`SELECT oid, 'same as'::text`
`40`	`40`	`FROM pg_proc`
`41`	`41`	`WHERE proname = '_int_same'::name;`
`42`	`42`
`43`	`43`	`CREATE FUNCTION _int_different(_int4, _int4) RETURNS bool`
`44`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`44`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`45`	`45`
`46`	`46`	`INSERT INTO pg_description (objoid, description)`
`47`	`47`	`SELECT oid, 'different'::text`
`@@ -51,10 +51,10 @@ INSERT INTO pg_description (objoid, description)`
`51`	`51`	`-- support routines for indexing`
`52`	`52`
`53`	`53`	`CREATE FUNCTION _int_union(_int4, _int4) RETURNS _int4`
`54`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`54`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`55`	`55`
`56`	`56`	`CREATE FUNCTION _int_inter(_int4, _int4) RETURNS _int4`
`57`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`57`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`58`	`58`
`59`	`59`	`--`
`60`	`60`	`-- OPERATORS`
`@@ -223,7 +223,7 @@ CREATE FUNCTION g_intbig_decompress(opaque) RETURNS opaque`
`223`	`223`	`AS 'MODULE_PATHNAME' LANGUAGE 'c';`
`224`	`224`
`225`	`225`	`CREATE FUNCTION g_intbig_penalty(opaque,opaque,opaque) RETURNS opaque`
`226`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`226`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`227`	`227`
`228`	`228`	`CREATE FUNCTION g_intbig_picksplit(opaque, opaque) RETURNS opaque`
`229`	`229`	`AS 'MODULE_PATHNAME' LANGUAGE 'c';`

`‎contrib/rtree_gist/rtree_gist.sql.in`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ create function gbox_compress(opaque) returns opaque as 'MODULE_PATHNAME' langua`
`13`	`13`
`14`	`14`	`create function rtree_decompress(opaque) returns opaque as 'MODULE_PATHNAME' language 'C';`
`15`	`15`
`16`		`-create function gbox_penalty(opaque,opaque,opaque) returns opaque as 'MODULE_PATHNAME' language 'C';`
	`16`	`+create function gbox_penalty(opaque,opaque,opaque) returns opaque as 'MODULE_PATHNAME' language 'C' with (isstrict);`
`17`	`17`
`18`	`18`	`create function gbox_picksplit(opaque, opaque) returns opaque as 'MODULE_PATHNAME' language 'C';`
`19`	`19`

`‎contrib/seg/seg.sql.in`

Lines changed: 19 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,25 +28,25 @@ COMMENT ON TYPE seg IS`
`28`	`28`	`-- Left/Right methods`
`29`	`29`
`30`	`30`	`CREATE FUNCTION seg_over_left(seg, seg) RETURNS bool`
`31`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`31`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`32`	`32`
`33`	`33`	`COMMENT ON FUNCTION seg_over_left(seg, seg) IS`
`34`	`34`	`'is over and left of';`
`35`	`35`
`36`	`36`	`CREATE FUNCTION seg_over_right(seg, seg) RETURNS bool`
`37`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`37`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`38`	`38`
`39`	`39`	`COMMENT ON FUNCTION seg_over_right(seg, seg) IS`
`40`	`40`	`'is over and right of';`
`41`	`41`
`42`	`42`	`CREATE FUNCTION seg_left(seg, seg) RETURNS bool`
`43`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`43`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`44`	`44`
`45`	`45`	`COMMENT ON FUNCTION seg_left(seg, seg) IS`
`46`	`46`	`'is left of';`
`47`	`47`
`48`	`48`	`CREATE FUNCTION seg_right(seg, seg) RETURNS bool`
`49`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`49`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`50`	`50`
`51`	`51`	`COMMENT ON FUNCTION seg_right(seg, seg) IS`
`52`	`52`	`'is right of';`
`@@ -55,77 +55,77 @@ COMMENT ON FUNCTION seg_right(seg, seg) IS`
`55`	`55`	`-- Comparison methods`
`56`	`56`
`57`	`57`	`CREATE FUNCTION seg_lt(seg, seg) RETURNS bool`
`58`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`58`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`59`	`59`
`60`	`60`	`COMMENT ON FUNCTION seg_lt(seg, seg) IS`
`61`	`61`	`'less than';`
`62`	`62`
`63`	`63`	`CREATE FUNCTION seg_le(seg, seg) RETURNS bool`
`64`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`64`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`65`	`65`
`66`	`66`	`COMMENT ON FUNCTION seg_le(seg, seg) IS`
`67`	`67`	`'less than or equal';`
`68`	`68`
`69`	`69`	`CREATE FUNCTION seg_gt(seg, seg) RETURNS bool`
`70`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`70`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`71`	`71`
`72`	`72`	`COMMENT ON FUNCTION seg_gt(seg, seg) IS`
`73`	`73`	`'greater than';`
`74`	`74`
`75`	`75`	`CREATE FUNCTION seg_ge(seg, seg) RETURNS bool`
`76`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`76`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`77`	`77`
`78`	`78`	`COMMENT ON FUNCTION seg_ge(seg, seg) IS`
`79`	`79`	`'greater than or equal';`
`80`	`80`
`81`	`81`	`CREATE FUNCTION seg_contains(seg, seg) RETURNS bool`
`82`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`82`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`83`	`83`
`84`	`84`	`COMMENT ON FUNCTION seg_contains(seg, seg) IS`
`85`	`85`	`'contains';`
`86`	`86`
`87`	`87`	`CREATE FUNCTION seg_contained(seg, seg) RETURNS bool`
`88`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`88`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`89`	`89`
`90`	`90`	`COMMENT ON FUNCTION seg_contained(seg, seg) IS`
`91`	`91`	`'contained in';`
`92`	`92`
`93`	`93`	`CREATE FUNCTION seg_overlap(seg, seg) RETURNS bool`
`94`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`94`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`95`	`95`
`96`	`96`	`COMMENT ON FUNCTION seg_overlap(seg, seg) IS`
`97`	`97`	`'overlaps';`
`98`	`98`
`99`	`99`	`CREATE FUNCTION seg_same(seg, seg) RETURNS bool`
`100`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`100`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`101`	`101`
`102`	`102`	`COMMENT ON FUNCTION seg_same(seg, seg) IS`
`103`	`103`	`'same as';`
`104`	`104`
`105`	`105`	`CREATE FUNCTION seg_different(seg, seg) RETURNS bool`
`106`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`106`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`107`	`107`
`108`	`108`	`COMMENT ON FUNCTION seg_different(seg, seg) IS`
`109`	`109`	`'different';`
`110`	`110`
`111`	`111`	`-- support routines for indexing`
`112`	`112`
`113`	`113`	`CREATE FUNCTION seg_union(seg, seg) RETURNS seg`
`114`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`114`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`115`	`115`
`116`	`116`	`CREATE FUNCTION seg_inter(seg, seg) RETURNS seg`
`117`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`117`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`118`	`118`
`119`	`119`	`CREATE FUNCTION seg_size(seg) RETURNS float4`
`120`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`120`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`121`	`121`
`122`	`122`	`-- miscellaneous`
`123`	`123`
`124`	`124`	`CREATE FUNCTION seg_upper(seg) RETURNS float4`
`125`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`125`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`126`	`126`
`127`	`127`	`CREATE FUNCTION seg_lower(seg) RETURNS float4`
`128`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`128`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`129`	`129`
`130`	`130`
`131`	`131`	`--`
`@@ -223,7 +223,7 @@ CREATE FUNCTION gseg_decompress(opaque) RETURNS opaque`
`223`	`223`	`AS 'MODULE_PATHNAME' LANGUAGE 'c';`
`224`	`224`
`225`	`225`	`CREATE FUNCTION gseg_penalty(opaque,opaque,opaque) RETURNS opaque`
`226`		`-AS 'MODULE_PATHNAME' LANGUAGE 'c';`
	`226`	`+AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);`
`227`	`227`
`228`	`228`	`CREATE FUNCTION gseg_picksplit(opaque, opaque) RETURNS opaque`
`229`	`229`	`AS 'MODULE_PATHNAME' LANGUAGE 'c';`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit13923be

File tree

7 files changed

7 files changed

`‎contrib/cube/cube.sql.in`

`‎contrib/intarray/_int.sql.in`

`‎contrib/rtree_gist/rtree_gist.sql.in`

`‎contrib/seg/seg.sql.in`

0 commit comments