Correct compile error

[bacula/bacula] / bacula / src / cats / postgresql.c

diff --git a/bacula/src/cats/postgresql.c b/bacula/src/cats/postgresql.c
index 39b27a6aeef3a05b329ee6727a8b5705f533ede6..bc5190e70b0c81efe906742a7297f209fa684e03 100644 (file)
--- a/bacula/src/cats/postgresql.c
+++ b/bacula/src/cats/postgresql.c
@@ -7,8 +7,8 @@
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation plus additions
-   that are listed in the file LICENSE.
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
 
    This program is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -143,6 +143,12 @@ db_open_database(JCR *jcr, B_DB *mdb)
    int errstat;
    char buf[10], *port;
 
+#ifdef xxx
+   if (!PQisthreadsafe()) {
+      Jmsg(jcr, M_ABORT, 0, _("PostgreSQL configuration problem. "          
+           "PostgreSQL library is not thread safe. Connot continue.\n"));
+   }
+#endif
    P(mutex);
    if (mdb->connected) {
       V(mutex);
@@ -151,8 +157,9 @@ db_open_database(JCR *jcr, B_DB *mdb)
    mdb->connected = false;
 
    if ((errstat=rwl_init(&mdb->lock)) != 0) {
+      berrno be;
       Mmsg1(&mdb->errmsg, _("Unable to initialize DB lock. ERR=%s\n"),
-            strerror(errstat));
+            be.bstrerror(errstat));
       V(mutex);
       return 0;
    }
@@ -247,7 +254,6 @@ db_close_database(JCR *jcr, B_DB *mdb)
       if (mdb->db_socket) {
          free(mdb->db_socket);
       }
-      my_postgresql_free_result(mdb);
       free(mdb);
    }
    V(mutex);
@@ -334,16 +340,15 @@ POSTGRESQL_ROW my_postgresql_fetch_row(B_DB *mdb)
 
    Dmsg0(500, "my_postgresql_fetch_row start\n");
 
