Bvfs: Create cache tables when updating the cache if they don't exist

diff --git a/bacula/src/cats/bvfs.c b/bacula/src/cats/bvfs.c
index 690102cd073c22659a7902b2b4d48095f11d1d5b..57c704e035dfa0303f362e42145539fb32f60ef4 100644 (file)
--- a/bacula/src/cats/bvfs.c
+++ b/bacula/src/cats/bvfs.c
@@ -358,10 +358,50 @@ DBId_t Bvfs::get_dir_filenameid()
 
 void bvfs_update_cache(JCR *jcr, B_DB *mdb)
 {
-   uint32_t nb;
+   uint32_t nb=0;
    db_lock(mdb);
    db_start_transaction(jcr, mdb);
 
+   Mmsg(mdb->cmd, "SELECT 1 from brestore_knownjobid LIMIT 1");
+   /* TODO: Add this code in the make_bacula_table script */
+   if (!QUERY_DB(jcr, mdb, mdb->cmd)) {
+      Dmsg0(dbglevel, "Creating cache table\n");
+      Mmsg(mdb->cmd,
+           "CREATE TABLE brestore_knownjobid ("
+           "JobId integer NOT NULL, "
+           "CONSTRAINT brestore_knownjobid_pkey PRIMARY KEY (JobId))");
+      QUERY_DB(jcr, mdb, mdb->cmd);
+
+      Mmsg(mdb->cmd,
+           "CREATE TABLE brestore_pathhierarchy ( "
+           "PathId integer NOT NULL, "
+           "PPathId integer NOT NULL, "
+           "CONSTRAINT brestore_pathhierarchy_pkey "
+           "PRIMARY KEY (PathId))");
+      QUERY_DB(jcr, mdb, mdb->cmd); 
+
+      Mmsg(mdb->cmd,
+           "CREATE INDEX brestore_pathhierarchy_ppathid "
+           "ON brestore_pathhierarchy (PPathId)");
+      QUERY_DB(jcr, mdb, mdb->cmd);
+
+      Mmsg(mdb->cmd, 
+           "CREATE TABLE brestore_pathvisibility ("
+           "PathId integer NOT NULL, "
+           "JobId integer NOT NULL, "
+           "Size int8 DEFAULT 0, "
+           "Files int4 DEFAULT 0, "
+           "CONSTRAINT brestore_pathvisibility_pkey "
+           "PRIMARY KEY (JobId, PathId))");
+      QUERY_DB(jcr, mdb, mdb->cmd);
+
+      Mmsg(mdb->cmd, 
+           "CREATE INDEX brestore_pathvisibility_jobid "
+           "ON brestore_pathvisibility (JobId)");
+      QUERY_DB(jcr, mdb, mdb->cmd);
+
+   }
+
    POOLMEM *jobids = get_pool_memory(PM_NAME);
    *jobids = 0;
 
@@ -377,6 +417,7 @@ void bvfs_update_cache(JCR *jcr, B_DB *mdb)
 
    db_end_transaction(jcr, mdb);
    db_start_transaction(jcr, mdb);
+   Dmsg0(dbglevel, "Cleaning pathvisibility\n");
    Mmsg(mdb->cmd, 
         "DELETE FROM brestore_pathvisibility "
          "WHERE NOT EXISTS "
@@ -384,6 +425,7 @@ void bvfs_update_cache(JCR *jcr, B_DB *mdb)
    nb = DELETE_DB(jcr, mdb, mdb->cmd);
    Dmsg1(dbglevel, "Affected row(s) = %d\n", nb);
 
+   Dmsg0(dbglevel, "Cleaning knownjobid\n");
    Mmsg(mdb->cmd,         
         "DELETE FROM brestore_knownjobid "
          "WHERE NOT EXISTS "
@@ -412,7 +454,7 @@ bvfs_update_path_hierarchy_cache(JCR *jcr, B_DB *mdb, char *jobids)
       if (stat == 0) {
          break;
       }
-
+      Dmsg1(dbglevel, "Updating cache for %lld\n", (uint64_t) JobId);
       update_path_hierarchy_cache(jcr, mdb, ppathid_cache, JobId);
    }
 }

diff --git a/bacula/src/tools/bvfs_test.c b/bacula/src/tools/bvfs_test.c
index 0772873bfc195a727aeafa38244b760080fb73b5..87c18b06e813f8c3b57def4c0f61020b1212b808 100644 (file)
--- a/bacula/src/tools/bvfs_test.c
+++ b/bacula/src/tools/bvfs_test.c
@@ -204,7 +204,7 @@ int main (int argc, char *argv[])
    bjcr->db = db;
 
    if (clean) {
-      Pmsg0(0, "Clean old table");
+      Pmsg0(0, "Clean old table\n");
       db_sql_query(db, "DELETE FROM brestore_pathhierarchy", NULL, NULL);
       db_sql_query(db, "DELETE FROM brestore_knownjobid", NULL, NULL);
       db_sql_query(db, "DELETE FROM brestore_pathvisibility", NULL, NULL);

diff --git a/bacula/technotes b/bacula/technotes
index 43e325668edc6c23dc27c986a039d8f588e9db44..0b9386feb908a9bf86e616efbc65ca8e5e06326f 100644 (file)
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -2,6 +2,8 @@
           
 General:
 
+07Aug09
+ebl  Create cache tables on the fly when using Bvfs object (for testing)
 06Aug09
 ebl  Document FT_DELETED FileIndex=0 special value in database Schema
 ebl  Add a new Bvfs class that implements brestore instant navigation