X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=bacula%2Fsrc%2Fcats%2Fsql.c;h=56b9ccaf0421b7395bf77d3ef953f4d22e671403;hb=85f8d20ff16a2bce53a64ccabaf23ecde3caf507;hp=e7b09f611507dd6566736b2ca6a71d518ee6e298;hpb=da8584df92d56dd3cbf3c9a7563b22d8335ba219;p=bacula%2Fbacula

diff --git a/bacula/src/cats/sql.c b/bacula/src/cats/sql.c
index e7b09f6115..56b9ccaf04 100644
--- a/bacula/src/cats/sql.c
+++ b/bacula/src/cats/sql.c
@@ -1,50 +1,112 @@
 /*
- * Bacula Catalog Database interface routines
- *
- *     Almost generic set of SQL database interface routines
- *	(with a little more work)
- *
- *    Kern Sibbald, March 2000
- *
- *    Version $Id$
- */
+   Bacula® - The Network Backup Solution
 
-/*
-   Copyright (C) 2000-2005 Kern Sibbald
+   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   The main author of Bacula is Kern Sibbald, with contributions from
+   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 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
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
+/*
+ * Bacula Catalog Database interface routines
+ *
+ *     Almost generic set of SQL database interface routines
+ *      (with a little more work)
+ *     SQL engine specific routines are in mysql.c, postgresql.c,
+ *       sqlite.c, ...
+ *
+ *    Kern Sibbald, March 2000
+ *
+ *    Version $Id$
  */
 
 /* The following is necessary so that we do not include
  * the dummy external definition of B_DB.
  */
-#define __SQL_C 		      /* indicate that this is sql.c */
+#define __SQL_C                       /* indicate that this is sql.c */
 
 #include "bacula.h"
 #include "cats.h"
 
-#if    HAVE_SQLITE3 || HAVE_MYSQL || HAVE_SQLITE || HAVE_POSTGRESQL
+#if    HAVE_SQLITE3 || HAVE_MYSQL || HAVE_SQLITE || HAVE_POSTGRESQL || HAVE_DBI
 
 uint32_t bacula_db_version = 0;
 
+int db_type = -1;
+
 /* Forward referenced subroutines */
 void print_dashes(B_DB *mdb);
 void print_result(B_DB *mdb);
 
+B_DB *db_init(JCR *jcr, const char *db_driver, const char *db_name, const char *db_user, 
+              const char *db_password, const char *db_address, int db_port, 
+              const char *db_socket, int mult_db_connections)
+{              
+#ifdef HAVE_DBI
+   char *p;
+   if (!db_driver) {
+      Jmsg0(jcr, M_ABORT, 0, _("Driver type not specified in Catalog resource.\n"));
+   }
+   if (strlen(db_driver) < 5 || db_driver[3] != ':' || strncasecmp(db_driver, "dbi", 3) != 0) {
+      Jmsg0(jcr, M_ABORT, 0, _("Invalid driver type, must be \"dbi:<type>\"\n"));
+   }
+   p = (char *)(db_driver + 4);      
+   if (strcasecmp(p, "mysql") == 0) {
+      db_type = SQL_TYPE_MYSQL;
+   } else if (strcasecmp(p, "postgresql") == 0) {
+      db_type = SQL_TYPE_POSTGRESQL;
+   } else if (strcasecmp(p, "sqlite") == 0) {
+      db_type = SQL_TYPE_SQLITE;
+   } else {
+      Jmsg1(jcr, M_ABORT, 0, _("Unknown database type: %s\n"), p);
+   }
+#elif HAVE_MYSQL
+   db_type = SQL_TYPE_MYSQL;
+#elif HAVE_POSTGRESQL
+   db_type = SQL_TYPE_POSTGRESQL;
+#elif HAVE_SQLITE
+   db_type = SQL_TYPE_SQLITE;
+#elif HAVE_SQLITE3
+   db_type = SQL_TYPE_SQLITE;
+#endif
+
+   return db_init_database(jcr, db_name, db_user, db_password, db_address,
+             db_port, db_socket, mult_db_connections);
+}
+
+dbid_list::dbid_list() 
+{
+   memset(this, 0, sizeof(dbid_list));
+   max_ids = 1000;
+   DBId = (DBId_t *)malloc(max_ids * sizeof(DBId_t));
+   num_ids = num_seen = tot_ids = 0;
+   PurgedFiles = NULL;
+}
+
+dbid_list::~dbid_list() 
+{ 
+   free(DBId);
+}
+
+
 /*
  * Called here to retrieve an integer from the database
  */
