X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fcats%2Fsql_get.c;h=e44dc47d4e220751151109096243f236c040872a;hb=f5984fe3b5fe567e1609078ed5966f4d0428f0a7;hp=78a68620387af9a811baf4c00df79a0f807a4203;hpb=5b3e20331aa4b399ee304d90852418364058391a;p=bacula%2Fbacula diff --git a/bacula/src/cats/sql_get.c b/bacula/src/cats/sql_get.c index 78a6862038..e44dc47d4e 100644 --- a/bacula/src/cats/sql_get.c +++ b/bacula/src/cats/sql_get.c @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2008 Free Software Foundation Europe e.V. + Copyright (C) 2000-2010 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -25,7 +25,7 @@ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. */ -/* +/** * Bacula Catalog Database Get record interface routines * Note, these routines generally get a record by id or * by name. If more logic is involved, the routine @@ -33,11 +33,11 @@ * * Kern Sibbald, March 2000 * - * Version $Id: sql_get.c 8918 2009-06-23 11:56:35Z ricozz $ */ -/* The following is necessary so that we do not include +/** + * The following is necessary so that we do not include * the dummy external definition of DB. */ #define __SQL_C /* indicate that this is sql.c */ @@ -45,7 +45,7 @@ #include "bacula.h" #include "cats.h" -#if HAVE_SQLITE3 || HAVE_MYSQL || HAVE_SQLITE || HAVE_POSTGRESQL || HAVE_DBI +#if HAVE_SQLITE3 || HAVE_MYSQL || HAVE_SQLITE || HAVE_POSTGRESQL || HAVE_INGRES || HAVE_DBI /* ----------------------------------------------------------------------- * @@ -57,10 +57,9 @@ /* Forward referenced functions */ static int db_get_file_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr, FILE_DBR *fdbr); static int db_get_filename_record(JCR *jcr, B_DB *mdb); -static int db_get_path_record(JCR *jcr, B_DB *mdb); -/* +/** * Given a full filename (with path), look up the File record * (with attributes) in the database. * @@ -87,7 +86,7 @@ int db_get_file_attributes_record(JCR *jcr, B_DB *mdb, char *fname, JOB_DBR *jr, } -/* +/** * Get a File record * Returns: 0 on failure * 1 on success @@ -117,7 +116,7 @@ int db_get_file_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr, FILE_DBR *fdbr) int stat = 0; char ed1[50], ed2[50], ed3[50]; - if (jcr->get_JobLevel() == L_VERIFY_DISK_TO_CATALOG) { + if (jcr->getJobLevel() == L_VERIFY_DISK_TO_CATALOG) { Mmsg(mdb->cmd, "SELECT FileId, LStat, MD5 FROM File,Job WHERE " "File.JobId=Job.JobId AND File.PathId=%s AND " @@ -126,16 +125,6 @@ int db_get_file_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr, FILE_DBR *fdbr) edit_int64(fdbr->PathId, ed1), edit_int64(fdbr->FilenameId, ed2), edit_int64(jr->ClientId,ed3)); - - } else if (jr != NULL) { - /* Called from Verify so jr->FileIndex is valid */ - Mmsg(mdb->cmd, -"SELECT FileId, LStat, MD5 FROM File WHERE File.JobId=%s AND File.PathId=%s AND " -"File.FilenameId=%s AND FileIndex=%u", - edit_int64(fdbr->JobId, ed1), - edit_int64(fdbr->PathId, ed2), - edit_int64(fdbr->FilenameId,ed3), - jr->FileIndex); } else { Mmsg(mdb->cmd, "SELECT FileId, LStat, MD5 FROM File WHERE File.JobId=%s AND File.PathId=%s AND " @@ -152,11 +141,6 @@ int db_get_file_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr, FILE_DBR *fdbr) if (QUERY_DB(jcr, mdb, mdb->cmd)) { mdb->num_rows = sql_num_rows(mdb); Dmsg1(050, "get_file_record num_rows=%d\n", (int)mdb->num_rows); - if (mdb->num_rows > 1) { - Mmsg1(mdb->errmsg, _("get_file_record want 1 got rows=%d\n"), - mdb->num_rows); - Dmsg1(000, "=== Problem! %s", mdb->errmsg); - } if (mdb->num_rows >= 1) { if ((row = sql_fetch_row(mdb)) == NULL) { Mmsg1(mdb->errmsg, _("Error fetching row: %s\n"), sql_strerror(mdb)); @@ -165,6 +149,13 @@ int db_get_file_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr, FILE_DBR *fdbr) bstrncpy(fdbr->LStat, row[1], sizeof(fdbr->LStat)); bstrncpy(fdbr->Digest, row[2], sizeof(fdbr->Digest)); stat = 1; + if (mdb->num_rows > 1) { + Mmsg3(mdb->errmsg, _("get_file_record want 1 got rows=%d PathId=%s FilenameId=%s\n"), + mdb->num_rows, + edit_int64(fdbr->PathId, ed1), + edit_int64(fdbr->FilenameId, ed2)); + Dmsg1(000, "=== Problem! %s", mdb->errmsg); + } } } else { Mmsg2(mdb->errmsg, _("File record for PathId=%s FilenameId=%s not found.\n"), @@ -179,7 +170,8 @@ int db_get_file_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr, FILE_DBR *fdbr) } -/* Get Filename record +/** + * Get Filename record * Returns: 0 on failure * FilenameId on success * @@ -223,13 +215,14 @@ static int db_get_filename_record(JCR *jcr, B_DB *mdb) return FilenameId; } -/* Get path record +/** + * Get path record * Returns: 0 on failure * PathId on success * * DO NOT use Jmsg in this routine (see notes for get_file_record) */ -static int db_get_path_record(JCR *jcr, B_DB *mdb) +int db_get_path_record(JCR *jcr, B_DB *mdb) { SQL_ROW row; uint32_t PathId = 0; @@ -282,7 +275,7 @@ static int db_get_path_record(JCR *jcr, B_DB *mdb) } -/* +/** * Get Job record for given JobId or Job name * Returns: false on failure * true on success @@ -297,13 +290,13 @@ bool db_get_job_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr) Mmsg(mdb->cmd, "SELECT VolSessionId,VolSessionTime," "PoolId,StartTime,EndTime,JobFiles,JobBytes,JobTDate,Job,JobStatus," "Type,Level,ClientId,Name,PriorJobId,RealEndTime,JobId,FileSetId," -"SchedTime,RealEndTime,ReadBytes,HasBase " +"SchedTime,RealEndTime,ReadBytes,HasBase,PurgedFiles " "FROM Job WHERE Job='%s'", jr->Job); } else { Mmsg(mdb->cmd, "SELECT VolSessionId,VolSessionTime," "PoolId,StartTime,EndTime,JobFiles,JobBytes,JobTDate,Job,JobStatus," "Type,Level,ClientId,Name,PriorJobId,RealEndTime,JobId,FileSetId," -"SchedTime,RealEndTime,ReadBytes,HasBase " +"SchedTime,RealEndTime,ReadBytes,HasBase,PurgedFiles " "FROM Job WHERE JobId=%s", edit_int64(jr->JobId, ed1)); } @@ -347,13 +340,14 @@ bool db_get_job_record(JCR *jcr, B_DB *mdb, JOB_DBR *jr) jr->EndTime = str_to_utime(jr->cEndTime); jr->RealEndTime = str_to_utime(jr->cRealEndTime); jr->HasBase = str_to_int64(row[21]); + jr->PurgedFiles = str_to_int64(row[22]); sql_free_result(mdb); db_unlock(mdb); return true; } -/* +/** * Find VolumeNames for a given JobId * Returns: 0 on error or no Volumes found * number of volumes on success @@ -410,7 +404,7 @@ int db_get_job_volume_names(JCR *jcr, B_DB *mdb, JobId_t JobId, POOLMEM **Volume return stat; } -/* +/** * Find Volume parameters for a give JobId * Returns: 0 on error or no Volumes found * number of volumes on success @@ -429,7 +423,7 @@ int db_get_job_volume_parameters(JCR *jcr, B_DB *mdb, JobId_t JobId, VOL_PARAMS db_lock(mdb); Mmsg(mdb->cmd, "SELECT VolumeName,MediaType,FirstIndex,LastIndex,StartFile," -"JobMedia.EndFile,StartBlock,JobMedia.EndBlock,Copy," +"JobMedia.EndFile,StartBlock,JobMedia.EndBlock," "Slot,StorageId,InChanger" " FROM JobMedia,Media WHERE JobMedia.JobId=%s" " AND JobMedia.MediaId=Media.MediaId ORDER BY VolIndex,JobMediaId", @@ -468,10 +462,9 @@ int db_get_job_volume_parameters(JCR *jcr, B_DB *mdb, JobId_t JobId, VOL_PARAMS EndBlock = str_to_uint64(row[7]); Vols[i].StartAddr = (((uint64_t)StartFile)<<32) | StartBlock; Vols[i].EndAddr = (((uint64_t)EndFile)<<32) | EndBlock; -// Vols[i].Copy = str_to_uint64(row[8]); - Vols[i].Slot = str_to_uint64(row[9]); - StorageId = str_to_uint64(row[10]); - Vols[i].InChanger = str_to_uint64(row[11]); + Vols[i].Slot = str_to_uint64(row[8]); + StorageId = str_to_uint64(row[9]); + Vols[i].InChanger = str_to_uint64(row[10]); Vols[i].Storage[0] = 0; SId[i] = StorageId; } @@ -499,7 +492,7 @@ int db_get_job_volume_parameters(JCR *jcr, B_DB *mdb, JobId_t JobId, VOL_PARAMS -/* +/** * Get the number of pool records * * Returns: -1 on failure @@ -516,7 +509,7 @@ int db_get_num_pool_records(JCR *jcr, B_DB *mdb) return stat; } -/* +/** * This function returns a list of all the Pool record ids. * The caller must free ids if non-NULL. * @@ -553,7 +546,7 @@ int db_get_pool_ids(JCR *jcr, B_DB *mdb, int *num_ids, uint32_t *ids[]) return stat; } -/* +/** * This function returns a list of all the Client record ids. * The caller must free ids if non-NULL. * @@ -569,7 +562,7 @@ int db_get_client_ids(JCR *jcr, B_DB *mdb, int *num_ids, uint32_t *ids[]) db_lock(mdb); *ids = NULL; - Mmsg(mdb->cmd, "SELECT ClientId FROM Client"); + Mmsg(mdb->cmd, "SELECT ClientId FROM Client ORDER BY Name"); if (QUERY_DB(jcr, mdb, mdb->cmd)) { *num_ids = sql_num_rows(mdb); if (*num_ids > 0) { @@ -592,7 +585,8 @@ int db_get_client_ids(JCR *jcr, B_DB *mdb, int *num_ids, uint32_t *ids[]) -/* Get Pool Record +/** + * Get Pool Record * If the PoolId is non-zero, we get its record, * otherwise, we search on the PoolName * @@ -610,13 +604,15 @@ bool db_get_pool_record(JCR *jcr, B_DB *mdb, POOL_DBR *pdbr) Mmsg(mdb->cmd, "SELECT PoolId,Name,NumVols,MaxVols,UseOnce,UseCatalog,AcceptAnyVolume," "AutoPrune,Recycle,VolRetention,VolUseDuration,MaxVolJobs,MaxVolFiles," -"MaxVolBytes,PoolType,LabelType,LabelFormat,RecyclePoolId,ScratchPoolId FROM Pool WHERE Pool.PoolId=%s", +"MaxVolBytes,PoolType,LabelType,LabelFormat,RecyclePoolId,ScratchPoolId," +"ActionOnPurge FROM Pool WHERE Pool.PoolId=%s", edit_int64(pdbr->PoolId, ed1)); } else { /* find by name */ Mmsg(mdb->cmd, "SELECT PoolId,Name,NumVols,MaxVols,UseOnce,UseCatalog,AcceptAnyVolume," "AutoPrune,Recycle,VolRetention,VolUseDuration,MaxVolJobs,MaxVolFiles," -"MaxVolBytes,PoolType,LabelType,LabelFormat,RecyclePoolId,ScratchPoolId FROM Pool WHERE Pool.Name='%s'", +"MaxVolBytes,PoolType,LabelType,LabelFormat,RecyclePoolId,ScratchPoolId," +"ActionOnPurge FROM Pool WHERE Pool.Name='%s'", pdbr->Name); } if (QUERY_DB(jcr, mdb, mdb->cmd)) { @@ -650,6 +646,7 @@ bool db_get_pool_record(JCR *jcr, B_DB *mdb, POOL_DBR *pdbr) bstrncpy(pdbr->LabelFormat, row[16]!=NULL?row[16]:"", sizeof(pdbr->LabelFormat)); pdbr->RecyclePoolId = str_to_int64(row[17]); pdbr->ScratchPoolId = str_to_int64(row[18]); + pdbr->ActionOnPurge = str_to_int32(row[19]); ok = true; } } @@ -672,7 +669,8 @@ bool db_get_pool_record(JCR *jcr, B_DB *mdb, POOL_DBR *pdbr) return ok; } -/* Get Client Record +/** + * Get Client Record * If the ClientId is non-zero, we get its record, * otherwise, we search on the Client Name * @@ -727,7 +725,7 @@ int db_get_client_record(JCR *jcr, B_DB *mdb, CLIENT_DBR *cdbr) return stat; } -/* +/** * Get Counter Record * * Returns: 0 on failure @@ -778,7 +776,8 @@ int db_get_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr) } -/* Get FileSet Record +/** + * Get FileSet Record * If the FileSetId is non-zero, we get its record, * otherwise, we search on the name * @@ -829,7 +828,7 @@ int db_get_fileset_record(JCR *jcr, B_DB *mdb, FILESET_DBR *fsr) } -/* +/** * Get the number of Media records * * Returns: -1 on failure @@ -846,10 +845,10 @@ int db_get_num_media_records(JCR *jcr, B_DB *mdb) return stat; } - -/* +/** * This function returns a list of all the Media record ids for - * the current Pool with the correct Media Type. + * the current Pool, the correct Media Type, Recyle, Enabled, StorageId, VolBytes + * VolumeName if specified * The caller must free ids if non-NULL. * * Returns false: on failure @@ -862,12 +861,50 @@ bool db_get_media_ids(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr, int *num_ids, uint32_t uint32_t *id; char ed1[50]; bool ok = false; + char buf[MAX_NAME_LENGTH*3]; /* Can contain MAX_NAME_LENGTH*2+1 + AND ....='' */ + char esc[MAX_NAME_LENGTH*2+1]; db_lock(mdb); *ids = NULL; - Mmsg(mdb->cmd, "SELECT DISTINCT MediaId FROM Media WHERE PoolId=%s " - " AND MediaType='%s'", - edit_int64(mr->PoolId, ed1), mr->MediaType); + + Mmsg(mdb->cmd, "SELECT DISTINCT MediaId FROM Media WHERE Recycle=%d AND Enabled=%d ", + mr->Recycle, mr->Enabled); + + if (*mr->MediaType) { + db_escape_string(jcr, mdb, esc, mr->MediaType, strlen(mr->MediaType)); + bsnprintf(buf, sizeof(buf), "AND MediaType='%s' ", esc); + pm_strcat(mdb->cmd, buf); + } + + if (mr->StorageId) { + bsnprintf(buf, sizeof(buf), "AND StorageId=%s ", edit_uint64(mr->StorageId, ed1)); + pm_strcat(mdb->cmd, buf); + } + + if (mr->PoolId) { + bsnprintf(buf, sizeof(buf), "AND PoolId=%s ", edit_uint64(mr->PoolId, ed1)); + pm_strcat(mdb->cmd, buf); + } + + if (mr->VolBytes) { + bsnprintf(buf, sizeof(buf), "AND VolBytes > %s ", edit_uint64(mr->VolBytes, ed1)); + pm_strcat(mdb->cmd, buf); + } + + if (*mr->VolumeName) { + db_escape_string(jcr, mdb, esc, mr->VolumeName, strlen(mr->VolumeName)); + bsnprintf(buf, sizeof(buf), "AND VolumeName = '%s' ", esc); + pm_strcat(mdb->cmd, buf); + } + + if (*mr->VolStatus) { + db_escape_string(jcr, mdb, esc, mr->VolStatus, strlen(mr->VolStatus)); + bsnprintf(buf, sizeof(buf), "AND VolStatus = '%s' ", esc); + pm_strcat(mdb->cmd, buf); + } + + Dmsg1(100, "q=%s\n", mdb->cmd); + if (QUERY_DB(jcr, mdb, mdb->cmd)) { *num_ids = sql_num_rows(mdb); if (*num_ids > 0) { @@ -889,7 +926,7 @@ bool db_get_media_ids(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr, int *num_ids, uint32_t } -/* +/** * This function returns a list of all the DBIds that are returned * for the query. * @@ -926,7 +963,8 @@ bool db_get_query_dbids(JCR *jcr, B_DB *mdb, POOL_MEM &query, dbid_list &ids) return ok; } -/* Get Media Record +/** + * Get Media Record * * Returns: false: on failure * true: on success @@ -951,7 +989,7 @@ bool db_get_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr) "MaxVolFiles,Recycle,Slot,FirstWritten,LastWritten,InChanger," "EndFile,EndBlock,VolParts,LabelType,LabelDate,StorageId," "Enabled,LocationId,RecycleCount,InitialWrite," - "ScratchPoolId,RecyclePoolId,VolReadTime,VolWriteTime " + "ScratchPoolId,RecyclePoolId,VolReadTime,VolWriteTime,ActionOnPurge " "FROM Media WHERE MediaId=%s", edit_int64(mr->MediaId, ed1)); } else { /* find by name */ @@ -961,7 +999,7 @@ bool db_get_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr) "MaxVolFiles,Recycle,Slot,FirstWritten,LastWritten,InChanger," "EndFile,EndBlock,VolParts,LabelType,LabelDate,StorageId," "Enabled,LocationId,RecycleCount,InitialWrite," - "ScratchPoolId,RecyclePoolId,VolReadTime,VolWriteTime " + "ScratchPoolId,RecyclePoolId,VolReadTime,VolWriteTime,ActionOnPurge " "FROM Media WHERE VolumeName='%s'", mr->VolumeName); } @@ -1019,6 +1057,7 @@ bool db_get_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr) mr->RecyclePoolId = str_to_int64(row[34]); mr->VolReadTime = str_to_int64(row[35]); mr->VolWriteTime = str_to_int64(row[36]); + mr->ActionOnPurge = str_to_int32(row[37]); ok = true; } @@ -1044,11 +1083,13 @@ bool db_get_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr) return ok; } -/* - * Find the last "accurate" backup state (that can take deleted files in account) +/** + * Find the last "accurate" backup state (that can take deleted files in + * account) * 1) Get all files with jobid in list (F subquery) * Get all files in BaseFiles with jobid in list - * 2) Take only the last version of each file (Temp subquery) => accurate list is ok + * 2) Take only the last version of each file (Temp subquery) => accurate list + * is ok * 3) Join the result to file table to get fileindex, jobid and lstat information * * TODO: See if we can do the SORT only if needed (as an argument) @@ -1066,29 +1107,22 @@ bool db_get_file_list(JCR *jcr, B_DB *mdb, char *jobids, #define new_db_get_file_list #ifdef new_db_get_file_list - /* This is broken, at least if called from ua_restore.c */ + POOL_MEM buf2(PM_MESSAGE); + Mmsg(buf2, select_recent_version_with_basejob[db_type], + jobids, jobids, jobids, jobids); Mmsg(buf, - "SELECT Path.Path, Filename.Name, File.FileIndex, File.JobId, File.LStat " - "FROM ( " - "SELECT max(FileId) as FileId, PathId, FilenameId " - "FROM (SELECT FileId, PathId, FilenameId FROM File WHERE JobId IN (%s) " - "UNION " - "SELECT File.FileId, PathId, FilenameId " - "FROM BaseFiles JOIN File USING (FileId) " - "WHERE BaseFiles.JobId IN (%s) " - ") AS F " - "GROUP BY PathId, FilenameId " - ") AS Temp " +"SELECT Path.Path, Filename.Name, Temp.FileIndex, Temp.JobId, LStat, MD5 " + "FROM ( %s ) 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 ORDER BY JobId, FileIndex ASC",/* Return sorted by JobId, */ - /* FileIndex for restore code */ - jobids, jobids); +"WHERE FileIndex > 0 " +"ORDER BY Temp.JobId, FileIndex ASC",/* Return sorted by JobId, */ + /* FileIndex for restore code */ + buf2.c_str()); #else /* - * I am not sure that this works the same as the code in ua_restore.c - * but it is very similar. The accurate-test fails in a restore. Bad file count. + * I am not sure that this works the same as the code in ua_restore.c but it + * is very similar. The accurate-test fails in a restore. Bad file count. */ Mmsg(buf, uar_sel_files, jobids); #endif @@ -1096,22 +1130,23 @@ bool db_get_file_list(JCR *jcr, B_DB *mdb, char *jobids, return db_sql_query(mdb, buf.c_str(), result_handler, ctx); } -/* +/** * This procedure gets the base jobid list used by jobids, - * You can specify jobids == result to concat base jobids to current jobids */ -bool db_get_used_base_jobids(JCR *jcr, B_DB *mdb, POOLMEM *jobids, POOLMEM *result) +bool db_get_used_base_jobids(JCR *jcr, B_DB *mdb, + POOLMEM *jobids, db_list_ctx *result) { POOL_MEM buf; Mmsg(buf, "SELECT DISTINCT BaseJobId " " FROM Job JOIN BaseFiles USING (JobId) " " WHERE Job.HasBase = 1 " - " AND JobId IN (%s) ", jobids); - return db_sql_query(mdb, buf.c_str(), db_get_int_handler, jobids); + " AND Job.JobId IN (%s) ", jobids); + return db_sql_query(mdb, buf.c_str(), db_list_handler, result); } -/* The decision do change an incr/diff was done before +/** + * The decision do change an incr/diff was done before * Full : do nothing * Differential : get the last full id * Incremental : get the last full + last diff + last incr(s) ids @@ -1122,7 +1157,7 @@ bool db_get_used_base_jobids(JCR *jcr, B_DB *mdb, POOLMEM *jobids, POOLMEM *resu * TODO: look and merge from ua_restore.c */ bool db_accurate_get_jobids(JCR *jcr, B_DB *mdb, - JOB_DBR *jr, POOLMEM *jobids) + JOB_DBR *jr, db_list_ctx *jobids) { bool ret=false; char clientid[50], jobid[50], filesetid[50]; @@ -1133,7 +1168,8 @@ bool db_accurate_get_jobids(JCR *jcr, B_DB *mdb, utime_t StartTime = (jr->StartTime)?jr->StartTime:time(NULL); bstrutime(date, sizeof(date), StartTime + 1); - jobids[0]='\0'; + jobids->list[0] = 0; + jobids->count = 0; /* First, find the last good Full backup for this job/client/fileset */ Mmsg(query, @@ -1199,8 +1235,8 @@ bool db_accurate_get_jobids(JCR *jcr, B_DB *mdb, /* build a jobid list ie: 1,2,3,4 */ Mmsg(query, "SELECT JobId FROM btemp3%s ORDER by JobTDate", jobid); - db_sql_query(mdb, query.c_str(), db_get_int_handler, jobids); - Dmsg1(10, "db_accurate_get_jobids=%s\n", jobids); + db_sql_query(mdb, query.c_str(), db_list_handler, jobids); + Dmsg1(1, "db_accurate_get_jobids=%s\n", jobids->list); ret = true; bail_out: @@ -1216,21 +1252,25 @@ bool db_get_base_file_list(JCR *jcr, B_DB *mdb, POOL_MEM buf(PM_MESSAGE); Mmsg(buf, - "SELECT Path, Name, FileIndex, JobId, LStat " + "SELECT Path, Name, FileIndex, JobId, LStat, MD5 " "FROM new_basefile%lld ORDER BY JobId, FileIndex ASC", (uint64_t) jcr->JobId); return db_sql_query(mdb, buf.c_str(), result_handler, ctx); } + bool db_get_base_jobid(JCR *jcr, B_DB *mdb, JOB_DBR *jr, JobId_t *jobid) { - char date[MAX_TIME_LENGTH]; - int64_t id = *jobid = 0; POOL_MEM query(PM_FNAME); + utime_t StartTime; + db_int64_ctx lctx; + char date[MAX_TIME_LENGTH]; + bool ret=false; + *jobid = 0; // char clientid[50], filesetid[50]; - utime_t StartTime = (jr->StartTime)?jr->StartTime:time(NULL); + StartTime = (jr->StartTime)?jr->StartTime:time(NULL); bstrutime(date, sizeof(date), StartTime + 1); /* we can take also client name, fileset, etc... */ @@ -1251,31 +1291,16 @@ bool db_get_base_jobid(JCR *jcr, B_DB *mdb, JOB_DBR *jr, JobId_t *jobid) date); Dmsg1(10, "db_get_base_jobid q=%s\n", query.c_str()); - if (!db_sql_query(mdb, query.c_str(), db_int64_handler, &id)) { + if (!db_sql_query(mdb, query.c_str(), db_int64_handler, &lctx)) { goto bail_out; } - *jobid = (JobId_t) id; + *jobid = (JobId_t) lctx.value; - Dmsg1(10, "db_get_base_jobid=%lld\n", id); - return true; + Dmsg1(10, "db_get_base_jobid=%lld\n", *jobid); + ret = true; bail_out: - return false; -} - -/* - * Use to build a string of int list from a query. "10,20,30" - */ -int db_get_int_handler(void *ctx, int num_fields, char **row) -{ - POOLMEM *ret = (POOLMEM *)ctx; - if (num_fields == 1) { - if (ret[0]) { - pm_strcat(ret, ","); - } - pm_strcat(ret, row[0]); - } - return 0; + return ret; } -#endif /* HAVE_SQLITE3 || HAVE_MYSQL || HAVE_SQLITE || HAVE_POSTGRESQL || HAVE_DBI */ +#endif /* HAVE_SQLITE3 || HAVE_MYSQL || HAVE_SQLITE || HAVE_POSTGRESQL || HAVE_INGRES || HAVE_DBI */