NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit6d1ae0c

committed

Fix typo (extraneous semicolon) in fd.c patch to avoid excess seeks.

Now it skips useless SEEK_CUR 0 calls too, as intended.

1 parent98fe670 commit6d1ae0cCopy full SHA for 6d1ae0c

File tree

1 file changed

+17

-9

lines changed

src/backend/storage/file
- fd.c

1 file changed

+17

-9

lines changed

`‎src/backend/storage/file/fd.c`

Lines changed: 17 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.61 2000/06/15 04:10:00 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.62 2000/07/05 21:10:05 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES:`
`13`	`13`	`*`
`@@ -809,11 +809,13 @@ FileWrite(File file, char *buffer, int amount)`
`809`	`809`
`810`	`810`	`FileAccess(file);`
`811`	`811`	`returnCode=write(VfdCache[file].fd,buffer,amount);`
`812`		`-if (returnCode>0) {`
	`812`	`+if (returnCode>0)`
	`813`	`+{`
`813`	`814`	`VfdCache[file].seekPos+=returnCode;`
`814`		`-/* mark the file as needing fsync */`
`815`		`-VfdCache[file].fdstate \|=FD_DIRTY;`
`816`		`-}else`
	`815`	`+/* mark the file as needing fsync */`
	`816`	`+VfdCache[file].fdstate \|=FD_DIRTY;`
	`817`	`+}`
	`818`	`+else`
`817`	`819`	`VfdCache[file].seekPos=FileUnknownPos;`
`818`	`820`
`819`	`821`	`returnreturnCode;`
`@@ -832,6 +834,8 @@ FileSeek(File file, long offset, int whence)`
`832`	`834`	`switch (whence)`
`833`	`835`	`{`
`834`	`836`	`caseSEEK_SET:`
	`837`	`+if (offset<0)`
	`838`	`+elog(ERROR,"FileSeek: invalid offset: %ld",offset);`
`835`	`839`	`VfdCache[file].seekPos=offset;`
`836`	`840`	`break;`
`837`	`841`	`caseSEEK_CUR:`
`@@ -844,18 +848,21 @@ FileSeek(File file, long offset, int whence)`
`844`	`848`	`default:`
`845`	`849`	`elog(ERROR,"FileSeek: invalid whence: %d",whence);`
`846`	`850`	`break;`
	`851`	`+}`
`847`	`852`	`}`
`848`		`-}else`
`849`		`-switch (whence) {`
	`853`	`+else`
	`854`	`+{`
	`855`	`+switch (whence)`
	`856`	`+{`
`850`	`857`	`caseSEEK_SET:`
`851`	`858`	`if (offset<0)`
`852`	`859`	`elog(ERROR,"FileSeek: invalid offset: %ld",offset);`
`853`	`860`	`if (VfdCache[file].seekPos!=offset)`
`854`	`861`	`VfdCache[file].seekPos=lseek(VfdCache[file].fd,offset,whence);`
`855`	`862`	`break;`
`856`	`863`	`caseSEEK_CUR:`
`857`		`-if ((offset!=0)\|\|(VfdCache[file].seekPos==FileUnknownPos));`
`858`		`-VfdCache[file].seekPos=lseek(VfdCache[file].fd,offset,whence);`
	`864`	`+if (offset!=0\|\|VfdCache[file].seekPos==FileUnknownPos)`
	`865`	`+VfdCache[file].seekPos=lseek(VfdCache[file].fd,offset,whence);`
`859`	`866`	`break;`
`860`	`867`	`caseSEEK_END:`
`861`	`868`	`VfdCache[file].seekPos=lseek(VfdCache[file].fd,offset,whence);`
`@@ -864,6 +871,7 @@ FileSeek(File file, long offset, int whence)`
`864`	`871`	`elog(ERROR,"FileSeek: invalid whence: %d",whence);`
`865`	`872`	`break;`
`866`	`873`	`}`
	`874`	`+}`
`867`	`875`	`returnVfdCache[file].seekPos;`
`868`	`876`	`}`
`869`	`877`

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!

Commit6d1ae0c

File tree

1 file changed

1 file changed

`‎src/backend/storage/file/fd.c`

0 commit comments