Commitd561f1c

committed

pgbench: accept unambiguous builtin prefixes for -b

This makes it easier to use "-b se" instead of typing the full "-bselect-only".Author: Fabien CoelhoReviewed-by: Michaël Paquier

1 parent2c83f43 commitd561f1cCopy full SHA for d561f1c

File tree

+20

-5

lines changed

+20

-5

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,7 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>`
`269`	`269`	`Add the specified builtin script to the list of executed scripts.`
`270`	`270`	`Available builtin scripts are: <literal>tpcb-like</>,`
`271`	`271`	`<literal>simple-update</> and <literal>select-only</>.`
	`272`	`+ Unambiguous prefixes of builtin names are accepted.`
`272`	`273`	`With special name <literal>list</>, show the list of builtin scripts`
`273`	`274`	`and exit immediately.`
`274`	`275`	`</para>`

Lines changed: 19 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2746,22 +2746,36 @@ listAvailableScripts(void)`
`2746`	`2746`	`fprintf(stderr,"\n");`
`2747`	`2747`	`}`
`2748`	`2748`
	`2749`	`+/* return builtin script "name" if unambiguous */`
`2749`	`2750`	`staticchar*`
`2750`	`2751`	`findBuiltin(constcharname,char*desc)`
`2751`	`2752`	`{`
`2752`		`-inti;`
	`2753`	`+inti,`
	`2754`	`+found=0,`
	`2755`	`+len=strlen(name);`
	`2756`	`+char*commands=NULL;`
`2753`	`2757`
`2754`	`2758`	`for (i=0;i<N_BUILTIN;i++)`
`2755`	`2759`	`{`
`2756`		`-if (strncmp(builtin_script[i].name,name,`
`2757`		`-strlen(builtin_script[i].name))==0)`
	`2760`	`+if (strncmp(builtin_script[i].name,name,len)==0)`
`2758`	`2761`	`{`
`2759`	`2762`	`*desc=builtin_script[i].desc;`
`2760`		`-returnbuiltin_script[i].commands;`
	`2763`	`+commands=builtin_script[i].commands;`
	`2764`	`+found++;`
`2761`	`2765`	`}`
`2762`	`2766`	`}`
`2763`	`2767`
`2764`		`-fprintf(stderr,"no builtin script found for name \"%s\"\n",name);`
	`2768`	`+/* ok, unambiguous result */`
	`2769`	`+if (found==1)`
	`2770`	`+returncommands;`
	`2771`	`+`
	`2772`	`+/* error cases */`
	`2773`	`+if (found==0)`
	`2774`	`+fprintf(stderr,"no builtin script found for name \"%s\"\n",name);`
	`2775`	`+else/* found > 1 */`
	`2776`	`+fprintf(stderr,`
	`2777`	`+"ambiguous builtin name: %d builtin scripts found for prefix \"%s\"\n",found,name);`
	`2778`	`+`
`2765`	`2779`	`listAvailableScripts();`
`2766`	`2780`	`exit(1);`
`2767`	`2781`	`}`

Comments

(0)