pgbench: accept unambiguous builtin prefixes for -b

alvherre · alvherre · commit d561f1caecbb · 2016-03-03T19:37:13.000-03:00
This makes it easier to use "-b se" instead of typing the full "-b
select-only".

Author: Fabien Coelho
Reviewed-by: Michaël Paquier
diff --git a/doc/src/sgml/ref/pgbench.sgml b/doc/src/sgml/ref/pgbench.sgml
@@ -269,6 +269,7 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
         Add the specified builtin script to the list of executed scripts.
         Available builtin scripts are: <literal>tpcb-like</>,
         <literal>simple-update</> and <literal>select-only</>.
+        Unambiguous prefixes of builtin names are accepted.
         With special name <literal>list</>, show the list of builtin scripts
         and exit immediately.
        </para>
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
@@ -2746,22 +2746,36 @@ listAvailableScripts(void)
 	fprintf(stderr, "\n");
 }
 
+/* return builtin script "name" if unambiguous */
 static char *
 findBuiltin(const char *name, char **desc)
 {
-	int			i;
+	int			i,
+				found = 0,
+				len = strlen(name);
+	char	   *commands = NULL;
 
 	for (i = 0; i < N_BUILTIN; i++)
 	{
-		if (strncmp(builtin_script[i].name, name,
-					strlen(builtin_script[i].name)) == 0)
+		if (strncmp(builtin_script[i].name, name, len) == 0)
 		{
 			*desc = builtin_script[i].desc;
-			return builtin_script[i].commands;
+			commands = builtin_script[i].commands;
+			found++;
 		}
 	}
 
-	fprintf(stderr, "no builtin script found for name \"%s\"\n", name);
+	/* ok, unambiguous result */
+	if (found == 1)
+		return commands;
+
+	/* error cases */
+	if (found == 0)
+		fprintf(stderr, "no builtin script found for name \"%s\"\n", name);
+	else	/* found > 1 */
+		fprintf(stderr,
+				"ambiguous builtin name: %d builtin scripts found for prefix \"%s\"\n", found, name);
+
 	listAvailableScripts();
 	exit(1);
 }

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`	`static char *`
`2750`	`2751`	`findBuiltin(const char name, char *desc)`
`2751`	`2752`	`{`
`2752`		`- int i;`
	`2753`	`+ int i,`
	`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`		`- return builtin_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`	`+ return commands;`
	`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`	`}`