NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitb399805

committed

Eliminate elog()'s hardwired limit on length of an error message.

This change seems necessary in conjunction with long queries, and itcleans up some bogosity in connection with long EXPLAIN texts anyway.Note that current libpq will accept any length error message (at leastuntil it runs out of memory); prior versions have a limit of 8K, butwill cleanly discard excess error text, so there shouldn't be anybig compatibility problems with old clients.

1 parent1e4f019 commitb399805Copy full SHA for b399805

File tree

4 files changed

+245

-145

lines changed

src
- backend
  - commands
    - explain.c
  - utils
    - error
      - elog.c
    - misc
      - trace.c
- include/utils
  - elog.h

4 files changed

+245

-145

lines changed

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

Lines changed: 3 additions & 24 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Copyright (c) 1994-5, Regents of the University of California`
`6`	`6`	`*`
`7`		`- * $Id: explain.c,v 1.46 1999/08/31 01:28:28 tgl Exp $`
	`7`	`+ * $Id: explain.c,v 1.47 1999/09/11 19:06:36 tgl Exp $`
`8`	`8`	`*`
`9`	`9`	`*/`
`10`	`10`
`@@ -28,7 +28,6 @@ typedef struct ExplainState`
`28`	`28`	`}ExplainState;`
`29`	`29`
`30`	`30`	`staticcharExplain_PlanToString(Planplan,ExplainState*es);`
`31`		`-staticvoidprintLongNotice(constcharheader,constcharmessage);`
`32`	`31`	`staticvoidExplainOneQuery(Query*query,boolverbose,CommandDestdest);`
`33`	`32`
`34`	`33`	`/* Convert a null string pointer into "<>" */`
`@@ -110,7 +109,7 @@ ExplainOneQuery(Query *query, bool verbose, CommandDest dest)`
`110`	`109`	`s=nodeToString(plan);`
`111`	`110`	`if (s)`
`112`	`111`	`{`
`113`		`-printLongNotice("QUERY DUMP:\n\n",s);`
	`112`	`+elog(NOTICE,"QUERY DUMP:\n\n%s",s);`
`114`	`113`	`pfree(s);`
`115`	`114`	`}`
`116`	`115`	`}`
`@@ -120,7 +119,7 @@ ExplainOneQuery(Query *query, bool verbose, CommandDest dest)`
`120`	`119`	`s=Explain_PlanToString(plan,es);`
`121`	`120`	`if (s)`
`122`	`121`	`{`
`123`		`-printLongNotice("QUERY PLAN:\n\n",s);`
	`122`	`+elog(NOTICE,"QUERY PLAN:\n\n%s",s);`
`124`	`123`	`pfree(s);`
`125`	`124`	`}`
`126`	`125`	`}`
`@@ -332,7 +331,6 @@ explain_outNode(StringInfo str, Plan plan, int indent, ExplainState es)`
`332`	`331`	`}`
`333`	`332`	`es->rtable=saved_rtable;`
`334`	`333`	`}`
`335`		`-return;`
`336`	`334`	`}`
`337`	`335`
`338`	`336`	`staticchar*`
`@@ -346,22 +344,3 @@ Explain_PlanToString(Plan plan, ExplainState es)`
`346`	`344`	`explain_outNode(&str,plan,0,es);`
`347`	`345`	`returnstr.data;`
`348`	`346`	`}`
`349`		`-`
`350`		`-/*`
`351`		`- * Print a message that might exceed the size of the elog message buffer.`
`352`		`- * This is a crock ... there shouldn't be an upper limit to what you can elog().`
`353`		`- */`
`354`		`-staticvoid`
`355`		`-printLongNotice(constcharheader,constcharmessage)`
`356`		`-{`
`357`		`-intlen=strlen(message);`
`358`		`-`
`359`		`-elog(NOTICE,"%.20s%.*s",header,ELOG_MAXLEN-64,message);`
`360`		`-len-=ELOG_MAXLEN-64;`
`361`		`-while (len>0)`
`362`		`-{`
`363`		`-message+=ELOG_MAXLEN-64;`
`364`		`-elog(NOTICE,"%.*s",ELOG_MAXLEN-64,message);`
`365`		`-len-=ELOG_MAXLEN-64;`
`366`		`-}`
`367`		`-}`

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!

Commitb399805

File tree

4 files changed

4 files changed

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

0 commit comments