NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit367ade1

committed

Remove -I../.. and -I../../include from Makefile

Add some missing include files

1 parentea04818 commit367ade1Copy full SHA for 367ade1

File tree

9 files changed

+53

-34

lines changed

src/backend/access/hash

9 files changed

+53

-34

lines changed

`‎src/backend/access/hash/Makefile`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,16 +4,14 @@`
`4`	`4`	`# Makefile for access/hash`
`5`	`5`	`#`
`6`	`6`	`# IDENTIFICATION`
`7`		`-# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.1 1996/10/27 09:46:08 bryanh Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.2 1996/10/31 08:24:36 scrappy Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`11`	`11`	`SRCDIR = ../../..`
`12`	`12`	`include ../../../Makefile.global`
`13`	`13`
`14`		`-INCLUDE_OPT = -I../..\`
`15`		`- -I../../port/$(PORTNAME)\`
`16`		`- -I../../include\`
	`14`	`+INCLUDE_OPT = -I../../port/$(PORTNAME)\`
`17`	`15`	`-I../../../include`
`18`	`16`
`19`	`17`	`CFLAGS+=$(INCLUDE_OPT)`

`‎src/backend/access/hash/hash.c`

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,18 +7,22 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.7 1996/10/24 06:30:23 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.8 1996/10/31 08:24:37 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* This file contains only the public interface routines.`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`17`	`17`
	`18`	`+#include<stdio.h>`
	`19`	`+#include<time.h>`
	`20`	`+`
`18`	`21`	`#include"postgres.h"`
`19`	`22`
`20`	`23`	`#include"catalog/pg_attribute.h"`
`21`	`24`	`#include"access/attnum.h"`
	`25`	`+#include"nodes/nodes.h"`
`22`	`26`	`#include"nodes/pg_list.h"`
`23`	`27`	`#include"access/tupdesc.h"`
`24`	`28`	`#include"storage/fd.h"`
`@@ -33,13 +37,13 @@`
`33`	`37`	`#include"storage/block.h"`
`34`	`38`	`#include"storage/off.h"`
`35`	`39`	`#include"storage/itemptr.h"`
`36`		`-#include<time.h>`
`37`	`40`	`#include"utils/nabstime.h"`
`38`	`41`	`#include"access/htup.h"`
`39`	`42`	`#include"access/itup.h"`
`40`	`43`	`#include"storage/itemid.h"`
`41`	`44`	`#include"storage/item.h"`
`42`	`45`	`#include"storage/buf.h"`
	`46`	`+#include"storage/page.h"`
`43`	`47`	`#include"storage/bufpage.h"`
`44`	`48`	`#include"access/sdir.h"`
`45`	`49`	`#include"access/funcindex.h"`
`@@ -48,8 +52,12 @@`
`48`	`52`	`#include"access/hash.h"`
`49`	`53`
`50`	`54`	`#include"nodes/params.h"`
	`55`	`+#include"storage/ipc.h"`
`51`	`56`	`#include"executor/hashjoin.h"`
	`57`	`+#include"utils/fcache.h"`
`52`	`58`	`#include"nodes/primnodes.h"`
	`59`	`+#include"utils/memutils.h"`
	`60`	`+#include"lib/fstack.h"`
`53`	`61`	`#include"nodes/memnodes.h"`
`54`	`62`	`#include"executor/tuptable.h"`
`55`	`63`	`#include"nodes/execnodes.h"`
`@@ -58,7 +66,6 @@`
`58`	`66`	`#include"nodes/parsenodes.h"`
`59`	`67`	`#include"tcop/dest.h"`
`60`	`68`	`#include"executor/execdesc.h"`
`61`		`-#include<stdio.h>`
`62`	`69`	`#include"catalog/pg_index.h"`
`63`	`70`	`#include"executor/executor.h"`
`64`	`71`

`‎src/backend/access/hash/hashinsert.c`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,19 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.4 1996/10/21 05:45:13 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.5 1996/10/31 08:24:38 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`14`	`14`
	`15`	`+#include<stdio.h>`
	`16`	`+#include<time.h>`
	`17`	`+`
