NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit26df706

committed

Move strategy numbers to include/access/stratnum.h

For upcoming BRIN opclasses, it's convenient to have strategy numbersdefined in a single place. Since there's nothing appropriate, createit. The StrategyNumber typedef now lives there, as well as existingstrategy numbers for B-trees (from skey.h) and R-tree-and-friends (fromgist.h). skey.h is forced to include stratnum.h because of theStrategyNumber typedef, but gist.h is not; extensions that currentlyrely on gist.h for rtree strategy numbers might need to add a newA few .c files can stop including skey.h and/or gist.h, which is a niceside benefit.Per discussion:https://www.postgresql.org/message-id/20150514232132.GZ2523@alvh.no-ip.orgAuthored by Emre Hasegeli and Álvaro.(It's not clear to me why bootscanner.l has any #include lines at all.)

1 parent1e98fa0 commit26df706Copy full SHA for 26df706

File tree

35 files changed

+129

-95

lines changed

contrib
- btree_gin
  - btree_gin.c
- cube
  - cube.c
- hstore
  - hstore_gin.c
  - hstore_gist.c
- intarray
- ltree
  - _ltree_gist.c
  - ltree_gist.c
- pg_trgm
  - trgm_gin.c
  - trgm_gist.c
- seg
  - seg.c
src
- backend
  - access
    - brin
      - brin_minmax.c
    - gin
      - ginarrayproc.c
    - gist
      - gistproc.c
    - spgist
      - spgkdtreeproc.c
      - spgquadtreeproc.c
  - bootstrap
    - bootparse.y
    - bootscanner.l
  - optimizer
    - path
    - plan
      - createplan.c
    - util
      - predtest.c
  - utils/adt
- include
  - access
  - utils
    - rangetypes.h

35 files changed

+129

-95

lines changed

`‎contrib/btree_gin/btree_gin.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`#include<limits.h>`
`7`	`7`
`8`		`-#include"access/skey.h"`
	`8`	`+#include"access/stratnum.h"`
`9`	`9`	`#include"utils/builtins.h"`
`10`	`10`	`#include"utils/bytea.h"`
`11`	`11`	`#include"utils/cash.h"`

`‎contrib/cube/cube.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`#include<math.h>`
`13`	`13`
`14`	`14`	`#include"access/gist.h"`
`15`		`-#include"access/skey.h"`
	`15`	`+#include"access/stratnum.h"`
`16`	`16`	`#include"utils/array.h"`
`17`	`17`	`#include"utils/builtins.h"`
`18`	`18`

`‎contrib/hstore/hstore_gin.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#include"postgres.h"`
`5`	`5`
`6`	`6`	`#include"access/gin.h"`
`7`		`-#include"access/skey.h"`
	`7`	`+#include"access/stratnum.h"`
`8`	`8`	`#include"catalog/pg_type.h"`
`9`	`9`
`10`	`10`	`#include"hstore.h"`

`‎contrib/hstore/hstore_gist.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#include"postgres.h"`
`5`	`5`
`6`	`6`	`#include"access/gist.h"`
`7`		`-#include"access/skey.h"`
	`7`	`+#include"access/stratnum.h"`
`8`	`8`	`#include"catalog/pg_type.h"`
`9`	`9`	`#include"utils/pg_crc.h"`
`10`	`10`

`‎contrib/intarray/_int_gin.c`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,7 @@`
`4`	`4`	`#include"postgres.h"`
`5`	`5`
`6`	`6`	`#include"access/gin.h"`
`7`		`-#include"access/gist.h"`
`8`		`-#include"access/skey.h"`
	`7`	`+#include"access/stratnum.h"`
`9`	`8`
`10`	`9`	`#include"_int.h"`
`11`	`10`

`‎contrib/intarray/_int_gist.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#include<limits.h>`
`7`	`7`
`8`	`8`	`#include"access/gist.h"`
`9`		`-#include"access/skey.h"`
	`9`	`+#include"access/stratnum.h"`
`10`	`10`
`11`	`11`	`#include"_int.h"`
`12`	`12`

