#if defined(BUILDING_CATS)
#ifdef HAVE_SQLITE
-#define BDB_VERSION 10
+#define BDB_VERSION 11
#include <sqlite.h>
#ifdef HAVE_SQLITE3
-#define BDB_VERSION 10
+#define BDB_VERSION 11
#include <sqlite3.h>
#ifdef HAVE_MYSQL
-#define BDB_VERSION 10
+#define BDB_VERSION 11
#include <mysql.h>
POOLMEM *cached_path;
int cached_path_len; /* length of cached path */
uint32_t cached_path_id;
+ bool allow_transactions; /* transactions allowed */
int changes; /* changes made to db */
POOLMEM *fname; /* Filename only */
POOLMEM *path; /* Path only */
#ifdef HAVE_POSTGRESQL
-#define BDB_VERSION 10
+#define BDB_VERSION 11
#include <libpq-fe.h>
#ifdef HAVE_DBI
-#define BDB_VERSION 10
+#define BDB_VERSION 11
#include <dbi/dbi.h>
extern uint32_t bacula_db_version;
-/*
- * These are the sizes of the current definitions of database
- * Ids. In general, FileId_t can be set to uint64_t and it
- * *should* work. Users have reported back that it does work
- * for PostgreSQL. For the other types, all places in Bacula
- * have been converted, but no one has actually tested it.
- * In principle, the only field that really should need to be
- * 64 bits is the FileId_t
- */
-typedef uint32_t FileId_t;
-typedef uint32_t DBId_t; /* general DB id type */
-typedef uint32_t JobId_t;
-
#define faddr_t long
/*
uint32_t JobErrors;
uint32_t JobMissingFiles;
uint64_t JobBytes;
+ uint64_t ReadBytes;
int PurgedFiles;
int HasBase;
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 */
int32_t Slot; /* Slot */
+ uint64_t StartAddr; /* Start address */
+ uint64_t EndAddr; /* End address */
+ int32_t InChanger; /* InChanger flag */
// uint32_t Copy; /* identical copy */
// uint32_t Stripe; /* RAIT strip number */
};
char *attr; /* attributes statp */
uint32_t FileIndex;
uint32_t Stream;
+ uint32_t FileType;
JobId_t JobId;
DBId_t ClientId;
DBId_t PathId;
uint32_t MaxVolFiles; /* Max files on Volume */
uint64_t MaxVolBytes; /* Max bytes on Volume */
DBId_t RecyclePoolId; /* RecyclePool destination when media is purged */
+ DBId_t ScratchPoolId; /* ScratchPool source when media is needed */
char PoolType[MAX_NAME_LENGTH];
char LabelFormat[MAX_NAME_LENGTH];
/* Extra stuff not in DB */