Movatterモバイル変換

Skip to content

postgrespro/postgres_clusterPublic

NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit26df706

alvherre

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);`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp