Commit869ee4f

committed

Disallow modifying statistics on system columns.

1 parentefdc7d7 commit869ee4fCopy full SHA for 869ee4f

File tree

+44

-0

lines changed

+44

-0

lines changed

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,13 @@ attribute_statistics_update(FunctionCallInfo fcinfo, int elevel)`
`167`	`167`	`stats_check_required_arg(fcinfo,attarginfo,ATTNAME_ARG);`
`168`	`168`	`attname=PG_GETARG_NAME(ATTNAME_ARG);`
`169`	`169`	`attnum=get_attnum(reloid,NameStr(*attname));`
	`170`	`+`
	`171`	`+if (attnum<0)`
	`172`	`+ereport(ERROR,`
	`173`	`+(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
	`174`	`+errmsg("cannot modify statistics on system column \"%s\"",`
	`175`	`+NameStr(*attname))));`
	`176`	`+`
`170`	`177`	`if (attnum==InvalidAttrNumber)`
`171`	`178`	`ereport(ERROR,`
`172`	`179`	`(errcode(ERRCODE_UNDEFINED_COLUMN),`
`@@ -882,6 +889,13 @@ pg_clear_attribute_stats(PG_FUNCTION_ARGS)`
`882`	`889`	`stats_check_required_arg(fcinfo,attarginfo,ATTNAME_ARG);`
`883`	`890`	`attname=PG_GETARG_NAME(ATTNAME_ARG);`
`884`	`891`	`attnum=get_attnum(reloid,NameStr(*attname));`
	`892`	`+`
	`893`	`+if (attnum<0)`
	`894`	`+ereport(ERROR,`
	`895`	`+(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
	`896`	`+errmsg("cannot clear statistics on system column \"%s\"",`
	`897`	`+NameStr(*attname))));`
	`898`	`+`
`885`	`899`	`if (attnum==InvalidAttrNumber)`
`886`	`900`	`ereport(ERROR,`
`887`	`901`	`(errcode(ERRCODE_UNDEFINED_COLUMN),`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,15 @@ SELECT pg_catalog.pg_set_attribute_stats(`
`195`	`195`	`avg_width => 2::integer,`
`196`	`196`	`n_distinct => 0.3::real);`
`197`	`197`	`ERROR: "relation" cannot be NULL`
	`198`	`+-- error: attribute is system column`
	`199`	`+SELECT pg_catalog.pg_set_attribute_stats(`
	`200`	`+ relation => 'stats_import.test'::regclass,`
	`201`	`+ attname => 'xmin'::name,`
	`202`	`+ inherited => false::boolean,`
	`203`	`+ null_frac => 0.1::real,`
	`204`	`+ avg_width => 2::integer,`
	`205`	`+ n_distinct => 0.3::real);`
	`206`	`+ERROR: cannot modify statistics on system column "xmin"`
`198`	`207`	`-- error: attname doesn't exist`
`199`	`208`	`SELECT pg_catalog.pg_set_attribute_stats(`
`200`	`209`	`relation => 'stats_import.test'::regclass,`
`@@ -204,6 +213,12 @@ SELECT pg_catalog.pg_set_attribute_stats(`
`204`	`213`	`avg_width => 2::integer,`
`205`	`214`	`n_distinct => 0.3::real);`
`206`	`215`	`ERROR: column "nope" of relation "test" does not exist`
	`216`	`+-- error: attribute is system column`
	`217`	`+SELECT pg_catalog.pg_clear_attribute_stats(`
	`218`	`+ relation => 'stats_import.test'::regclass,`
	`219`	`+ attname => 'ctid'::name,`
	`220`	`+ inherited => false::boolean);`
	`221`	`+ERROR: cannot clear statistics on system column "ctid"`
`207`	`222`	`-- error: attname doesn't exist`
`208`	`223`	`SELECT pg_catalog.pg_clear_attribute_stats(`
`209`	`224`	`relation => 'stats_import.test'::regclass,`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,15 @@ SELECT pg_catalog.pg_set_attribute_stats(`
`145`	`145`	`avg_width=>2::integer,`
`146`	`146`	`n_distinct=>0.3::real);`
`147`	`147`
	`148`	`+-- error: attribute is system column`
	`149`	`+SELECTpg_catalog.pg_set_attribute_stats(`
	`150`	`+ relation=>'stats_import.test'::regclass,`
	`151`	`+ attname=>'xmin'::name,`
	`152`	`+ inherited=> false::boolean,`
	`153`	`+ null_frac=>0.1::real,`
	`154`	`+ avg_width=>2::integer,`
	`155`	`+ n_distinct=>0.3::real);`
	`156`	`+`
`148`	`157`	`-- error: attname doesn't exist`
`149`	`158`	`SELECTpg_catalog.pg_set_attribute_stats(`
`150`	`159`	`relation=>'stats_import.test'::regclass,`
`@@ -154,6 +163,12 @@ SELECT pg_catalog.pg_set_attribute_stats(`
`154`	`163`	`avg_width=>2::integer,`
`155`	`164`	`n_distinct=>0.3::real);`
`156`	`165`
	`166`	`+-- error: attribute is system column`
	`167`	`+SELECTpg_catalog.pg_clear_attribute_stats(`
	`168`	`+ relation=>'stats_import.test'::regclass,`
	`169`	`+ attname=>'ctid'::name,`
	`170`	`+ inherited=> false::boolean);`
	`171`	`+`
`157`	`172`	`-- error: attname doesn't exist`
`158`	`173`	`SELECTpg_catalog.pg_clear_attribute_stats(`
`159`	`174`	`relation=>'stats_import.test'::regclass,`

Comments

(0)