`15`	`18`	`#include"postgres.h"`
`16`	`19`
`17`	`20`	`#include"catalog/pg_attribute.h"`
`18`	`21`	`#include"access/attnum.h"`
	`22`	`+#include"nodes/nodes.h"`
`19`	`23`	`#include"nodes/pg_list.h"`
`20`	`24`	`#include"access/tupdesc.h"`
`21`	`25`	`#include"storage/fd.h"`
`@@ -30,13 +34,13 @@`
`30`	`34`	`#include"storage/block.h"`
`31`	`35`	`#include"storage/off.h"`
`32`	`36`	`#include"storage/itemptr.h"`
`33`		`-#include<time.h>`
`34`	`37`	`#include"utils/nabstime.h"`
`35`	`38`	`#include"access/htup.h"`
`36`	`39`	`#include"access/itup.h"`
`37`	`40`	`#include"storage/itemid.h"`
`38`	`41`	`#include"storage/item.h"`
`39`	`42`	`#include"storage/buf.h"`
	`43`	`+#include"storage/page.h"`
`40`	`44`	`#include"storage/bufpage.h"`
`41`	`45`	`#include"access/sdir.h"`
`42`	`46`	`#include"access/funcindex.h"`
`@@ -45,7 +49,6 @@`
`45`	`49`	`#include"access/relscan.h"`
`46`	`50`	`#include"access/hash.h"`
`47`	`51`
`48`		`-#include<stdio.h>`
`49`	`52`	`#include"storage/ipc.h"`
`50`	`53`	`#include"storage/bufmgr.h"`
`51`	`54`

`‎src/backend/access/hash/hashovfl.c`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,18 +7,23 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.5 1996/10/23 07:38:32 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.6 1996/10/31 08:24:39 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* Overflow pages look like ordinary relation pages.`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`17`	`17`
	`18`	`+#include<stdio.h>`
	`19`	`+#include<time.h>`
	`20`	`+#include<string.h>`
	`21`	`+`
`18`	`22`	`#include"postgres.h"`
`19`	`23`
`20`	`24`	`#include"catalog/pg_attribute.h"`
`21`	`25`	`#include"access/attnum.h"`
	`26`	`+#include"nodes/nodes.h"`
`22`	`27`	`#include"nodes/pg_list.h"`
`23`	`28`	`#include"access/tupdesc.h"`
`24`	`29`	`#include"storage/fd.h"`
`@@ -33,26 +38,23 @@`
`33`	`38`	`#include"storage/block.h"`
`34`	`39`	`#include"storage/off.h"`
`35`	`40`	`#include"storage/itemptr.h"`
`36`		`-#include<time.h>`
`37`	`41`	`#include"utils/nabstime.h"`
`38`	`42`	`#include"access/htup.h"`
`39`	`43`	`#include"access/itup.h"`
`40`	`44`	`#include"storage/itemid.h"`
`41`	`45`	`#include"storage/item.h"`
`42`	`46`	`#include"storage/buf.h"`
	`47`	`+#include"storage/page.h"`
`43`	`48`	`#include"storage/bufpage.h"`
`44`	`49`	`#include"access/sdir.h"`
`45`	`50`	`#include"access/funcindex.h"`
`46`	`51`	`#include"utils/tqual.h"`
`47`		`-#include"storage/buf.h"`
`48`	`52`	`#include"access/relscan.h"`
`49`	`53`	`#include"access/hash.h"`
`50`	`54`
`51`		`-#include<stdio.h>`
`52`	`55`	`#include"storage/ipc.h"`
`53`	`56`	`#include"storage/bufmgr.h"`
`54`	`57`
`55`		`-#include<string.h>`
`56`	`58`
`57`	`59`	`#include"utils/memutils.h"`
`58`	`60`

`‎src/backend/access/hash/hashpage.c`

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.4 1996/10/21 05:45:15 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.5 1996/10/31 08:24:41 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* Postgres hash pages look like ordinary relation pages. The opaque`
`@@ -23,10 +23,15 @@`
`23`	`23`	`*-------------------------------------------------------------------------`
`24`	`24`	`*/`
`25`	`25`
	`26`	`+#include<stdio.h>`
	`27`	`+#include<time.h>`
	`28`	`+#include<string.h>`
	`29`	`+`
