*
* Version $Id$
*/
-
/*
- Copyright (C) 2000-2003 Kern Sibbald and John Walker
+ Copyright (C) 2000-2005 Kern Sibbald
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.
+ modify it under the terms of the GNU General Public License
+ version 2 as amended with additional clauses defined in the
+ file LICENSE in the main source directory.
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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ the file LICENSE for additional 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.
+ */
+/*
+ Here is how database versions work.
+
+ While I am working on a new release with database changes, the
+ update scripts are in the src/cats directory under the names
+ update_xxx_tables.in. Most of the time, I make database updates
+ in one go and immediately update the version, but not always. If
+ there are going to be several updates as is the case with version
+ 1.37, then I will often forgo changing the version until the last
+ update otherwise I will end up with too many versions and a lot
+ of confusion.
+
+ When I am pretty sure there will be no more updates, I will
+ change the version from 8 to 9 (in the present case), and when I
+ am 100% sure there will be no more changes, the update script
+ will be copied to the updatedb directory with the correct name
+ (in the present case 8 to 9).
+
+ Now, in principle, each of the different DB implementations
+ can have a different version, but in practice they are all
+ the same (simplifies things). The exception is the internal
+ database, which is no longer used, and hence, no longer changes.
*/
+
#ifndef __SQL_H_
#define __SQL_H_ 1
-typedef void (DB_LIST_HANDLER)(void *, char *);
+typedef void (DB_LIST_HANDLER)(void *, const char *);
typedef int (DB_RESULT_HANDLER)(void *, int, char **);
#define db_lock(mdb) _db_lock(__FILE__, __LINE__, mdb)
#ifdef HAVE_SQLITE
-#define BDB_VERSION 7
+#define BDB_VERSION 9
#include <sqlite.h>
typedef struct s_sql_field {
char *name; /* name of column */
- uint32_t length; /* length */
- uint32_t max_length; /* max length */
+ int length; /* length */
+ int max_length; /* max length */
uint32_t type; /* type */
uint32_t flags; /* flags */
} SQL_FIELD;
* subroutines.
* S Q L I T E
*/
-typedef struct s_db {
+struct B_DB {
BQUEUE bq; /* queue control */
brwlock_t lock; /* transaction lock */
struct sqlite *db;
int ncolumn; /* ncolum returned from sqlite */
int num_rows; /* used by code */
int row; /* seek row */
- int have_insert_id; /* do not have insert id */
- int fields_defined; /* set when fields defined */
int field; /* seek field */
SQL_FIELD **fields; /* defined fields */
int ref_count;
char *db_socket; /* socket for local access */
char *db_password;
int db_port; /* port for host name address */
- int connected;
+ bool connected; /* connection made to db */
+ bool have_insert_id; /* do not have insert id */
+ bool fields_defined; /* set when fields defined */
char *sqlite_errmsg; /* error message returned by sqlite */
POOLMEM *errmsg; /* nicely edited error message */
POOLMEM *cmd; /* SQL command string */
POOLMEM *cached_path; /* cached path name */
int cached_path_len; /* length of cached path */
uint32_t cached_path_id; /* cached path id */
- int transaction; /* transaction started */
+ bool allow_transactions; /* transactions allowed */
+ bool transaction; /* transaction started */
int changes; /* changes during transaction */
POOLMEM *fname; /* Filename only */
POOLMEM *path; /* Path only */
POOLMEM *esc_name; /* Escaped file/path name */
int fnl; /* file name length */
int pnl; /* path name length */
-} B_DB;
+};
-/*
- * "Generic" names for easier conversion
+/*
+ * "Generic" names for easier conversion
*
* S Q L I T E
*/
#define sql_free_result(x) my_sqlite_free_table(x)
#define sql_fetch_row(x) my_sqlite_fetch_row(x)
#define sql_query(x, y) my_sqlite_query((x), (y))
-#define sql_close(x) sqlite_close((x)->db)
+#ifdef HAVE_SQLITE3
+#define sql_insert_id(x,y) sqlite3_last_insert_rowid((x)->db)
+#define sql_close(x) sqlite3_close((x)->db)
+#else
+#define sql_insert_id(x,y) sqlite_last_insert_rowid((x)->db)
+#define sql_close(x) sqlite_close((x)->db)
+#endif
+#define sql_strerror(x) (x)->sqlite_errmsg?(x)->sqlite_errmsg:"unknown"
+#define sql_num_rows(x) (x)->nrow
+#define sql_data_seek(x, i) (x)->row = (i)
+#define sql_affected_rows(x) 1
+#define sql_field_seek(x, y) my_sqlite_field_seek((x), (y))
+#define sql_fetch_field(x) my_sqlite_fetch_field(x)
+#define sql_num_fields(x) ((x)->ncolumn)
+#define SQL_ROW char**
+
+
+
+/* In cats/sqlite.c */
+void my_sqlite_free_table(B_DB *mdb);
+SQL_ROW my_sqlite_fetch_row(B_DB *mdb);
+int my_sqlite_query(B_DB *mdb, char *cmd);
+void my_sqlite_field_seek(B_DB *mdb, int field);
+SQL_FIELD *my_sqlite_fetch_field(B_DB *mdb);
+
+
+#else
+
+/* S Q L I T E 3 */
+
+
+#ifdef HAVE_SQLITE3
+
+
+#define BDB_VERSION 9
+
+#include <sqlite3.h>
+
+/* Define opaque structure for sqlite */
+struct sqlite3 {
+ char dummy;
+};
+
+#define IS_NUM(x) ((x) == 1)
+#define IS_NOT_NULL(x) ((x) == 1)
+
+typedef struct s_sql_field {
+ char *name; /* name of column */
+ int length; /* length */
+ int max_length; /* max length */
+ uint32_t type; /* type */
+ uint32_t flags; /* flags */
+} SQL_FIELD;
+
+/*
+ * This is the "real" definition that should only be
+ * used inside sql.c and associated database interface
+ * subroutines.
+ * S Q L I T E
+ */
+struct B_DB {
+ BQUEUE bq; /* queue control */
+ brwlock_t lock; /* transaction lock */
+ struct sqlite3 *db;
+ char **result;
+ int status;
+ int nrow; /* nrow returned from sqlite */
+ int ncolumn; /* ncolum returned from sqlite */
+ int num_rows; /* used by code */
+ int row; /* seek row */
+ int field; /* seek field */
+ SQL_FIELD **fields; /* defined fields */
+ int ref_count;
+ char *db_name;
+ char *db_user;
+ char *db_address; /* host name address */
+ char *db_socket; /* socket for local access */
+ char *db_password;
+ int db_port; /* port for host name address */
+ bool connected; /* connection made to db */
+ bool have_insert_id; /* do not have insert id */
+ bool fields_defined; /* set when fields defined */
+ char *sqlite_errmsg; /* error message returned by sqlite */
+ POOLMEM *errmsg; /* nicely edited error message */
+ POOLMEM *cmd; /* SQL command string */
+ POOLMEM *cached_path; /* cached path name */
+ int cached_path_len; /* length of cached path */
+ uint32_t cached_path_id; /* cached path id */
+ bool allow_transactions; /* transactions allowed */
+ bool transaction; /* transaction started */
+ int changes; /* changes during transaction */
+ POOLMEM *fname; /* Filename only */
+ POOLMEM *path; /* Path only */
+ POOLMEM *esc_name; /* Escaped file/path name */
+ int fnl; /* file name length */
+ int pnl; /* path name length */
+};
+
+/*
+ * Conversion of sqlite 2 names to sqlite3
+ */
+#define sqlite_last_insert_rowid sqlite3_last_insert_rowid
+#define sqlite_open sqlite3_open
+#define sqlite_close sqlite3_close
+#define sqlite_result sqlite3_result
+#define sqlite_exec sqlite3_exec
+#define sqlite_get_table sqlite3_get_table
+#define sqlite_free_table sqlite3_free_table
+
+
+/*
+ * "Generic" names for easier conversion
+ *
+ * S Q L I T E 3
+ */
+#define sql_store_result(x) (x)->result
+#define sql_free_result(x) my_sqlite_free_table(x)
+#define sql_fetch_row(x) my_sqlite_fetch_row(x)
+#define sql_query(x, y) my_sqlite_query((x), (y))
+#ifdef HAVE_SQLITE3
+#define sql_insert_id(x,y) sqlite3_last_insert_rowid((x)->db)
+#define sql_close(x) sqlite3_close((x)->db)
+#else
+#define sql_insert_id(x,y) sqlite_last_insert_rowid((x)->db)
+#define sql_close(x) sqlite_close((x)->db)
+#endif
#define sql_strerror(x) (x)->sqlite_errmsg?(x)->sqlite_errmsg:"unknown"
#define sql_num_rows(x) (x)->nrow
#define sql_data_seek(x, i) (x)->row = (i)
#define sql_affected_rows(x) 1
-#define sql_insert_id(x) sqlite_last_insert_rowid((x)->db)
#define sql_field_seek(x, y) my_sqlite_field_seek((x), (y))
#define sql_fetch_field(x) my_sqlite_fetch_field(x)
-#define sql_num_fields(x) (unsigned)((x)->ncolumn)
-#define SQL_ROW char**
+#define sql_num_fields(x) ((x)->ncolumn)
+#define SQL_ROW char**
/* In cats/sqlite.c */
-extern int my_sqlite_query(B_DB *mdb, char *cmd);
-extern SQL_ROW my_sqlite_fetch_row(B_DB *mdb);
-extern void my_sqlite_free_table(B_DB *mdb);
+void my_sqlite_free_table(B_DB *mdb);
+SQL_ROW my_sqlite_fetch_row(B_DB *mdb);
+int my_sqlite_query(B_DB *mdb, char *cmd);
+void my_sqlite_field_seek(B_DB *mdb, int field);
+SQL_FIELD *my_sqlite_fetch_field(B_DB *mdb);
+
#else
#ifdef HAVE_MYSQL
-#define BDB_VERSION 7
+#define BDB_VERSION 9
#include <mysql.h>
*
* M Y S Q L
*/
-typedef struct s_db {
+struct B_DB {
BQUEUE bq; /* queue control */
brwlock_t lock; /* transaction lock */
MYSQL mysql;
char *db_socket; /* socket for local access */
int db_port; /* port of host address */
int have_insert_id; /* do have insert_id() */
- int connected;
+ bool connected;
POOLMEM *errmsg; /* nicely edited error message */
POOLMEM *cmd; /* SQL command string */
POOLMEM *cached_path;
POOLMEM *esc_name; /* Escaped file/path name */
int fnl; /* file name length */
int pnl; /* path name length */
-} B_DB;
+};
#define DB_STATUS int
/* "Generic" names for easier conversion */
#define sql_store_result(x) mysql_store_result((x)->db)
+#define sql_use_result(x) mysql_use_result((x)->db)
#define sql_free_result(x) mysql_free_result((x)->result)
#define sql_fetch_row(x) mysql_fetch_row((x)->result)
#define sql_query(x, y) mysql_query((x)->db, (y))
-#define sql_close(x) mysql_close((x)->db)
+#define sql_close(x) mysql_close((x)->db)
#define sql_strerror(x) mysql_error((x)->db)
#define sql_num_rows(x) mysql_num_rows((x)->result)
#define sql_data_seek(x, i) mysql_data_seek((x)->result, (i))
#define sql_affected_rows(x) mysql_affected_rows((x)->db)
-#define sql_insert_id(x) mysql_insert_id((x)->db)
+#define sql_insert_id(x,y) mysql_insert_id((x)->db)
#define sql_field_seek(x, y) mysql_field_seek((x)->result, (y))
#define sql_fetch_field(x) mysql_fetch_field((x)->result)
-#define sql_num_fields(x) mysql_num_fields((x)->result)
+#define sql_num_fields(x) (int)mysql_num_fields((x)->result)
#define SQL_ROW MYSQL_ROW
#define SQL_FIELD MYSQL_FIELD
#ifdef HAVE_POSTGRESQL
-#define BDB_VERSION 7
+#define BDB_VERSION 9
#include <libpq-fe.h>
/* TEMP: the following is taken from select OID, typname from pg_type; */
-#define IS_NUM(x) ((x) == 20 || (x) == 21 || (x) == 23 || (x) == 700 || (x) == 701 )
-#define IS_NOT_NULL(x) ((x) == 1)
+#define IS_NUM(x) ((x) == 20 || (x) == 21 || (x) == 23 || (x) == 700 || (x) == 701)
+#define IS_NOT_NULL(x) ((x) == 1)
typedef char **POSTGRESQL_ROW;
typedef struct pg_field {
- char *name;
- unsigned int max_length;
- unsigned int type; // 1 = number
- unsigned int flags; // 1 == not null
+ char *name;
+ int max_length;
+ unsigned int type;
+ unsigned int flags; // 1 == not null
} POSTGRESQL_FIELD;
* used inside sql.c and associated database interface
* subroutines.
*
- * P O S T G R E S Q L
+ * P O S T G R E S Q L
*/
-typedef struct s_db {
- BQUEUE bq; /* queue control */
- brwlock_t lock; /* transaction lock */
+struct B_DB {
+ BQUEUE bq; /* queue control */
+ brwlock_t lock; /* transaction lock */
PGconn *db;
PGresult *result;
int status;
POSTGRESQL_ROW row;
- POSTGRESQL_FIELD field;
+ POSTGRESQL_FIELD *fields;
int num_rows;
int num_fields;
- int row_number; /* what row number did we get via my_postgresql_data_seek? */
- int field_number; /* what field number did we get via my_postgresql_field_seek? */
+ int row_number; /* what row number did we get via my_postgresql_data_seek? */
+ int field_number; /* what field number did we get via my_postgresql_field_seek? */
int ref_count;
char *db_name;
char *db_user;
char *db_password;
- char *db_address; /* host address */
- char *db_socket; /* socket for local access */
- int db_port; /* port of host address */
- int have_insert_id; /* do have insert_id() */
- int connected;
- POOLMEM *errmsg; /* nicely edited error message */
- POOLMEM *cmd; /* SQL command string */
+ char *db_address; /* host address */
+ char *db_socket; /* socket for local access */
+ int db_port; /* port of host address */
+ int have_insert_id; /* do have insert_id() */
+ bool connected;
+ POOLMEM *errmsg; /* nicely edited error message */
+ POOLMEM *cmd; /* SQL command string */
POOLMEM *cached_path;
- int cached_path_len; /* length of cached path */
+ int cached_path_len; /* length of cached path */
uint32_t cached_path_id;
- int changes; /* changes made to db */
- POOLMEM *fname; /* Filename only */
- POOLMEM *path; /* Path only */
- POOLMEM *esc_name; /* Escaped file/path name */
- int fnl; /* file name length */
- int pnl; /* path name length */
-
- int LastID; /* we need to set this during INSERT_DB ****WORK**** */
-} B_DB;
-
+ bool allow_transactions; /* transactions allowed */
+ bool transaction; /* transaction started */
+ int changes; /* changes made to db */
+ POOLMEM *fname; /* Filename only */
+ POOLMEM *path; /* Path only */
+ POOLMEM *esc_name; /* Escaped file/path name */
+ int fnl; /* file name length */
+ int pnl; /* path name length */
+};
+
+void my_postgresql_free_result(B_DB *mdb);
POSTGRESQL_ROW my_postgresql_fetch_row (B_DB *mdb);
+int my_postgresql_query (B_DB *mdb, const char *query);
+void my_postgresql_data_seek (B_DB *mdb, int row);
+int my_postgresql_currval (B_DB *mdb, char *table_name);
+void my_postgresql_field_seek (B_DB *mdb, int row);
POSTGRESQL_FIELD * my_postgresql_fetch_field(B_DB *mdb);
-void my_postgresql_data_seek (B_DB *mdb, int row);
-void my_postgresql_field_seek (B_DB *mdb, int row);
-int my_postgresql_query (B_DB *mdb, char *query);
-void my_postgresql_free_result(B_DB *mdb);
-
/* "Generic" names for easier conversion */
#define sql_store_result(x) ((x)->result)
#define sql_free_result(x) my_postgresql_free_result(x)
#define sql_fetch_row(x) my_postgresql_fetch_row(x)
#define sql_query(x, y) my_postgresql_query((x), (y))
-#define sql_close(x) PQfinish((x)->db)
+#define sql_close(x) PQfinish((x)->db)
#define sql_strerror(x) PQresultErrorMessage((x)->result)
-#define sql_num_rows(x) PQntuples((x)->result)
+#define sql_num_rows(x) ((unsigned) PQntuples((x)->result))
#define sql_data_seek(x, i) my_postgresql_data_seek((x), (i))
-#define sql_affected_rows(x) ((int) PQcmdTuples((x)->result))
-#define sql_insert_id(x) ((x)->LastID)
+#define sql_affected_rows(x) ((unsigned) atoi(PQcmdTuples((x)->result)))
+#define sql_insert_id(x,y) my_postgresql_currval((x), (y))
#define sql_field_seek(x, y) my_postgresql_field_seek((x), (y))
#define sql_fetch_field(x) my_postgresql_fetch_field(x)
-#define sql_num_fields(x) (x)->num_fields
+#define sql_num_fields(x) ((x)->num_fields)
#define SQL_ROW POSTGRESQL_ROW
#define SQL_FIELD POSTGRESQL_FIELD
/* Change this each time there is some incompatible
* file format change!!!!
*/
-#define BDB_VERSION 12 /* file version number */
+#define BDB_VERSION 13 /* file version number */
struct s_control {
int bdb_version; /* Version number */
/* This is the REAL definition for using the
* Bacula internal DB
*/
-typedef struct s_db {
+struct B_DB {
BQUEUE bq; /* queue control */
/* pthread_mutex_t mutex; */ /* single thread lock */
brwlock_t lock; /* transaction lock */
POOLMEM *cached_path;
int cached_path_len; /* length of cached path */
uint32_t cached_path_id;
-} B_DB;
+};
+#endif /* HAVE_SQLITE3 */
#endif /* HAVE_MYSQL */
#endif /* HAVE_SQLITE */
#endif /* HAVE_POSTGRESQL */
/* This is a "dummy" definition for use outside of sql.c
*/
-typedef struct s_db {
+struct B_DB {
int dummy; /* for SunOS compiler */
-} B_DB;
+};
#endif /* __SQL_C */
extern uint32_t bacula_db_version;
-/* ***FIXME*** FileId_t should be uint64_t */
+/* ***FIXME*** FileId_t should *really* be uint64_t
+ * but at the current time, this breaks MySQL.
+ */
typedef uint32_t FileId_t;
typedef uint32_t DBId_t; /* general DB id type */
typedef uint32_t JobId_t;
-
+
#define faddr_t long
JobId_t JobId;
char Job[MAX_NAME_LENGTH]; /* Job unique name */
char Name[MAX_NAME_LENGTH]; /* Job base name */
- int Type; /* actually char(1) */
- int Level; /* actually char(1) */
+ int JobType; /* actually char(1) */
+ int JobLevel; /* actually char(1) */
int JobStatus; /* actually char(1) */
- uint32_t ClientId; /* Id of client */
- uint32_t PoolId; /* Id of pool */
- uint32_t FileSetId; /* Id of FileSet */
+ DBId_t ClientId; /* Id of client */
+ DBId_t PoolId; /* Id of pool */
+ DBId_t FileSetId; /* Id of FileSet */
time_t SchedTime; /* Time job scheduled */
time_t StartTime; /* Job start time */
time_t EndTime; /* Job termination time */
char cStartTime[MAX_TIME_LENGTH];
char cEndTime[MAX_TIME_LENGTH];
/* Extra stuff not in DB */
+ int limit; /* limit records to display */
faddr_t rec_addr;
};
*/
/* JobMedia record */
struct JOBMEDIA_DBR {
- uint32_t JobMediaId; /* record id */
+ DBId_t JobMediaId; /* record id */
JobId_t JobId; /* JobId */
- uint32_t MediaId; /* MediaId */
+ DBId_t MediaId; /* MediaId */
uint32_t FirstIndex; /* First index this Volume */
uint32_t LastIndex; /* Last index this Volume */
uint32_t StartFile; /* File for start of data */
uint32_t EndFile; /* End file on Volume */
uint32_t StartBlock; /* start block on tape */
uint32_t EndBlock; /* last block */
+ uint32_t Copy; /* identical copy */
+ uint32_t Stripe; /* RAIT strip number */
};
/* Volume Parameter structure */
struct VOL_PARAMS {
char VolumeName[MAX_NAME_LENGTH]; /* Volume name */
- uint32_t VolIndex; /* Volume seqence no. */
+ char MediaType[MAX_NAME_LENGTH]; /* Media Type */
+ uint32_t VolIndex; /* Volume seqence no. */
uint32_t FirstIndex; /* First index this Volume */
uint32_t LastIndex; /* Last index this Volume */
uint32_t StartFile; /* File for start of data */
uint32_t EndFile; /* End file on Volume */
uint32_t StartBlock; /* start block on tape */
uint32_t EndBlock; /* last block */
+// uint32_t Copy; /* identical copy */
+// uint32_t Stripe; /* RAIT strip number */
};
uint32_t FileIndex;
uint32_t Stream;
JobId_t JobId;
- uint32_t ClientId;
- uint32_t PathId;
- uint32_t FilenameId;
+ DBId_t ClientId;
+ DBId_t PathId;
+ DBId_t FilenameId;
FileId_t FileId;
+ char *Sig;
+ int SigType;
};
FileId_t FileId;
uint32_t FileIndex;
JobId_t JobId;
- uint32_t FilenameId;
- uint32_t PathId;
+ DBId_t FilenameId;
+ DBId_t PathId;
JobId_t MarkId;
char LStat[256];
-/* int Status; */
char SIG[50];
int SigType; /* NO_SIG/MD5_SIG/SHA1_SIG */
};
/* Pool record -- same format as database */
struct POOL_DBR {
- uint32_t PoolId;
+ DBId_t PoolId;
char Name[MAX_NAME_LENGTH]; /* Pool name */
uint32_t NumVols; /* total number of volumes */
uint32_t MaxVols; /* max allowed volumes */
+ int32_t LabelType; /* Bacula/ANSI/IBM */
int32_t UseOnce; /* set to use once only */
int32_t UseCatalog; /* set to use catalog */
int32_t AcceptAnyVolume; /* set to accept any volume sequence */
uint32_t MaxVolJobs; /* Max Jobs on Volume */
uint32_t MaxVolFiles; /* Max files on Volume */
uint64_t MaxVolBytes; /* Max bytes on Volume */
- char PoolType[MAX_NAME_LENGTH];
+ char PoolType[MAX_NAME_LENGTH];
char LabelFormat[MAX_NAME_LENGTH];
/* Extra stuff not in DB */
faddr_t rec_addr;
};
+class DEVICE_DBR {
+public:
+ DBId_t DeviceId;
+ char Name[MAX_NAME_LENGTH]; /* Device name */
+ DBId_t MediaTypeId; /* MediaType */
+ DBId_t StorageId; /* Storage id if autochanger */
+ uint32_t DevMounts; /* Number of times mounted */
+ uint32_t DevErrors; /* Number of read/write errors */
+ uint64_t DevReadBytes; /* Number of bytes read */
+ uint64_t DevWriteBytes; /* Number of bytew written */
+ uint64_t DevReadTime; /* time spent reading volume */
+ uint64_t DevWriteTime; /* time spent writing volume */
+ uint64_t DevReadTimeSincCleaning; /* read time since cleaning */
+ uint64_t DevWriteTimeSincCleaning; /* write time since cleaning */
+ time_t CleaningDate; /* time last cleaned */
+ utime_t CleaningPeriod; /* time between cleanings */
+};
+
+class STORAGE_DBR {
+public:
+ DBId_t StorageId;
+ char Name[MAX_NAME_LENGTH]; /* Device name */
+ int AutoChanger; /* Set if autochanger */
+
+ /* Not in database */
+ bool created; /* set if created by db_create ... */
+};
+
+class MEDIATYPE_DBR {
+public:
+ DBId_t MediaTypeId;
+ char MediaType[MAX_NAME_LENGTH]; /* MediaType string */
+ int ReadOnly; /* Set if read-only */
+};
+
+
/* Media record -- same as the database */
struct MEDIA_DBR {
- uint32_t MediaId; /* Unique volume id */
+ DBId_t MediaId; /* Unique volume id */
char VolumeName[MAX_NAME_LENGTH]; /* Volume name */
char MediaType[MAX_NAME_LENGTH]; /* Media type */
- uint32_t PoolId; /* Pool id */
+ DBId_t PoolId; /* Pool id */
time_t FirstWritten; /* Time Volume first written */
time_t LastWritten; /* Time Volume last written */
time_t LabelDate; /* Date/Time Volume labeled */
+ int32_t LabelType; /* Label (Bacula/ANSI/IBM) */
uint32_t VolJobs; /* number of jobs on this medium */
uint32_t VolFiles; /* Number of files */
uint32_t VolBlocks; /* Number of blocks */
uint32_t VolWrites; /* Number of writes */
uint32_t VolReads; /* Number of reads */
uint64_t VolBytes; /* Number of bytes written */
+ uint32_t VolParts; /* Number of parts written */
uint64_t MaxVolBytes; /* Max bytes to write to Volume */
uint64_t VolCapacityBytes; /* capacity estimate */
+ uint64_t VolReadTime; /* time spent reading volume */
+ uint64_t VolWriteTime; /* time spent writing volume */
utime_t VolRetention; /* Volume retention in seconds */
utime_t VolUseDuration; /* time in secs volume can be used */
uint32_t MaxVolJobs; /* Max Jobs on Volume */
uint32_t MaxVolFiles; /* Max files on Volume */
int32_t Recycle; /* recycle yes/no */
int32_t Slot; /* slot in changer */
- int32_t Drive; /* drive in changer */
int32_t InChanger; /* Volume currently in changer */
+ DBId_t StorageId; /* Storage record Id */
+ uint32_t EndFile; /* Last file on volume */
+ uint32_t EndBlock; /* Last block on volume */
char VolStatus[20]; /* Volume status */
/* Extra stuff not in DB */
faddr_t rec_addr; /* found record address */
/* Since the database returns times as strings, this is how we pass
* them back.
*/
- char cFirstWritten[MAX_TIME_LENGTH]; /* FirstWritten returned from DB */
+ char cFirstWritten[MAX_TIME_LENGTH]; /* FirstWritten returned from DB */
char cLastWritten[MAX_TIME_LENGTH]; /* LastWritten returned from DB */
- char cLabelData[MAX_TIME_LENGTH]; /* LabelData returned from DB */
+ char cLabelDate[MAX_TIME_LENGTH]; /* LabelData returned from DB */
+ bool set_first_written;
+ bool set_label_date;
};
/* Client record -- same as the database */
struct CLIENT_DBR {
- uint32_t ClientId; /* Unique Client id */
+ DBId_t ClientId; /* Unique Client id */
int AutoPrune;
utime_t FileRetention;
utime_t JobRetention;
/* FileSet record -- same as the database */
struct FILESET_DBR {
- uint32_t FileSetId; /* Unique FileSet id */
+ DBId_t FileSetId; /* Unique FileSet id */
char FileSet[MAX_NAME_LENGTH]; /* FileSet name */
char MD5[50]; /* MD5 signature of include/exclude */
time_t CreateTime; /* date created */
};
+
#include "protos.h"
#include "jcr.h"
-
+
+/*
+ * Some functions exported by sql.c for use withing the
+ * cats directory.
+ */
+void list_result(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx, e_list_type type);
+void list_dashes(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx);
+int get_sql_record_max(JCR *jcr, B_DB *mdb);
+int check_tables_version(JCR *jcr, B_DB *mdb);
+void _db_unlock(const char *file, int line, B_DB *mdb);
+void _db_lock(const char *file, int line, B_DB *mdb);
+
#endif /* __SQL_H_ */
projects / bacula / bacula / blobdiff