]> 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 e880f638f06aab300cc858ba9cc09bda49c94c61..2ffd24b25b907d2242e9331a18b8f070724fcd8d 100644 (file)
@@ -1,10 +1,10 @@
 /*
- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.58 2006/10/21 06:31:28 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-2006     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
@@ -188,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);
@@ -216,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);
 }
@@ -243,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 */
 }
@@ -455,21 +469,17 @@ top:
                        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 (pg_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);
@@ -719,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];
@@ -740,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 * 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 * 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 * 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))
                {
@@ -819,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);
 }
 
@@ -1154,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 */
@@ -1183,6 +1132,11 @@ main(int argc, char **argv)
 
        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')
@@ -1213,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;
@@ -1450,49 +1404,16 @@ main(int argc, char **argv)
        if (!is_no_vacuum)
        {
                fprintf(stderr, "starting vacuum...");
-               res = PQexec(con, "vacuum branches");
-               if (PQresultStatus(res) != PGRES_COMMAND_OK)
-               {
-                       fprintf(stderr, "%s", PQerrorMessage(con));
-                       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)
-               {
-                       fprintf(stderr, "%s", PQerrorMessage(con));
-                       exit(1);
-               }
-               PQclear(res);
-
+               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");
                }
        }
@@ -1500,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);