NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit814c8a0

committed

Further fixes for per-tablespace options patch.

Add missing varlena header to TableSpaceOpts structure. And, perTom Lane, instead of calling tablespace_reloptions in CacheMemoryContext,call it in the caller's memory context and copy the value overafterwards, to reduce the chances of a session-lifetime memory leak.

1 parentc7f0891 commit814c8a0Copy full SHA for 814c8a0

File tree

2 files changed

-7

lines changed

src
- backend/utils/cache
  - spccache.c
- include/commands
  - tablespace.h

2 files changed

-7

lines changed

`‎src/backend/utils/cache/spccache.c`

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* Portions Copyright (c) 1994, Regents of the University of California`
`13`	`13`	`*`
`14`	`14`	`* IDENTIFICATION`
`15`		`- * $PostgreSQL: pgsql/src/backend/utils/cache/spccache.c,v 1.3 2010/01/06 23:00:02 tgl Exp $`
	`15`	`+ * $PostgreSQL: pgsql/src/backend/utils/cache/spccache.c,v 1.4 2010/01/07 03:53:08 rhaas Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -142,7 +142,6 @@ get_tablespace(Oid spcid)`
`142`	`142`	`{`
`143`	`143`	`Datumdatum;`
`144`	`144`	`boolisNull;`
`145`		`-MemoryContextoctx;`
`146`	`145`
`147`	`146`	`datum=SysCacheGetAttr(TABLESPACEOID,`
`148`	`147`	`tp,`
`@@ -152,10 +151,9 @@ get_tablespace(Oid spcid)`
`152`	`151`	`opts=NULL;`
`153`	`152`	`else`
`154`	`153`	`{`
`155`		`-/* XXX should NOT do the parsing work in CacheMemoryContext */`
`156`		`-octx=MemoryContextSwitchTo(CacheMemoryContext);`
`157`		`-opts= (TableSpaceOpts*)tablespace_reloptions(datum, false);`
`158`		`-MemoryContextSwitchTo(octx);`
	`154`	`+bytea*bytea_opts=tablespace_reloptions(datum, false);`
	`155`	`+opts=MemoryContextAlloc(CacheMemoryContext,VARSIZE(bytea_opts));`
	`156`	`+memcpy(opts,bytea_opts,VARSIZE(bytea_opts));`
`159`	`157`	`}`
`160`	`158`	`ReleaseSysCache(tp);`
`161`	`159`	`}`

`‎src/include/commands/tablespace.h`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/include/commands/tablespace.h,v 1.22 2010/01/05 21:53:59 rhaas Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/include/commands/tablespace.h,v 1.23 2010/01/07 03:53:08 rhaas Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -34,6 +34,7 @@ typedef struct xl_tblspc_drop_rec`
`34`	`34`
`35`	`35`	`typedefstructTableSpaceOpts`
`36`	`36`	`{`
	`37`	`+int32vl_len_;/* varlena header (do not touch directly!) */`
`37`	`38`	`float8random_page_cost;`
`38`	`39`	`float8seq_page_cost;`
`39`	`40`	`}TableSpaceOpts;`

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!

Commit814c8a0

File tree

2 files changed

2 files changed

`‎src/backend/utils/cache/spccache.c`

`‎src/include/commands/tablespace.h`

0 commit comments