`26`	`30`	`#include"postgres.h"`
`27`	`31`
`28`	`32`	`#include"catalog/pg_attribute.h"`
`29`	`33`	`#include"access/attnum.h"`
	`34`	`+#include"nodes/nodes.h"`
`30`	`35`	`#include"nodes/pg_list.h"`
`31`	`36`	`#include"access/tupdesc.h"`
`32`	`37`	`#include"storage/fd.h"`
`@@ -41,31 +46,27 @@`
`41`	`46`	`#include"storage/block.h"`
`42`	`47`	`#include"storage/off.h"`
`43`	`48`	`#include"storage/itemptr.h"`
`44`		`-#include<time.h>`
`45`	`49`	`#include"utils/nabstime.h"`
`46`	`50`	`#include"access/htup.h"`
`47`	`51`	`#include"access/itup.h"`
`48`	`52`	`#include"storage/itemid.h"`
`49`	`53`	`#include"storage/item.h"`
`50`	`54`	`#include"storage/buf.h"`
	`55`	`+#include"storage/page.h"`
`51`	`56`	`#include"storage/bufpage.h"`
`52`	`57`	`#include"access/sdir.h"`
`53`	`58`	`#include"access/funcindex.h"`
`54`	`59`	`#include"utils/tqual.h"`
`55`		`-#include"storage/buf.h"`
`56`	`60`	`#include"access/relscan.h"`
`57`	`61`	`#include"access/hash.h"`
`58`	`62`
`59`		`-#include<stdio.h>`
`60`	`63`	`#include"storage/ipc.h"`
`61`	`64`	`#include"storage/bufmgr.h"`
`62`	`65`
`63`	`66`	`#include"miscadmin.h"`
`64`	`67`
`65`	`68`	`#include"utils/memutils.h"`
`66`	`69`
`67`		`-#include<string.h>`
`68`		`-`
`69`	`70`	`#include"storage/spin.h"`
`70`	`71`	`#include"utils/hsearch.h"`
`71`	`72`	`#include"storage/shmem.h"`

`‎src/backend/access/hash/hashscan.c`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.4 1996/10/21 05:45:16 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.5 1996/10/31 08:24:42 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* Because we can be doing an index scan on a relation while we`
`@@ -27,10 +27,13 @@`
`27`	`27`	`*-------------------------------------------------------------------------`
`28`	`28`	`*/`
`29`	`29`
	`30`	`+#include<time.h>`
	`31`	`+`
`30`	`32`	`#include"postgres.h"`
`31`	`33`
`32`	`34`	`#include"catalog/pg_attribute.h"`
`33`	`35`	`#include"access/attnum.h"`
	`36`	`+#include"nodes/nodes.h"`
`34`	`37`	`#include"nodes/pg_list.h"`
`35`	`38`	`#include"access/tupdesc.h"`
`36`	`39`	`#include"storage/fd.h"`
`@@ -45,18 +48,17 @@`
`45`	`48`	`#include"storage/block.h"`
`46`	`49`	`#include"storage/off.h"`
`47`	`50`	`#include"storage/itemptr.h"`
`48`		`-#include<time.h>`
`49`	`51`	`#include"utils/nabstime.h"`
`50`	`52`	`#include"access/htup.h"`
`51`	`53`	`#include"access/itup.h"`
`52`	`54`	`#include"storage/itemid.h"`
`53`	`55`	`#include"storage/item.h"`
`54`	`56`	`#include"storage/buf.h"`
	`57`	`+#include"storage/page.h"`
`55`	`58`	`#include"storage/bufpage.h"`
`56`	`59`	`#include"access/sdir.h"`
`57`	`60`	`#include"access/funcindex.h"`
`58`	`61`	`#include"utils/tqual.h"`
`59`		`-#include"storage/buf.h"`
`60`	`62`	`#include"access/relscan.h"`
`61`	`63`	`#include"access/hash.h"`
`62`	`64`

`‎src/backend/access/hash/hashsearch.c`

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,19 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.4 1996/10/21 05:45:19 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.5 1996/10/31 08:24:43 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`14`	`14`
	`15`	`+#include<stdio.h>`
	`16`	`+#include<time.h>`
	`17`	`+`
