Commitcba9cd4

committed

Make psql use pg_table_size instead of pg_relation_size on 9.0+ servers.

Per discussion, pg_table_size() is a more helpful number thanpg_relation_size().Bernd Helmle, reviewed by Susanne Ebrecht and me.

1 parent0bd155c commitcba9cd4Copy full SHA for cba9cd4

File tree

+15

-4

lines changed

+15

-4

lines changed

Lines changed: 15 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2522,14 +2522,25 @@ listTables(const char tabtypes, const char pattern, bool verbose, bool showSys`
`2522`	`2522`	`",\n c2.relname as \"%s\"",`
`2523`	`2523`	`gettext_noop("Table"));`
`2524`	`2524`
`2525`		`-if (verbose&&pset.sversion >=80100)`
`2526`		`-appendPQExpBuffer(&buf,`
`2527`		`-",\n pg_catalog.pg_size_pretty(pg_catalog.pg_relation_size(c.oid)) as \"%s\"",`
`2528`		`-gettext_noop("Size"));`
`2529`	`2525`	`if (verbose)`
	`2526`	`+{`
	`2527`	`+/*`
	`2528`	`+ * As of PostgreSQL 9.0, use pg_table_size() to show a more acurate size`
	`2529`	`+ * of a table, including FSM, VM and TOAST tables.`
	`2530`	`+ */`
	`2531`	`+if (pset.sversion >=90000)`
	`2532`	`+appendPQExpBuffer(&buf,`
	`2533`	`+",\n pg_catalog.pg_size_pretty(pg_catalog.pg_table_size(c.oid)) as \"%s\"",`
	`2534`	`+gettext_noop("Size"));`
	`2535`	`+elseif (pset.sversion >=80100)`
	`2536`	`+appendPQExpBuffer(&buf,`
	`2537`	`+",\n pg_catalog.pg_size_pretty(pg_catalog.pg_relation_size(c.oid)) as \"%s\"",`
	`2538`	`+gettext_noop("Size"));`
	`2539`	`+`
`2530`	`2540`	`appendPQExpBuffer(&buf,`
`2531`	`2541`	`",\n pg_catalog.obj_description(c.oid, 'pg_class') as \"%s\"",`
`2532`	`2542`	`gettext_noop("Description"));`
	`2543`	`+}`
`2533`	`2544`
`2534`	`2545`	`appendPQExpBuffer(&buf,`
`2535`	`2546`	`"\nFROM pg_catalog.pg_class c"`

Comments

(0)