]> granicus.if.org Git - postgresql/blobdiff - contrib/pgbench/pgbench.c
Enhance pgbench -l option to add timestamp. Patch contributed by Greg
[postgresql] / contrib / pgbench / pgbench.c
index cac391e231acc06022e89a3548e2e831bd736c3a..2ffd24b25b907d2242e9331a18b8f070724fcd8d 100644 (file)
@@ -1,10 +1,10 @@
 /*
- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.46 2005/11/22 18:17:04 momjian 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
@@ -37,8 +37,9 @@
 #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;
@@ -58,10 +59,10 @@ int                 nclients = 1;           /* default number of simulated clients */
 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
@@ -134,10 +135,13 @@ int                       num_files;                      /* its number */
 
 /* default scenario */
 static char *tpc_b = {
-       "\\setrandom aid 1 100000\n"
-       "\\setrandom bid 1 1\n"
-       "\\setrandom tid 1 10\n"
-       "\\setrandom delta 1 10000\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"
+       "\\setrandom delta -5000 5000\n"
        "BEGIN;\n"
        "UPDATE accounts SET abalance = abalance + :delta WHERE aid = :aid;\n"
        "SELECT abalance FROM accounts WHERE aid = :aid;\n"
@@ -149,10 +153,13 @@ static char *tpc_b = {
 
 /* -N case */
 static char *simple_update = {
-       "\\setrandom aid 1 100000\n"
-       "\\setrandom bid 1 1\n"
-       "\\setrandom tid 1 10\n"
-       "\\setrandom delta 1 10000\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"
+       "\\setrandom delta -5000 5000\n"
        "BEGIN;\n"
        "UPDATE accounts SET abalance = abalance + :delta WHERE aid = :aid;\n"
        "SELECT abalance FROM accounts WHERE aid = :aid;\n"
@@ -162,14 +169,15 @@ static char *simple_update = {
 
 /* -S case */
 static char *select_only = {
-       "\\setrandom aid 1 100000\n"
+       "\\set naccounts 100000 * :scale\n"
+       "\\setrandom aid 1 :naccounts\n"
        "SELECT abalance FROM accounts WHERE aid = :aid;\n"
 };
 
 static void
 usage(void)
 {
-       fprintf(stderr, "usage: pgbench [-h hostname][-p port][-c nclients][-t ntransactions][-s scaling_factor][-n][-C][-v][-S][-N][-f filename][-l][-U login][-P password][-d][dbname]\n");
+       fprintf(stderr, "usage: pgbench [-h hostname][-p port][-c nclients][-t ntransactions][-s scaling_factor][-D varname=value][-n][-C][-v][-S][-N][-f filename][-l][-U login][-P password][-d][dbname]\n");
        fprintf(stderr, "(initialize mode): pgbench -i [-h hostname][-p port][-s scaling_factor][-U login][-P password][-d][dbname]\n");
 }
 
@@ -180,12 +188,26 @@ getrand(int min, int max)
        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);
@@ -208,13 +230,7 @@ doConnect(void)
                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);
 }
@@ -235,17 +251,23 @@ discard_response(CState * state)
 
 /* 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 */
 }
@@ -331,10 +353,13 @@ putVariable(CState * st, char *name, char *value)
        }
        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;
@@ -411,6 +436,7 @@ doCustom(CState * state, int n, int debug)
        CState     *st = &state[n];
        Command   **commands;
 
+top:
        commands = sql_files[st->use_file];
 
        if (st->listen)
@@ -443,21 +469,17 @@ doCustom(CState * state, int n, int debug)
                        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))
                        {
-                               if (check(state, res, n, PGRES_COMMAND_OK))
-                                       return;
-                       }
-                       else
-                       {
-                               if (check(state, res, n, PGRES_TUPLES_OK))
-                                       return;
+                               PQclear(res);
+                               return;
                        }
                        PQclear(res);
                        discard_response(st);
@@ -489,6 +511,7 @@ doCustom(CState * state, int n, int debug)
                {
                        st->state = 0;
                        st->use_file = getrand(0, num_files - 1);
+                       commands = sql_files[st->use_file];
                }
        }
 
@@ -548,30 +571,141 @@ doCustom(CState * state, int n, int debug)
                        fprintf(stderr, "\n");
                }
 
-               if (strcasecmp(argv[0], "setrandom") == 0)
+               if (pg_strcasecmp(argv[0], "setrandom") == 0)
                {
-                       char       *val;
+                       char       *var;
+                       int                     min,
+                                               max;
+                       char            res[64];
 
-                       if ((val = malloc(strlen(argv[3]) + 1)) == NULL)
+                       if (*argv[2] == ':')
+                       {
+                               if ((var = getVariable(st, argv[2] + 1)) == NULL)
+                               {
+                                       fprintf(stderr, "%s: undefined variable %s\n", argv[0], argv[2]);
+                                       st->ecnt++;
+                                       return;
+                               }
+                               min = atoi(var);
+                       }
+                       else
+                               min = atoi(argv[2]);
+
+#ifdef NOT_USED
+                       if (min < 0)
+                       {
+                               fprintf(stderr, "%s: invalid minimum number %d\n", argv[0], min);
+                               st->ecnt++;
+                               return;
+                       }
+#endif
+
+                       if (*argv[3] == ':')
+                       {
+                               if ((var = getVariable(st, argv[3] + 1)) == NULL)
+                               {
+                                       fprintf(stderr, "%s: undefined variable %s\n", argv[0], argv[3]);
+                                       st->ecnt++;
+                                       return;
+                               }
+                               max = atoi(var);
+                       }
+                       else
+                               max = atoi(argv[3]);
+
+                       if (max < min || max > MAX_RANDOM_VALUE)
+                       {
+                               fprintf(stderr, "%s: invalid maximum number %d\n", argv[0], max);
+                               st->ecnt++;
+                               return;
+                       }
+
+#ifdef DEBUG
+                       printf("min: %d max: %d random: %d\n", min, max, getrand(min, max));
+#endif
+                       snprintf(res, sizeof(res), "%d", getrand(min, max));
+
+                       if (putVariable(st, argv[1], res) == false)
                        {
                                fprintf(stderr, "%s: out of memory\n", argv[0]);
                                st->ecnt++;
                                return;
                        }
 
-                       sprintf(val, "%d", getrand(atoi(argv[2]), atoi(argv[3])));
+                       st->listen = 1;
+               }
+               else if (pg_strcasecmp(argv[0], "set") == 0)
+               {
+                       char       *var;
+                       int                     ope1,
+                                               ope2;
+                       char            res[64];
+
+                       if (*argv[2] == ':')
+                       {
+                               if ((var = getVariable(st, argv[2] + 1)) == NULL)
+                               {
+                                       fprintf(stderr, "%s: undefined variable %s\n", argv[0], argv[2]);
+                                       st->ecnt++;
+                                       return;
+                               }
+                               ope1 = atoi(var);
+                       }
+                       else
+                               ope1 = atoi(argv[2]);
+
+                       if (argc < 5)
+                               snprintf(res, sizeof(res), "%d", ope1);
+                       else
+                       {
+                               if (*argv[4] == ':')
+                               {
+                                       if ((var = getVariable(st, argv[4] + 1)) == NULL)
+                                       {
+                                               fprintf(stderr, "%s: undefined variable %s\n", argv[0], argv[4]);
+                                               st->ecnt++;
+                                               return;
+                                       }
+                                       ope2 = atoi(var);
+                               }
+                               else
+                                       ope2 = atoi(argv[4]);
+
+                               if (strcmp(argv[3], "+") == 0)
+                                       snprintf(res, sizeof(res), "%d", ope1 + ope2);
+                               else if (strcmp(argv[3], "-") == 0)
+                                       snprintf(res, sizeof(res), "%d", ope1 - ope2);
+                               else if (strcmp(argv[3], "*") == 0)
+                                       snprintf(res, sizeof(res), "%d", ope1 * ope2);
+                               else if (strcmp(argv[3], "/") == 0)
+                               {
+                                       if (ope2 == 0)
+                                       {
+                                               fprintf(stderr, "%s: division by zero\n", argv[0]);
+                                               st->ecnt++;
+                                               return;
+                                       }
+                                       snprintf(res, sizeof(res), "%d", ope1 / ope2);
+                               }
+                               else
+                               {
+                                       fprintf(stderr, "%s: unsupported operator %s\n", argv[0], argv[3]);
+                                       st->ecnt++;
+                                       return;
+                               }
+                       }
 
-                       if (putVariable(st, argv[1], val) == false)
+                       if (putVariable(st, argv[1], res) == false)
                        {
                                fprintf(stderr, "%s: out of memory\n", argv[0]);
-                               free(val);
                                st->ecnt++;
                                return;
                        }
 
-                       free(val);
                        st->listen = 1;
                }