@@ -56,7 +118,7 @@ static int int_handler(void *ctx, int num_fields, char **row)
 
    if (row[0]) {
       Dmsg1(800, "int_handler finds '%s'\n", row[0]);
-      *val = atoi(row[0]);
+      *val = str_to_int64(row[0]);
    } else {
       Dmsg0(800, "int_handler finds zero\n");
       *val = 0;
@@ -65,6 +127,21 @@ static int int_handler(void *ctx, int num_fields, char **row)
    return 0;
 }
 
+/*
+ * Called here to retrieve a 32/64 bit integer from the database.
+ *   The returned integer will be extended to 64 bit.
+ */
+int db_int64_handler(void *ctx, int num_fields, char **row)
+{
+   db_int64_ctx *lctx = (db_int64_ctx *)ctx;
+
+   if (row[0]) {
+      lctx->value = str_to_int64(row[0]);
+      lctx->count++;
+   }
+   return 0;
+}
+
 
 
 /* NOTE!!! The following routines expect that the
@@ -72,19 +149,22 @@ static int int_handler(void *ctx, int num_fields, char **row)
  */
 
 /* Check that the tables correspond to the version we want */
-int check_tables_version(JCR *jcr, B_DB *mdb)
+bool check_tables_version(JCR *jcr, B_DB *mdb)
 {
    const char *query = "SELECT VersionId FROM Version";
 
    bacula_db_version = 0;
-   db_sql_query(mdb, query, int_handler, (void *)&bacula_db_version);
+   if (!db_sql_query(mdb, query, int_handler, (void *)&bacula_db_version)) {
+      Jmsg(jcr, M_FATAL, 0, "%s", mdb->errmsg);
+      return false;
+   }
    if (bacula_db_version != BDB_VERSION) {
       Mmsg(mdb->errmsg, "Version error for database \"%s\". Wanted %d, got %d\n",
-	  mdb->db_name, BDB_VERSION, bacula_db_version);
+          mdb->db_name, BDB_VERSION, bacula_db_version);
       Jmsg(jcr, M_FATAL, 0, "%s", mdb->errmsg);
-      return 0;
+      return false;
    }
-   return 1;
+   return true;
 }
 
 /* Utility routine for queries. The database MUST be locked before calling here. */
