#include "bacula.h"
#include "cats.h"
-static const int dbglevel = 500;
+static const int dbglevel = 10;
#if HAVE_SQLITE3 || HAVE_MYSQL || HAVE_SQLITE || HAVE_POSTGRESQL || HAVE_DBI
*/
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");
const char *create_temp_basefile[4] = {
/* MySQL */
"CREATE TEMPORARY TABLE basefile%lld ("
- "Name BLOB NOT NULL,"
- "FileName BLOB NOT NULL)",
+ "Path BLOB NOT NULL,"
+ "Name BLOB NOT NULL)",
/* Postgresql */
"CREATE TEMPORARY TABLE basefile%lld ("
- "Name TEXT,"
- "FileName TEXT)",
+// "CREATE TABLE basefile%lld ("
+ "Path TEXT,"
+ "Name TEXT)",
/* SQLite */
"CREATE TEMPORARY TABLE basefile%lld ("
- "Name TEXT,"
- "FileName TEXT)",
+ "Path TEXT,"
+ "Name TEXT)",
/* SQLite3 */
"CREATE TEMPORARY TABLE basefile%lld ("
- "Name TEXT,"
- "FileName TEXT)"
+ "Path TEXT,"
+ "Name TEXT)"
};
-boot db_init_base_file(JCR *jcr, B_DB *mdb)
+/*
+ * Create file attributes record, or base file attributes record
+ */
+bool db_create_attributes_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
{
- POOL_MEM q(PM_MESSAGE);
- Mmsg(q, create_temp_basefile[db_type], (uint64_t) jcr->JobId);
- return db_sql_query(mdb, q.c_str(), NULL, NULL);
+ bool ret;
+ 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;
}
/*
*/
bool db_create_base_file_attributes_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
{
- Dmsg1(dbglevel, "Fname=%s\n", ar->fname);
- Dmsg0(dbglevel, "put_file_into_catalog\n");
+ bool ret;
+ Dmsg1(dbglevel, "create_base_file Fname=%s\n", ar->fname);
+ Dmsg0(dbglevel, "put_base_file_into_catalog\n");
/*
* Make sure we have an acceptable attributes record.
}
db_lock(mdb);
- split_path_and_file(jcr, bdb, ar->fname);
+ split_path_and_file(jcr, mdb, ar->fname);
mdb->esc_name = check_pool_memory_size(mdb->esc_name, mdb->fnl*2+1);
db_escape_string(jcr, mdb, mdb->esc_name, mdb->fname, mdb->fnl);
mdb->esc_path = check_pool_memory_size(mdb->esc_path, mdb->pnl*2+1);
db_escape_string(jcr, mdb, mdb->esc_path, mdb->path, mdb->pnl);
- len = Mmsg(mdb->cmd, "INSERT INTO basefile%lld VALUES ('%s','%s')",
- (uint64_t)jcr->JobId, mdb->esc_path, mdb->esc_name);
-
- boot ret = INSERT_DB(jcr, mdb, mdb->cmd);
+ Mmsg(mdb->cmd, "INSERT INTO basefile%lld (Path, Name) VALUES ('%s','%s')",
+ (uint64_t)jcr->JobId, mdb->esc_path, mdb->esc_name);
+
+ 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);
Mmsg(buf,
- "INSERT INTO BaseFile (BaseJobId, JobId, FileId, FileIndex) ( "
- "SELECT A.JobId AS BaseJobId, %s AS JobId, "
- "A.FileId, A.FileIndex "
+ "INSERT INTO BaseFiles (BaseJobId, JobId, FileId, FileIndex) ( "
+ "SELECT B.JobId AS BaseJobId, %s AS JobId, "
+ "B.FileId, B.FileIndex "
"FROM basefile%s AS A, new_basefile%s AS B "
"WHERE A.Path = B.Path "
- "AND A.Filename = B.Filename "
- "ORDER BY FileId)",
- edit_uint64(ed1, jcr->JobId), ed1, ed1);
-
- 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)
-{
- 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);
+ "AND A.Name = B.Name "
+ "ORDER BY B.FileId)",
+ edit_uint64(jcr->JobId, ed1), ed1, ed1);
+ ret = db_sql_query(mdb, buf.c_str(), NULL, NULL);
+ db_cleanup_base_file(jcr, mdb);
+ return ret;
}
/*
*/
bool db_create_base_file_list(JCR *jcr, B_DB *mdb, char *jobids)
{
+ POOL_MEM buf(PM_MESSAGE);
+
if (!*jobids) {
db_lock(mdb);
Mmsg(mdb->errmsg, _("ERR=JobIds are empty\n"));
db_unlock(mdb);
return false;
}
- POOL_MEM buf(PM_MESSAGE);
-
+
+ Mmsg(buf, create_temp_basefile[db_type], (uint64_t) jcr->JobId);
+ if (!db_sql_query(mdb, buf.c_str(), NULL, NULL)) {
+ return false;
+ }
+
Mmsg(buf,
- "CREATE TEMPORARY new_basefile%lld AS ( "
- "SELECT Path.Path AS Path, Filename.Name AS Filename, 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);
}
projects / bacula / bacula / blobdiff