*
* Version $Id$
*/
-
/*
- Copyright (C) 2000-2005 Kern Sibbald
+ Copyright (C) 2000-2006 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
#ifdef HAVE_SQLITE
-#define BDB_VERSION 8
+#define BDB_VERSION 10
#include <sqlite.h>
* 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;
POOLMEM *esc_name; /* Escaped file/path name */
int fnl; /* file name length */
int pnl; /* path name length */
-} B_DB;
+};
/*
#ifdef HAVE_SQLITE3
-#define BDB_VERSION 8
+#define BDB_VERSION 10
#include <sqlite3.h>
* subroutines.
* S Q L I T E
*/
-typedef struct s_db {
+struct B_DB {
BQUEUE bq; /* queue control */
brwlock_t lock; /* transaction lock */
struct sqlite3 *db;
POOLMEM *esc_name; /* Escaped file/path name */
int fnl; /* file name length */
int pnl; /* path name length */
-} B_DB;
+};
/*
* Conversion of sqlite 2 names to sqlite3
#ifdef HAVE_MYSQL
-#define BDB_VERSION 8
+#define BDB_VERSION 10
#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;
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))
#ifdef HAVE_POSTGRESQL
-#define BDB_VERSION 8
+#define BDB_VERSION 10
#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;
- int max_length;
- unsigned int type;
- unsigned int flags; // 1 == not null
+ char *name;
+ int max_length;
+ unsigned int type;
+ unsigned int flags; // 1 == not null
} POSTGRESQL_FIELD;
*
* P O S T G R E S Q L
*/
-typedef struct s_db {
+struct B_DB {
BQUEUE bq; /* queue control */
brwlock_t lock; /* transaction lock */
PGconn *db;
POOLMEM *esc_name; /* Escaped file/path name */
int fnl; /* file name length */
int pnl; /* path name length */
-} B_DB;
+};
void my_postgresql_free_result(B_DB *mdb);
POSTGRESQL_ROW my_postgresql_fetch_row (B_DB *mdb);
/* 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 */
/* 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 */
DBId_t ClientId; /* Id of client */
DBId_t PoolId; /* Id of pool */
DBId_t FileSetId; /* Id of FileSet */
+ DBId_t PriorJobId; /* Id of migrated (prior) job */
time_t SchedTime; /* Time job scheduled */
time_t StartTime; /* Job start time */
- time_t EndTime; /* Job termination time */
+ time_t EndTime; /* Job termination time of orig job */
+ time_t RealEndTime; /* Job termination time of this job */
utime_t JobTDate; /* Backup time/date in seconds */
uint32_t VolSessionId;
uint32_t VolSessionTime;
uint32_t JobErrors;
uint32_t JobMissingFiles;
uint64_t JobBytes;
+ int PurgedFiles;
+ int HasBase;
/* Note, FirstIndex, LastIndex, Start/End File and Block
* are only used in the JobMedia record.
char cSchedTime[MAX_TIME_LENGTH];
char cStartTime[MAX_TIME_LENGTH];
char cEndTime[MAX_TIME_LENGTH];
+ char cRealEndTime[MAX_TIME_LENGTH];
/* Extra stuff not in DB */
+ int limit; /* limit records to display */
faddr_t rec_addr;
};
uint32_t EndFile; /* End file on Volume */
uint32_t StartBlock; /* start block on tape */
uint32_t EndBlock; /* last block */
+ uint32_t Copy; /* identical copy */
};
struct VOL_PARAMS {
char VolumeName[MAX_NAME_LENGTH]; /* Volume name */
char MediaType[MAX_NAME_LENGTH]; /* Media Type */
+ char Storage[MAX_NAME_LENGTH]; /* Storage name */
uint32_t VolIndex; /* Volume seqence no. */
uint32_t FirstIndex; /* First index this Volume */
uint32_t LastIndex; /* Last index this Volume */
uint32_t EndFile; /* End file on Volume */
uint32_t StartBlock; /* start block on tape */
uint32_t EndBlock; /* last block */
+ int32_t Slot; /* Slot */
+// uint32_t Copy; /* identical copy */
+// uint32_t Stripe; /* RAIT strip number */
};
DBId_t PathId;
DBId_t FilenameId;
FileId_t FileId;
+ char *Digest;
+ int DigestType;
};
DBId_t PathId;
JobId_t MarkId;
char LStat[256];
- char SIG[50];
- int SigType; /* NO_SIG/MD5_SIG/SHA1_SIG */
+ char Digest[BASE64_SIZE(CRYPTO_DIGEST_MAX_SIZE)];
+ int DigestType; /* NO_SIG/MD5_SIG/SHA1_SIG */
};
/* Pool record -- same format as database */
public:
DBId_t StorageId;
char Name[MAX_NAME_LENGTH]; /* Device name */
- DBId_t MediaTypeId; /* MediaType */
int AutoChanger; /* Set if autochanger */
+
+ /* Not in database */
+ bool created; /* set if created by db_create ... */
};
class MEDIATYPE_DBR {
char VolumeName[MAX_NAME_LENGTH]; /* Volume name */
char MediaType[MAX_NAME_LENGTH]; /* Media type */
DBId_t PoolId; /* Pool id */
- time_t FirstWritten; /* Time Volume first written */
+ time_t FirstWritten; /* Time Volume first written this usage */
time_t LastWritten; /* Time Volume last written */
time_t LabelDate; /* Date/Time Volume labeled */
+ time_t InitialWrite; /* Date/Time Volume first written */
int32_t LabelType; /* Label (Bacula/ANSI/IBM) */
uint32_t VolJobs; /* number of jobs on this medium */
uint32_t VolFiles; /* Number of files */
uint32_t MaxVolFiles; /* Max files on Volume */
int32_t Recycle; /* recycle yes/no */
int32_t Slot; /* slot in changer */
+ int32_t Enabled; /* 0=disabled, 1=enabled, 2=archived */
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 */
+ uint32_t RecycleCount; /* Number of times recycled */
+ char VolStatus[20]; /* Volume status */
+ DBId_t DeviceId; /* Device where Vol last written */
+ DBId_t LocationId; /* Where Volume is -- user defined */
+ DBId_t ScratchPoolId; /* Where to move if scratch */
+ DBId_t RecyclePoolId; /* Where to move when recycled */
/* Extra stuff not in DB */
faddr_t rec_addr; /* found record address */
/* Since the database returns times as strings, this is how we pass
*/
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 */
+ char cInitialWrite[MAX_TIME_LENGTH]; /* InitialWrite returned from DB */
+ bool set_first_written;
+ bool set_label_date;
};
/* Client record -- same as the database */
projects / bacula / bacula / blobdiff