-   if (mdb->row_number == -1 || mdb->row == NULL) {
+   if (!mdb->row || mdb->row_size < mdb->num_fields) {
       Dmsg1(500, "we have need space of %d bytes\n", sizeof(char *) * mdb->num_fields);
 
-      if (mdb->row != NULL) {
+      if (mdb->row) {
          Dmsg0(500, "my_postgresql_fetch_row freeing space\n");
          free(mdb->row);
-         mdb->row = NULL;
       }
-
       mdb->row = (POSTGRESQL_ROW) malloc(sizeof(char *) * mdb->num_fields);
+      mdb->row_size = mdb->num_fields;
 
       // now reset the row_number now that we have the space allocated
       mdb->row_number = 0;
@@ -399,9 +404,14 @@ POSTGRESQL_FIELD * my_postgresql_fetch_field(B_DB *mdb)
    int     i;
 
    Dmsg0(500, "my_postgresql_fetch_field starts\n");
-   if (mdb->fields == NULL) {
+
+   if (!mdb->fields || mdb->fields_size < mdb->num_fields) {
+      if (mdb->fields) {
+         free(mdb->fields);
+      }
       Dmsg1(500, "allocating space for %d fields\n", mdb->num_fields);
       mdb->fields = (POSTGRESQL_FIELD *)malloc(sizeof(POSTGRESQL_FIELD) * mdb->num_fields);
+      mdb->fields_size = mdb->num_fields;
 
       for (i = 0; i < mdb->num_fields; i++) {
          Dmsg1(500, "filling field %d\n", i);
@@ -466,6 +476,7 @@ int my_postgresql_query(B_DB *mdb, const char *query)
       bmicrosleep(5, 0);
    }
    if (!mdb->result) {
+      Dmsg1(50, "Query failed: %s\n", query);
       goto bail_out;
    }
 
@@ -482,6 +493,7 @@ int my_postgresql_query(B_DB *mdb, const char *query)
 
       mdb->status = 0;                  /* succeed */
    } else {
+      Dmsg1(50, "Result status failed: %s\n", query);
       goto bail_out;
    }
 
@@ -498,6 +510,8 @@ bail_out:
 
 void my_postgresql_free_result(B_DB *mdb)
 {
+   
+   db_lock(mdb);
    if (mdb->result) {
       PQclear(mdb->result);
       mdb->result = NULL;
@@ -512,6 +526,7 @@ void my_postgresql_free_result(B_DB *mdb)
       free(mdb->fields);
       mdb->fields = NULL;
    }
+   db_unlock(mdb);
 }
 
 int my_postgresql_currval(B_DB *mdb, char *table_name)
@@ -549,9 +564,18 @@ int my_postgresql_currval(B_DB *mdb, char *table_name)
    bstrncat(sequence, "_seq", sizeof(sequence));
    bsnprintf(query, sizeof(query), "SELECT currval('%s')", sequence);
 
-// Mmsg(query, "SELECT currval('%s')", sequence);
    Dmsg1(500, "my_postgresql_currval invoked with '%s'\n", query);
-   result = PQexec(mdb->db, query);
+   for (int i=0; i < 10; i++) {
+      result = PQexec(mdb->db, query);
+      if (result) {
+         break;
+      }
+      bmicrosleep(5, 0);
+   }
+   if (!result) {
+      Dmsg1(50, "Query failed: %s\n", query);
+      goto bail_out;
+   }
 
    Dmsg0(500, "exec done");
 
@@ -560,9 +584,11 @@ int my_postgresql_currval(B_DB *mdb, char *table_name)
       id = atoi(PQgetvalue(result, 0, 0));
       Dmsg2(500, "got value '%s' which became %d\n", PQgetvalue(result, 0, 0), id);
    } else {
+      Dmsg1(50, "Result status failed: %s\n", query);
       Mmsg1(&mdb->errmsg, _("error fetching currval: %s\n"), PQerrorMessage(mdb->db));
    }
 
+bail_out:
    PQclear(result);
 
    return id;
@@ -570,6 +596,8 @@ int my_postgresql_currval(B_DB *mdb, char *table_name)
 
 int my_postgresql_batch_start(JCR *jcr, B_DB *mdb)
 {
+   char *query = "COPY batch FROM STDIN";
+
    Dmsg0(500, "my_postgresql_batch_start started\n");
 
    if (my_postgresql_query(mdb,
@@ -590,11 +618,20 @@ int my_postgresql_batch_start(JCR *jcr, B_DB *mdb)
    mdb->row_number   = -1;
    mdb->field_number = -1;
 
-   if (mdb->result != NULL) {
-      my_postgresql_free_result(mdb);
+   my_postgresql_free_result(mdb);
+
+   for (int i=0; i < 10; i++) {
+      mdb->result = PQexec(mdb->db, query);
+      if (mdb->result) {
+         break;
+      }
+      bmicrosleep(5, 0);
+   }
+   if (!mdb->result) {
+      Dmsg1(50, "Query failed: %s\n", query);
+      goto bail_out;
    }
 
-   mdb->result = PQexec(mdb->db, "COPY batch FROM STDIN");
    mdb->status = PQresultStatus(mdb->result);
    if (mdb->status == PGRES_COPY_IN) {
       // how many fields in the set?
@@ -602,13 +639,19 @@ int my_postgresql_batch_start(JCR *jcr, B_DB *mdb)
       mdb->num_rows   = 0;
       mdb->status = 1;
    } else {
-      Dmsg0(500, "we failed\n");
-      mdb->status = 0;
+      Dmsg1(50, "Result status failed: %s\n", query);
+      goto bail_out;
    }
 
    Dmsg0(500, "my_postgresql_batch_start finishing\n");
 
    return mdb->status;
+
+bail_out:
+   mdb->status = 0;
+   PQclear(mdb->result);
+   mdb->result = NULL;
+   return mdb->status;
 }
 
 /* set error to something to abort operation */