`‎contrib/intarray/_intbig_gist.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#include"postgres.h"`
`5`	`5`
`6`	`6`	`#include"access/gist.h"`
`7`		`-#include"access/skey.h"`
	`7`	`+#include"access/stratnum.h"`
`8`	`8`
`9`	`9`	`#include"_int.h"`
`10`	`10`

`‎contrib/ltree/_ltree_gist.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#include"postgres.h"`
`9`	`9`
`10`	`10`	`#include"access/gist.h"`
`11`		`-#include"access/skey.h"`
	`11`	`+#include"access/stratnum.h"`
`12`	`12`	`#include"crc32.h"`
`13`	`13`	`#include"ltree.h"`
`14`	`14`

`‎contrib/ltree/ltree_gist.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#include"postgres.h"`
`7`	`7`
`8`	`8`	`#include"access/gist.h"`
`9`		`-#include"access/skey.h"`
	`9`	`+#include"access/stratnum.h"`
`10`	`10`	`#include"crc32.h"`
`11`	`11`	`#include"ltree.h"`
`12`	`12`

`‎contrib/pg_trgm/trgm_gin.c`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@`
`6`	`6`	`#include"trgm.h"`
`7`	`7`
`8`	`8`	`#include"access/gin.h"`
`9`		`-#include"access/skey.h"`
	`9`	`+#include"access/stratnum.h"`
	`10`	`+#include"fmgr.h"`
`10`	`11`
`11`	`12`
`12`	`13`	`PG_FUNCTION_INFO_V1(gin_extract_trgm);`

`‎contrib/pg_trgm/trgm_gist.c`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,8 @@`
`5`	`5`
`6`	`6`	`#include"trgm.h"`
`7`	`7`
`8`		`-#include"access/skey.h"`
	`8`	`+#include"access/stratnum.h"`
	`9`	`+#include"fmgr.h"`
`9`	`10`
`10`	`11`
`11`	`12`	`typedefstruct`

`‎contrib/seg/seg.c`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@`
`12`	`12`	`#include<float.h>`
`13`	`13`
`14`	`14`	`#include"access/gist.h"`
`15`		`-#include"access/skey.h"`
	`15`	`+#include"access/stratnum.h"`
	`16`	`+#include"fmgr.h"`
`16`	`17`
`17`	`18`	`#include"segdata.h"`
`18`	`19`

`‎src/backend/access/brin/brin_minmax.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`#include"access/genam.h"`
`14`	`14`	`#include"access/brin_internal.h"`
`15`	`15`	`#include"access/brin_tuple.h"`
`16`		`-#include"access/skey.h"`
	`16`	`+#include"access/stratnum.h"`
`17`	`17`	`#include"catalog/pg_type.h"`
`18`	`18`	`#include"catalog/pg_amop.h"`
`19`	`19`	`#include"utils/datum.h"`

`‎src/backend/access/gin/ginarrayproc.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`#include"postgres.h"`
`15`	`15`
`16`	`16`	`#include"access/gin.h"`
`17`		`-#include"access/skey.h"`
	`17`	`+#include"access/stratnum.h"`
`18`	`18`	`#include"utils/array.h"`
`19`	`19`	`#include"utils/builtins.h"`
`20`	`20`	`#include"utils/lsyscache.h"`

`‎src/backend/access/gist/gistproc.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`#include"postgres.h"`
`19`	`19`
`20`	`20`	`#include"access/gist.h"`
`21`		`-#include"access/skey.h"`
	`21`	`+#include"access/stratnum.h"`
`22`	`22`	`#include"utils/geo_decls.h"`
`23`	`23`
`24`	`24`

`‎src/backend/access/spgist/spgkdtreeproc.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@`
`15`	`15`
`16`	`16`	`#include"postgres.h"`
`17`	`17`
`18`		`-#include"access/gist.h"/* for RTree strategy numbers */`
`19`	`18`	`#include"access/spgist.h"`
	`19`	`+#include"access/stratnum.h"`
`20`	`20`	`#include"catalog/pg_type.h"`
`21`	`21`	`#include"utils/builtins.h"`
`22`	`22`	`#include"utils/geo_decls.h"`