@@ -92,6 +172,8 @@ int
 QueryDB(const char *file, int line, JCR *jcr, B_DB *mdb, char *cmd)
 {
    int status;
+
+   sql_free_result(mdb);
    if ((status=sql_query(mdb, cmd)) != 0) {
       m_msg(file, line, &mdb->errmsg, _("query %s failed:\n%s\n"), cmd, sql_strerror(mdb));
       j_msg(file, line, jcr, M_FATAL, 0, "%s", mdb->errmsg);
@@ -109,7 +191,7 @@ QueryDB(const char *file, int line, JCR *jcr, B_DB *mdb, char *cmd)
 /*
  * Utility routine to do inserts
  * Returns: 0 on failure
- *	    1 on success
+ *          1 on success
  */
 int
 InsertDB(const char *file, int line, JCR *jcr, B_DB *mdb, char *cmd)
@@ -130,7 +212,7 @@ InsertDB(const char *file, int line, JCR *jcr, B_DB *mdb, char *cmd)
    if (mdb->num_rows != 1) {
       char ed1[30];
       m_msg(file, line, &mdb->errmsg, _("Insertion problem: affected_rows=%s\n"),
-	 edit_uint64(mdb->num_rows, ed1));
+         edit_uint64(mdb->num_rows, ed1));
       if (verbose) {
          j_msg(file, line, jcr, M_INFO, 0, "%s\n", cmd);
       }
@@ -142,7 +224,7 @@ InsertDB(const char *file, int line, JCR *jcr, B_DB *mdb, char *cmd)
 
 /* Utility routine for updates.
  *  Returns: 0 on failure
- *	     1 on success
+ *           1 on success
  */
 int
 UpdateDB(const char *file, int line, JCR *jcr, B_DB *mdb, char *cmd)
@@ -159,8 +241,8 @@ UpdateDB(const char *file, int line, JCR *jcr, B_DB *mdb, char *cmd)
    mdb->num_rows = sql_affected_rows(mdb);
    if (mdb->num_rows < 1) {
       char ed1[30];
-      m_msg(file, line, &mdb->errmsg, _("Update problem: affected_rows=%s\n"),
-	 edit_uint64(mdb->num_rows, ed1));
+      m_msg(file, line, &mdb->errmsg, _("Update failed: affected_rows=%s for %s\n"),
+         edit_uint64(mdb->num_rows, ed1), cmd);
       if (verbose) {
 //       j_msg(file, line, jcr, M_INFO, 0, "%s\n", cmd);
       }
@@ -173,7 +255,7 @@ UpdateDB(const char *file, int line, JCR *jcr, B_DB *mdb, char *cmd)
 /* Utility routine for deletes
  *
  * Returns: -1 on error
- *	     n number of rows affected
+ *           n number of rows affected
  */
 int
 DeleteDB(const char *file, int line, JCR *jcr, B_DB *mdb, char *cmd)
@@ -197,7 +279,7 @@ DeleteDB(const char *file, int line, JCR *jcr, B_DB *mdb, char *cmd)
  *  No locking done
  *
  * Returns: -1 on failure
- *	    count on success
+ *          count on success
  */
 int get_sql_record_max(JCR *jcr, B_DB *mdb)
 {
@@ -207,9 +289,9 @@ int get_sql_record_max(JCR *jcr, B_DB *mdb)
    if (QUERY_DB(jcr, mdb, mdb->cmd)) {
       if ((row = sql_fetch_row(mdb)) == NULL) {
          Mmsg1(&mdb->errmsg, _("error fetching row: %s\n"), sql_strerror(mdb));
-	 stat = -1;
+         stat = -1;
       } else {
-	 stat = atoi(row[0]);
+         stat = str_to_int64(row[0]);
       }
       sql_free_result(mdb);
    } else {
@@ -237,8 +319,8 @@ void _db_lock(const char *file, int line, B_DB *mdb)
    int errstat;
    if ((errstat=rwl_writelock(&mdb->lock)) != 0) {
       berrno be;
-      e_msg(file, line, M_ABORT, 0, "rwl_writelock failure. ERR=%s\n",
-	   be.strerror(errstat));
+      e_msg(file, line, M_FATAL, 0, "rwl_writelock failure. stat=%d: ERR=%s\n",
+           errstat, be.bstrerror(errstat));
    }
 }
 
@@ -252,8 +334,8 @@ void _db_unlock(const char *file, int line, B_DB *mdb)
    int errstat;
    if ((errstat=rwl_writeunlock(&mdb->lock)) != 0) {
       berrno be;
-      e_msg(file, line, M_ABORT, 0, "rwl_writeunlock failure. ERR=%s\n",
-	   be.strerror(errstat));
+      e_msg(file, line, M_FATAL, 0, "rwl_writeunlock failure. stat=%d: ERR=%s\n",
+           errstat, be.bstrerror(errstat));
    }
 }
 
@@ -264,6 +346,13 @@ void _db_unlock(const char *file, int line, B_DB *mdb)
  */
 void db_start_transaction(JCR *jcr, B_DB *mdb)
 {
+   if (!jcr->attr) {
+      jcr->attr = get_pool_memory(PM_FNAME);
+   }
+   if (!jcr->ar) {
+      jcr->ar = (ATTR_DBR *)malloc(sizeof(ATTR_DBR));
+   }
+
 #ifdef HAVE_SQLITE
    if (!mdb->allow_transactions) {
       return;
@@ -307,11 +396,20 @@ void db_end_transaction(JCR *jcr, B_DB *mdb)
 {
    /*
     * This can be called during thread cleanup and
-    *	the db may already be closed.  So simply return.
+    *   the db may already be closed.  So simply return.
     */
    if (!mdb) {
       return;
    }
+
+   if (jcr && jcr->cached_attribute) {
+      Dmsg0(400, "Flush last cached attribute.\n");
+      if (!db_create_file_attributes_record(jcr, mdb, jcr->ar)) {
+         Jmsg1(jcr, M_FATAL, 0, _("Attribute create error. %s"), db_strerror(jcr->db));
+      }
+      jcr->cached_attribute = false;
+   }
+
 #ifdef HAVE_SQLITE
    if (!mdb->allow_transactions) {
       return;
@@ -357,13 +455,13 @@ void split_path_and_file(JCR *jcr, B_DB *mdb, const char *fname)
     * must be a path name (e.g. c:).
     */
    for (p=f=fname; *p; p++) {
-      if (*p == '/') {
-	 f = p; 		      /* set pos of last slash */
+      if (IsPathSeparator(*p)) {
+         f = p;                       /* set pos of last slash */
       }
    }
-   if (*f == '/') {                   /* did we find a slash? */
-      f++;			      /* yes, point to filename */
-   } else {			      /* no, whole thing must be path name */
+   if (IsPathSeparator(*f)) {                   /* did we find a slash? */
+      f++;                            /* yes, point to filename */
+   } else {                           /* no, whole thing must be path name */
       f = p;
    }
 
@@ -375,7 +473,7 @@ void split_path_and_file(JCR *jcr, B_DB *mdb, const char *fname)
    mdb->fnl = p - f;
    if (mdb->fnl > 0) {
       mdb->fname = check_pool_memory_size(mdb->fname, mdb->fnl+1);
-      memcpy(mdb->fname, f, mdb->fnl);	  /* copy filename */
+      memcpy(mdb->fname, f, mdb->fnl);    /* copy filename */
       mdb->fname[mdb->fnl] = 0;
    } else {
       mdb->fname[0] = 0;
@@ -442,22 +540,22 @@ list_result(JCR *jcr, B_DB *mdb, DB_LIST_HANDLER *send, void *ctx, e_list_type t
    for (i = 0; i < sql_num_fields(mdb); i++) {
       Dmsg1(800, "list_result processing field %d\n", i);
       field = sql_fetch_field(mdb);
-      col_len = strlen(field->name);
+      col_len = cstrlen(field->name);
       if (type == VERT_LIST) {
-	 if (col_len > max_len) {
-	    max_len = col_len;
-	 }
+         if (col_len > max_len) {
+            max_len = col_len;
+         }
       } else {
-	 if (IS_NUM(field->type) && (int)field->max_length > 0) { /* fixup for commas */
-	    field->max_length += (field->max_length - 1) / 3;
-	 }
-	 if (col_len < (int)field->max_length) {
-	    col_len = field->max_length;
-	 }
-	 if (col_len < 4 && !IS_NOT_NULL(field->flags)) {
+         if (IS_NUM(field->type) && (int)field->max_length > 0) { /* fixup for commas */
+            field->max_length += (field->max_length - 1) / 3;
+         }
+         if (col_len < (int)field->max_length) {
+            col_len = field->max_length;
+         }
+         if (col_len < 4 && !IS_NOT_NULL(field->flags)) {
             col_len = 4;                 /* 4 = length of the word "NULL" */
-	 }
-	 field->max_length = col_len;	 /* reset column info */
+         }
+         field->max_length = col_len;    /* reset column info */
       }
    }
 
@@ -484,16 +582,16 @@ list_result(JCR *jcr, B_DB *mdb, DB_LIST_HANDLER *send, void *ctx, e_list_type t
       sql_field_seek(mdb, 0);
       send(ctx, "|");
       for (i = 0; i < sql_num_fields(mdb); i++) {
-	 field = sql_fetch_field(mdb);
-	 if (row[i] == NULL) {
+         field = sql_fetch_field(mdb);
+         if (row[i] == NULL) {
             bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, "NULL");
-	 } else if (IS_NUM(field->type) && !jcr->gui && is_an_integer(row[i])) {
+         } else if (IS_NUM(field->type) && !jcr->gui && is_an_integer(row[i])) {
             bsnprintf(buf, sizeof(buf), " %*s |", (int)field->max_length,
-		      add_commas(row[i], ewc));
-	 } else {
+                      add_commas(row[i], ewc));
+         } else {
             bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, row[i]);
-	 }
-	 send(ctx, buf);
+         }
+         send(ctx, buf);
       }
       send(ctx, "\n");
    }
@@ -506,16 +604,16 @@ vertical_list:
    while ((row = sql_fetch_row(mdb)) != NULL) {
       sql_field_seek(mdb, 0);
       for (i = 0; i < sql_num_fields(mdb); i++) {
-	 field = sql_fetch_field(mdb);
-	 if (row[i] == NULL) {
+         field = sql_fetch_field(mdb);
+         if (row[i] == NULL) {
             bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, "NULL");
-	 } else if (IS_NUM(field->type) && !jcr->gui && is_an_integer(row[i])) {
+         } else if (IS_NUM(field->type) && !jcr->gui && is_an_integer(row[i])) {
             bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name,
-		add_commas(row[i], ewc));
-	 } else {
+                add_commas(row[i], ewc));
+         } else {
             bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, row[i]);
-	 }
-	 send(ctx, buf);
+         }
+         send(ctx, buf);
       }
       send(ctx, "\n");
    }