NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit85a0781

committed

Use one transaction while reading postgres.bki, not one per line.

AFAICT, the only actual benefit of closing a bootstrap transactionis to reclaim transient memory. We can do that a lot more cheaplyby just doing a MemoryContextReset on a suitable context. Thisgets the runtime of the "bootstrap" phase of initdb down to thepoint where, at least by eyeball, it's quite negligible comparedto the rest of the phases. Per discussion with Andres Freund.Discussion:https://postgr.es/m/9244.1492106743@sss.pgh.pa.us

1 parent2040bb4 commit85a0781Copy full SHA for 85a0781

File tree

2 files changed

+16

-5

lines changed

src/backend/bootstrap
- bootparse.y
- bootstrap.c

2 files changed

+16

-5

lines changed

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

Lines changed: 13 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@`
`22`	`22`	`#include"access/htup.h"`
`23`	`23`	`#include"access/itup.h"`
`24`	`24`	`#include"access/tupdesc.h"`
`25`		`-#include"access/xact.h"`
`26`	`25`	`#include"bootstrap/bootstrap.h"`
`27`	`26`	`#include"catalog/catalog.h"`
`28`	`27`	`#include"catalog/heap.h"`
`@@ -49,6 +48,7 @@`
`49`	`48`	`#include"storage/off.h"`
`50`	`49`	`#include"storage/smgr.h"`
`51`	`50`	`#include"tcop/dest.h"`
	`51`	`+#include"utils/memutils.h"`
`52`	`52`	`#include"utils/rel.h"`
`53`	`53`
`54`	`54`
`@@ -63,19 +63,27 @@`
`63`	`63`	`#defineYYMALLOC palloc`
`64`	`64`	`#defineYYFREE pfree`
`65`	`65`
	`66`	`+static MemoryContext per_line_ctx =NULL;`
	`67`	`+`
`66`	`68`	`staticvoid`
`67`	`69`	`do_start(void)`
`68`	`70`	`{`
`69`		`-StartTransactionCommand();`
`70`		`-elog(DEBUG4,"start transaction");`
	`71`	`+Assert(CurrentMemoryContext == CurTransactionContext);`
	`72`	`+/* First time through, create the per-line working context*/`
	`73`	`+if (per_line_ctx ==NULL)`
	`74`	`+per_line_ctx =AllocSetContextCreate(CurTransactionContext,`
	`75`	`+"bootstrap per-line processing",`
	`76`	`+ ALLOCSET_DEFAULT_SIZES);`
	`77`	`+MemoryContextSwitchTo(per_line_ctx);`
`71`	`78`	`}`
`72`	`79`
`73`	`80`
`74`	`81`	`staticvoid`
`75`	`82`	`do_end(void)`
`76`	`83`	`{`
`77`		`-CommitTransactionCommand();`
`78`		`-elog(DEBUG4,"commit transaction");`
	`84`	`+/* Reclaim memory allocated while processing this line*/`
	`85`	`+MemoryContextSwitchTo(CurTransactionContext);`
	`86`	`+MemoryContextReset(per_line_ctx);`
`79`	`87`	`CHECK_FOR_INTERRUPTS();/* allow SIGINT to kill bootstrap run*/`
`80`	`88`	`if (isatty(0))`
`81`	`89`	`{`

`‎src/backend/bootstrap/bootstrap.c`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`#include<signal.h>`
`19`	`19`
`20`	`20`	`#include"access/htup_details.h"`
	`21`	`+#include"access/xact.h"`
`21`	`22`	`#include"bootstrap/bootstrap.h"`
`22`	`23`	`#include"catalog/index.h"`
`23`	`24`	`#include"catalog/pg_collation.h"`
`@@ -496,7 +497,9 @@ BootstrapModeMain(void)`
`496`	`497`	`/*`
`497`	`498`	`* Process bootstrap input.`
`498`	`499`	`*/`
	`500`	`+StartTransactionCommand();`
`499`	`501`	`boot_yyparse();`
	`502`	`+CommitTransactionCommand();`
`500`	`503`
`501`	`504`	`/*`
`502`	`505`	`* We should now know about all mapped relations, so it's okay to write`

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!

Commit85a0781

File tree

2 files changed

2 files changed

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

`‎src/backend/bootstrap/bootstrap.c`

0 commit comments