`‎src/backend/access/spgist/spgquadtreeproc.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@`
`15`	`15`
`16`	`16`	`#include"postgres.h"`
`17`	`17`
`18`		`-#include"access/gist.h"/* for RTree strategy numbers */`
`19`	`18`	`#include"access/spgist.h"`
	`19`	`+#include"access/stratnum.h"`
`20`	`20`	`#include"catalog/pg_type.h"`
`21`	`21`	`#include"utils/builtins.h"`
`22`	`22`	`#include"utils/geo_decls.h"`

`‎src/backend/bootstrap/bootparse.y`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@`
`21`	`21`	`#include"access/attnum.h"`
`22`	`22`	`#include"access/htup.h"`
`23`	`23`	`#include"access/itup.h"`
`24`		`-#include"access/skey.h"`
`25`	`24`	`#include"access/tupdesc.h"`
`26`	`25`	`#include"access/xact.h"`
`27`	`26`	`#include"bootstrap/bootstrap.h"`

`‎src/backend/bootstrap/bootscanner.l`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`#include"access/attnum.h"`
`19`	`19`	`#include"access/htup.h"`
`20`	`20`	`#include"access/itup.h"`
`21`		`-#include"access/skey.h"`
`22`	`21`	`#include"access/tupdesc.h"`
`23`	`22`	`#include"bootstrap/bootstrap.h"`
`24`	`23`	`#include"catalog/pg_am.h"`

`‎src/backend/optimizer/path/equivclass.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*/`
`17`	`17`	`#include"postgres.h"`
`18`	`18`
`19`		`-#include"access/skey.h"`
	`19`	`+#include"access/stratnum.h"`
`20`	`20`	`#include"catalog/pg_type.h"`
`21`	`21`	`#include"nodes/makefuncs.h"`
`22`	`22`	`#include"nodes/nodeFuncs.h"`

`‎src/backend/optimizer/path/indxpath.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`
`18`	`18`	`#include<math.h>`
`19`	`19`
`20`		`-#include"access/skey.h"`
	`20`	`+#include"access/stratnum.h"`
`21`	`21`	`#include"access/sysattr.h"`
`22`	`22`	`#include"catalog/pg_am.h"`
`23`	`23`	`#include"catalog/pg_collation.h"`

`‎src/backend/optimizer/path/pathkeys.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`*/`
`18`	`18`	`#include"postgres.h"`
`19`	`19`
`20`		`-#include"access/skey.h"`
	`20`	`+#include"access/stratnum.h"`
`21`	`21`	`#include"nodes/makefuncs.h"`
`22`	`22`	`#include"nodes/nodeFuncs.h"`
`23`	`23`	`#include"nodes/plannodes.h"`

`‎src/backend/optimizer/plan/createplan.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`#include<limits.h>`
`20`	`20`	`#include<math.h>`
`21`	`21`
`22`		`-#include"access/skey.h"`
	`22`	`+#include"access/stratnum.h"`
`23`	`23`	`#include"access/sysattr.h"`
`24`	`24`	`#include"catalog/pg_class.h"`
`25`	`25`	`#include"catalog/pg_operator.h"`

`‎src/backend/optimizer/util/predtest.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1248,7 +1248,7 @@ list_member_strip(List list, Expr datum)`
`1248`	`1248`	`* Define "operator implication tables" for btree operators ("strategies"),`
`1249`	`1249`	`* and similar tables for refutation.`
`1250`	`1250`	`*`
`1251`		`- * The strategy numbers defined by btree indexes (see access/skey.h) are:`
	`1251`	`+ * The strategy numbers defined by btree indexes (see access/stratnum.h) are:`
`1252`	`1252`	`*1 <2 <=3 =4 >=5 >`
`1253`	`1253`	`* and in addition we use 6 to represent <>. <> is not a btree-indexable`
`1254`	`1254`	`* operator, but we assume here that if an equality operator of a btree`

`‎src/backend/utils/adt/jsonb_gin.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`#include"access/gin.h"`
`17`	`17`	`#include"access/hash.h"`
`18`		`-#include"access/skey.h"`
	`18`	`+#include"access/stratnum.h"`
