stop copy/migration using basejobs

[bacula/bacula] / bacula / src / cats / sql_create.c

diff --git a/bacula/src/cats/sql_create.c b/bacula/src/cats/sql_create.c
index 7e96b1eb0b1a08f6c32eea8c5b50258b91a97282..bc960664a9d1615d521c78e51da139e1bc52ff0a 100644 (file)
--- a/bacula/src/cats/sql_create.c
+++ b/bacula/src/cats/sql_create.c
@@ -843,6 +843,8 @@ bool db_write_batch_file_records(JCR *jcr)
  */
 bool db_create_file_attributes_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
 {
+   ASSERT(ar->FileType != FT_BASE);
+
    Dmsg1(dbglevel, "Fname=%s\n", ar->fname);
    Dmsg0(dbglevel, "put_file_into_catalog\n");
 
@@ -1117,8 +1119,8 @@ const char *create_temp_basefile[4] = {
    "Name BLOB NOT NULL)",
 
    /* Postgresql */
-//   "CREATE TEMPORARY TABLE basefile%lld (" 
-   "CREATE TABLE basefile%lld (" 
+   "CREATE TEMPORARY TABLE basefile%lld (" 
+//   "CREATE TABLE basefile%lld (" 
    "Path TEXT,"
    "Name TEXT)",
 
@@ -1139,10 +1141,15 @@ const char *create_temp_basefile[4] = {
 bool db_create_attributes_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
 {
    bool ret;
-   if (ar->FileType == FT_BASE) {
-      ret = db_create_base_file_attributes_record(jcr, mdb, ar);
-   } else {
+   if (ar->FileType != FT_BASE) {
       ret = db_create_file_attributes_record(jcr, mdb, ar);
+
+   } else if (jcr->HasBase) {
+      ret = db_create_base_file_attributes_record(jcr, jcr->db_batch, ar);
+
+   } else {
+      Jmsg0(jcr, M_FATAL, 0, _("Can't Copy/Migrate job using BaseJob"));
+      ret = true;               /* in copy/migration what do we do ? */
    }
 
    return ret;
@@ -1180,18 +1187,33 @@ bool db_create_base_file_attributes_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
    
    Mmsg(mdb->cmd, "INSERT INTO basefile%lld (Path, Name) VALUES ('%s','%s')",
         (uint64_t)jcr->JobId, mdb->esc_path, mdb->esc_name);
-   Dmsg1(0, "%s\n", mdb->cmd);
 
    ret = INSERT_DB(jcr, mdb, mdb->cmd);
    db_unlock(mdb);
 
    return ret;
 }
+
+/* 
+ * Cleanup the base file temporary tables
+ */
+static void db_cleanup_base_file(JCR *jcr, B_DB *mdb)
+{
+   POOL_MEM buf(PM_MESSAGE);
+   Mmsg(buf, "DROP TABLE new_basefile%lld", (uint64_t) jcr->JobId);
+   db_sql_query(mdb, buf.c_str(), NULL, NULL);
+
+   Mmsg(buf, "DROP TABLE basefile%lld", (uint64_t) jcr->JobId);
+   db_sql_query(mdb, buf.c_str(), NULL, NULL);
+}
+
 /*
  * Put all base file seen in the backup to the BaseFile table
+ * and cleanup temporary tables
  */
 bool db_commit_base_file_attributes_record(JCR *jcr, B_DB *mdb)
 {
+   bool ret;
    char ed1[50];
    POOL_MEM buf(PM_MESSAGE);
 
@@ -1204,21 +1226,9 @@ bool db_commit_base_file_attributes_record(JCR *jcr, B_DB *mdb)
       "AND A.Name = B.Name "
     "ORDER BY B.FileId)", 
         edit_uint64(jcr->JobId, ed1), ed1, ed1);
-   Dmsg1(0, "%s\n", buf.c_str());
-   return db_sql_query(mdb, buf.c_str(), NULL, NULL);
-}
-
-/* 
- * Cleanup the base file temporary tables
- */
-void db_cleanup_base_file(JCR *jcr, B_DB *mdb)
-{
-   POOL_MEM buf(PM_MESSAGE);
-   Mmsg(buf, "DROP TABLE new_basefile%lld", (uint64_t) jcr->JobId);
-//   db_sql_query(mdb, buf.c_str(), NULL, NULL);
-
-   Mmsg(buf, "DROP TABLE basefile%lld", (uint64_t) jcr->JobId);
-//   db_sql_query(mdb, buf.c_str(), NULL, NULL);
+   ret = db_sql_query(mdb, buf.c_str(), NULL, NULL);
+   db_cleanup_base_file(jcr, mdb);
+   return ret;
 }
 
 /*
@@ -1245,19 +1255,19 @@ bool db_create_base_file_list(JCR *jcr, B_DB *mdb, char *jobids)
    }
      
    Mmsg(buf,
-// "CREATE TEMPORARY TABLE new_basefile%lld AS ( "
- "CREATE TABLE new_basefile%lld AS ( "
-   "SELECT Path.Path AS Path, Filename.Name AS Name, File.FileIndex AS FileIndex, "
-          "File.JobId AS JobId, File.LStat AS LStat, File.FileId AS FileId "
-   "FROM ( "
-    "SELECT max(FileId) as FileId, PathId, FilenameId "
-      "FROM (SELECT FileId, PathId, FilenameId FROM File WHERE JobId IN (%s)) AS F "
-     "GROUP BY PathId, FilenameId "
-    ") AS Temp "
-   "JOIN Filename ON (Filename.FilenameId = Temp.FilenameId) "
-   "JOIN Path ON (Path.PathId = Temp.PathId) "
-   "JOIN File ON (File.FileId = Temp.FileId) "
-  "WHERE File.FileIndex > 0)",
+"CREATE TEMPORARY TABLE new_basefile%lld AS ( "
+//"CREATE TABLE new_basefile%lld AS ( "
+  "SELECT Path.Path AS Path, Filename.Name AS Name, File.FileIndex AS FileIndex,"
+         "File.JobId AS JobId, File.LStat AS LStat, File.FileId AS FileId "
+  "FROM ( "
+   "SELECT max(FileId) as FileId, PathId, FilenameId "
+     "FROM (SELECT FileId, PathId, FilenameId FROM File WHERE JobId IN (%s)) AS F "
+    "GROUP BY PathId, FilenameId "
+   ") AS Temp "
+  "JOIN Filename ON (Filename.FilenameId = Temp.FilenameId) "
+  "JOIN Path ON (Path.PathId = Temp.PathId) "
+  "JOIN File ON (File.FileId = Temp.FileId) "
+ "WHERE File.FileIndex > 0)",
         (uint64_t)jcr->JobId, jobids);
    return db_sql_query(mdb, buf.c_str(), NULL, NULL);
 }