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
#ifdef HAVE_POSTGRESQL
#include "postgres_ext.h" /* needed for NAMEDATALEN */
+#include "pg_config_manual.h" /* get NAMEDATALEN on version 8.3 or later */
/* -----------------------------------------------------------------------
*
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);
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;
}
}
sql_query(mdb, "SET datestyle TO 'ISO, YMD'");
+
+ /* tell PostgreSQL we are using standard conforming strings
+ and avoid warnings such as:
+ WARNING: nonstandard use of \\ in a string literal
+ */
+ sql_query(mdb, "set standard_conforming_strings=on");
V(mutex);
return 1;
if (mdb->db_socket) {
free(mdb->db_socket);
}
- my_postgresql_free_result(mdb);
free(mdb);
}
V(mutex);
}
+void db_thread_cleanup()
+{ }
+
/*
* Return the next unique index (auto-increment) for
* the given table. Return NULL on error.
* the escaped output.
*/
void
-db_escape_string(char *snew, char *old, int len)
+db_escape_string(JCR *jcr, B_DB *mdb, char *snew, char *old, int len)
{
- PQescapeString(snew, old, len);
+ int error;
+
+ PQescapeStringConn(mdb->db, snew, old, len, &error);
+ if (error) {
+ Jmsg(jcr, M_FATAL, 0, _("PQescapeStringConn returned non-zero.\n"));
+ /* error on encoding, probably invalid multibyte encoding in the source string
+ see PQescapeStringConn documentation for details. */
+ Dmsg0(500, "PQescapeStringConn failed\n");
+ }
}
/*
* Submit a general SQL command (cmd), and for each row returned,
* the sqlite_handler is called with the ctx.
*/
-int db_sql_query(B_DB *mdb, const char *query, DB_RESULT_HANDLER *result_handler, void *ctx)
+bool db_sql_query(B_DB *mdb, const char *query, DB_RESULT_HANDLER *result_handler, void *ctx)
{
SQL_ROW row;
Mmsg(mdb->errmsg, _("Query failed: %s: ERR=%s\n"), query, sql_strerror(mdb));
db_unlock(mdb);
Dmsg0(500, "db_sql_query failed\n");
- return 0;
+ return false;
}
Dmsg0(500, "db_sql_query succeeded. checking handler\n");
Dmsg0(500, "db_sql_query finished\n");
- return 1;
+ return true;
}
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) {
+ int num_fields = 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);
+ num_fields += 20; /* add a bit extra */
+ mdb->row = (POSTGRESQL_ROW)malloc(sizeof(char *) * num_fields);
+ mdb->row_size = num_fields;
// now reset the row_number now that we have the space allocated
mdb->row_number = 0;
Dmsg2(500, "my_postgresql_fetch_row row number '%d' is NOT acceptable (0..%d)\n", mdb->row_number, mdb->num_rows);
}
- Dmsg1(500, "my_postgresql_fetch_row finishes returning %x\n", row);
+ Dmsg1(500, "my_postgresql_fetch_row finishes returning %p\n", row);
return row;
}
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);
/*
* Note, if this routine returns 1 (failure), Bacula expects
* that no result has been stored.
+ * This is where QUERY_DB comes with Postgresql.
+ *
+ * Returns: 0 on success
+ * 1 on failure
+ *
*/
-int my_postgresql_query(B_DB *mdb, const char *query) {
+int my_postgresql_query(B_DB *mdb, const char *query)
+{
Dmsg0(500, "my_postgresql_query started\n");
// We are starting a new query. reset everything.
mdb->num_rows = -1;
mdb->row_number = -1;
mdb->field_number = -1;
- if (mdb->result != NULL) {
+ if (mdb->result) {
PQclear(mdb->result); /* hmm, someone forgot to free?? */
+ mdb->result = NULL;
}
Dmsg1(500, "my_postgresql_query starts with '%s'\n", query);
- mdb->result = PQexec(mdb->db, query);
+
+ 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->status = PQresultStatus(mdb->result);
if (mdb->status == PGRES_TUPLES_OK || mdb->status == PGRES_COMMAND_OK) {
Dmsg1(500, "we have a result\n", query);
// how many fields in the set?
- mdb->num_fields = (int) PQnfields(mdb->result);
+ mdb->num_fields = (int)PQnfields(mdb->result);
Dmsg1(500, "we have %d fields\n", mdb->num_fields);
- mdb->num_rows = PQntuples(mdb->result);
+ mdb->num_rows = PQntuples(mdb->result);
Dmsg1(500, "we have %d rows\n", mdb->num_rows);
- mdb->status = 0;
+ mdb->status = 0; /* succeed */
} else {
- Dmsg1(500, "we failed\n", query);
- mdb->status = 1;
+ Dmsg1(50, "Result status failed: %s\n", query);
+ goto bail_out;
}
Dmsg0(500, "my_postgresql_query finishing\n");
+ return mdb->status;
+bail_out:
+ Dmsg1(500, "we failed\n", query);
+ PQclear(mdb->result);
+ mdb->result = NULL;
+ mdb->status = 1; /* failed */
return mdb->status;
}
void my_postgresql_free_result(B_DB *mdb)
{
+
+ db_lock(mdb);
if (mdb->result) {
PQclear(mdb->result);
mdb->result = NULL;
free(mdb->fields);
mdb->fields = NULL;
}
+ db_unlock(mdb);
}
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");
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;
}
+#ifdef HAVE_BATCH_FILE_INSERT
+
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,
- " CREATE TEMPORARY TABLE batch "
- " (fileindex int, "
- " jobid int, "
- " path varchar, "
- " name varchar, "
- " lstat varchar, "
- " md5 varchar)") == 1)
+ "CREATE TEMPORARY TABLE batch ("
+ "fileindex int,"
+ "jobid int,"
+ "path varchar,"
+ "name varchar,"
+ "lstat varchar,"
+ "md5 varchar)") == 1)
{
Dmsg0(500, "my_postgresql_batch_start failed\n");
return 1;
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?
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:
+ Mmsg1(&mdb->errmsg, _("error starting batch mode: %s"), PQerrorMessage(mdb->db));
+ mdb->status = 0;
+ PQclear(mdb->result);
+ mdb->result = NULL;
+ return mdb->status;
}
/* set error to something to abort operation */
if (res <= 0) {
Dmsg0(500, "we failed\n");
mdb->status = 0;
- Mmsg1(&mdb->errmsg, _("error ending batch mode: %s\n"), PQerrorMessage(mdb->db));
+ Mmsg1(&mdb->errmsg, _("error ending batch mode: %s"), PQerrorMessage(mdb->db));
}
Dmsg0(500, "my_postgresql_batch_end finishing\n");
if (res <= 0) {
Dmsg0(500, "we failed\n");
mdb->status = 0;
- Mmsg1(&mdb->errmsg, _("error ending batch mode: %s\n"), PQerrorMessage(mdb->db));
+ Mmsg1(&mdb->errmsg, _("error ending batch mode: %s"), PQerrorMessage(mdb->db));
}
Dmsg0(500, "my_postgresql_batch_insert finishing\n");
return mdb->status;
}
+#endif /* HAVE_BATCH_FILE_INSERT */
+
/*
* Escape strings so that PostgreSQL is happy on COPY
*
return dest;
}
-char *my_pg_batch_lock_path_query = "BEGIN; LOCK TABLE Path IN SHARE ROW EXCLUSIVE MODE";
+#ifdef HAVE_BATCH_FILE_INSERT
+const char *my_pg_batch_lock_path_query =
+ "BEGIN; LOCK TABLE Path IN SHARE ROW EXCLUSIVE MODE";
+
+const char *my_pg_batch_lock_filename_query =
+ "BEGIN; LOCK TABLE Filename IN SHARE ROW EXCLUSIVE MODE";
-char *my_pg_batch_lock_filename_query = "BEGIN; LOCK TABLE Filename IN SHARE ROW EXCLUSIVE MODE";
+const char *my_pg_batch_unlock_tables_query = "COMMIT";
-char *my_pg_batch_unlock_tables_query = "COMMIT";
+const char *my_pg_batch_fill_path_query =
+ "INSERT INTO Path (Path) "
+ "SELECT a.Path FROM "
+ "(SELECT DISTINCT Path FROM batch) AS a "
+ "WHERE NOT EXISTS (SELECT Path FROM Path WHERE Path = a.Path) ";
-char *my_pg_batch_fill_path_query = "INSERT INTO Path (Path) "
- " SELECT a.Path FROM "
- " (SELECT DISTINCT Path FROM batch) AS a "
- " WHERE NOT EXISTS (SELECT Path FROM Path WHERE Path = a.Path) ";
+const char *my_pg_batch_fill_filename_query =
+ "INSERT INTO Filename (Name) "
+ "SELECT a.Name FROM "
+ "(SELECT DISTINCT Name FROM batch) as a "
+ "WHERE NOT EXISTS "
+ "(SELECT Name FROM Filename WHERE Name = a.Name)";
+#endif /* HAVE_BATCH_FILE_INSERT */
-char *my_pg_batch_fill_filename_query = "INSERT INTO Filename (Name) "
- " SELECT a.Name FROM "
- " (SELECT DISTINCT Name FROM batch) as a "
- " WHERE NOT EXISTS "
- " (SELECT Name FROM Filename WHERE Name = a.Name)";
#endif /* HAVE_POSTGRESQL */
projects / bacula / bacula / blobdiff