NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit04c5b69

committed

Clean up psql variable code a little: eliminate unnecessary tests in

GetVariable() and be consistent about treatment of the list header.Motivated by noticing strspn() taking an unreasonable percentage ofruntime --- the call removed from GetVariable() was the only one thatcould be in a high-usage path ...

1 parent3f9aace commit04c5b69Copy full SHA for 04c5b69

File tree

1 file changed

+20

-21

lines changed

src/bin/psql
- variables.c

1 file changed

+20

-21

lines changed

`‎src/bin/psql/variables.c`

Lines changed: 20 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2006, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/variables.c,v 1.24 2006/06/14 16:49:03 tgl Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/variables.c,v 1.25 2006/06/21 16:05:11 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"common.h"`
`@@ -29,15 +29,13 @@ GetVariable(VariableSpace space, const char *name)`
`29`	`29`	`if (!space)`
`30`	`30`	`returnNULL;`
`31`	`31`
`32`		`-if (strspn(name,VALID_VARIABLE_CHARS)!=strlen(name))`
`33`		`-returnNULL;`
`34`		`-`
`35`		`-for (current=space;current;current=current->next)`
	`32`	`+for (current=space->next;current;current=current->next)`
`36`	`33`	`{`
`37`		`-psql_assert(current->name);`
`38`		`-psql_assert(current->value);`
`39`	`34`	`if (strcmp(current->name,name)==0)`
	`35`	`+{`
	`36`	`+psql_assert(current->value);`
`40`	`37`	`returncurrent->value;`
	`38`	`+}`
`41`	`39`	`}`
`42`	`40`
`43`	`41`	`returnNULL;`
`@@ -126,6 +124,9 @@ PrintVariables(VariableSpace space)`
`126`	`124`	`{`
`127`	`125`	`struct_variable*ptr;`
`128`	`126`
	`127`	`+if (!space)`
	`128`	`+return;`
	`129`	`+`
`129`	`130`	`for (ptr=space->next;ptr;ptr=ptr->next)`
`130`	`131`	`{`
`131`	`132`	`printf("%s = '%s'\n",ptr->name,ptr->value);`
`@@ -143,18 +144,19 @@ SetVariable(VariableSpace space, const char name, const char value)`
`143`	`144`	`if (!space)`
`144`	`145`	`return false;`
`145`	`146`
`146`		`-if (!value)`
`147`		`-returnDeleteVariable(space,name);`
`148`		`-`
`149`	`147`	`if (strspn(name,VALID_VARIABLE_CHARS)!=strlen(name))`
`150`	`148`	`return false;`
`151`	`149`
`152`		`-for (current=space,previous=NULL;current;previous=current,current=current->next)`
	`150`	`+if (!value)`
	`151`	`+returnDeleteVariable(space,name);`
	`152`	`+`
	`153`	`+for (previous=space,current=space->next;`
	`154`	`+current;`
	`155`	`+previous=current,current=current->next)`
`153`	`156`	`{`
`154`		`-psql_assert(current->name);`
`155`		`-psql_assert(current->value);`
`156`	`157`	`if (strcmp(current->name,name)==0)`
`157`	`158`	`{`
	`159`	`+psql_assert(current->value);`
`158`	`160`	`free(current->value);`
`159`	`161`	`current->value=pg_strdup(value);`
`160`	`162`	`return true;`
`@@ -182,19 +184,16 @@ DeleteVariable(VariableSpace space, const char *name)`
`182`	`184`	`if (!space)`
`183`	`185`	`return false;`
`184`	`186`
`185`		`-if (strspn(name,VALID_VARIABLE_CHARS)!=strlen(name))`
`186`		`-return false;`
`187`		`-`
`188`		`-for (current=space,previous=NULL;current;previous=current,current=current->next)`
	`187`	`+for (previous=space,current=space->next;`
	`188`	`+current;`
	`189`	`+previous=current,current=current->next)`
`189`	`190`	`{`
`190`		`-psql_assert(current->name);`
`191`		`-psql_assert(current->value);`
`192`	`191`	`if (strcmp(current->name,name)==0)`
`193`	`192`	`{`
	`193`	`+psql_assert(current->value);`
	`194`	`+previous->next=current->next;`
`194`	`195`	`free(current->name);`
`195`	`196`	`free(current->value);`
`196`		`-if (previous)`
`197`		`-previous->next=current->next;`
`198`	`197`	`free(current);`
`199`	`198`	`return true;`
`200`	`199`	`}`

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!

Commit04c5b69

File tree

1 file changed

1 file changed

`‎src/bin/psql/variables.c`

0 commit comments