`19`	`19`	`#include"catalog/pg_collation.h"`
`20`	`20`	`#include"catalog/pg_type.h"`
`21`	`21`	`#include"utils/builtins.h"`

`‎src/backend/utils/adt/network_gist.c`

Lines changed: 12 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,23 +48,23 @@`
`48`	`48`	`#include<sys/socket.h>`
`49`	`49`
`50`	`50`	`#include"access/gist.h"`
`51`		`-#include"access/skey.h"`
	`51`	`+#include"access/stratnum.h"`
`52`	`52`	`#include"utils/inet.h"`
`53`	`53`
`54`	`54`	`/*`
`55`	`55`	`* Operator strategy numbers used in the GiST inet_ops opclass`
`56`	`56`	`*/`
`57`		`-#defineINETSTRAT_OVERLAPS3`
`58`		`-#defineINETSTRAT_EQ18`
`59`		`-#defineINETSTRAT_NE19`
`60`		`-#defineINETSTRAT_LT20`
`61`		`-#defineINETSTRAT_LE21`
`62`		`-#defineINETSTRAT_GT22`
`63`		`-#defineINETSTRAT_GE23`
`64`		`-#defineINETSTRAT_SUB24`
`65`		`-#defineINETSTRAT_SUBEQ25`
`66`		`-#defineINETSTRAT_SUP26`
`67`		`-#defineINETSTRAT_SUPEQ27`
	`57`	`+#defineINETSTRAT_OVERLAPSRTOverlapStrategyNumber`
	`58`	`+#defineINETSTRAT_EQRTEqualStrategyNumber`
	`59`	`+#defineINETSTRAT_NERTNotEqualStrategyNumber`
	`60`	`+#defineINETSTRAT_LTRTLessStrategyNumber`
	`61`	`+#defineINETSTRAT_LERTLessEqualStrategyNumber`
	`62`	`+#defineINETSTRAT_GTRTGreaterStrategyNumber`
	`63`	`+#defineINETSTRAT_GERTGreaterEqualStrategyNumber`
	`64`	`+#defineINETSTRAT_SUBRTSubStrategyNumber`
	`65`	`+#defineINETSTRAT_SUBEQRTSubOrEqualStrategyNumber`
	`66`	`+#defineINETSTRAT_SUPRTSuperStrategyNumber`
	`67`	`+#defineINETSTRAT_SUPEQRTSuperOrEqualStrategyNumber`
`68`	`68`
`69`	`69`
`70`	`70`	`/*`

`‎src/backend/utils/adt/rangetypes_gist.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`#include"postgres.h"`
`16`	`16`
`17`	`17`	`#include"access/gist.h"`
`18`		`-#include"access/skey.h"`
	`18`	`+#include"access/stratnum.h"`
`19`	`19`	`#include"utils/builtins.h"`
`20`	`20`	`#include"utils/datum.h"`
`21`	`21`	`#include"utils/rangetypes.h"`

`‎src/backend/utils/adt/rangetypes_spgist.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`#include"postgres.h"`
`38`	`38`
`39`	`39`	`#include"access/spgist.h"`
`40`		`-#include"access/skey.h"`
	`40`	`+#include"access/stratnum.h"`
`41`	`41`	`#include"catalog/pg_type.h"`
`42`	`42`	`#include"utils/builtins.h"`
`43`	`43`	`#include"utils/datum.h"`

`‎src/backend/utils/adt/tsginidx.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`#include"postgres.h"`
`15`	`15`
`16`	`16`	`#include"access/gin.h"`
`17`		`-#include"access/skey.h"`
	`17`	`+#include"access/stratnum.h"`
`18`	`18`	`#include"miscadmin.h"`
`19`	`19`	`#include"tsearch/ts_type.h"`
`20`	`20`	`#include"tsearch/ts_utils.h"`

`‎src/backend/utils/adt/tsquery_gist.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`#include"postgres.h"`
`16`	`16`
`17`		`-#include"access/skey.h"`
	`17`	`+#include"access/stratnum.h"`
