NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit4efb205

committed

remove useless includes, raise warning if PostgreSQL <= 9.5.4

1 parente23663c commit4efb205Copy full SHA for 4efb205

File tree

6 files changed

+15

-20

lines changed

6 files changed

+15

-20

lines changed

`‎src/hooks.c`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,13 @@`
`12`	`12`	`#include"init.h"`
`13`	`13`	`#include"runtimeappend.h"`
`14`	`14`	`#include"runtime_merge_append.h"`
	`15`	`+#include"partition_filter.h"`
`15`	`16`	`#include"utils.h"`
`16`	`17`
`17`	`18`	`#include"miscadmin.h"`
`18`	`19`	`#include"optimizer/cost.h"`
`19`	`20`	`#include"optimizer/restrictinfo.h"`
`20`		`-#include"partition_filter.h"`
	`21`	`+#include"utils/typcache.h"`
`21`	`22`
`22`	`23`
`23`	`24`	`set_join_pathlist_hook_typeset_join_pathlist_next=NULL;`

`‎src/init.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,10 @@`
`20`	`20`	`#include"access/htup_details.h"`
`21`	`21`	`#include"access/sysattr.h"`
`22`	`22`	`#include"catalog/indexing.h"`
	`23`	`+#include"catalog/pg_constraint.h"`
	`24`	`+#include"catalog/pg_inherits.h"`
`23`	`25`	`#include"catalog/pg_inherits_fn.h"`
`24`	`26`	`#include"catalog/pg_type.h"`
`25`		`-#include"catalog/pg_inherits.h"`
`26`		`-#include"catalog/pg_constraint.h"`
`27`	`27`	`#include"executor/spi.h"`
`28`	`28`	`#include"miscadmin.h"`
`29`	`29`	`#include"optimizer/clauses.h"`

`‎src/pathman.h`

Lines changed: 7 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,11 @@`
`11`	`11`	`#ifndefPATHMAN_H`
`12`	`12`	`#definePATHMAN_H`
`13`	`13`
`14`		`-#include"dsm_array.h"`
`15`	`14`	`#include"init.h"`
`16`	`15`	`#include"relation_info.h"`
`17`	`16`	`#include"rangeset.h"`
`18`	`17`
`19`	`18`	`#include"postgres.h"`
`20`		`-#include"utils/date.h"`
`21`		`-#include"utils/snapshot.h"`
`22`		`-#include"utils/typcache.h"`
`23`	`19`	`#include"nodes/makefuncs.h"`
`24`	`20`	`#include"nodes/primnodes.h"`
`25`	`21`	`#include"nodes/execnodes.h"`
`@@ -28,16 +24,18 @@`
`28`	`24`
`29`	`25`
`30`	`26`	`/* Check PostgreSQL version (9.5.4 contains an important fix for BGW) */`
`31`		`-#ifPG_VERSION_NUM<90504`
`32`		`-#error "Cannot build pg_pathman with PostgreSQL version lower than 9.5.4"`
	`27`	`+#ifPG_VERSION_NUM<90503`
	`28`	`+#error "Cannot build pg_pathman with PostgreSQL version lower than 9.5.3"`
	`29`	`+#elifPG_VERSION_NUM<90504`
	`30`	`+#warning "It is STRONGLY recommended to use pg_pathman with PostgreSQL 9.5.4 since it contains important fixes"`
`33`	`31`	`#endif`
`34`	`32`
`35`	`33`	`/* Get CString representation of Datum (simple wrapper) */`
`36`	`34`	`#ifdefUSE_ASSERT_CHECKING`
`37`		`-#include"utils.h"`
`38`		`-#defineDebugPrintDatum(datum,typid) ( datum_to_cstring((datum), (typid)) )`
	`35`	`+#include"utils.h"`
	`36`	`+#defineDebugPrintDatum(datum,typid) ( datum_to_cstring((datum), (typid)) )`
`39`	`37`	`#else`
`40`		`-#defineDebugPrintDatum(datum,typid) ( "[use --enable-cassert]" )`
	`38`	`+#defineDebugPrintDatum(datum,typid) ( "[use --enable-cassert]" )`
`41`	`39`	`#endif`
`42`	`40`
`43`	`41`

`‎src/pg_pathman.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@`
`41`	`41`	`#include"utils/syscache.h"`
`42`	`42`	`#include"utils/selfuncs.h"`
`43`	`43`	`#include"utils/snapmgr.h"`
	`44`	`+#include"utils/typcache.h"`
`44`	`45`
`45`	`46`
`46`	`47`	`PG_MODULE_MAGIC;`

`‎src/relation_info.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`#include"utils/lsyscache.h"`
`25`	`25`	`#include"utils/memutils.h"`
`26`	`26`	`#include"utils/snapmgr.h"`
	`27`	`+#include"utils/typcache.h"`
`27`	`28`
`28`	`29`
`29`	`30`	`/*`

`‎src/utils.c`

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,24 +15,18 @@`
`15`	`15`	`#include"access/sysattr.h"`
`16`	`16`	`#include"access/xact.h"`
`17`	`17`	`#include"catalog/heap.h"`
`18`		`-#include"catalog/namespace.h"`
`19`	`18`	`#include"catalog/pg_type.h"`
`20`	`19`	`#include"catalog/pg_extension.h"`
`21`	`20`	`#include"commands/extension.h"`
`22`		`-#include"executor/spi.h"`
`23`		`-#include"fmgr.h"`
`24`	`21`	`#include"miscadmin.h"`
`25`		`-#include"nodes/nodeFuncs.h"`
`26`		`-#include"nodes/makefuncs.h"`
`27`	`22`	`#include"optimizer/var.h"`
`28`	`23`	`#include"optimizer/restrictinfo.h"`
`29`	`24`	`#include"parser/parse_oper.h"`
`30`		`-#include"rewrite/rewriteManip.h"`
`31`	`25`	`#include"utils/builtins.h"`
`32`		`-#include"utils/memutils.h"`
	`26`	`+#include"utils/fmgroids.h"`
`33`	`27`	`#include"utils/lsyscache.h"`
`34`	`28`	`#include"utils/syscache.h"`
`35`		`-#include"utils/fmgroids.h"`
	`29`	`+#include"utils/typcache.h"`
`36`	`30`
`37`	`31`
`38`	`32`	`#defineTABLEOID_STR(subst) ( "pathman_tableoid" subst )`

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!

Commit4efb205

File tree

6 files changed

6 files changed

`‎src/hooks.c`

`‎src/init.c`

`‎src/pathman.h`

`‎src/pg_pathman.c`

`‎src/relation_info.c`

`‎src/utils.c`

0 commit comments