pgbench: More fix with handling default scaling factor in the default

tatsuo-ishii · tatsuo-ishii · commit a5007d671afe · 2006-10-21T06:31:28.000Z
scenarios. With multiple clinets, only the first client got the right
scaling factor and this gave a illusion of better performance in case
of the scaling factor greater than 1.
diff --git a/contrib/pgbench/README.pgbench b/contrib/pgbench/README.pgbench
@@ -1,4 +1,4 @@
-pgbench README		2006/07/26 Tatsuo Ishii
+pgbench README		2006/10/21 Tatsuo Ishii
 
 o What is pgbench?
 
@@ -235,6 +235,10 @@ Basically it is same as BSD license. See pgbench.c for more details.
 
 o History
 
+2006/10/21
+	* more fix with handling default scaling factor in the default
+          scenarios
+
 2006/09/14
 	* change "tps" to "scale" to avoid confusion
 
diff --git a/contrib/pgbench/README.pgbench_jis b/contrib/pgbench/README.pgbench_jis
@@ -1,4 +1,4 @@
-pgbench README		2006/07/26 Tatsuo Ishii
+pgbench README		2006/10/21 Tatsuo Ishii
 
 $B"#(Bpgbench $B$H$O!)(B
 
@@ -285,6 +285,10 @@ pgbench $B$O@P0f(B $BC#IW$K$h$C$F=q$+$l$^$7$?!%%i%$%;%s%9>r7o$O(B pgbench.c
 
 $B"#2~DjMzNr(B
 
+2006/10/21
+	* $B99$K%G%U%)%k%H$N%9%1!<%j%s%0%U%!%/%?$r(Bbranches$B$+$i<h$C$F$3$J(B
+          $B$$%P%0$r=$@5!%(B
+
 2006/09/13
 	* $BJQ?t(Btps$B$OJ6$i$o$7$$$N$G(Bscale$B$KJQ99!%%G%U%)%k%H%7%J%j%*$N;~$K!$(B
 	  $B%G%U%)%k%H$N%9%1!<%j%s%0%U%!%/%?$r(Bbranches$B$+$i<h$C$F$3$J$$%P%0$r=$@5!%(B
diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.57 2006/10/07 19:25:28 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.58 2006/10/21 06:31:28 ishii Exp $
  *
  * pgbench: a simple benchmark program for PostgreSQL
  * written by Tatsuo Ishii
@@ -1352,6 +1352,8 @@ main(int argc, char **argv)
 
 		memset(state + 1, 0, sizeof(*state) * (nclients - 1));
 
+		snprintf(val, sizeof(val), "%d", scale);
+
 		for (i = 1; i < nclients; i++)
 		{
 			int			j;
@@ -1364,6 +1366,12 @@ main(int argc, char **argv)
 					exit(1);
 				}
 			}
+
+			if (putVariable(&state[i], "scale", val) == false)
+			{
+				fprintf(stderr, "Couldn't allocate memory for variable\n");
+				exit(1);
+			}
 		}
 	}
 
@@ -1425,6 +1433,18 @@ main(int argc, char **argv)
 			fprintf(stderr, "Couldn't allocate memory for variable\n");
 			exit(1);
 		}
+
+		if (nclients > 1)
+		{
+			for (i = 1; i < nclients; i++)
+			{
+				if (putVariable(&state[i], "scale", val) == false)
+				{
+					fprintf(stderr, "Couldn't allocate memory for variable\n");
+					exit(1);
+				}
+			}
+		}
 	}
 
 	if (!is_no_vacuum)

-Original file line number
+Diff line change
@@ @@ -1,4 +1,4 @@ @@
 -pgbench README		2006/07/26 Tatsuo Ishii
 +pgbench README		2006/10/21 Tatsuo Ishii
 $B"#(Bpgbench $B$H$O!)(B
 $B"#2~DjMzNr(B
 +2006/10/21
 +	* $B99$K%G%U%)%k%H$N%9%1!<%j%s%0%U%!%/%?$r(Bbranches$B$+$i<h$C$F$3$J(B
 +          $B$$%P%0$r=$@5!%(B
++
 /09/13
 	* $BJQ?t(Btps$B$OJ6$i$o$7$$$N$G(Bscale$B$KJQ99!%%G%U%)%k%H%7%J%j%*$N;~$K!$(B
 	  $B%G%U%)%k%H$N%9%1!<%j%s%0%U%!%/%?$r(Bbranches$B$+$i<h$C$F$3$J$$%P%0$r=$@5!%(B
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.57 2006/10/07 19:25:28 tgl Exp $`
	`2`	`+ * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.58 2006/10/21 06:31:28 ishii Exp $`
`3`	`3`	`*`
`4`	`4`	`* pgbench: a simple benchmark program for PostgreSQL`
`5`	`5`	`* written by Tatsuo Ishii`
`@@ -1352,6 +1352,8 @@ main(int argc, char **argv)`
`1352`	`1352`
`1353`	`1353`	`memset(state + 1, 0, sizeof(state) (nclients - 1));`
`1354`	`1354`
	`1355`	`+ snprintf(val, sizeof(val), "%d", scale);`
	`1356`	`+`
`1355`	`1357`	`for (i = 1; i < nclients; i++)`
`1356`	`1358`	`{`
`1357`	`1359`	`int j;`
`@@ -1364,6 +1366,12 @@ main(int argc, char **argv)`
`1364`	`1366`	`exit(1);`
`1365`	`1367`	`}`
`1366`	`1368`	`}`
	`1369`	`+`
	`1370`	`+ if (putVariable(&state[i], "scale", val) == false)`
	`1371`	`+ {`
	`1372`	`+ fprintf(stderr, "Couldn't allocate memory for variable\n");`
	`1373`	`+ exit(1);`
	`1374`	`+ }`
`1367`	`1375`	`}`
`1368`	`1376`	`}`
`1369`	`1377`
`@@ -1425,6 +1433,18 @@ main(int argc, char **argv)`
`1425`	`1433`	`fprintf(stderr, "Couldn't allocate memory for variable\n");`
`1426`	`1434`	`exit(1);`
`1427`	`1435`	`}`
	`1436`	`+`
	`1437`	`+ if (nclients > 1)`
	`1438`	`+ {`
	`1439`	`+ for (i = 1; i < nclients; i++)`
	`1440`	`+ {`
	`1441`	`+ if (putVariable(&state[i], "scale", val) == false)`
	`1442`	`+ {`
	`1443`	`+ fprintf(stderr, "Couldn't allocate memory for variable\n");`
	`1444`	`+ exit(1);`
	`1445`	`+ }`
	`1446`	`+ }`
	`1447`	`+ }`
`1428`	`1448`	`}`
`1429`	`1449`
`1430`	`1450`	`if (!is_no_vacuum)`