`18`	`18`	`#include"access/gist.h"`
`19`	`19`	`#include"tsearch/ts_utils.h"`
`20`	`20`

`‎src/include/access/gist.h`

Lines changed: 0 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,26 +36,6 @@`
`36`	`36`	`#defineGIST_FETCH_PROC9`
`37`	`37`	`#defineGISTNProcs9`
`38`	`38`
`39`		`-/*`
`40`		`- * strategy numbers for GiST opclasses that want to implement the old`
`41`		`- * RTREE behavior.`
`42`		`- */`
`43`		`-#defineRTLeftStrategyNumber1`
`44`		`-#defineRTOverLeftStrategyNumber2`
`45`		`-#defineRTOverlapStrategyNumber3`
`46`		`-#defineRTOverRightStrategyNumber4`
`47`		`-#defineRTRightStrategyNumber5`
`48`		`-#defineRTSameStrategyNumber6`
`49`		`-#defineRTContainsStrategyNumber7/* for @> */`
`50`		`-#defineRTContainedByStrategyNumber8/* for <@ */`
`51`		`-#defineRTOverBelowStrategyNumber9`
`52`		`-#defineRTBelowStrategyNumber10`
`53`		`-#defineRTAboveStrategyNumber11`
`54`		`-#defineRTOverAboveStrategyNumber12`
`55`		`-#defineRTOldContainsStrategyNumber13/* for old spelling of @> */`
`56`		`-#defineRTOldContainedByStrategyNumber14/* for old spelling of <@ */`
`57`		`-#defineRTKNNSearchStrategyNumber15`
`58`		`-`
`59`	`39`	`/*`
`60`	`40`	`* Page opaque data in a GiST index page.`
`61`	`41`	`*/`

`‎src/include/access/nbtree.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ typedef struct xl_btree_newroot`
`430`	`430`
`431`	`431`
`432`	`432`	`/*`
`433`		`- *Operator strategy numbers for B-tree have been moved to access/skey.h,`
	`433`	`+ *Operator strategy numbers for B-tree have been moved to access/stratnum.h,`
`434`	`434`	`*because many places need to use them in ScanKeyInit() calls.`
`435`	`435`	`*`
`436`	`436`	`*The strategy numbers are chosen so that we can commute them by`

`‎src/include/access/skey.h`

Lines changed: 1 addition & 22 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,31 +15,10 @@`
`15`	`15`	`#defineSKEY_H`
`16`	`16`
`17`	`17`	`#include"access/attnum.h"`
	`18`	`+#include"access/stratnum.h"`
`18`	`19`	`#include"fmgr.h"`
`19`	`20`
`20`	`21`
`21`		`-/*`
`22`		`- * Strategy numbers identify the semantics that particular operators have`
`23`		`- * with respect to particular operator classes. In some cases a strategy`
`24`		`- * subtype (an OID) is used as further information.`
`25`		`- */`
`26`		`-typedefuint16StrategyNumber;`
`27`		`-`
`28`		`-#defineInvalidStrategy ((StrategyNumber) 0)`
`29`		`-`
`30`		`-/*`
`31`		`- * We define the strategy numbers for B-tree indexes here, to avoid having`
`32`		`- * to import access/nbtree.h into a lot of places that shouldn't need it.`
`33`		`- */`
`34`		`-#defineBTLessStrategyNumber1`
`35`		`-#defineBTLessEqualStrategyNumber2`
`36`		`-#defineBTEqualStrategyNumber3`
`37`		`-#defineBTGreaterEqualStrategyNumber4`
`38`		`-#defineBTGreaterStrategyNumber5`
`39`		`-`
`40`		`-#defineBTMaxStrategyNumber5`
`41`		`-`
`42`		`-`
`43`	`22`	`/*`
`44`	`23`	`* A ScanKey represents the application of a comparison operator between`
`45`	`24`	`* a table or index column and a constant. When it's part of an array of`

0 commit comments

Comments

(0)

Movatterモバイル変換

File tree

35 files changed

35 files changed

0 commit comments