/*
- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.52 2006/07/31 05:15:14 ishii Exp $
+ * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.64 2007/04/06 09:16:16 ishii Exp $
*
* pgbench: a simple benchmark program for PostgreSQL
* written by Tatsuo Ishii
*
- * Copyright (c) 2000-2005 Tatsuo Ishii
+ * Copyright (c) 2000-2007 Tatsuo Ishii
*
* Permission to use, copy, modify, and distribute this software and
* its documentation for any purpose and without fee is hereby
#include <sys/select.h>
#endif
-/* for getrlimit */
-#include <sys/resource.h>
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h> /* for getrlimit */
+#endif
#endif /* ! WIN32 */
extern char *optarg;
int nxacts = 10; /* default number of transactions per clients */
/*
- * scaling factor. for example, tps = 10 will make 1000000 tuples of
+ * scaling factor. for example, scale = 10 will make 1000000 tuples of
* accounts table.
*/
-int tps = 1;
+int scale = 1;
/*
* end of configurable parameters
/* default scenario */
static char *tpc_b = {
- "\\set nbranches :tps\n"
- "\\set ntellers 10 * :tps\n"
- "\\set naccounts 100000 * :tps\n"
+ "\\set nbranches :scale\n"
+ "\\set ntellers 10 * :scale\n"
+ "\\set naccounts 100000 * :scale\n"
"\\setrandom aid 1 :naccounts\n"
"\\setrandom bid 1 :nbranches\n"
"\\setrandom tid 1 :ntellers\n"
/* -N case */
static char *simple_update = {
- "\\set nbranches :tps\n"
- "\\set ntellers 10 * :tps\n"
- "\\set naccounts 100000 * :tps\n"
+ "\\set nbranches :scale\n"
+ "\\set ntellers 10 * :scale\n"
+ "\\set naccounts 100000 * :scale\n"
"\\setrandom aid 1 :naccounts\n"
"\\setrandom bid 1 :nbranches\n"
"\\setrandom tid 1 :ntellers\n"
/* -S case */
static char *select_only = {
- "\\set naccounts 100000 * :tps\n"
+ "\\set naccounts 100000 * :scale\n"
"\\setrandom aid 1 :naccounts\n"
"SELECT abalance FROM accounts WHERE aid = :aid;\n"
};
return min + (int) (((max - min) * (double) random()) / MAX_RANDOM_VALUE + 0.5);
}
+/* call PQexec() and exit() on failure */
+static void
+executeStatement(PGconn *con, const char* sql)
+{
+ PGresult *res;
+
+ res = PQexec(con, sql);
+ if (PQresultStatus(res) != PGRES_COMMAND_OK)
+ {
+ fprintf(stderr, "%s", PQerrorMessage(con));
+ exit(1);
+ }
+ PQclear(res);
+}
+
/* set up a connection to the backend */
static PGconn *
doConnect(void)
{
PGconn *con;
- PGresult *res;
con = PQsetdbLogin(pghost, pgport, pgoptions, pgtty, dbName,
login, pwd);
return (NULL);
}
- res = PQexec(con, "SET search_path = public");
- if (PQresultStatus(res) != PGRES_COMMAND_OK)
- {
- fprintf(stderr, "%s", PQerrorMessage(con));
- exit(1);
- }
- PQclear(res);
+ executeStatement(con, "SET search_path = public");
return (con);
}
/* check to see if the SQL result was good */
static int
-check(CState * state, PGresult *res, int n, int good)
+check(CState *state, PGresult *res, int n)
{
CState *st = &state[n];
- if (res && PQresultStatus(res) != good)
+ switch (PQresultStatus(res))
{
- fprintf(stderr, "Client %d aborted in state %d: %s", n, st->state, PQerrorMessage(st->con));
- remains--; /* I've aborted */
- PQfinish(st->con);
- st->con = NULL;
- return (-1);
+ case PGRES_COMMAND_OK:
+ case PGRES_TUPLES_OK:
+ /* OK */
+ break;
+ default:
+ fprintf(stderr, "Client %d aborted in state %d: %s",
+ n, st->state, PQerrorMessage(st->con));
+ remains--; /* I've aborted */
+ PQfinish(st->con);
+ st->con = NULL;
+ return (-1);
}
return (0); /* OK */
}
}
else
{
- if ((value = strdup(value)) == NULL)
+ char *val;
+
+ if ((val = strdup(value)) == NULL)
return false;
+
free(var->value);
- var->value = value;
+ var->value = val;
}
return true;
diff = (int) (now.tv_sec - st->txn_begin.tv_sec) * 1000000.0 +
(int) (now.tv_usec - st->txn_begin.tv_usec);
- fprintf(LOGFILE, "%d %d %.0f\n", st->id, st->cnt, diff);
+ fprintf(LOGFILE, "%d %d %.0f %d %ld %ld\n",
+ st->id, st->cnt, diff, st->use_file, now.tv_sec,now.tv_usec);
}
if (commands[st->state]->type == SQL_COMMAND)
{
res = PQgetResult(st->con);
- if (strncasecmp(commands[st->state]->argv[0], "select", 6) != 0)
- {
- if (check(state, res, n, PGRES_COMMAND_OK))
- return;
- }
- else
+ if (check(state, res, n))
{
- if (check(state, res, n, PGRES_TUPLES_OK))
- return;
+ PQclear(res);
+ return;
}
PQclear(res);
discard_response(st);
fprintf(stderr, "\n");
}
- if (strcasecmp(argv[0], "setrandom") == 0)
+ if (pg_strcasecmp(argv[0], "setrandom") == 0)
{
char *var;
int min,
st->listen = 1;
}
- else if (strcasecmp(argv[0], "set") == 0)
+ else if (pg_strcasecmp(argv[0], "set") == 0)
{
char *var;
int ope1,
PGconn *con;
PGresult *res;
static char *DDLs[] = {
- "drop table branches",
+ "drop table if exists branches",
"create table branches(bid int not null,bbalance int,filler char(88))",
- "drop table tellers",
+ "drop table if exists tellers",
"create table tellers(tid int not null,bid int,tbalance int,filler char(84))",
- "drop table accounts",
+ "drop table if exists accounts",
"create table accounts(aid int not null,bid int,abalance int,filler char(84))",
- "drop table history",
- "create table history(tid int,bid int,aid int,delta int,mtime timestamp,filler char(22))"};
+ "drop table if exists history",
+ "create table history(tid int,bid int,aid int,delta int,mtime timestamp,filler char(22))"};
static char *DDLAFTERs[] = {
"alter table branches add primary key (bid)",
"alter table tellers add primary key (tid)",
- "alter table accounts add primary key (aid)"};
+ "alter table accounts add primary key (aid)"};
char sql[256];
if ((con = doConnect()) == NULL)
exit(1);
- for (i = 0; i < (sizeof(DDLs) / sizeof(char *)); i++)
- {
- res = PQexec(con, DDLs[i]);
- if (strncmp(DDLs[i], "drop", 4) && PQresultStatus(res) != PGRES_COMMAND_OK)
- {
- fprintf(stderr, "%s", PQerrorMessage(con));
- exit(1);
- }
- PQclear(res);
- }
+ for (i = 0; i < lengthof(DDLs); i++)
+ executeStatement(con, DDLs[i]);
- res = PQexec(con, "begin");
- if (PQresultStatus(res) != PGRES_COMMAND_OK)
- {
- fprintf(stderr, "%s", PQerrorMessage(con));
- exit(1);
- }
- PQclear(res);
+ executeStatement(con, "begin");
- for (i = 0; i < nbranches * tps; i++)
+ for (i = 0; i < nbranches * scale; i++)
{
snprintf(sql, 256, "insert into branches(bid,bbalance) values(%d,0)", i + 1);
- res = PQexec(con, sql);
- if (PQresultStatus(res) != PGRES_COMMAND_OK)
- {
- fprintf(stderr, "%s", PQerrorMessage(con));
- exit(1);
- }
- PQclear(res);
+ executeStatement(con, sql);
}
- for (i = 0; i < ntellers * tps; i++)
+ for (i = 0; i < ntellers * scale; i++)
{
snprintf(sql, 256, "insert into tellers(tid,bid,tbalance) values (%d,%d,0)"
,i + 1, i / ntellers + 1);
- res = PQexec(con, sql);
- if (PQresultStatus(res) != PGRES_COMMAND_OK)
- {
- fprintf(stderr, "%s", PQerrorMessage(con));
- exit(1);
- }
- PQclear(res);
+ executeStatement(con, sql);
}
- res = PQexec(con, "end");
- if (PQresultStatus(res) != PGRES_COMMAND_OK)
+ executeStatement(con, "commit");
+
+ /*
+ * fill the accounts table with some data
+ */
+ fprintf(stderr, "creating tables...\n");
+
+ executeStatement(con, "begin");
+ executeStatement(con, "truncate accounts");
+
+ res = PQexec(con, "copy accounts from stdin");
+ if (PQresultStatus(res) != PGRES_COPY_IN)
{
fprintf(stderr, "%s", PQerrorMessage(con));
exit(1);
}
PQclear(res);
- /*
- * occupy accounts table with some data
- */
- fprintf(stderr, "creating tables...\n");
- for (i = 0; i < naccounts * tps; i++)
+ for (i = 0; i < naccounts * scale; i++)
{
int j = i + 1;
- if (j % 10000 == 1)
- {
- res = PQexec(con, "copy accounts from stdin");
- if (PQresultStatus(res) != PGRES_COPY_IN)
- {
- fprintf(stderr, "%s", PQerrorMessage(con));
- exit(1);
- }
- PQclear(res);
- }
-
snprintf(sql, 256, "%d\t%d\t%d\t\n", j, i / naccounts + 1, 0);
if (PQputline(con, sql))
{
}
if (j % 10000 == 0)
- {
- /*
- * every 10000 tuples, we commit the copy command. this should
- * avoid generating too much WAL logs
- */
fprintf(stderr, "%d tuples done.\n", j);
- if (PQputline(con, "\\.\n"))
- {
- fprintf(stderr, "very last PQputline failed\n");
- exit(1);
- }
-
- if (PQendcopy(con))
- {
- fprintf(stderr, "PQendcopy failed\n");
- exit(1);
- }
-
-#ifdef NOT_USED
-
- /*
- * do a checkpoint to purge the old WAL logs
- */
- res = PQexec(con, "checkpoint");
- if (PQresultStatus(res) != PGRES_COMMAND_OK)
- {
- fprintf(stderr, "%s", PQerrorMessage(con));
- exit(1);
- }
- PQclear(res);
-#endif /* NOT_USED */
- }
}
- fprintf(stderr, "set primary key...\n");
- for (i = 0; i < (sizeof(DDLAFTERs) / sizeof(char *)); i++)
+ if (PQputline(con, "\\.\n"))
{
- res = PQexec(con, DDLAFTERs[i]);
- if (PQresultStatus(res) != PGRES_COMMAND_OK)
- {
- fprintf(stderr, "%s", PQerrorMessage(con));
- exit(1);
- }
- PQclear(res);
+ fprintf(stderr, "very last PQputline failed\n");
+ exit(1);
}
-
- /* vacuum */
- fprintf(stderr, "vacuum...");
- res = PQexec(con, "vacuum analyze");
- if (PQresultStatus(res) != PGRES_COMMAND_OK)
+ if (PQendcopy(con))
{
- fprintf(stderr, "%s", PQerrorMessage(con));
+ fprintf(stderr, "PQendcopy failed\n");
exit(1);
}
- PQclear(res);
- fprintf(stderr, "done.\n");
+ executeStatement(con, "commit");
+ /*
+ * create indexes
+ */
+ fprintf(stderr, "set primary key...\n");
+ for (i = 0; i < lengthof(DDLAFTERs); i++)
+ executeStatement(con, DDLAFTERs[i]);
+
+ /* vacuum */
+ fprintf(stderr, "vacuum...");
+ executeStatement(con, "vacuum analyze");
+
+ fprintf(stderr, "done.\n");
PQfinish(con);
}
tok = strtok(NULL, delim);
}
- if (strcasecmp(my_commands->argv[0], "setrandom") == 0)
+ if (pg_strcasecmp(my_commands->argv[0], "setrandom") == 0)
{
if (my_commands->argc < 4)
{
fprintf(stderr, "%s: extra argument \"%s\" ignored\n",
my_commands->argv[0], my_commands->argv[j]);
}
- else if (strcasecmp(my_commands->argv[0], "set") == 0)
+ else if (pg_strcasecmp(my_commands->argv[0], "set") == 0)
{
if (my_commands->argc < 3)
{
while (isspace((unsigned char) buf[i]))
i++;
- if (strncmp(&buf[i], "\n", 1) != 0 && strncmp(&buf[i], "--", 2) != 0) {
+ if (buf[i] != '\0' && strncmp(&buf[i], "--", 2) != 0)
+ {
commands = process_commands(&buf[i]);
if (commands == NULL)
{
fclose(fd);
return false;
}
- } else
+ }
+ else
continue;
my_commands[lineno] = commands;
s = "Custom query";
printf("transaction type: %s\n", s);
- printf("scaling factor: %d\n", tps);
+ printf("scaling factor: %d\n", scale);
printf("number of clients: %d\n", nclients);
printf("number of transactions per client: %d\n", nxacts);
printf("number of transactions actually processed: %d/%d\n", normal_xacts, nxacts * nclients);
int c;
int is_init_mode = 0; /* initialize mode? */
int is_no_vacuum = 0; /* no vacuum at all before testing? */
- int is_full_vacuum = 0; /* do full vacuum before testing? */
+ int do_vacuum_accounts = 0; /* do vacuum accounts before testing? */
int debug = 0; /* debug flag */
int ttype = 0; /* transaction type. 0: TPC-B, 1: SELECT only,
* 2: skip update of branches and tellers */
int nsocks; /* return from select(2) */
int maxsock; /* max socket number to be waited */
-#if !(defined(__CYGWIN__) || defined(__MINGW32__))
+#ifdef HAVE_GETRLIMIT
struct rlimit rlim;
#endif
PGresult *res;
char *env;
+ char val[64];
+
+#ifdef WIN32
+ /* stderr is buffered on Win32. */
+ setvbuf(stderr, NULL, _IONBF, 0);
+#endif
+
if ((env = getenv("PGHOST")) != NULL && *env != '\0')
pghost = env;
if ((env = getenv("PGPORT")) != NULL && *env != '\0')
is_no_vacuum++;
break;
case 'v':
- is_full_vacuum++;
+ do_vacuum_accounts++;
break;
case 'p':
pgport = optarg;
fprintf(stderr, "invalid number of clients: %d\n", nclients);
exit(1);
}
-#if !(defined(__CYGWIN__) || defined(__MINGW32__))
-#ifdef RLIMIT_NOFILE /* most platform uses RLIMIT_NOFILE */
+#ifdef HAVE_GETRLIMIT
+#ifdef RLIMIT_NOFILE /* most platforms use RLIMIT_NOFILE */
if (getrlimit(RLIMIT_NOFILE, &rlim) == -1)
#else /* but BSD doesn't ... */
if (getrlimit(RLIMIT_OFILE, &rlim) == -1)
}
if (rlim.rlim_cur <= (nclients + 2))
{
- fprintf(stderr, "You need at least %d open files resource but you are only allowed to use %ld.\n", nclients + 2, (long) rlim.rlim_cur);
- fprintf(stderr, "Use limit/ulimt to increase the limit before using pgbench.\n");
+ fprintf(stderr, "You need at least %d open files but you are only allowed to use %ld.\n", nclients + 2, (long) rlim.rlim_cur);
+ fprintf(stderr, "Use limit/ulimit to increase the limit before using pgbench.\n");
exit(1);
}
-#endif
+#endif /* HAVE_GETRLIMIT */
break;
case 'C':
is_connect = 1;
break;
case 's':
- tps = atoi(optarg);
- if (tps <= 0)
+ scale = atoi(optarg);
+ if (scale <= 0)
{
- fprintf(stderr, "invalid scaling factor: %d\n", tps);
+ fprintf(stderr, "invalid scaling factor: %d\n", scale);
exit(1);
}
break;
remains = nclients;
- if (getVariable(&state[0], "tps") == NULL)
+ if (getVariable(&state[0], "scale") == NULL)
{
- char val[64];
-
- snprintf(val, sizeof(val), "%d", tps);
- if (putVariable(&state[0], "tps", val) == false)
+ snprintf(val, sizeof(val), "%d", scale);
+ if (putVariable(&state[0], "scale", val) == false)
{
fprintf(stderr, "Couldn't allocate memory for variable\n");
exit(1);
memset(state + 1, 0, sizeof(*state) * (nclients - 1));
+ snprintf(val, sizeof(val), "%d", scale);
+
for (i = 1; i < nclients; i++)
{
int j;
exit(1);
}
}
+
+ if (putVariable(&state[i], "scale", val) == false)
+ {
+ fprintf(stderr, "Couldn't allocate memory for variable\n");
+ exit(1);
+ }
}
}
fprintf(stderr, "%s", PQerrorMessage(con));
exit(1);
}
- tps = atoi(PQgetvalue(res, 0, 0));
- if (tps < 0)
- {
- fprintf(stderr, "count(*) from branches invalid (%d)\n", tps);
- exit(1);
- }
- PQclear(res);
- }
-
- if (!is_no_vacuum)
- {
- fprintf(stderr, "starting vacuum...");
- res = PQexec(con, "vacuum branches");
- if (PQresultStatus(res) != PGRES_COMMAND_OK)
+ scale = atoi(PQgetvalue(res, 0, 0));
+ if (scale < 0)
{
- fprintf(stderr, "%s", PQerrorMessage(con));
+ fprintf(stderr, "count(*) from branches invalid (%d)\n", scale);
exit(1);
}
PQclear(res);
- res = PQexec(con, "vacuum tellers");
- if (PQresultStatus(res) != PGRES_COMMAND_OK)
+ snprintf(val, sizeof(val), "%d", scale);
+ if (putVariable(&state[0], "scale", val) == false)
{
- fprintf(stderr, "%s", PQerrorMessage(con));
+ fprintf(stderr, "Couldn't allocate memory for variable\n");
exit(1);
}
- PQclear(res);
- res = PQexec(con, "delete from history");
- if (PQresultStatus(res) != PGRES_COMMAND_OK)
- {
- fprintf(stderr, "%s", PQerrorMessage(con));
- exit(1);
- }
- PQclear(res);
- res = PQexec(con, "vacuum history");
- if (PQresultStatus(res) != PGRES_COMMAND_OK)
+ if (nclients > 1)
{
- fprintf(stderr, "%s", PQerrorMessage(con));
- exit(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);
+ }
+ }
}
- PQclear(res);
+ }
+ if (!is_no_vacuum)
+ {
+ fprintf(stderr, "starting vacuum...");
+ executeStatement(con, "vacuum branches");
+ executeStatement(con, "vacuum tellers");
+ executeStatement(con, "delete from history");
+ executeStatement(con, "vacuum history");
fprintf(stderr, "end.\n");
- if (is_full_vacuum)
+ if (do_vacuum_accounts)
{
- fprintf(stderr, "starting full vacuum...");
- res = PQexec(con, "vacuum analyze accounts");
- if (PQresultStatus(res) != PGRES_COMMAND_OK)
- {
- fprintf(stderr, "%s", PQerrorMessage(con));
- exit(1);
- }
- PQclear(res);
+ fprintf(stderr, "starting vacuum accounts...");
+ executeStatement(con, "vacuum analyze accounts");
fprintf(stderr, "end.\n");
}
}
/* set random seed */
gettimeofday(&tv1, NULL);
- srand((unsigned int) tv1.tv_usec);
+ srandom((unsigned int) tv1.tv_usec);
/* get start up time */
gettimeofday(&tv1, NULL);
if (state[i].ecnt > prev_ecnt && commands[state[i].state]->type == META_COMMAND)
{
fprintf(stderr, "Client %d aborted in state %d. Execution meta-command failed.\n", i, state[i].state);
- remains--; /* I've aborted */
+ remains--; /* I've aborted */
PQfinish(state[i].con);
state[i].con = NULL;
}
if (state[i].ecnt > prev_ecnt && commands[state[i].state]->type == META_COMMAND)
{
fprintf(stderr, "Client %d aborted in state %d. Execution meta-command failed.\n", i, state[i].state);
- remains--; /* I've aborted */
+ remains--; /* I've aborted */
PQfinish(state[i].con);
state[i].con = NULL;
}
projects / postgresql / blobdiff