+
+               goto top;
        }
 }
 
@@ -595,18 +729,18 @@ init(void)
        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];
@@ -616,77 +750,46 @@ init(void)
        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))
                {
@@ -695,62 +798,32 @@ init(void)
                }
 
                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);
 }
 
@@ -802,11 +875,8 @@ process_commands(char *buf)
                        tok = strtok(NULL, delim);
                }
 
-               if (strcasecmp(my_commands->argv[0], "setrandom") == 0)
+               if (pg_strcasecmp(my_commands->argv[0], "setrandom") == 0)
                {
-                       int                     min,
-                                               max;
-
                        if (my_commands->argc < 4)
                        {
                                fprintf(stderr, "%s: missing argument\n", my_commands->argv[0]);
@@ -816,20 +886,18 @@ process_commands(char *buf)
                        for (j = 4; j < my_commands->argc; j++)
                                fprintf(stderr, "%s: extra argument \"%s\" ignored\n",
                                                my_commands->argv[0], my_commands->argv[j]);
-
-                       if ((min = atoi(my_commands->argv[2])) < 0)
+               }
+               else if (pg_strcasecmp(my_commands->argv[0], "set") == 0)
+               {
+                       if (my_commands->argc < 3)
                        {
-                               fprintf(stderr, "%s: invalid minimum number %s\n",
-                                               my_commands->argv[0], my_commands->argv[2]);
+                               fprintf(stderr, "%s: missing argument\n", my_commands->argv[0]);
                                return NULL;
                        }
 
-                       if ((max = atoi(my_commands->argv[3])) < min || max > MAX_RANDOM_VALUE)
-                       {
-                               fprintf(stderr, "%s: invalid maximum number %s\n",
-                                               my_commands->argv[0], my_commands->argv[3]);
-                               return NULL;
-                       }
+                       for (j = my_commands->argc < 5 ? 3 : 5; j < my_commands->argc; j++)
+                               fprintf(stderr, "%s: extra argument \"%s\" ignored\n",
+                                               my_commands->argv[0], my_commands->argv[j]);
                }
                else
                {
@@ -885,13 +953,23 @@ process_file(char *filename)
        while (fgets(buf, sizeof(buf), fd) != NULL)
        {
                Command    *commands;
+               int                     i;
 
-               commands = process_commands(buf);
-               if (commands == NULL)
+               i = 0;
+               while (isspace((unsigned char) buf[i]))
+                       i++;
+
+               if (buf[i] != '\0' && strncmp(&buf[i], "--", 2) != 0)
                {
-                       fclose(fd);
-                       return false;
+                       commands = process_commands(&buf[i]);
+                       if (commands == NULL)
+                       {
+                               fclose(fd);
+                               return false;
+                       }
                }
+               else
+                       continue;
 
                my_commands[lineno] = commands;
                lineno++;
@@ -1010,7 +1088,7 @@ printResults(
                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);
@@ -1025,7 +1103,7 @@ main(int argc, char **argv)
        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 */
@@ -1044,7 +1122,7 @@ main(int argc, char **argv)
        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
 
@@ -1052,6 +1130,13 @@ main(int argc, char **argv)
        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')
@@ -1059,7 +1144,16 @@ main(int argc, char **argv)
        else if ((env = getenv("PGUSER")) != NULL && *env != '\0')
                login = env;
 
-       while ((c = getopt(argc, argv, "ih:nvp:dc:t:s:U:P:CNSlf:")) != -1)
+       state = (CState *) malloc(sizeof(CState));
+       if (state == NULL)
+       {
+               fprintf(stderr, "Couldn't allocate memory for state\n");
+               exit(1);
+       }
+
+       memset(state, 0, sizeof(*state));
+
+       while ((c = getopt(argc, argv, "ih:nvp:dc:t:s:U:P:CNSlf:D:")) != -1)
        {
                switch (c)
                {
@@ -1073,7 +1167,7 @@ main(int argc, char **argv)
                                is_no_vacuum++;
                                break;
                        case 'v':
-                               is_full_vacuum++;
+                               do_vacuum_accounts++;
                                break;
                        case 'p':
                                pgport = optarg;
@@ -1094,8 +1188,8 @@ main(int argc, char **argv)
                                        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)
@@ -1106,21 +1200,20 @@ main(int argc, char **argv)
                                }
                                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   /* #if !(defined(__CYGWIN__) ||
-                                                                * defined(__MINGW32__)) */
+#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;
@@ -1144,9 +1237,27 @@ main(int argc, char **argv)
                        case 'f':
                                ttype = 3;
                                filename = optarg;
-                               if (process_file(filename) == false)
+                               if (process_file(filename) == false || *sql_files[num_files - 1] == NULL)
                                        exit(1);
                                break;
+                       case 'D':
+                               {
+                                       char       *p;
+
+                                       if ((p = strchr(optarg, '=')) == NULL || p == optarg || *(p + 1) == '\0')
+                                       {
+                                               fprintf(stderr, "invalid variable definition: %s\n", optarg);
+                                               exit(1);
+                                       }
+
+                                       *p++ = '\0';
+                                       if (putVariable(&state[0], optarg, p) == false)
+                                       {
+                                               fprintf(stderr, "Couldn't allocate memory for variable\n");
+                                               exit(1);
+                                       }
+                               }
+                               break;
                        default:
                                usage();
                                exit(1);
@@ -1174,14 +1285,49 @@ main(int argc, char **argv)
 
        remains = nclients;
 
-       state = (CState *) malloc(sizeof(CState) * nclients);
-       if (state == NULL)
+       if (getVariable(&state[0], "scale") == NULL)
        {
-               fprintf(stderr, "Couldn't allocate memory for state\n");
-               exit(1);
+               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, 0, sizeof(*state) * nclients);
+       if (nclients > 1)
+       {
+               state = (CState *) realloc(state, sizeof(CState) * nclients);
+               if (state == NULL)
+               {
+                       fprintf(stderr, "Couldn't allocate memory for state\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;
+
+                       for (j = 0; j < state[0].nvariables; j++)
+                       {
+                               if (putVariable(&state[i], state[0].variables[j].name, state[0].variables[j].value) == false)
+                               {
+                                       fprintf(stderr, "Couldn't allocate memory for variable\n");
+                                       exit(1);
+                               }
+                       }
+
+                       if (putVariable(&state[i], "scale", val) == false)
+                       {
+                               fprintf(stderr, "Couldn't allocate memory for variable\n");
+                               exit(1);
+                       }
+               }
+       }
 
        if (use_log)
        {
@@ -1227,61 +1373,47 @@ main(int argc, char **argv)
                        fprintf(stderr, "%s", PQerrorMessage(con));
                        exit(1);
                }
-               tps = atoi(PQgetvalue(res, 0, 0));
-               if (tps < 0)
+               scale = atoi(PQgetvalue(res, 0, 0));
+               if (scale < 0)
                {
-                       fprintf(stderr, "count(*) from branches invalid (%d)\n", tps);
+                       fprintf(stderr, "count(*) from branches invalid (%d)\n", scale);
                        exit(1);
                }
                PQclear(res);
-       }
 
-       if (!is_no_vacuum)
-       {
-               fprintf(stderr, "starting vacuum...");
-               res = PQexec(con, "vacuum branches");
-               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, "vacuum tellers");
-               if (PQresultStatus(res) != PGRES_COMMAND_OK)
-               {
-                       fprintf(stderr, "%s", PQerrorMessage(con));
-                       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");
                }
        }
@@ -1289,7 +1421,7 @@ main(int argc, char **argv)
 
        /* 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);
@@ -1311,38 +1443,21 @@ main(int argc, char **argv)
        /* process bultin SQL scripts */
        switch (ttype)
        {
-                       char            buf[128];
-
                case 0:
                        sql_files[0] = process_builtin(tpc_b);
-                       snprintf(buf, sizeof(buf), "%d", 100000 * tps);
-                       sql_files[0][0]->argv[3] = strdup(buf);
-                       snprintf(buf, sizeof(buf), "%d", 1 * tps);
-                       sql_files[0][1]->argv[3] = strdup(buf);
-                       snprintf(buf, sizeof(buf), "%d", 10 * tps);
-                       sql_files[0][2]->argv[3] = strdup(buf);
-                       snprintf(buf, sizeof(buf), "%d", 10000 * tps);
-                       sql_files[0][3]->argv[3] = strdup(buf);
                        num_files = 1;
                        break;
+
                case 1:
                        sql_files[0] = process_builtin(select_only);
-                       snprintf(buf, sizeof(buf), "%d", 100000 * tps);
-                       sql_files[0][0]->argv[3] = strdup(buf);
                        num_files = 1;
                        break;
+
                case 2:
                        sql_files[0] = process_builtin(simple_update);
-                       snprintf(buf, sizeof(buf), "%d", 100000 * tps);
-                       sql_files[0][0]->argv[3] = strdup(buf);
-                       snprintf(buf, sizeof(buf), "%d", 1 * tps);
-                       sql_files[0][1]->argv[3] = strdup(buf);
-                       snprintf(buf, sizeof(buf), "%d", 10 * tps);
-                       sql_files[0][2]->argv[3] = strdup(buf);
-                       snprintf(buf, sizeof(buf), "%d", 10000 * tps);
-                       sql_files[0][3]->argv[3] = strdup(buf);
                        num_files = 1;
                        break;
+
                default:
                        break;
        }
@@ -1350,8 +1465,19 @@ main(int argc, char **argv)
        /* send start up queries in async manner */
        for (i = 0; i < nclients; i++)
        {
+               Command   **commands = sql_files[state[i].use_file];
+               int                     prev_ecnt = state[i].ecnt;
+
                state[i].use_file = getrand(0, num_files - 1);
                doCustom(state, i, debug);
+
+               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 */
+                       PQfinish(state[i].con);
+                       state[i].con = NULL;
+               }
        }
 
        for (;;)
@@ -1417,12 +1543,21 @@ main(int argc, char **argv)
                for (i = 0; i < nclients; i++)
                {
                        Command   **commands = sql_files[state[i].use_file];
+                       int                     prev_ecnt = state[i].ecnt;
 
                        if (state[i].con && (FD_ISSET(PQsocket(state[i].con), &input_mask)
                                                  || commands[state[i].state]->type == META_COMMAND))
                        {
                                doCustom(state, i, debug);
                        }
+
+                       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 */
+                               PQfinish(state[i].con);
+                               state[i].con = NULL;
+                       }
                }
        }
 }