db_lock(ua->db);
/* Do it in two times for mysql */
- Mmsg(query, uap_upgrade_copies_oldest_job[db_type], JT_JOB_COPY, jobs, jobs);
+ Mmsg(query, uap_upgrade_copies_oldest_job[db_get_type_index(ua->db)], JT_JOB_COPY, jobs, jobs);
db_sql_query(ua->db, query.c_str(), NULL, (void *)NULL);
Dmsg1(050, "Upgrade copies Log sql=%s\n", query.c_str());
bool purge_jobs_from_volume(UAContext *ua, MEDIA_DBR *mr, bool force)
{
POOL_MEM query(PM_MESSAGE);
- struct del_ctx del;
+ db_list_ctx lst;
+ char *jobids=NULL;
int i;
bool purged = false;
bool stat;
- JOB_DBR jr;
- char ed1[50];
stat = strcmp(mr->VolStatus, "Append") == 0 ||
strcmp(mr->VolStatus, "Full") == 0 ||
return 0;
}
- memset(&jr, 0, sizeof(jr));
- memset(&del, 0, sizeof(del));
- del.max_ids = 1000;
- del.JobId = (JobId_t *)malloc(sizeof(JobId_t) * del.max_ids);
-
/*
* Check if he wants to purge a single jobid
*/
i = find_arg_with_value(ua, "jobid");
- if (i >= 0) {
- del.num_ids = 1;
- del.JobId[0] = str_to_int64(ua->argv[i]);
+ if (i >= 0 && is_a_number_list(ua->argv[i])) {
+ jobids = ua->argv[i];
} else {
/*
* Purge ALL JobIds
*/
- Mmsg(query, "SELECT DISTINCT JobId FROM JobMedia WHERE MediaId=%s",
- edit_int64(mr->MediaId, ed1));
- if (!db_sql_query(ua->db, query.c_str(), file_delete_handler, (void *)&del)) {
+ if (!db_get_volume_jobids(ua->jcr, ua->db, mr, &lst)) {
ua->error_msg("%s", db_strerror(ua->db));
Dmsg0(050, "Count failed\n");
goto bail_out;
}
+ jobids = lst.list;
}
- purge_job_list_from_catalog(ua, del);
+ if (*jobids) {
+ purge_jobs_from_catalog(ua, jobids);
+ }
- ua->info_msg(_("%d File%s on Volume \"%s\" purged from catalog.\n"), del.num_del,
- del.num_del==1?"":"s", mr->VolumeName);
+ ua->info_msg(_("%d File%s on Volume \"%s\" purged from catalog.\n"),
+ lst.count, lst.count<=1?"":"s", mr->VolumeName);
purged = is_volume_purged(ua, mr, force);
bail_out:
- if (del.JobId) {
- free(del.JobId);
- }
return purged;
}
/* If purged, mark it so */
cnt.count = 0;
- Mmsg(query, "SELECT count(*) FROM JobMedia WHERE MediaId=%s",
+ Mmsg(query, "SELECT 1 FROM JobMedia WHERE MediaId=%s LIMIT 1",
edit_int64(mr->MediaId, ed1));
if (!db_sql_query(ua->db, query.c_str(), del_count_handler, (void *)&cnt)) {
ua->error_msg("%s", db_strerror(ua->db));
if (strcasecmp(ua->argk[i], NT_("allpools")) == 0) {
allpools = true;
- } else if (strcasecmp(ua->argk[i], NT_("volume")) == 0 && ua->argv[i]) {
+ } else if (strcasecmp(ua->argk[i], NT_("volume")) == 0
+ && is_name_valid(ua->argv[i], NULL)) {
bstrncpy(mr.VolumeName, ua->argv[i], sizeof(mr.VolumeName));
- } else if (strcasecmp(ua->argk[i], NT_("devicetype")) == 0 && ua->argv[i]) {
+ } else if (strcasecmp(ua->argk[i], NT_("devicetype")) == 0
+ && ua->argv[i]) {
bstrncpy(mr.MediaType, ua->argv[i], sizeof(mr.MediaType));
} else if (strcasecmp(ua->argk[i], NT_("drive")) == 0 && ua->argv[i]) {
drive = atoi(ua->argv[i]);
- } else if (strcasecmp(ua->argk[i], NT_("action")) == 0 && ua->argv[i]) {
+ } else if (strcasecmp(ua->argk[i], NT_("action")) == 0
+ && is_name_valid(ua->argv[i], NULL)) {
action=ua->argv[i];
}
}