NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit388e75a

committed

Replace run-time error check with assertion

The error message was checking that the structures returned from theparser matched expectations. That's something we usually useassertions for, not a full user-facing error message. So replace thatwith an assertion (hidden inside lfirst_node()).Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>Discussion:https://www.postgresql.org/message-id/flat/452e9df8-ec89-e01b-b64a-8cc6ce830458%40enterprisedb.com

1 parent2941138 commit388e75aCopy full SHA for 388e75a

File tree

1 file changed

-16

lines changed

src/backend/commands
- statscmds.c

1 file changed

-16

lines changed

`‎src/backend/commands/statscmds.c`

Lines changed: 5 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -220,26 +220,14 @@ CreateStatistics(CreateStatsStmt *stmt)`
`220`	`220`	`*/`
`221`	`221`	`foreach(cell,stmt->exprs)`
`222`	`222`	`{`
`223`		`-Nodeexpr= (Node)lfirst(cell);`
`224`		`-StatsElem*selem;`
`225`		`-HeapTupleatttuple;`
`226`		`-Form_pg_attributeattForm;`
`227`		`-TypeCacheEntry*type;`
`228`		`-`
`229`		`-/*`
`230`		`- * We should not get anything else than StatsElem, given the grammar.`
`231`		`- * But let's keep it as a safety.`
`232`		`- */`
`233`		`-if (!IsA(expr,StatsElem))`
`234`		`-ereport(ERROR,`
`235`		`-(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`236`		`-errmsg("only simple column references and expressions are allowed in CREATE STATISTICS")));`
`237`		`-`
`238`		`-selem= (StatsElem*)expr;`
	`223`	`+StatsElem*selem=lfirst_node(StatsElem,cell);`
`239`	`224`
`240`	`225`	`if (selem->name)/* column reference */`
`241`	`226`	`{`
`242`	`227`	`char*attname;`
	`228`	`+HeapTupleatttuple;`
	`229`	`+Form_pg_attributeattForm;`
	`230`	`+TypeCacheEntry*type;`
`243`	`231`
`244`	`232`	`attname=selem->name;`
`245`	`233`
`@@ -273,6 +261,7 @@ CreateStatistics(CreateStatsStmt *stmt)`
`273`	`261`	`{`
`274`	`262`	`Node*expr=selem->expr;`
`275`	`263`	`Oidatttype;`
	`264`	`+TypeCacheEntry*type;`
`276`	`265`
`277`	`266`	`Assert(expr!=NULL);`
`278`	`267`

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!

Commit388e75a

File tree

1 file changed

1 file changed

`‎src/backend/commands/statscmds.c`

0 commit comments