X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fcats%2Fcats.h;h=9431685fe1f34f4fa0faca570ff994c0e3d011e7;hb=d6a2978cea17ce237b4ea9c71853cb96b9f4416f;hp=e8e1d40c82d32c844d79a6afe0ad13758c17af62;hpb=c47adb7146b78abf0e0722e6f87f14f7cf4bffca;p=bacula%2Fbacula

diff --git a/bacula/src/cats/cats.h b/bacula/src/cats/cats.h
index e8e1d40c82..9431685fe1 100644
--- a/bacula/src/cats/cats.h
+++ b/bacula/src/cats/cats.h
@@ -88,7 +88,7 @@ typedef int (DB_RESULT_HANDLER)(void *, int, char **);
 #if defined(BUILDING_CATS)
 #ifdef HAVE_SQLITE
 
-#define BDB_VERSION 10
+#define BDB_VERSION 11
 
 #include <sqlite.h>
 
@@ -208,7 +208,7 @@ extern const char* my_sqlite_batch_fill_path_query;
 #ifdef HAVE_SQLITE3
 
 
-#define BDB_VERSION 10
+#define BDB_VERSION 11
 
 #include <sqlite3.h>
 
@@ -334,7 +334,7 @@ extern const char* my_sqlite_batch_fill_path_query;
 
 #ifdef HAVE_MYSQL
 
-#define BDB_VERSION 10
+#define BDB_VERSION 11
 
 #include <mysql.h>
 
@@ -367,6 +367,7 @@ struct B_DB {
    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 */
@@ -416,7 +417,7 @@ extern void  my_mysql_free_result(B_DB *mdb);
 
 #ifdef HAVE_POSTGRESQL
 
-#define BDB_VERSION 10
+#define BDB_VERSION 11
 
 #include <libpq-fe.h>
 
@@ -530,7 +531,7 @@ extern const char* my_pg_batch_fill_path_query;
 
 #ifdef HAVE_DBI
 
-#define BDB_VERSION 10
+#define BDB_VERSION 11
 
 #include <dbi/dbi.h>
 
@@ -739,19 +740,6 @@ struct B_DB {
 
 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
 
 /*
@@ -802,6 +790,7 @@ struct JOB_DBR {
    uint32_t JobErrors;
    uint32_t JobMissingFiles;
    uint64_t JobBytes;
+   uint64_t ReadBytes;
    int PurgedFiles;
    int HasBase;
 
@@ -851,11 +840,9 @@ struct VOL_PARAMS {
    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 */
 // uint32_t Copy;                     /* identical copy */
 // uint32_t Stripe;                   /* RAIT strip number */
 };
@@ -912,6 +899,7 @@ struct POOL_DBR {
    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 */