`15`	`18`	`#include"postgres.h"`
`16`	`19`
`17`	`20`	`#include"catalog/pg_attribute.h"`
`18`	`21`	`#include"access/attnum.h"`
	`22`	`+#include"nodes/nodes.h"`
`19`	`23`	`#include"nodes/pg_list.h"`
`20`	`24`	`#include"access/tupdesc.h"`
`21`	`25`	`#include"storage/fd.h"`
`@@ -30,18 +34,17 @@`
`30`	`34`	`#include"storage/block.h"`
`31`	`35`	`#include"storage/off.h"`
`32`	`36`	`#include"storage/itemptr.h"`
`33`		`-#include<time.h>`
`34`	`37`	`#include"utils/nabstime.h"`
`35`	`38`	`#include"access/htup.h"`
`36`	`39`	`#include"access/itup.h"`
`37`	`40`	`#include"storage/itemid.h"`
`38`	`41`	`#include"storage/item.h"`
`39`	`42`	`#include"storage/buf.h"`
	`43`	`+#include"storage/page.h"`
`40`	`44`	`#include"storage/bufpage.h"`
`41`	`45`	`#include"access/sdir.h"`
`42`	`46`	`#include"access/funcindex.h"`
`43`	`47`	`#include"utils/tqual.h"`
`44`		`-#include"storage/buf.h"`
`45`	`48`	`#include"access/relscan.h"`
`46`	`49`	`#include"access/hash.h"`
`47`	`50`
`@@ -53,7 +56,6 @@`
`53`	`56`	`# include<string.h>`
`54`	`57`	`#endif`
`55`	`58`
`56`		`-#include<stdio.h>`
`57`	`59`	`#include"storage/ipc.h"`
`58`	`60`	`#include"storage/bufmgr.h"`
`59`	`61`

`‎src/backend/access/hash/hashstrat.c`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,18 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.4 1996/10/21 05:45:20 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.5 1996/10/31 08:24:45 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`14`	`14`
	`15`	`+#include<time.h>`
	`16`	`+`
`15`	`17`	`#include"postgres.h"`
`16`	`18`
`17`	`19`	`#include"catalog/pg_attribute.h"`
`18`	`20`	`#include"access/attnum.h"`
	`21`	`+#include"nodes/nodes.h"`
`19`	`22`	`#include"nodes/pg_list.h"`
`20`	`23`	`#include"access/tupdesc.h"`
`21`	`24`	`#include"storage/fd.h"`
`@@ -30,18 +33,17 @@`
`30`	`33`	`#include"storage/block.h"`
`31`	`34`	`#include"storage/off.h"`
`32`	`35`	`#include"storage/itemptr.h"`
`33`		`-#include<time.h>`
`34`	`36`	`#include"utils/nabstime.h"`
`35`	`37`	`#include"access/htup.h"`
`36`	`38`	`#include"access/itup.h"`
`37`	`39`	`#include"storage/itemid.h"`
`38`	`40`	`#include"storage/item.h"`
`39`	`41`	`#include"storage/buf.h"`
	`42`	`+#include"storage/page.h"`
`40`	`43`	`#include"storage/bufpage.h"`
`41`	`44`	`#include"access/sdir.h"`
`42`	`45`	`#include"access/funcindex.h"`
`43`	`46`	`#include"utils/tqual.h"`
`44`		`-#include"storage/buf.h"`
`45`	`47`	`#include"access/relscan.h"`
`46`	`48`	`#include"access/hash.h"`
`47`	`49`

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!

Commit367ade1

File tree

9 files changed

9 files changed

`‎src/backend/access/hash/Makefile`

`‎src/backend/access/hash/hash.c`

`‎src/backend/access/hash/hashinsert.c`

`‎src/backend/access/hash/hashovfl.c`

`‎src/backend/access/hash/hashpage.c`

`‎src/backend/access/hash/hashscan.c`

`‎src/backend/access/hash/hashsearch.c`

`‎src/backend/access/hash/hashstrat.c`

0 commit comments